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 for openSUSE:Factory checked in at 2020-05-29 21:20:06
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive (Old)
and /work/SRC/openSUSE:Factory/.texlive.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive"
Fri May 29 21:20:06 2020 rev:66 rq:808817 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive/texlive.changes 2020-03-31 17:32:05.932255341 +0200
+++ /work/SRC/openSUSE:Factory/.texlive.new.3606/texlive.changes 2020-05-29 21:35:51.662379108 +0200
@@ -1,0 +2,88 @@
+Mon May 25 14:52:43 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Clean rpmlintrc as request in SR#805514
+
+-------------------------------------------------------------------
+Thu May 14 08:46:23 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Correct permissions of wrapper of e.g. mktexlsr (boo#1171341)
+
+-------------------------------------------------------------------
+Tue May 12 09:03:38 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Tue May 5 09:01:14 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add patch source-ppc64.dif to get ppc64 acrch to work
+ (nevertheless ppc64 is currently disabled)
+
+-------------------------------------------------------------------
+Tue May 5 08:56:04 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Avouid conflict with rungs(.tlu) seeing twice in texlive-scripts
+ and texlive-dvipdfmx-bin
+
+-------------------------------------------------------------------
+Wed Apr 29 09:56:08 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add patch 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
+ *Support luajit on ppc64/ppc64le
+- Add patch 0006-Fix-register-allocation-bug-in-arm64.patch
+ * luajit fix for arm64
+- Modify spec file to build luajit based programs on ppc64*
+
+-------------------------------------------------------------------
+Wed Apr 22 11:20:57 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- More LuaJIT binaries which are not build on ppc64/ppc64le not fixed
+ since ages https://github.com/LuaJIT/LuaJIT/issues/42
+
+-------------------------------------------------------------------
+Wed Apr 22 10:27:33 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Adopt patch source-poppler0.59.0.patch to latest use of read_pdf_info()
+
+-------------------------------------------------------------------
+Wed Apr 22 09:49:08 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add a _constraints file to have a better control how much disk
+ space and power we have to get all binaries build and installed
+
+-------------------------------------------------------------------
+Wed Apr 22 06:18:45 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Extend patch source-overflow.dif to catch an overflow found
+ by fortify on ppc64
+- TeXLive 2020 requires harfbuzz >= 2.6
+
+-------------------------------------------------------------------
+Mon Apr 20 07:02:13 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Update to TeXLive 2020
+ * Version based on texlive-20200327-source and biber-2.14
+ * Remove patches now fixed upstream
+ 0001-Updated-tests-after-U-C-upgrade-changed-sortinit-hashes.patch
+ source-poppler0.84.0.patch
+ source-common.patch
+ source-fix-axohelp.patch
+ source-synctex-bump-soname.dif
+ * Ported patches
+ biber-certs.dif
+ source-64.dif
+ source-a2ping.dif
+ source-configure.dif
+ source-fix-bool-poppler.patch
+ source-fix-const-poppler0.66.0.patch
+ source-lacheck.dif
+ source-poppler-fix-dict-memleak.patch
+ source-poppler-use-std_string.patch
+ source-psutils-kpathsea.dif
+ source-psutils.dif
+ source-warns.dif
+ source-x11r7.dif
+ source.dif
+ * New patch source-psutils-kpathsea.dif to avoid false positiv
+
+-------------------------------------------------------------------
@@ -4,0 +93,6 @@
+
+-------------------------------------------------------------------
+Fri Mar 20 12:12:25 UTC 2020 - Dr. Werner Fink <werner(a)suse.de>
+
+- Add patch source-psutils-kpathsea.dif to ignore warning from
+ kpathsea due missing ls-R files
Old:
----
0001-Updated-tests-after-U-C-upgrade-changed-sortinit-hashes.patch
biber-2.12.tar.xz
source-common.patch
source-fix-axohelp.patch
source-poppler0.84.0.patch
source-synctex-bump-soname.dif
texlive-20190407-source.tar.xz
New:
----
0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch
0006-Fix-register-allocation-bug-in-arm64.patch
_constraints
biber-2.14.tar.xz
source-ppc64.dif
source-psutils-kpathsea.dif
texlive-20200327-source.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive.spec ++++++
++++ 1698 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive/texlive.spec
++++ and /work/SRC/openSUSE:Factory/.texlive.new.3606/texlive.spec
++++++ 0004-Add-ppc64-support-based-on-koriakin-GitHub-patchset.patch ++++++
++++ 3521 lines (skipped)
++++++ 0006-Fix-register-allocation-bug-in-arm64.patch ++++++
From: Jason Teplitz <jason(a)tensyr.com>
Date: Mon, 9 Oct 2017 23:03:09 +0000
Subject: Fix register allocation bug in arm64
---
src/lj_asm_arm64.h | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/src/lj_asm_arm64.h b/src/lj_asm_arm64.h
index 8fd92e7..549f8a6 100644
--- a/src/lj_asm_arm64.h
+++ b/src/lj_asm_arm64.h
@@ -871,7 +871,7 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
int bigofs = !emit_checkofs(A64I_LDRx, ofs);
RegSet allow = RSET_GPR;
Reg dest = (ra_used(ir) || bigofs) ? ra_dest(as, ir, RSET_GPR) : RID_NONE;
- Reg node = ra_alloc1(as, ir->op1, allow);
+ Reg node = ra_alloc1(as, ir->op1, ra_hasreg(dest) ? rset_clear(allow, dest) : allow);
Reg key = ra_scratch(as, rset_clear(allow, node));
Reg idx = node;
uint64_t k;
@@ -879,7 +879,6 @@ static void asm_hrefk(ASMState *as, IRIns *ir)
rset_clear(allow, key);
if (bigofs) {
idx = dest;
- rset_clear(allow, dest);
kofs = (int32_t)offsetof(Node, key);
} else if (ra_hasreg(dest)) {
emit_opk(as, A64I_ADDx, dest, node, ofs, allow);
++++++ _constraints ++++++
<constraints>
<hardware>
<disk>
<size unit="G">4</size>
</disk>
<physicalmemory>
<size unit="G">4</size>
</physicalmemory>
<processors>4</processors>
</hardware>
<overwrite>
<conditions>
<arch>x86_64</arch>
<arch>ppc64le</arch>
<arch>s390x</arch>
<arch>aarch64</arch>
</conditions>
<hardware>
<memory>
<size unit="G">6</size>
</memory>
<processors>8</processors>
</hardware>
</overwrite>
</constraints>
++++++ biber-2.12.tar.xz -> biber-2.14.tar.xz ++++++
++++ 54689 lines of diff (skipped)
++++++ biber-certs.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.282383930 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.286383942 +0200
@@ -4,18 +4,18 @@
2 files changed, 2 insertions(+), 1 deletion(-)
--- Build.PL
-+++ Build.PL 2018-04-12 12:07:59.531719830 +0000
-@@ -54,7 +54,6 @@ my $builder = $class->new(
++++ Build.PL 2020-03-20 11:01:12.391105105 +0100
+@@ -55,7 +55,6 @@ my $builder = $class->new(
'List::AllUtils' => 0,
'List::MoreUtils' => 0,
'List::MoreUtils::XS' => 0,
- 'Mozilla::CA' => '20160104',
'Regexp::Common' => 0,
'Log::Log4perl' => 0,
- 'Unicode::Collate' => '1.25',
+ 'Unicode::Collate' => '1.27',
--- bin/biber
+++ bin/biber 2018-04-12 12:06:39.913188617 +0000
-@@ -116,6 +116,8 @@ GetOptions(
+@@ -123,6 +123,8 @@ GetOptions(
) or pod2usage(-verbose => 0,
-exitval => EXIT_ERROR);
++++++ source-64.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.334384084 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.334384084 +0200
@@ -5,7 +5,7 @@
--- configure
+++ configure 2018-04-10 08:58:00.463820598 +0000
-@@ -20674,6 +20674,10 @@ fi
+@@ -20747,6 +20747,10 @@ fi
# most powerpc-linux boxes support dynamic linking these days and
# people can always --disable-shared, the test was removed, and we
# assume the GNU/Linux dynamic linker is in use.
++++++ source-a2ping.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.346384120 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.346384120 +0200
@@ -4,7 +4,7 @@
--- texk/texlive/linked_scripts/a2ping/a2ping.pl
+++ texk/texlive/linked_scripts/a2ping/a2ping.pl 2018-04-10 09:00:52.856579965 +0000
-@@ -1676,7 +1676,7 @@ showpage quit
+@@ -1677,7 +1677,7 @@ showpage quit
## print STDERR $res;
error $?==11 ? "segmentation fault in $GS" : "not a GS output from $GS ($?)"
if !defined $res # BUGFIX at Sun Mar 7 18:51:34 CET 2004
++++++ source-configure.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.366384180 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.366384180 +0200
@@ -30,13 +30,13 @@
ac_configure_args="$ac_configure_args '--enable-native-texlive-build'"])
AS_CASE([$enable_largefile],
--- texk/dvipdfm-x/configure.ac
-+++ texk/dvipdfm-x/configure.ac 2019-05-13 10:27:04.041797653 +0000
-@@ -7,7 +7,7 @@ dnl This file is free software; the co
++++ texk/dvipdfm-x/configure.ac 2020-03-19 13:15:34.631031066 +0000
+@@ -8,7 +8,7 @@ dnl This file is free software; the co
dnl gives unlimited permission to copy and/or distribute it,
dnl with or without modifications, as long as this notice is preserved.
dnl
--AC_INIT([dvipdfm-x (TeX Live)], [20190225], [tex-k(a)tug.org])
-+AC_INIT([dvipdfmx (TeX Live)], [20190225], [tex-k(a)tug.org])
+-AC_INIT([dvipdfm-x (TeX Live)], [20200315], [dvipdfmx(a)tug.org])
++AC_INIT([dvipdfm (TeX Live)], [20200315], [dvipdfmx(a)tug.org])
AC_PREREQ([2.65])
AC_CONFIG_SRCDIR([agl.c])
AC_CONFIG_AUX_DIR([../../build-aux])
++++++ source-fix-bool-poppler.patch ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.390384251 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.390384251 +0200
@@ -80,7 +80,7 @@
index 3b1d250..7dbee00 100644
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
-@@ -178,9 +178,9 @@ int main(int argc, char *argv[])
+@@ -174,9 +174,9 @@ int main(int argc, char *argv[])
// parse the header: object numbers and offsets
objStr.streamReset();
++++++ source-fix-const-poppler0.66.0.patch ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.410384311 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.410384311 +0200
@@ -16,7 +16,7 @@
===================================================================
--- texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
-@@ -73,7 +73,7 @@ int main(int argc, char *argv[])
+@@ -69,7 +69,7 @@ int main(int argc, char *argv[])
Stream *s;
Object srcStream, srcName, catalogDict;
FILE *outfile;
@@ -437,7 +437,7 @@
int rotate;
--- texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+++ texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc 2019-05-13 08:38:55.432114555 +0000
-@@ -275,7 +275,7 @@ static int getNewObjectNumber(Ref ref)
+@@ -276,7 +276,7 @@ static int getNewObjectNumber(Ref ref)
static void copyObject(Object *);
@@ -446,7 +446,7 @@
{
pdf_puts("/");
for (; *s != 0; s++) {
-@@ -287,7 +287,7 @@ static void copyName(char *s)
+@@ -288,7 +288,7 @@ static void copyName(char *s)
}
}
@@ -455,7 +455,7 @@
{
Object obj1;
copyName((char *)obj->dictGetKey(i));
-@@ -297,7 +297,7 @@ static void copyDictEntry(Object * obj,
+@@ -298,7 +298,7 @@ static void copyDictEntry(Object * obj,
pdf_puts("\n");
}
@@ -464,7 +464,7 @@
{
int i, l;
if (!obj->isDict())
-@@ -307,10 +307,10 @@ static void copyDict(Object * obj)
+@@ -308,10 +308,10 @@ static void copyDict(Object * obj)
copyDictEntry(obj, i);
}
@@ -477,7 +477,7 @@
if (!obj->isDict())
pdftex_fail("PDF inclusion: invalid dict type <%s>",
obj->getTypeName());
-@@ -382,7 +382,7 @@ static bool embeddableFont(Object * font
+@@ -383,7 +383,7 @@ static bool embeddableFont(Object * font
return false;
}
@@ -486,7 +486,7 @@
{
Object fontdict, subtype, basefont, fontdescRef, fontdesc, charset,
stemV;
-@@ -467,7 +467,7 @@ static void copyFontResources(Object * o
+@@ -468,7 +468,7 @@ static void copyFontResources(Object * o
pdf_puts(">>\n");
}
@@ -495,7 +495,7 @@
{
// copies all other resources (write_epdf handles Fonts and ProcSets),
-@@ -554,8 +554,8 @@ static void copyObject(Object * obj)
+@@ -555,8 +555,8 @@ static void copyObject(Object * obj)
Object obj1;
int i, l, c;
Ref ref;
@@ -506,7 +506,7 @@
if (obj->isBool()) {
pdf_printf("%s", obj->getBool()? "true" : "false");
} else if (obj->isInt()) {
-@@ -655,7 +655,7 @@ static void writeRefs()
+@@ -656,7 +656,7 @@ static void writeRefs()
static void writeEncodings()
{
UsedEncoding *r, *n;
@@ -515,7 +515,7 @@
int i;
for (r = encodingList; r != 0; r = r->next) {
for (i = 0; i < 256; i++) {
-@@ -822,7 +822,7 @@ void write_epdf(void)
+@@ -823,7 +823,7 @@ void write_epdf(void)
Object groupDict;
bool writeSepGroup = false;
Object info;
++++++ source-lacheck.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.426384359 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.430384371 +0200
@@ -4,7 +4,7 @@
--- utils/lacheck/lacheck.l
+++ utils/lacheck/lacheck.l 2016-01-28 12:07:17.472961598 +0000
-@@ -119,6 +119,7 @@
+@@ -121,6 +121,7 @@
#include <stdio.h>
#include <string.h>
++++++ source-overflow.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.446384418 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.446384418 +0200
@@ -1,6 +1,7 @@
---
+ texk/upmendex/convert.c | 2 +-
utils/lacheck/lacheck.test | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ 2 files changed, 3 insertions(+), 2 deletions(-)
--- utils/lacheck/lacheck.test
+++ utils/lacheck/lacheck.test 2018-04-10 08:57:17.672625041 +0000
@@ -12,3 +13,14 @@
+test -e $srcdir/test.old || > $srcdir/test.old
+diff $srcdir/test.old test.out || true
+--- texk/upmendex/convert.c
++++ texk/upmendex/convert.c 2020-04-22 06:10:54.285427585 +0000
+@@ -187,7 +187,7 @@ static int dcomp(const void *bf1, const
+ int convert(UChar *buff1, UChar *buff2)
+ {
+ int i=0,j=0,k;
+- char errbuff[BUFFERLEN],errbuff2[BUFFERLEN];
++ char errbuff[BUFFERLEN+42],errbuff2[BUFFERLEN];
+ int wclen;
+ UChar buff3[3];
+
++++++ source-poppler-fix-dict-memleak.patch ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.458384454 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.462384466 +0200
@@ -50,7 +50,7 @@
diff --git a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
--- a/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
+++ b/texk/web2c/pdftexdir/pdftoepdf-poppler0.72.0.cc
-@@ -977,7 +977,7 @@ The changes below seem to work fine.
+@@ -978,7 +978,7 @@ The changes below seem to work fine.
}
l = dic1.getLength();
for (i = 0; i < l; i++) {
++++++ source-poppler-use-std_string.patch ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.470384489 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.474384501 +0200
@@ -11,7 +11,7 @@
index 7dbee00..cc44daf 100644
--- a/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
+++ b/texk/web2c/pdftexdir/pdftosrc-newpoppler.cc
-@@ -114,7 +114,7 @@ int main(int argc, char *argv[])
+@@ -110,7 +110,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "No SourceName found\n");
exit(1);
}
@@ -20,7 +20,7 @@
// We cannot free srcName, as objname shares its string.
// srcName.free();
} else if (objnum > 0) {
-@@ -123,7 +123,7 @@ int main(int argc, char *argv[])
+@@ -119,7 +119,7 @@ int main(int argc, char *argv[])
fprintf(stderr, "Not a Stream object\n");
exit(1);
}
@@ -29,7 +29,7 @@
if ((p = strrchr(buf, '.')) == 0)
p = strchr(buf, 0);
if (objgen == 0)
-@@ -133,7 +133,7 @@ int main(int argc, char *argv[])
+@@ -129,7 +129,7 @@ int main(int argc, char *argv[])
outname = buf;
} else { // objnum < 0 means we are extracting the XRef table
extract_xref_table = true;
++++++ source-poppler0.59.0.patch ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.486384537 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.486384537 +0200
@@ -717,7 +717,7 @@
+
+int
+read_pdf_info(char *image_name, char *page_name, int page_num,
-+ int pagebox_spec, int minor_pdf_version_wanted,
++ int pagebox_spec, int major_pdf_version_wanted, int minor_pdf_version_wanted,
+ int pdf_inclusion_errorlevel)
+{
+ PdfDocument *pdf_doc;
@@ -745,16 +745,16 @@
+#ifdef POPPLER_VERSION
+ pdf_major_version_found = pdf_doc->doc->getPDFMajorVersion();
+ pdf_minor_version_found = pdf_doc->doc->getPDFMinorVersion();
-+ if ((pdf_major_version_found > 1)
++ if ((pdf_major_version_found > major_pdf_version_wanted)
+ || (pdf_minor_version_found > minor_pdf_version_wanted)) {
+ const char *msg =
+ "PDF inclusion: found PDF version <%d.%d>, but at most version <1.%d> allowed";
+ if (pdf_inclusion_errorlevel > 0) {
-+ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
++ pdftex_fail(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+ } else if (pdf_inclusion_errorlevel < 0) {
+ ; /* do nothing */
+ } else { /* = 0, give warning */
-+ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, minor_pdf_version_wanted);
++ pdftex_warn(msg, pdf_major_version_found, pdf_minor_version_found, major_pdf_version_wanted, minor_pdf_version_wanted);
+ }
+ }
+#else
++++++ source-ppc64.dif ++++++
---
libs/luajit/configure | 9 +++++++++
libs/luajit/m4/lj-system.m4 | 8 +++++++-
2 files changed, 16 insertions(+), 1 deletion(-)
--- libs/luajit/configure
+++ libs/luajit/configure 2020-04-30 15:42:15.998038368 +0000
@@ -14300,6 +14300,15 @@ fi
fi
if test "x$LJHOST" = xPS3; then :
echo '-D PPE -D TOC' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D OPD' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D OPDENV' >>dynasm_flags
+fi
+ if grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1; then :
+ echo '-D ELFV2' >>dynasm_flags
fi ;; #(
*) :
;;
--- libs/luajit/m4/lj-system.m4
+++ libs/luajit/m4/lj-system.m4 2020-04-30 15:42:03.782274022 +0000
@@ -87,7 +87,13 @@ AS_CASE([$LJARCH],
AS_IF([grep 'LJ_ARCH_PPC64 ' conftest.i >/dev/null 2>&1],
[DASM_ARCH=ppc64])
AS_IF([test "x$LJHOST" = xPS3],
- [echo '-D PPE -D TOC' >>dynasm_flags])])
+ [echo '-D PPE -D TOC' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_OPD 1' conftest.i >/dev/null 2>&1],
+ [echo '-D OPD' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_OPDENV 1' conftest.i >/dev/null 2>&1],
+ [echo '-D OPDENV' >>dynasm_flags])
+ AS_IF([grep 'LJ_ARCH_PPC_ELFV2 1' conftest.i >/dev/null 2>&1],
+ [echo '-D ELFV2' >>dynasm_flags])])
AS_IF([test "x$build" != "x$host"],
[AS_CASE([$LJHOST],
++++++ source-psutils-kpathsea.dif ++++++
---
texk/psutils/tests/playnup.2 | 8 ++++++++
texk/psutils/tests/playnup1.2 | 8 ++++++++
texk/psutils/tests/playps.2 | 8 ++++++++
3 files changed, 24 insertions(+)
--- texk/psutils/tests/playnup.2
+++ texk/psutils/tests/playnup.2 2020-03-20 12:06:37.965805617 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] [2] [3] [4] [5] [6] Wrote 6 pages, 16644 bytes
--- texk/psutils/tests/playnup1.2
+++ texk/psutils/tests/playnup1.2 2020-03-20 12:07:21.136995637 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] Wrote 1 pages, 19503 bytes
--- texk/psutils/tests/playps.2
+++ texk/psutils/tests/playps.2 2020-03-20 12:08:02.816213645 +0000
@@ -1 +1,9 @@
+warning: kpathsea: /etc/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/lib/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /usr/share/texmf/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
+warning: kpathsea: /var/cache/texmf/fonts/ls-R: No usable entries in ls-R.
+warning: kpathsea: See the manual for how to generate ls-R.
[1] [2] [3] [4] [5] [6] Wrote 6 pages, 16696 bytes
++++++ source-psutils.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.530384668 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.534384680 +0200
@@ -1,9 +1,9 @@
---
- texk/psutils/psutils-1.23/epsffit.c | 13 +++++++++----
+ texk/psutils/psutils-src/epsffit.c | 13 +++++++++----
1 file changed, 9 insertions(+), 4 deletions(-)
---- texk/psutils/psutils-1.23/epsffit.c
-+++ texk/psutils/psutils-1.23/epsffit.c 2009-08-28 14:47:37.000000000 +0000
+--- texk/psutils/psutils-src/epsffit.c
++++ texk/psutils/psutils-src/epsffit.c 2009-08-28 14:47:37.000000000 +0000
@@ -147,9 +147,14 @@ main(int argc, char **argv)
yoffset -= lly * yscale;
}
++++++ source-warns.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.554384740 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.558384752 +0200
@@ -1,19 +1,18 @@
---
libs/gmp/Makefile.in | 2 +-
libs/icu/icu-src/source/i18n/decNumber.h | 22 +++++++++++++---------
- libs/lua52/Makefile.in | 4 ++--
libs/lua53/Makefile.in | 4 ++--
libs/mpfr/Makefile.in | 2 +-
- libs/teckit/TECkit-src/source/Compiler.cpp | 17 ++++++++++-------
+ libs/teckit/TECkit-src/source/Compiler.cpp | 12 +++++++-----
texk/makeindexk/genind.h | 16 +++++++++++++++-
texk/makeindexk/mkind.h | 20 +++++++++++++++++---
texk/makeindexk/scanid.h | 16 +++++++++++++++-
texk/makeindexk/scanst.h | 16 +++++++++++++++-
- 10 files changed, 93 insertions(+), 32 deletions(-)
+ 9 files changed, 86 insertions(+), 24 deletions(-)
--- libs/gmp/Makefile.in
+++ libs/gmp/Makefile.in 2016-06-07 13:29:33.925651292 +0000
-@@ -480,7 +480,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+@@ -484,7 +484,7 @@ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
am__v_lt_0 = --silent
am__v_lt_1 =
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -66,7 +65,7 @@
--- libs/lua53/Makefile.in
+++ libs/lua53/Makefile.in 2016-06-07 13:29:33.925651292 +0000
-@@ -238,11 +238,11 @@ depcomp = $(SHELL) $(top_srcdir)/../../b
+@@ -238,11 +238,11 @@ am__depfiles_remade = ./$(DEPDIR)/luates
@LUA53_TREE@/src/$(DEPDIR)/lzio.Plo
am__mv = mv -f
COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
@@ -92,28 +91,23 @@
am__v_CC_ = $(am__v_CC_@AM_DEFAULT_V@)
am__v_CC_0 = @echo " CC " $@;
--- libs/teckit/TECkit-src/source/Compiler.cpp
-+++ libs/teckit/TECkit-src/source/Compiler.cpp 2016-06-07 13:29:51.653318024 +0000
-@@ -1449,13 +1449,16 @@ Compiler::Compiler(const char* txt, UInt
- if (dest != 0) {
- int result = compress2(dest + 8, &destLen, compiledTable, compiledSize, Z_BEST_COMPRESSION);
++++ libs/teckit/TECkit-src/source/Compiler.cpp 2020-03-19 13:42:03.021195717 +0000
+@@ -1451,11 +1451,13 @@ Compiler::Compiler(const char* txt, UInt
if (result == Z_OK) {
-- destLen += 8;
-- dest = (Byte*)realloc(dest, destLen); // shrink dest to fit
-- WRITE(((FileHeader*)dest)->type, kMagicNumberCmp);
-- WRITE(((FileHeader*)dest)->version, compiledSize);
+ destLen += 8;
+ dest = static_cast<Byte*>(realloc(dest, destLen)); // shrink dest to fit
+- WRITE(reinterpret_cast<FileHeader*>(dest)->type, kMagicNumberCmp);
+- WRITE(reinterpret_cast<FileHeader*>(dest)->version, compiledSize);
- free(compiledTable);
- compiledTable = dest;
- compiledSize = destLen;
-+ if ((dest = (Byte*)realloc(dest, destLen+8)) != NULL) {
-+ destLen += 8;
-+ WRITE(((FileHeader*)dest)->type, kMagicNumberCmp);
-+ WRITE(((FileHeader*)dest)->version, compiledSize);
++ if (dest != NULL) {
++ WRITE(reinterpret_cast<FileHeader*>(dest)->type, kMagicNumberCmp);
++ WRITE(reinterpret_cast<FileHeader*>(dest)->version, compiledSize);
+ free(compiledTable);
+ compiledTable = dest;
+ compiledSize = destLen;
+ }
-+ else
-+ free(dest);
}
else
free(dest);
++++++ source-x11r7.dif ++++++
--- /var/tmp/diff_new_pack.rdukq5/_old 2020-05-29 21:35:53.570384787 +0200
+++ /var/tmp/diff_new_pack.rdukq5/_new 2020-05-29 21:35:53.574384799 +0200
@@ -4,7 +4,7 @@
--- texk/xdvik/xdvi.h
+++ texk/xdvik/xdvi.h 2016-01-28 12:20:33.976881969 +0000
-@@ -194,6 +194,12 @@ extern unsigned long time_start, time_en
+@@ -182,6 +182,12 @@ extern unsigned long time_start, time_en
#include <inttypes.h>
#endif
++++++ source.dif ++++++
++++ 855 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive/source.dif
++++ and /work/SRC/openSUSE:Factory/.texlive.new.3606/source.dif
++++++ texlive-20190407-source.tar.xz -> texlive-20200327-source.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive/texlive-20190407-source.tar.xz /work/SRC/openSUSE:Factory/.texlive.new.3606/texlive-20200327-source.tar.xz differ: char 26, line 1
1
0
Hello community,
here is the log from the commit of package python-hypothesis for openSUSE:Factory checked in at 2020-05-29 21:19:59
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/python-hypothesis (Old)
and /work/SRC/openSUSE:Factory/.python-hypothesis.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "python-hypothesis"
Fri May 29 21:19:59 2020 rev:47 rq:808025 version:5.11.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/python-hypothesis/python-hypothesis.changes 2020-05-11 13:26:20.515229462 +0200
+++ /work/SRC/openSUSE:Factory/.python-hypothesis.new.3606/python-hypothesis.changes 2020-05-29 21:35:36.494333957 +0200
@@ -1,0 +2,6 @@
+Thu May 21 14:56:04 UTC 2020 - Matej Cepl <mcepl(a)suse.com>
+
+- Add failing-test_array_values_are_unique_high_collision.patch
+ to avoid failing test on i586 (gh#HypothesisWorks/hypothesis#2447)
+
+-------------------------------------------------------------------
New:
----
failing-test_array_values_are_unique_high_collision.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ python-hypothesis.spec ++++++
--- /var/tmp/diff_new_pack.hbTW7s/_old 2020-05-29 21:35:37.174335982 +0200
+++ /var/tmp/diff_new_pack.hbTW7s/_new 2020-05-29 21:35:37.178335994 +0200
@@ -34,6 +34,9 @@
License: MPL-2.0
URL: https://github.com/HypothesisWorks/hypothesis-python
Source: https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-%{v…
+# PATCH-FIX-UPSTREAM failing-test_array_values_are_unique_high_collision.patch gh#HypothesisWorks/hypothesis#2447 mcepl(a)suse.com
+# Skip failing test on i586.
+Patch0: failing-test_array_values_are_unique_high_collision.patch
BuildRequires: %{python_module setuptools >= 36}
BuildRequires: fdupes
BuildRequires: python-rpm-macros
@@ -79,6 +82,8 @@
%prep
%setup -q -n hypothesis-hypothesis-python-%{version}/hypothesis-python
+%autopatch -p1
+
# the django fails to initialize
rm -r tests/django
# do not pull in pandas as a dep in ring1; it slows down things too much
++++++ failing-test_array_values_are_unique_high_collision.patch ++++++
--- a/tests/numpy/test_gen_data.py
+++ b/tests/numpy/test_gen_data.py
@@ -13,6 +13,7 @@
#
# END HEADER
+import struct
import sys
from functools import reduce
from itertools import zip_longest
@@ -28,6 +29,7 @@ from hypothesis.strategies._internal imp
from tests.common.debug import find_any, minimal
from tests.common.utils import fails_with, flaky
+_IS_32BIT = 8 * struct.calcsize("P") == 32
ANY_SHAPE = nps.array_shapes(min_dims=0, max_dims=32, min_side=0, max_side=32)
ANY_NONZERO_SHAPE = nps.array_shapes(min_dims=0, max_dims=32, min_side=1, max_side=32)
STANDARD_TYPES = list(
@@ -361,6 +363,7 @@ def test_cannot_generate_unique_array_of
strat.example()
+(a)pytest.mark.skipif(_IS_32BIT, reason="Test fails on 32bit architecture.")
@given(
nps.arrays(
elements=st.just(0.0),
1
0
Hello community,
here is the log from the commit of package ovmf for openSUSE:Factory checked in at 2020-05-29 21:19:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/ovmf (Old)
and /work/SRC/openSUSE:Factory/.ovmf.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "ovmf"
Fri May 29 21:19:52 2020 rev:48 rq:807896 version:202002
Changes:
--------
--- /work/SRC/openSUSE:Factory/ovmf/ovmf.changes 2020-04-25 20:09:21.243675129 +0200
+++ /work/SRC/openSUSE:Factory/.ovmf.new.3606/ovmf.changes 2020-05-29 21:35:34.922329278 +0200
@@ -1,0 +2,6 @@
+Thu May 21 03:36:17 UTC 2020 - Gary Ching-Pang Lin <glin(a)suse.com>
+
+- Add ovmf-bsc1171643-workaround-outline-atomics.patch to disable
+ gcc10 outline-atomics in AArch64 (bsc#1171643)
+
+-------------------------------------------------------------------
New:
----
ovmf-bsc1171643-workaround-outline-atomics.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ ovmf.spec ++++++
--- /var/tmp/diff_new_pack.fQ3DPa/_old 2020-05-29 21:35:35.878332124 +0200
+++ /var/tmp/diff_new_pack.fQ3DPa/_new 2020-05-29 21:35:35.878332124 +0200
@@ -49,6 +49,7 @@
Patch4: %{name}-disable-ia32-firmware-piepic.patch
Patch5: %{name}-set-fixed-enroll-time.patch
Patch6: %{name}-bsc1163927-fix-ping-and-ip6dxe.patch
+Patch7: %{name}-bsc1171643-workaround-outline-atomics.patch
Patch100: openssl-fix-syntax-error.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: bc
@@ -168,6 +169,9 @@
%patch4 -p1
%patch5 -p1
%patch6 -p1
+%if %{gcc_version} >= 10
+%patch7 -p1
+%endif
# add openssl
pushd CryptoPkg/Library/OpensslLib/openssl
++++++ ovmf-bsc1171643-workaround-outline-atomics.patch ++++++
diff --git a/BaseTools/Conf/tools_def.template b/BaseTools/Conf/tools_def.template
index 2b17d3b..cc510ae 100755
--- a/BaseTools/Conf/tools_def.template
+++ b/BaseTools/Conf/tools_def.template
@@ -2010,7 +2010,7 @@ DEFINE GCC5_ARM_ASM_FLAGS = DEF(GCC49_ARM_ASM_FLAGS)
DEFINE GCC5_AARCH64_ASM_FLAGS = DEF(GCC49_AARCH64_ASM_FLAGS)
DEFINE GCC5_ARM_CC_FLAGS = DEF(GCC49_ARM_CC_FLAGS)
DEFINE GCC5_ARM_CC_XIPFLAGS = DEF(GCC49_ARM_CC_XIPFLAGS)
-DEFINE GCC5_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS)
+DEFINE GCC5_AARCH64_CC_FLAGS = DEF(GCC49_AARCH64_CC_FLAGS) -mno-outline-atomics
DEFINE GCC5_AARCH64_CC_XIPFLAGS = DEF(GCC49_AARCH64_CC_XIPFLAGS)
DEFINE GCC5_ARM_DLINK_FLAGS = DEF(GCC49_ARM_DLINK_FLAGS)
DEFINE GCC5_ARM_DLINK2_FLAGS = DEF(GCC49_ARM_DLINK2_FLAGS) -Wno-error
1
0
Hello community,
here is the log from the commit of package permissions for openSUSE:Factory checked in at 2020-05-29 21:19:46
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/permissions (Old)
and /work/SRC/openSUSE:Factory/.permissions.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "permissions"
Fri May 29 21:19:46 2020 rev:135 rq:807568 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/permissions/permissions.changes 2020-05-12 22:25:31.175016360 +0200
+++ /work/SRC/openSUSE:Factory/.permissions.new.3606/permissions.changes 2020-05-29 21:35:33.506325063 +0200
@@ -1,0 +2,34 @@
+Wed May 20 09:02:14 UTC 2020 - matthias.gerstner(a)suse.com
+
+- Update to version 20200520:
+ * permissions fixed profile: utempter: reinstate libexec compatibility entry
+
+-------------------------------------------------------------------
+Tue May 19 09:14:38 UTC 2020 - matthias.gerstner(a)suse.com
+
+- Update to version 20200519:
+ * chkstat: fix sign conversion warnings on 32-bit architectures
+ * chkstat: allow simultaneous use of `--set` and `--system`
+ * regtest: adjust TestUnkownOwnership test to new warning output behaviour
+
+-------------------------------------------------------------------
+Mon May 18 12:06:10 UTC 2020 - malte.kraus(a)suse.com
+
+- Update to version 20200518:
+ * whitelist texlive public binary (bsc#1171686)
+
+-------------------------------------------------------------------
+Fri May 15 09:49:48 UTC 2020 - matthias.gerstner(a)suse.com
+
+- Update to version 20200514:
+ * fixed permissions: adjust to new libexec dir location (bsc#1171164)
+ (affects utempter path)
+
+-------------------------------------------------------------------
+Wed May 13 12:09:17 UTC 2020 - matthias.gerstner(a)suse.com
+
+- Update to version 20200513:
+ * major rewrite of the chkstat tool
+ * setuid bit for cockpit (bsc#1169614)
+
+-------------------------------------------------------------------
Old:
----
permissions-20200506.tar.xz
New:
----
permissions-20200520.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ permissions.spec ++++++
--- /var/tmp/diff_new_pack.tekRUj/_old 2020-05-29 21:35:34.138326944 +0200
+++ /var/tmp/diff_new_pack.tekRUj/_new 2020-05-29 21:35:34.142326956 +0200
@@ -16,7 +16,7 @@
#
-%define VERSION_DATE 20200506
+%define VERSION_DATE 20200520
Name: permissions
Version: %{VERSION_DATE}.%{suse_version}
@@ -31,6 +31,7 @@
BuildRequires: gcc-c++
BuildRequires: libcap-devel
BuildRequires: libcap-progs
+BuildRequires: tclap
Requires: chkstat
Requires: permissions-config
Recommends: permissions-doc
++++++ _servicedata ++++++
--- /var/tmp/diff_new_pack.tekRUj/_old 2020-05-29 21:35:34.178327063 +0200
+++ /var/tmp/diff_new_pack.tekRUj/_new 2020-05-29 21:35:34.178327063 +0200
@@ -1,4 +1,4 @@
<servicedata>
<service name="tar_scm">
<param name="url">https://github.com/openSUSE/permissions.git</param>
- <param name="changesrevision">8c6029212030ca9c4fc90a60ff26411acd64a565</param></service></servicedata>
\ No newline at end of file
+ <param name="changesrevision">d6344d0fa65aa85c9da0c9a9df00f21a7ddc95b3</param></service></servicedata>
\ No newline at end of file
++++++ permissions-20200506.tar.xz -> permissions-20200520.tar.xz ++++++
++++ 3745 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package texlive-specs-z for openSUSE:Factory checked in at 2020-05-29 21:19:42
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-z (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-z.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-z"
Fri May 29 21:19:42 2020 rev:39 rq:806936 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.changes 2019-11-07 23:12:44.148285658 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-z.new.3606/texlive-specs-z.changes 2020-05-29 21:35:00.966228202 +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
+
+-------------------------------------------------------------------
New:
----
xecyrmongolian.doc.tar.xz
xecyrmongolian.tar.xz
xelatex-dev.tar.xz
xepersian-hm.doc.tar.xz
xepersian-hm.tar.xz
xetex_conf.dif
xkcdcolors.doc.tar.xz
xkcdcolors.tar.xz
xpdfopen.doc.tar.xz
yazd-thesis.doc.tar.xz
yazd-thesis.tar.xz
yquant.doc.tar.xz
yquant.tar.xz
zref.doc.tar.xz
zref.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-z.spec ++++++
++++ 11322 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-z/texlive-specs-z.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-z.new.3606/texlive-specs-z.spec
++++++ xassoccnt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xassoccnt.doc.tlpobj new/tlpkg/tlpobj/xassoccnt.doc.tlpobj
--- old/tlpkg/tlpobj/xassoccnt.doc.tlpobj 2019-02-28 04:15:13.000000000 +0100
+++ new/tlpkg/tlpobj/xassoccnt.doc.tlpobj 2020-03-04 23:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name xassoccnt.doc
category Package
-revision 49516
+revision 54080
shortdesc doc files of xassoccnt
relocated 1
docfiles size=354
++++++ xassoccnt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xassoccnt.tlpobj new/tlpkg/tlpobj/xassoccnt.tlpobj
--- old/tlpkg/tlpobj/xassoccnt.tlpobj 2019-02-28 04:15:14.000000000 +0100
+++ new/tlpkg/tlpobj/xassoccnt.tlpobj 2020-03-04 23:55:21.000000000 +0100
@@ -1,6 +1,6 @@
name xassoccnt
category Package
-revision 49516
+revision 54080
shortdesc Associated counters stepping simultaneously
relocated 1
longdesc This package provides a way of associating counters to an
@@ -15,9 +15,7 @@
runfiles size=31
RELOC/tex/latex/xassoccnt/xassoccnt.sty
catalogue-also assoccnt
-catalogue-contact-home http://www.ich-rede-mich-um-kopf-und-kragen.de
catalogue-ctan /macros/latex/contrib/xassoccnt
-catalogue-date 2018-12-28 09:34:58 +0100
catalogue-license lppl1.3
catalogue-topics counter-mgmt macro-supp
catalogue-version 1.7
++++++ xbmks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xbmks/README.md new/doc/latex/xbmks/README.md
--- old/doc/latex/xbmks/README.md 2018-07-04 23:28:02.000000000 +0200
+++ new/doc/latex/xbmks/README.md 2020-01-18 22:21:48.000000000 +0100
@@ -1,6 +1,6 @@
The xbmks Package
Author: D. P. Story
-Dated: 2018/07/04
+Dated: 2020-01-16
Short description: Create a cross-document bookmark tree.
@@ -16,6 +16,9 @@
PDF Creator: no restrictions, use dvips->distiller|ps2pdf, pdflatex,
lualatex, or xelatex.
+What's New (2020/01/16) Minor modifications to conform to the
+new web.cfg, which is read, if it exists.
+
What's New (2018/07/04) Fixed a problem wherein the bookmarks do not appear
after an even number of compilations.
Binary files old/doc/latex/xbmks/docs/xbmksman.pdf and new/doc/latex/xbmks/docs/xbmksman.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xbmks/docs/xbmksman.tex new/doc/latex/xbmks/docs/xbmksman.tex
--- old/doc/latex/xbmks/docs/xbmksman.tex 2018-07-04 23:28:02.000000000 +0200
+++ new/doc/latex/xbmks/docs/xbmksman.tex 2020-01-18 22:21:48.000000000 +0100
@@ -11,12 +11,12 @@
aebxmp
]{aeb_pro}
\usepackage{aeb_mlink}
-\usepackage{xbmks}
\usepackage{graphicx,array}
%\usepackage{myriadpro}
%\usepackage{calibri}
\usepackage[altbullet]{lucidbry}
+\usepackage{xbmks}
\DeclareInitView{layoutmag={navitab:UseOutlines}}
\xbmksetup{colors={int=red},styles={intbf}}
@@ -63,7 +63,7 @@
email={dpstory(a)acrotex.net},
subject={Documentation for the xbmks package from AcroTeX: cross-document bookmarks},
talksite={\url{www.acrotex.net}},
- version={v2.0.2, 2018/07/04},
+ version={2.0.3, 2020/01/16},
Keywords={AcroTeX, bookmarks, cross-document, document bundle},
copyrightStatus=True,
copyrightNotice={Copyright (C) \the\year, D. P. Story},
Binary files old/doc/latex/xbmks/examples/doc1.pdf and new/doc/latex/xbmks/examples/doc1.pdf differ
Binary files old/doc/latex/xbmks/examples/doc2.pdf and new/doc/latex/xbmks/examples/doc2.pdf differ
Binary files old/doc/latex/xbmks/examples/master.pdf and new/doc/latex/xbmks/examples/master.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xbmks.doc.tlpobj new/tlpkg/tlpobj/xbmks.doc.tlpobj
--- old/tlpkg/tlpobj/xbmks.doc.tlpobj 2019-02-28 04:15:14.000000000 +0100
+++ new/tlpkg/tlpobj/xbmks.doc.tlpobj 2020-01-19 01:54:52.000000000 +0100
@@ -1,9 +1,9 @@
name xbmks.doc
category Package
-revision 48138
+revision 53448
shortdesc doc files of xbmks
relocated 1
-docfiles size=105
+docfiles size=118
RELOC/doc/latex/xbmks/README.md
RELOC/doc/latex/xbmks/docs/xbmks.pdf
RELOC/doc/latex/xbmks/docs/xbmksman.pdf
++++++ xbmks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xbmks/xbmks.sty new/tex/latex/xbmks/xbmks.sty
--- old/tex/latex/xbmks/xbmks.sty 2018-07-04 23:28:02.000000000 +0200
+++ new/tex/latex/xbmks/xbmks.sty 2020-01-18 22:21:48.000000000 +0100
@@ -19,7 +19,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}[1997/12/01]
\ProvidesPackage{xbmks}
- [2018/07/04 v2.0.2 xbmks: Cross-document bookmarks (dps)]
+ [2020/01/16 v2.0.3 xbmks: Cross-document bookmarks (dps)]
\RequirePackage{xkeyval}
\RequirePackage{ifpdf}[2006/02/20]
\RequirePackage{ifxetex}[2006/08/21]
@@ -29,6 +29,8 @@
\DeclareOptionX{pdftex}{\def\xbmk(a)driver{xbmks-pdftex.def}}
\DeclareOptionX{luatex}{\def\xbmk(a)driver{xbmks-pdftex.def}}
\DeclareOptionX{xetex}{\def\xbmk(a)driver{xbmks-xetex.def}}
+\let\bWebCustomize\endinput
+\let\eWebCustomize\relax
\ifpdf\ExecuteOptionsX{pdftex}\else
\ifxetex\ExecuteOptionsX{xetex}\else
\let\ExecuteOptions@SAVE\ExecuteOptions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xbmks.tlpobj new/tlpkg/tlpobj/xbmks.tlpobj
--- old/tlpkg/tlpobj/xbmks.tlpobj 2019-02-28 04:15:14.000000000 +0100
+++ new/tlpkg/tlpobj/xbmks.tlpobj 2020-01-19 01:54:52.000000000 +0100
@@ -1,6 +1,6 @@
name xbmks
category Package
-revision 48138
+revision 53448
shortdesc Create a cross-document bookmark tree
relocated 1
longdesc The package defines the concept of a document bundle, which is
@@ -17,6 +17,5 @@
RELOC/tex/latex/xbmks/xbmks-xetex.def
RELOC/tex/latex/xbmks/xbmks.sty
catalogue-ctan /macros/latex/contrib/xbmks
-catalogue-date 2018-07-04 18:39:06 +0200
catalogue-license lppl1.2
catalogue-topics pdfprocess adobe-distiller
++++++ xcharter.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xcharter/README new/doc/fonts/xcharter/README
--- old/doc/fonts/xcharter/README 2018-08-27 23:40:13.000000000 +0200
+++ new/doc/fonts/xcharter/README 2020-01-24 22:46:53.000000000 +0100
@@ -1,6 +1,6 @@
XCharter Fonts
Michael Sharpe
- 2018-08-25
+ 2020-01-23
This package is an extension of Bitstream Charter, whose original license is reproduced below, as required under the terms of that license. The extension provides small caps, oldstyle figures and superior figures in all four styles, accompanied by LaTeX font support files. The font files themselves are in otf and pfb formats. The fonts are licensed as Free fonts under the same terms as the original from Bitstream. All other support files are subject to the LaTeX Project Public License. See
http://www.ctan.org/license/lppl1.3
@@ -19,10 +19,45 @@
BITSTREAM CHARTER is a registered trademark of Bitstream Inc.
-Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2018, Michael Sharpe.
+Portions of the font modifications are Copyright (c) 2009--2012, Andrey Panov; Copyright (c) 2013--2020, Michael Sharpe.
-Current version: 1.116 2018-08-25
+Current version: 1.205 2020-01-23
+
+Changes in version 1.205
+Replaced the otf files, some of which had corrupted feature lookups.
+
+Changes in version 1.204
+1. Added the missing Dcroat glyphs in the otf files.
+2. Added Greek glyphs designed earlier for math use as text glyphs in the otf files. Currently, these are available only in Roman, Italic, Slanted and Bold, but the only ones with reasonably proper text spacing are Roman and Italic. These are not yet available to LaTeX users.
+3. For reasons I do not understand, with the current version of fontspec, loading XCharter with option Numbers={OldStyle} does not work, but RawFeature={+onum} does.
+
+Changes in version 1.203
+1. Corrected a bad LIGKERN entry affecting the >> ligature in t2 encodings.
+2. Modified the math italic and bold math italic v and w to be more shapely.
+3. Added a variant for of math italic and bold math italic y. These may be chosen using the alty option to newtxmath/charter.
+(Thanks Fabien Guillemot for suggestions concerning the last two items.)
+
+Changes in version 1.202
+Removed some tfm files which were duplicates of some in newtx.
+
+Changes in version 1.201
+Changed name of subscript adjustments file from xcharter.subs to newtx-xcharter-subs.tex.
+
+Changes in version 1.20
+The mathematical parts of fonts have been enhanced so that, when used with newtxmath, they can produce pdf files that satisfy PDF/A-1b. See the newtxmath documentation for details. Note that \hslash, \hbar, \lambdaslash and \lambdabar are now built from Charter glyphs.
+
+Changes in version 1.122
+1. Added many accented glyphs, so that XCharter can now be used to produce Romanized forms of Sanskrit, Tamil and Vietnamize, as well as other European languages.
+2. Modified a number of kerning pairs.
+
+Changes in version 1.121
+Added mark to mark tables so that in unicode text processing, single diacritics are correctly drawn even if there is no precomposed glyph.
+
+Changes in version 1.12
+1. Added new glyphs for Sharp-s and its small caps version as well as a new feature, ss01, to control whether to use these forms in unicode processing.
+2. Added feature cv01 to control shape of oldstyle "one" in unicode processing.
+3. Added kerning for parens and brackets as well as for some unusual letter combinations.
Changes in version 1.116
1. Corrected some kerns between quotesinglbase---U+201A (resp., quotedblbase---U+201E) and A, X. (Thanks to Ulrich Büchsel.)
Binary files old/doc/fonts/xcharter/newgermanfxch-crop.pdf and new/doc/fonts/xcharter/newgermanfxch-crop.pdf differ
Binary files old/doc/fonts/xcharter/newgermanfxch.pdf and new/doc/fonts/xcharter/newgermanfxch.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xcharter/newgermanfxch.tex new/doc/fonts/xcharter/newgermanfxch.tex
--- old/doc/fonts/xcharter/newgermanfxch.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/xcharter/newgermanfxch.tex 2019-08-02 23:29:42.000000000 +0200
@@ -0,0 +1,121 @@
+% !TEX TS-program = XeLaTeX
+\documentclass[11pt]{article}
+\usepackage{geometry}
+\usepackage{fontspec}
+%\uccode`ß=\SS
+%\renewcommand{\SS}{{\addfontfeature{RawFeature=+ss02}\symbol{"1E9E}}}
+\defaultfontfeatures{Mapping=tex-text}
+\setromanfont{XCharter}
+\pagestyle{empty}
+%\setromanfont{cochineal}[StylisticSet=1]
+%\setromanfont{cochineal}[StylisticSet=1]
+%\setsansfont[Scale=MatchLowercase,Mapping=tex-text]{LMSans}
+%\setmonofont[Scale=MatchLowercase]{courierN}
+%\newunicodechar{ß}{\ss}
+%\usepackage{fonttable}
+%\usepackage[ngerman]{babel}
+%\usepackage{polyglossia}
+%\setmainlanguage{german}
+%\def\longs{\symbol{"017F}}
+\begin{document}
+\noindent \textbf{New symbols in XCharter:}
+\begin{center}
+ \begin{tabular}{@{} lcl @{}}
+ \hline
+ Glyph name & glyph & macro\\
+ \hline
+ {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\
+ {\tt uni1E9E.ss01} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\
+ {\tt germandbls.sc} & \textsc{\ss} & \verb|{\textsc{\ss}}| \\
+ {\tt germandbls.sc.ss01} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\
+ \hline
+ \end{tabular}
+\end{center}
+
+%{\bfseries
+%\begin{center}
+% \begin{tabular}{@{} lcl @{}}
+% \hline
+% Glyph name & glyph & macro\\
+% \hline
+% {\tt uni1E9E} & \symbol{"1E9E} &\verb|\symbol{"1E9E}|\\
+% {\tt uni1E9E.alt} & {\addfontfeature{StylisticSet=1}\symbol{"1E9E}} & \verb|{\addfontfeature{StylisticSet=1}\symbol{"1E9E}}| \\
+% {\tt germandbls.sc.ss02} & {\addfontfeature{StylisticSet=1}\textsc{\ss}} & \verb|{\addfontfeature{StylisticSet=1}\textsc{\ss}}| \\
+% \hline
+% \end{tabular}
+%\end{center}
+%}
+\noindent \textbf{Effect of choice of {\tt StylisticSet}:}
+
+\begin{center}
+ \begin{tabular}{@{} ccccc @{}}
+ \hline
+ StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+ \hline
+ None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+
+ =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+ \hline
+ \end{tabular}
+\end{center}
+
+\noindent \textbf{Choosing the shape of the oldstyle figure ``one'':}\\
+
+The default is \oldstylenums{1}. The choice is controlled by the feature \texttt{cv01}. To change this globally when you load XCharter, you may make oldstyle numbers the default with the alternate shape for ``one'':
+\begin{verbatim}
+\setmainfont{XCharter}[CharacterVariant={1:0},Numbers={OldStyle}]
+\end{verbatim}
+To set this for one-time use, you can write:
+\begin{verbatim}
+{\addfontfeature{CharacterVariant={1:0},Numbers={OldStyle}}1}
+\end{verbatim}
+to make $1$ render as {\addfontfeature{CharacterVariant={1:0},Numbers={OldStyle}}\oldstylenums{1}}. (According to its documentation, the first index $1$ in \verb|{1:0}| refers to the {\tt CharacterVariant} index, and the second index, $0$, refers to the first choice specified among the variant forms.)
+
+
+%{\itshape
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+%}
+%
+%\bfseries
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+%
+%\itshape
+%\begin{center}
+% \begin{tabular}{@{} ccccc @{}}
+% \hline
+% StylisticSet & \verb|\ss| & \verb|\SS| & \verb|\MakeUppercase{\ss}| & \verb|\textsc{\ss}| \\
+% \hline
+% None & \ss & \SS & \MakeUppercase{\ss} & \textsc{\ss}\\
+%
+% =1 & {\addfontfeature{StylisticSet=1}\ss} & {\addfontfeature{StylisticSet=1}\SS} & {\addfontfeature{StylisticSet=1}\MakeUppercase{\ss}} & {\addfontfeature{StylisticSet=1}\textsc{\ss}}\\
+% \hline
+% \end{tabular}
+%\end{center}
+
+%{\addfontfeature{StylisticSet=1}
+%
+%\ss\ \MakeUppercase{\ss} \SS\ \textsc{\ss}
+%
+%}
+%\expandafter\show\csname SS\endcsname
+\end{document}
\ No newline at end of file
Binary files old/doc/fonts/xcharter/xcharter-doc.pdf and new/doc/fonts/xcharter/xcharter-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xcharter/xcharter-doc.tex new/doc/fonts/xcharter/xcharter-doc.tex
--- old/doc/fonts/xcharter/xcharter-doc.tex 2018-08-27 23:40:13.000000000 +0200
+++ new/doc/fonts/xcharter/xcharter-doc.tex 2019-11-22 23:14:57.000000000 +0100
@@ -1,20 +1,29 @@
-% !TEX TS-program = pdflatexmk
+% !TEX TS-program = pdflatexmk
\documentclass[11pt]{article}
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage[a-1b]{pdfx} % version 1.6.4 or higher
\usepackage[margin=1in]{geometry}
\usepackage[parfill]{parskip}
-\pdfmapfile{=XCharter.map}
+\usepackage{graphicx}
+%\pdfmapfile{=XCharter.map}
+%\pdfmapfile{=newtx.map}
\usepackage[scaled=1.03,varqu,varl]{inconsolata}
\usepackage[type1]{cabin}
-\usepackage[scaled=.98,osfI]{XCharter}
+\usepackage[scaled=.98,osf]{XCharter}
\usepackage[OT2,T2A,T1]{fontenc}
\linespread{1.04}
-\usepackage[charter,vvarbb,scaled=1.05]{newtxmath}
+\usepackage[charter,alty,vvarbb,scaled=1.05]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
\font\osfIfnt=XCharter-Roman-tosf-t1 at 11pt
\font\osffnt=XCharter1-Roman-tosf-t1 at 11pt
\usepackage{fonttable}
\usepackage{booktabs}
\usepackage{url}
+\def\Sha{{\usefont{OT2}{XCharter-TLF}{m}{n}\char88 }}
\newcommand\cyrtext{\fontfamily{XCharter-TLF}\fontencoding{OT2}\selectfont} % declaration
\DeclareTextFontCommand{\textcyr}{\cyrtext} %macro with argument
%\usepackage[cal=rsfso]{mathalfa}
@@ -62,8 +71,8 @@
\end{itemize}
-Three math packages seem to provide reasonable companions for \textsf{XCharter}. The first example uses Charter italics as math italics, but doesn't provide arbitrary scaling and doesn't sufficiently distinguish math italic v from mathematical Greek \verb|\nu|. Moreover, it is not easy to redefine \verb|\mathcal| to get a better math calligraphic alphabet---eg, the {\tt mathalfa} package fails. The second uses \textsf{libertine} italics and Greek in math mode, which is a good match to Charter in style and weight after scaling up, is arbitrarily scalable, has distinct math italic v and mathematical Greek \verb|\nu|, and is completely compatible with {\tt mathalfa}. The third is a new revision of {\tt newtxmath} with option {\tt charter} (or, equivalently, {\tt xcharter}), which substitutes Charter italics as math italics and, as of version 1.11, uses a newly developed family of Greek symbols in {regular,bold} $\times$ {upright, italic} to match the style and italic angle of XCharter. This version is scalable and has a math italic v (plus a matching w) distinct from \verb|\nu|. (The option {\tt noxchvw} to {\tt newtxmath} changes the v and w to be the original Charter italic glyphs, which may lead to issues with \verb|\nu|.)
-
+Three math packages seem to provide reasonable companions for \textsf{XCharter}. The first example uses Charter italics as math italics, but doesn't provide arbitrary scaling and doesn't sufficiently distinguish math italic v from mathematical Greek \verb|\nu|. Moreover, it is not easy to redefine \verb|\mathcal| to get a better math calligraphic alphabet---eg, the {\tt mathalfa} package fails. The second uses \textsf{libertine} italics and Greek in math mode, which is a good match to Charter in style and weight after scaling up, is arbitrarily scalable, has distinct math italic v and mathematical Greek \verb|\nu|, and is completely compatible with {\tt mathalfa}. The third is a new revision of {\tt newtxmath} with option {\tt charter} (or, equivalently, {\tt xcharter}), which substitutes Charter italics as math italics and, as of version 1.11, uses a newly developed family of Greek symbols in \{regular, bold\} $\times$ \{upright, italic\} to match the style and italic angle of XCharter. This version is scalable and has a math italic v (plus a matching w) distinct from \verb|\nu|. (The option {\tt noxchvw} to {\tt newtxmath} changes the v and w to be the original Charter italic glyphs, which may lead to issues with \verb|\nu|. The option {\tt alty} to {\tt newtxmath/charter}, new as of version {\tt 1.203}, substitutes $y$ for the default \emph{y} which, IMO, works better in combination with other math symbols because it lacks the problematic tail of \emph{y}.)
+%\newpage
\textsc{Example 1:}
\begin{verbatim}
@@ -77,7 +86,7 @@
\usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
\usepackage[type1]{cabin}% sans serif
-\usepackage[libertine,vvarbb,scaled=1.07]{newtxmath}
+\usepackage[libertine,vvarbb,scaled=1.05]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
\linespread{1.04}
\end{verbatim}
@@ -87,7 +96,7 @@
\usepackage[scaled=.98,sups,osf]{XCharter}% lining figures in math, osf in text
\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
\usepackage[type1]{cabin}% sans serif
-\usepackage[charter,vvarbb,scaled=1.07]{newtxmath}
+\usepackage[charter,vvarbb,scaled=1.05]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
\linespread{1.04}
\end{verbatim}
@@ -97,11 +106,30 @@
\usepackage[scaled=.98,sups,osf]{XCharter}% osf in text, lining figures in math
\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
\usepackage[type1]{cabin}% sans serif
-\usepackage[charter,vvarbb,scaled=1.07]{newtxmath}
+\usepackage[charter,vvarbb,scaled=1.05]{newtxmath}
+\usepackage[cal=boondoxo]{mathalfa}
+\linespread{1.04}
+\end{verbatim}
+
+\textsc{Example 5:}
+\begin{verbatim}
+% Adds instructions to produce a pdf conforming tp PDF/A-1b
+\pdfcompresslevel=0
+\pdfgentounicode=1
+\input glyphtounicode.tex
+\InputIfFileExists{glyphtounicode-cmr.tex}{}{}
+\InputIfFileExists{glyphtounicode-ntx.tex}{}{}
+\usepackage[a-1b]{pdfx} % version 1.6.4 or higher
+\usepackage[<specify babel languages>]{babel}% load before XCharter
+\usepackage[scaled=.98,sups,osf]{XCharter}% osf in text, lining figures in math
+\usepackage[scaled=1.04,varqu,varl]{inconsolata}% inconsolata typewriter
+\usepackage[type1]{cabin}% sans serif
+\usepackage[charter,vvarbb,scaled=1.05]{newtxmath}
\usepackage[cal=boondoxo]{mathalfa}
\linespread{1.04}
\end{verbatim}
+
Here is a short sample based on the preamble of \textsc{Example 3}:\\[4pt]
\def\Pr{\ensuremath{\mathbb{P}}}
\def\rmd{\mathrm{d}}
@@ -158,7 +186,7 @@
\testlowgreekiu\testlowgreekiiu\testlowgreekiiiu}
\def\test#1{\; #1}
-\newpage
+%\newpage
\textbf{Greek letters in version 1.11:} \[\testupgreek\]
\[\testupgreekit\]
\[\testlowgreek\]
@@ -202,6 +230,10 @@
\textsc{XCharter-Roman-tlf-ot2.tfm}:\\
\fonttable{XCharter-Roman-tlf-ot2}
+This encoding contains the upright {\tt Sha} glyph in slot 88. This may be used in mathematical formulas by defining
+\verb|\def\Sha{{\usefont{OT2}{XCharter-TLF}{m}{n}\char88 }}|
+so that one may write \verb|$\text{\Sha}(A/K)$| for the Tate–Shafarevich group $\text{\Sha}(A/K)$.
+
\textsc{Example OT$2$ Preamble:}
\begin{verbatim}
@@ -287,4 +319,26 @@
It may be be possible to work out a scheme that would allow multiple scripts and languages to be used with {\tt serbianc} as the main or as a secondary language in {\tt babel}, but I have not succeeded in doing this with XCharter, and know of no other example that I might crib from.
%\textsc{Example 2:
+
+\section*{Opentype processing and German orthography}
+Prior to version {\tt1.12}, {\tt XCharter} offered only basic support for German orthography, having all required accented glyphs and the lower case \ss, as well as a small caps \textsc{\ss}. Under LaTeX, the T$1$ encoding contained \verb|S_S|. With unicode tex processing:
+\begin{verbatim}
+{\addfontfeature{StylisticSet=1}\ss\ \textsc{\ss}}
+\end{verbatim}
+typesets, as in LaTeX processing, to
+
+\ss\ \textsc{\ss}
+
+Note also that in unicode processing, in order to obtain the expected case change behavior, it may be necessary to add in your preamble:
+\begin{verbatim}
+\uccode`ß="1E9E
+\end{verbatim}
+
+
+ As of version {\tt1.12} of {\tt XCharter}, there are now glyphs in each style for {\tt U+1E9E} and for its small caps version, accessible under unicode TeX. The glyphs may be used as the uppercase and small caps versions of {\tt germandbls}. Currently, the new glyphs are not available in any of the LaTeX encodings and must be used via unicode TeX.
+
+The following tables show how to access the new glyphs in unicode TeX. Note that you will need to set {\tt StylisticSet=1} if you wish not to use the new sharp-s glyphs.
+
+\includegraphics{newgermanfxch-crop}
+
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xcharter.doc.tlpobj new/tlpkg/tlpobj/xcharter.doc.tlpobj
--- old/tlpkg/tlpobj/xcharter.doc.tlpobj 2019-02-28 04:15:14.000000000 +0100
+++ new/tlpkg/tlpobj/xcharter.doc.tlpobj 2020-03-24 02:04:28.000000000 +0100
@@ -1,10 +1,13 @@
name xcharter.doc
category Package
-revision 48498
+revision 54512
shortdesc doc files of xcharter
relocated 1
-docfiles size=95
+docfiles size=193
RELOC/doc/fonts/xcharter/README
RELOC/doc/fonts/xcharter/altone.py
+ RELOC/doc/fonts/xcharter/newgermanfxch-crop.pdf
+ RELOC/doc/fonts/xcharter/newgermanfxch.pdf
+ RELOC/doc/fonts/xcharter/newgermanfxch.tex
RELOC/doc/fonts/xcharter/xcharter-doc.pdf
RELOC/doc/fonts/xcharter/xcharter-doc.tex
++++++ xcharter.tar.xz ++++++
++++ 28556 lines of diff (skipped)
++++++ xcite.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xcite/README new/doc/latex/xcite/README
--- old/doc/latex/xcite/README 2011-09-04 01:15:34.000000000 +0200
+++ new/doc/latex/xcite/README 2020-01-21 22:44:13.000000000 +0100
@@ -1,9 +1,13 @@
The xcite lets you use citations keys used in another
document, just like the package xr does with labels.
-This is version 1.0 of the package
+This is version 16383.99998 of the package.
-Copyright (C) 2011 by Enrico Gregorio
+Actually this is the final version which just loads
+xr, which now includes the facilities previously in
+xcite.
+
+Copyright (C) 2011-2020 by Enrico Gregorio
<Enrico dot Gregorio at univr dot it>
-------------------------------------------------------
@@ -37,5 +41,5 @@
o run "makeindex -s gglo.ist -o xcite.gls xcite.glo"
o run "pdflatex xcite.dtx"
-2011/09/02
+2020/01/21
Enrico Gregorio
Binary files old/doc/latex/xcite/xcite.pdf and new/doc/latex/xcite/xcite.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xcite.doc.tlpobj new/tlpkg/tlpobj/xcite.doc.tlpobj
--- old/tlpkg/tlpobj/xcite.doc.tlpobj 2019-02-28 04:15:17.000000000 +0100
+++ new/tlpkg/tlpobj/xcite.doc.tlpobj 2020-01-22 03:13:17.000000000 +0100
@@ -1,8 +1,8 @@
name xcite.doc
category Package
-revision 23783
+revision 53486
shortdesc doc files of xcite
relocated 1
-docfiles size=52
+docfiles size=40
RELOC/doc/latex/xcite/README
RELOC/doc/latex/xcite/xcite.pdf
++++++ xcite.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xcite/xcite.sty new/tex/latex/xcite/xcite.sty
--- old/tex/latex/xcite/xcite.sty 2011-09-04 01:15:34.000000000 +0200
+++ new/tex/latex/xcite/xcite.sty 2020-01-21 22:44:13.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2011 by Enrico Gregorio
+%% Copyright (C) 2011-2020 by Enrico Gregorio
%% <Enrico dot Gregorio at univr dot it>
%% -------------------------------------------------------
%%
@@ -31,36 +31,8 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{xcite}
- [2011/09/02 v1.0 eXternal Citations (EG)]
-\newcommand\externalcitedocument[2][]{{%
- \makeatletter
- \def\XC@prefix{#1}%
- \XC(a)next#2.aux\relax\\}}
-\def\XC@next#1\relax#2\\{%
- \edef\XC@list{#2}%
- \XC@loop{#1}}
-\def\XC@aux{%
- \ifx\XC@list\@empty\else\expandafter\XC@explist\fi}
-\def\XC@explist{\expandafter\XC@next\XC@list\\}
-\def\XC@loop#1{\openin\@inputcheck#1\relax
- \ifeof\@inputcheck
- \PackageWarning{xc}{^^JNo file #1^^JLABELS NOT IMPORTED.^^J}%
- \expandafter\XC@aux
- \else
- \PackageInfo{xc}{IMPORTING LABELS FROM #1}%
- \expandafter\XC@read\fi}
-\def\XC@read{%
- \read\@inputcheck to\XC@line
- \expandafter\XC@test\XC@line...\XC@}
-\long\def\XC@test#1#2#3#4\XC@{%
- \ifx#1\bibcite
- \bibcite{\XC@prefix#2}{#3}%
- \else\ifx#1\@input
- \edef\XC@list{\XC@list#2\relax}%
- \fi\fi
- \ifeof\@inputcheck\expandafter\XC@aux
- \else\expandafter\XC@read\fi}
-
+ [2020/01/21 v16383.99998 eXternal Citations (EG)]
+\RequirePackage{xr}
\endinput
%%
%% End of file `xcite.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xcite.tlpobj new/tlpkg/tlpobj/xcite.tlpobj
--- old/tlpkg/tlpobj/xcite.tlpobj 2019-02-28 04:15:17.000000000 +0100
+++ new/tlpkg/tlpobj/xcite.tlpobj 2020-01-22 03:13:17.000000000 +0100
@@ -1,14 +1,15 @@
name xcite
category Package
-revision 23783
+revision 53486
shortdesc Use citation keys from a different document
relocated 1
-longdesc The package lets you use citation keys from another document,
-longdesc just as the xr package allows cross-document use of labels.
+longdesc The package xcite is no longer necessary, because its
+longdesc functionality has been taken over by xr, so this final version
+longdesc is just a stub that loads xr.
runfiles size=1
RELOC/tex/latex/xcite/xcite.sty
+catalogue-also xr
catalogue-ctan /macros/latex/contrib/xcite
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics cite-supp
-catalogue-version 1.0
+catalogue-license lppl1.3c
+catalogue-topics cite-supp obsolete
+catalogue-version 16383.99998
++++++ xcntperchap.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xcntperchap.doc.tlpobj new/tlpkg/tlpobj/xcntperchap.doc.tlpobj
--- old/tlpkg/tlpobj/xcntperchap.doc.tlpobj 2019-02-28 04:15:18.000000000 +0100
+++ new/tlpkg/tlpobj/xcntperchap.doc.tlpobj 2020-03-04 23:55:21.000000000 +0100
@@ -1,6 +1,6 @@
name xcntperchap.doc
category Package
-revision 46236
+revision 54080
shortdesc doc files of xcntperchap
relocated 1
docfiles size=102
++++++ xcntperchap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xcntperchap.tlpobj new/tlpkg/tlpobj/xcntperchap.tlpobj
--- old/tlpkg/tlpobj/xcntperchap.tlpobj 2019-02-28 04:15:18.000000000 +0100
+++ new/tlpkg/tlpobj/xcntperchap.tlpobj 2020-03-04 23:55:21.000000000 +0100
@@ -1,6 +1,6 @@
name xcntperchap
category Package
-revision 46236
+revision 54080
shortdesc Track the number of subsections etc. that occur in a specified tracklevel
relocated 1
longdesc This package is the successor of cntperchap and allows to
@@ -8,9 +8,7 @@
runfiles size=3
RELOC/tex/latex/xcntperchap/xcntperchap.sty
catalogue-also cntperchap
-catalogue-contact-home http://www.ich-rede-mich-um-kopf-und-kragen.de
catalogue-ctan /macros/latex/contrib/xcntperchap
-catalogue-date 2018-01-05 22:19:02 +0100
catalogue-license lppl1.3
catalogue-topics counter-mgmt macro-supp
catalogue-version 0.5
++++++ xdvi.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/xdvi.1 new/texmf-dist/doc/man/man1/xdvi.1
--- old/texmf-dist/doc/man/man1/xdvi.1 2019-03-26 15:41:17.000000000 +0100
+++ new/texmf-dist/doc/man/man1/xdvi.1 2020-03-13 18:30:40.000000000 +0100
@@ -52,7 +52,7 @@
.de SB
\&\fB\s-1\&\\$1 \\$2\s0\fR
..
-.TH XDVI 1 "2016-04-02" "Xdvik 22.87.03"
+.TH XDVI 1 "2020-02-29" "Xdvik 22.87.04"
.\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.\"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
.SH NAME
@@ -1885,7 +1885,7 @@
moves down the corresponding fraction of a window-full.
.\" Therefore, a more
.\" ``smooth'' scrolling using the ``Up'' and ``Down'' keys can be
-.\" achieved by the the following setting:
+.\" achieved by the following setting:
.\" .sp
.\" xdvi.mainTranslations: #override\e
.\" .br
@@ -3066,7 +3066,7 @@
mechanism, as a single argument after the `!'. Any arguments
listed in the
.B Dvips options
-field are segmented at whitespaces and passed as separate arguments to dvips.
+field are segmented at whitespace and passed as separate arguments to dvips.
If you e.g. want to print the file 2-up, you should enter
the following string into the
.B Printer
@@ -4133,6 +4133,7 @@
the
.B Kpathsea
documentation,
+.BR https://ctan.org/pkg/xdvi/ .
and the Xdvik home page at
.BR http://xdvi.sourceforge.net/ .
.SH AUTHORS
@@ -4147,10 +4148,9 @@
.PP
Code for the xdvik variant has been contributed
by many people, whose names are scattered across the
-source files. Xdvik is hosted on
-.B CTAN:dviware/xdvik
-and on SourceForge; for the most up-to-date information, please
-visit:
+source files.
+.PP
+For the most up-to-date information, please visit:
.PP
.B http://xdvi.sourceforge.net
.PP
Binary files old/texmf-dist/doc/man/man1/xdvi.man1.pdf and new/texmf-dist/doc/man/man1/xdvi.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xdvi.doc.tlpobj new/tlpkg/tlpobj/xdvi.doc.tlpobj
--- old/tlpkg/tlpobj/xdvi.doc.tlpobj 2019-03-27 02:29:19.000000000 +0100
+++ new/tlpkg/tlpobj/xdvi.doc.tlpobj 2020-03-16 02:22:10.000000000 +0100
@@ -1,6 +1,6 @@
name xdvi.doc
category TLCore
-revision 50602
+revision 54338
shortdesc doc files of xdvi
docfiles size=70
texmf-dist/doc/man/man1/xdvi.1
++++++ xdvi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xdvi.tlpobj new/tlpkg/tlpobj/xdvi.tlpobj
--- old/tlpkg/tlpobj/xdvi.tlpobj 2019-03-27 02:29:20.000000000 +0100
+++ new/tlpkg/tlpobj/xdvi.tlpobj 2020-03-16 02:22:10.000000000 +0100
@@ -1,6 +1,6 @@
name xdvi
category TLCore
-revision 50602
+revision 54338
shortdesc A DVI previewer for the X Window System
longdesc The canonical previewer for use on Unix and other X-windows
longdesc based systems. The distribution has been integrated with that
@@ -12,9 +12,7 @@
texmf-dist/xdvi/XDvi
texmf-dist/xdvi/pixmap/toolbar.xpm
texmf-dist/xdvi/pixmap/toolbar2.xpm
+catalogue-alias xdvik
catalogue-contact-repository http://xdvi.sourceforge.net/
-catalogue-ctan /dviware/xdvi
-catalogue-date 2018-08-16 21:33:21 +0200
catalogue-license other-free
catalogue-topics previewer
-catalogue-version 22.87
++++++ xechangebar.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xechangebar.doc.tlpobj new/tlpkg/tlpobj/xechangebar.doc.tlpobj
--- old/tlpkg/tlpobj/xechangebar.doc.tlpobj 2019-02-28 04:15:30.000000000 +0100
+++ new/tlpkg/tlpobj/xechangebar.doc.tlpobj 2020-03-04 23:55:22.000000000 +0100
@@ -1,6 +1,6 @@
name xechangebar.doc
category Package
-revision 44954
+revision 54080
shortdesc doc files of xechangebar
relocated 1
docfiles size=4
++++++ xechangebar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xechangebar.tlpobj new/tlpkg/tlpobj/xechangebar.tlpobj
--- old/tlpkg/tlpobj/xechangebar.tlpobj 2019-02-28 04:15:30.000000000 +0100
+++ new/tlpkg/tlpobj/xechangebar.tlpobj 2020-03-04 23:55:22.000000000 +0100
@@ -1,17 +1,16 @@
name xechangebar
category Package
-revision 44954
+revision 54080
shortdesc An extension of package changebar that can be used with XeLaTeX
relocated 1
longdesc The package extends package changebar so it can be used with
longdesc XeLaTeX. It introduces the new option xetex for use with
longdesc XeLaTeX. Everything else remains the same and users should
-longdesc consult the original documenation for usage information.
+longdesc consult the original documentation for usage information.
runfiles size=9
RELOC/tex/xelatex/xechangebar/xechangebar.sty
catalogue-also changebar
catalogue-ctan /macros/xetex/latex/xechangebar
-catalogue-date 2017-08-06 05:28:53 +0200
catalogue-license lppl1.3
catalogue-topics editorial
catalogue-version 1.0
++++++ xecjk.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/xecjk/README.md new/doc/xelatex/xecjk/README.md
--- old/doc/xelatex/xecjk/README.md 2019-04-07 23:28:36.000000000 +0200
+++ new/doc/xelatex/xecjk/README.md 2020-02-10 23:12:31.000000000 +0100
@@ -20,8 +20,8 @@
---------------------
Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
- Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
- Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+ Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+ Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
----------------------------------------------------------------------
This work may be distributed and/or modified under the
Binary files old/doc/xelatex/xecjk/xeCJK.pdf and new/doc/xelatex/xecjk/xeCJK.pdf differ
Binary files old/doc/xelatex/xecjk/xunicode-symbols.pdf and new/doc/xelatex/xecjk/xunicode-symbols.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xecjk.doc.tlpobj new/tlpkg/tlpobj/xecjk.doc.tlpobj
--- old/tlpkg/tlpobj/xecjk.doc.tlpobj 2019-04-08 01:40:32.000000000 +0200
+++ new/tlpkg/tlpobj/xecjk.doc.tlpobj 2020-02-19 01:55:58.000000000 +0100
@@ -1,6 +1,6 @@
name xecjk.doc
category Package
-revision 50852
+revision 53835
shortdesc doc files of xecjk
relocated 1
docfiles size=446
++++++ xecjk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xeCJK-listings.sty new/tex/xelatex/xecjk/xeCJK-listings.sty
--- old/tex/xelatex/xecjk/xeCJK-listings.sty 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xeCJK-listings.sty 2020-02-18 23:31:44.000000000 +0100
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `listings')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{xeCJK patch file for listings}
\ProvidesExplPackage{xeCJK-listings}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { xeCJK } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xeCJK.cfg new/tex/xelatex/xecjk/xeCJK.cfg
--- old/tex/xelatex/xecjk/xeCJK.cfg 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xeCJK.cfg 2020-02-18 23:31:44.000000000 +0100
@@ -6,10 +6,10 @@
%%
%% xeCJK.dtx (with options: `config')
%%
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{Configuration file for xeCJK package}
\ProvidesExplFile{\ExplFileName.cfg}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
%%
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xeCJK.sty new/tex/xelatex/xecjk/xeCJK.sty
--- old/tex/xelatex/xecjk/xeCJK.sty 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xeCJK.sty 2020-02-18 23:31:44.000000000 +0100
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `package')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{Typesetting CJK scripts with XeLaTeX}
\ProvidesExplPackage{\ExplFileName}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
\msg_new:nnn { xeCJK } { Require-XeTeX }
{
The~xeCJK~package~requires~XeTeX~to~function.\\\\
@@ -49,7 +49,7 @@
using~your~TeX~package~manager~or~from~CTAN.\\
\str_if_eq:nnT {#1} { expl3 } { Loading~xeCJK~will~abort! }
}
-\@ifpackagelater { expl3 } { 2019/03/05 } { }
+\@ifpackagelater { expl3 } { 2020/02/08 } { }
{ \msg_critical:nnn { xeCJK } { l3-too-old } { expl3 } }
\prg_new_conditional:Npnn \xeCJK_if_package_loaded:n #1 { p , T , F , TF }
{
@@ -67,21 +67,19 @@
The~`#1'~package~and~xeCJK~are~incompatible.\\\\
Please~load~it~after~xeCJK.
}
-\clist_map_inline:nn { CJKfntef , CJKnumb }
+\clist_map_inline:nn { CJKnumb }
{
\xeCJK_if_package_loaded:nT {#1}
{ \msg_error:nnn { xeCJK } { after-package } {#1} }
}
-\clist_map_inline:nn { CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
+\clist_map_inline:nn
+ { CJKfntef , CJKulem , CJKvert , CJKpunct , CJKutf8 , CJK }
{
\xeCJK_if_package_loaded:nTF {#1}
{ \msg_error:nnn { xeCJK } { incompatible-package } {#1} }
{ \tl_const:cn { ver@ #1 . \c__xeCJK_package_ext_tl } { 9999/99/99 } }
}
-\RequirePackage { xtemplate }
-\@ifpackagelater { xtemplate } { 2012/11/10 } { }
- { \msg_error:nnn { xeCJK } { l3-too-old } { xtemplate } }
-\RequirePackage { xparse , l3keys2e }
+\RequirePackage { l3keys2e , xtemplate , xparse }
\tl_new:N \l__xeCJK_tmp_tl
\int_new:N \l__xeCJK_tmp_int
\box_new:N \l__xeCJK_tmp_box
@@ -101,8 +99,8 @@
\cs_new_protected_nopar:Npn \xeCJK_allow_break:
{ \tex_penalty:D \c_zero_int }
\cs_new_protected_nopar:Npn \xeCJK_no_break:
- { \tex_penalty:D \c__xeCJK_ten_thousand_int }
-\int_const:Nn \c__xeCJK_ten_thousand_int { 10 000 }
+ { \tex_penalty:D \c__xeCJK_nobreak_penalty_int }
+\int_const:Nn \c__xeCJK_nobreak_penalty_int { 10 000 }
\tl_new:N \g__xeCJK_at_end_preamble_hook_tl
\tl_new:N \g__xeCJK_after_preamble_hook_tl
\tl_new:N \g__xeCJK_after_end_preamble_hook_tl
@@ -182,11 +180,9 @@
\cs_set_eq:NN #2 \__xeCJK_swap_cs_aux:w
\cs_undefine:N \__xeCJK_swap_cs_aux:w
}
-\cs_new_protected_nopar:Npn \xeCJK_font_gset_to_current:c #1
- {
- \exp_last_unbraced:Nco \cs_gset_eq:NN
- {#1} \tex_the:D \tex_font:D
- }
+\cs_new_protected_nopar:Npn \xeCJK_font_gset_to_current:N #1
+ { \exp_after:wN \cs_gset_eq:NN \exp_after:wN #1 \tex_the:D \tex_font:D }
+\cs_generate_variant:Nn \xeCJK_font_gset_to_current:N { c }
\prg_new_conditional:Npnn \xeCJK_glyph_if_exist:N #1 { p , T , F , TF }
{
\tex_iffontchar:D \tex_font:D `#1 \exp_stop_f:
@@ -292,8 +288,10 @@
\cs_new_protected:Npn \xeCJK_peek_catcode_ignore_spaces:NTF #1#2#3
{
\cs_set_eq:NN \l__xeCJK_peek_search_token #1 \scan_stop:
- \tl_set:Nn \__xeCJK_peek_catcode_true:w { \group_align_safe_end: #2 }
- \tl_set:Nn \__xeCJK_peek_catcode_false:w { \group_align_safe_end: #3 }
+ \cs_set_protected:Npx \__xeCJK_peek_catcode_true:w
+ { \exp_not:N \group_align_safe_end: \exp_not:n {#2} }
+ \cs_set_protected:Npx \__xeCJK_peek_catcode_false:w
+ { \exp_not:N \group_align_safe_end: \exp_not:n {#3} }
\bool_set_false:N \l__xeCJK_peek_ignore_spaces_bool
\group_align_safe_begin:
\peek_after:Nw \__xeCJK_peek_catcode_ignore_spaces_branches:w
@@ -317,25 +315,9 @@
\fi:
}
\cs_new_eq:NN \l__xeCJK_peek_search_token ?
-\tl_new:N \__xeCJK_peek_catcode_true:w
-\tl_new:N \__xeCJK_peek_catcode_false:w
+\cs_new_eq:NN \__xeCJK_peek_catcode_true:w \prg_do_nothing:
+\cs_new_eq:NN \__xeCJK_peek_catcode_false:w \prg_do_nothing:
\bool_new:N \l__xeCJK_peek_ignore_spaces_bool
-\cs_new_protected:Npn \xeCJK_peek_after_ignore_spaces:nw #1
- {
- \tl_set:Nn \__xeCJK_peek_after_do:w { \group_align_safe_end: #1 }
- \group_align_safe_begin:
- \peek_after:Nw \__xeCJK_peek_ignore_spaces_branches:w
- }
-\cs_new_protected_nopar:Npn \__xeCJK_peek_ignore_spaces_branches:w
- {
- \if_meaning:w \l_peek_token \c_space_token
- \exp_after:wN \peek_after:Nw
- \exp_after:wN \__xeCJK_peek_ignore_spaces_branches:w
- \tex_romannumeral:D 0
- \else:
- \exp_after:wN \__xeCJK_peek_after_do:w
- \fi:
- }
\cs_new_nopar:Npn \xeCJK_token_value_class:N #1
{ \tex_XeTeXcharclass:D \xeCJK_token_value_charcode:N #1 }
\cs_new_nopar:Npn \xeCJK_token_value_charcode:N #1
@@ -551,6 +533,8 @@
"17000 -> "187FF ,
"18800 -> "18AFF ,
"1B000 -> "1B0FF ,
+ "1B100 -> "1B12F ,
+ "1B130 -> "1B16F ,
"1F200 -> "1F2FF ,
"20000 -> "2A6DF ,
"2A700 -> "2B73F ,
@@ -928,10 +912,7 @@
\cs_new_protected_nopar:Npn \__xeCJK_check_for_glue_auxiii:
{
\bool_if:NT \l__xeCJK_last_penalty_bool
- {
- \__xeCJK_add_offset_skip:N \l__xeCJK_last_skip
- \tex_penalty:D \l__xeCJK_last_penalty_int
- }
+ { \tex_penalty:D \l__xeCJK_last_penalty_int }
\skip_horizontal:N \l__xeCJK_last_skip
\tl_if_eq:NNF \l__xeCJK_aligni_tl \c__xeCJK_left_tl { \CJKglue }
}
@@ -1195,7 +1176,6 @@
{
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\exp_after:wN \xeCJK_punct_node:N \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\tex_ignorespaces:D
@@ -1232,7 +1212,6 @@
{ \__xeCJK_use_dim_or_skip:nNN { bound_kern } #1 #2 }
\dim_compare:nNnF \l__xeCJK_tmp_dim = \l__xeCJK_last_bound_dim
{ \__xeCJK_punct_bound_kern_ratio:NN #1 #2 }
- \__xeCJK_add_offset_skip:N \l__xeCJK_punct_kern_skip
\bool_if:NTF \l__xeCJK_last_penalty_bool
{
\tex_penalty:D \l__xeCJK_last_penalty_int
@@ -1241,17 +1220,6 @@
{ \__xeCJK_punct_bound_kern_aux:NNN #1 #2 }
\l__xeCJK_punct_kern_skip
}
-\cs_new_protected_nopar:Npn \__xeCJK_add_offset_skip:N #1
- {
- \tl_if_eq:NNF \l__xeCJK_aligni_tl \c__xeCJK_left_tl
- {
- \int_compare:nNnT \tex_lastnodetype:D = { 11 }
- {
- \skip_add:Nn #1 { \tex_lastskip:D }
- \tex_unskip:D
- }
- }
- }
\skip_new:N \l__xeCJK_punct_kern_skip
\cs_new_protected_nopar:Npn \__xeCJK_punct_bound_kern_ratio:NN #1#2
{
@@ -1334,13 +1302,6 @@
depth \c_zero_dim
height \c_zero_dim \scan_stop:
}
-\cs_new_protected_nopar:Npn \__xeCJK_punct_offset:NN #1#2
- {
- \dim_set:Nn \l__xeCJK_tmp_dim
- { - \__xeCJK_use_punct_dim:nNN { offset } #1 #2 }
- \dim_compare:nNnF \l__xeCJK_tmp_dim = \c_zero_dim
- { \__xeCJK_punct_hskip:n { \l__xeCJK_tmp_dim } }
- }
\cs_new_protected_nopar:Npn \__xeCJK_punct_glue:NN #1#2
{ \__xeCJK_punct_hskip:n { \__xeCJK_use_dim_or_skip:nNN { glue } #1 #2 } }
\cs_new_eq:NN \__xeCJK_punct_hskip:n \skip_horizontal:n
@@ -1367,7 +1328,7 @@
\exp_after:wN \__xeCJK_punct_if_right:NT #1
{ \__xeCJK_punct_rule:NN \c__xeCJK_right_tl #1 }
\__xeCJK_punct_breakable_kern:n
- { \__xeCJK_use_dim_or_skip:nNN { break_kern } #1 #2 }
+ { \__xeCJK_use_dim_or_skip:nNN { bound_kern } #1 #2 }
\__xeCJK_punct_if_right:NF #2
{ \__xeCJK_punct_rule:NN \c__xeCJK_left_tl #2 }
}
@@ -1399,7 +1360,7 @@
}
\cs_new_protected_nopar:Npn \__xeCJK_nobreak_zero_glue:
{
- \tex_penalty:D \c__xeCJK_ten_thousand_int
+ \tex_penalty:D \c__xeCJK_nobreak_penalty_int
\skip_horizontal:N \c_zero_skip
}
\cs_new_protected_nopar:Npn \__xeCJK_zero_glue:
@@ -1407,7 +1368,6 @@
\cs_new_protected_nopar:Npn \xeCJK_FullRight_and_CJK:
{
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_select_font:
\CJKglue
@@ -1416,7 +1376,6 @@
{
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
}
\cs_new_protected_nopar:Npn \xeCJK_Default_and_FullLeft:nN #1#2
@@ -1432,10 +1391,7 @@
\CJKpunctsymbol #2
}
\cs_new_protected_nopar:Npn \__xeCJK_Default_and_FullLeft_glue:N #1
- {
- \__xeCJK_punct_glue:NN \c__xeCJK_left_tl #1
- \__xeCJK_punct_offset:NN \c__xeCJK_left_tl #1
- }
+ { \__xeCJK_punct_glue:NN \c__xeCJK_left_tl #1 }
\cs_new_protected_nopar:Npn \xeCJK_CJK_and_FullLeft:N #1
{
\xeCJK_get_punct_bounds:NN \c__xeCJK_left_tl #1
@@ -1449,13 +1405,11 @@
{
\CJKglue
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl #1
- \__xeCJK_punct_offset:NN \c__xeCJK_left_tl #1
}
\cs_new_protected_nopar:Npn \xeCJK_Boundary_and_FullLeft:N #1
{
\xeCJK_get_punct_bounds:NN \c__xeCJK_left_tl #1
\__xeCJK_Boundary_and_FullLeft_glue:N #1
- \__xeCJK_punct_offset:NN \c__xeCJK_left_tl #1
\xeCJK_class_group_begin:
\xeCJK_select_punct_font:
\xeCJK_clear_Boundary_and_CJK_toks:
@@ -1598,7 +1552,7 @@
{
\skip_set_eq:NN \l__xeCJK_last_skip \tex_lastskip:D
\tex_unskip:D
- \int_compare:nNnTF \tex_lastpenalty:D = { 1000 }
+ \int_compare:nNnTF \tex_lastpenalty:D = \c__xeCJK_nobreak_penalty_int
{ \__xeCJK_if_last_punct_auxi:TF { \use_i:nn } }
{
\xeCJK_if_last_node:TF
@@ -1644,7 +1598,7 @@
\bool_if:NF \l__xeCJK_last_penalty_bool
{
\bool_set_true:N \l__xeCJK_last_penalty_bool
- \int_set:Nn \l__xeCJK_last_penalty_int { 1000 }
+ \int_set_eq:NN \l__xeCJK_last_penalty_int \c__xeCJK_nobreak_penalty_int
}
\xeCJK_if_last_node:TF
{ \__xeCJK_if_last_punct_auxii:TF { \use_i:nn } }
@@ -1801,17 +1755,13 @@
\group_insert_after:N \xeCJK_no_break:
}
{ \group_align_safe_end: }
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\exp_after:wN \xeCJK_punct_node:N \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
}
\prg_generate_conditional_variant:Nnn \tl_case:Nn { No } { TF , F }
\cs_new_protected_nopar:Npn \xeCJK_check_FullRight_symbol:Nw #1
- {
- \xeCJK_peek_after_ignore_spaces:nw
- { \__xeCJK_save_FullRight_symbol:N #1 }
- }
+ { \peek_remove_spaces:n { \__xeCJK_save_FullRight_symbol:N #1 } }
\cs_new_protected:Npn \xeCJK_cs_case_keys_define:nNNnn #1#2#3#4#5
{
\tl_new:N #2
@@ -1899,7 +1849,7 @@
\keys_define:nn { xeCJK / options }
{
WidowPenalty .int_set:N = \l__xeCJK_widow_penalty_int ,
- WidowPenalty .default:n = { 1000 }
+ WidowPenalty .default:n = { 10 000 }
}
\cs_new_protected_nopar:Npn \xeCJK_widow_penalty:
{ \tex_penalty:D \l__xeCJK_widow_penalty_int }
@@ -2441,6 +2391,7 @@
\__xeCJK_save_punct_dim:nNNn { rule } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { glue } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { offset } #1 #2 { \c_zero_dim }
+ \__xeCJK_save_punct_dim:nNNn { margin } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound } \c__xeCJK_left_tl {#2} { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound } \c__xeCJK_right_tl {#2} { \c_zero_dim }
\__xeCJK_save_punct_skip:nNNn { glue } #1 #2 { \c_zero_skip }
@@ -2506,11 +2457,9 @@
\cs_new_protected_nopar:Npn \__xeCJK_save_punct_kerning_plain:NN #1#2
{
\__xeCJK_save_punct_dim:nNNn { kern } #1 #2 { \c_zero_dim }
- \__xeCJK_save_punct_dim:nNNn { break_kern } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound_kern } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_dim:nNNn { bound_width } #1 #2 { \c_zero_dim }
\__xeCJK_save_punct_skip:nNNn { kern } #1 #2 { \c_zero_skip }
- \__xeCJK_save_punct_skip:nNNn { break_kern } #1 #2 { \c_zero_skip }
\__xeCJK_save_punct_skip:nNNn { bound_kern } #1 #2 { \c_zero_skip }
}
\cs_new_protected_nopar:Npn \__xeCJK_save_punct_kerning:NN
@@ -2533,7 +2482,7 @@
}
{ \__xeCJK_calc_punct_width:N #2 }
}
- \dim_set:Nn \l__xeCJK_tmp_dim
+ \dim_set:Nn \l__xeCJK_margin_dim
{
\dim_max:nn
{ \l__xeCJK_margin_minimum_dim }
@@ -2572,24 +2521,9 @@
}
}
}
- \__xeCJK_save_punct_dim:nNNn { glue } #1 #2 { \l__xeCJK_tmp_dim }
- \__xeCJK_save_punct_skip:nNNnnn { glue } #1 #2
- { \l__xeCJK_tmp_dim }
- {
- \__xeCJK_punct_if_middle:NTF #2
- {
- ( \__xeCJK_use_punct_dim:nN { width } #2 -
- \__xeCJK_use_punct_dim:nN { dimen } #2 ) / 2
- - \l__xeCJK_tmp_dim
- }
- { \l__xeCJK_bound_dim - \l__xeCJK_tmp_dim }
- }
- {
- \__xeCJK_punct_if_middle:NTF #2
- { .5 \l__xeCJK_tmp_dim }
- { \l__xeCJK_tmp_dim - \l__xeCJK_reverse_bound_dim }
- }
+ \__xeCJK_save_punct_dim:nNNn { margin } #1 #2 { \l__xeCJK_margin_dim }
}
+\dim_new:N \l__xeCJK_margin_dim
\cs_new_nopar:Npn \__xeCJK_calc_punct_width:N #1
{
\__xeCJK_punct_if_middle:NTF #1
@@ -2646,7 +2580,7 @@
\__xeCJK_punct_if_middle:NTF #2
{
\l__xeCJK_tmp_dim
- - ( \__xeCJK_use_punct_dim:nNN { glue } #1 #2 )
+ - \l__xeCJK_margin_dim
- ( \__xeCJK_use_punct_dim:nN { dimen } #2 )
}
{
@@ -2665,15 +2599,33 @@
}
\__xeCJK_save_punct_dim:nNNn { offset } #1 #2
{ \l__xeCJK_tmp_dim }
- \__xeCJK_save_punct_dim:nNNn { rule } #1 #2
- { - \l__xeCJK_bound_dim + \l__xeCJK_tmp_dim }
+ \__xeCJK_save_punct_dim:nNNn { rule } #1 #2
+ { \l__xeCJK_tmp_dim - \l__xeCJK_bound_dim }
+ \__xeCJK_save_punct_dim:nNNn { glue } #1 #2
+ { \l__xeCJK_margin_dim - \l__xeCJK_tmp_dim }
+ \__xeCJK_save_punct_skip:nNNnnn { glue } #1 #2
+ { \l__xeCJK_margin_dim - \l__xeCJK_tmp_dim }
+ {
+ \__xeCJK_punct_if_middle:NTF #2
+ {
+ ( \__xeCJK_use_punct_dim:nN { width } #2 -
+ \__xeCJK_use_punct_dim:nN { dimen } #2 ) / 2
+ - \l__xeCJK_margin_dim
+ }
+ { \l__xeCJK_bound_dim - \l__xeCJK_margin_dim }
+ }
+ {
+ \__xeCJK_punct_if_middle:NTF #2
+ { .5 \l__xeCJK_margin_dim }
+ { \l__xeCJK_margin_dim - \l__xeCJK_reverse_bound_dim }
+ }
}
\cs_new_nopar:Npn \__xeCJK_punct_width_or_ratio:nN #1#2
{
\dim_compare:nNnTF { \use:c { l__xeCJK_#1_punct_width_dim } } < \c_max_dim
{ \use:c { l__xeCJK_#1_punct_width_dim } }
{
- \fp_compare:nNnTF { \use:c { l__xeCJK_#1_punct_ratio_fp } } ? \c_zero_fp
+ \fp_if_nan:nTF { \use:c { l__xeCJK_#1_punct_ratio_fp } }
{ \c_max_dim }
{
\fp_use:c { l__xeCJK_#1_punct_ratio_fp }
@@ -2694,7 +2646,7 @@
}
\cs_new_protected_nopar:Npn \xeCJK_punct_kerning_process:NN #1#2
{
- \dim_set:Nn \l__xeCJK_original_margin_dim
+ \dim_set:Nn \l__xeCJK_margin_dim
{ \__xeCJK_original_kerning_margin:NN #1 #2 }
\dim_set:Nn \l__xeCJK_minimum_bound_dim
{ \__xeCJK_punct_min_bound:NN #1 #2 }
@@ -2719,33 +2671,13 @@
\__xeCJK_punct_if_right:NTF #1
{
\__xeCJK_punct_if_right:NTF #2
- {
- \__xeCJK_save_kerning:nNNNN
- { bound_kern } \c__xeCJK_left_tl #2 #1 #2
- \__xeCJK_save_kerning:nnnNN
- { break_kern } { offset } { bound }
- }
- {
- \__xeCJK_save_kerning:nnNN
- { break_kern } { offset } #1 #2
- \__xeCJK_save_kerning_aux:nnNN
- { bound_kern } { \l__xeCJK_kerning_margin_dim }
- }
+ { \__xeCJK_save_kerning:nnnNN { bound_kern } { offset } { bound } }
+ { \__xeCJK_save_kerning:nnNN { bound_kern } { offset } }
}
{
\__xeCJK_punct_if_right:NTF #2
- {
- \__xeCJK_save_kerning:nnNN
- { bound_kern } { bound } #1 #2
- \__xeCJK_save_kerning_aux:nnNN
- { break_kern } { \l__xeCJK_tmp_dim }
- }
- {
- \__xeCJK_save_kerning:nNNNN
- { bound_kern } \c__xeCJK_right_tl #1 #1 #2
- \__xeCJK_save_kerning:nnnNN
- { break_kern } { bound } { offset }
- }
+ { \__xeCJK_save_kerning:nnNN { bound_kern } { bound } }
+ { \__xeCJK_save_kerning:nnnNN { bound_kern } { bound } { offset } }
}
#1 #2
}
@@ -2753,11 +2685,10 @@
{
\bool_if:NTF \l__xeCJK_enabled_kerning_bool
{ \__xeCJK_calc_kerning_margin:NN #1 #2 }
- { \l__xeCJK_original_margin_dim }
+ { \l__xeCJK_margin_dim }
}
\dim_new:N \l__xeCJK_minimum_bound_dim
\dim_new:N \l__xeCJK_kerning_margin_dim
-\dim_new:N \l__xeCJK_original_margin_dim
\cs_new_protected_nopar:Npn \__xeCJK_save_kerning:nnNN #1#2
{ \__xeCJK_save_kerning:nnnNN {#1} {#2} {#2} }
\cs_new_protected_nopar:Npn \__xeCJK_save_kerning:nnnNN #1#2#3#4#5
@@ -2768,23 +2699,10 @@
- ( \__xeCJK_use_punct_dim:nNN {#2} \c__xeCJK_right_tl #4 )
- ( \__xeCJK_use_punct_dim:nNN {#3} \c__xeCJK_left_tl #5 )
}
- \__xeCJK_save_kerning_aux:nnNN {#1} { \l__xeCJK_tmp_dim } #4 #5
- }
-\cs_new_protected_nopar:Npn \__xeCJK_save_kerning:nNNNN #1#2#3#4#5
- {
- \dim_set:Nn \l__xeCJK_tmp_dim
- {
- \l__xeCJK_kerning_margin_dim
- - ( \__xeCJK_use_punct_dim:nNN { bound } #2 #3 )
- }
- \__xeCJK_save_kerning_aux:nnNN {#1} { \l__xeCJK_tmp_dim } #4 #5
- }
-\cs_new_protected_nopar:Npn \__xeCJK_save_kerning_aux:nnNN #1#2#3#4
- {
- \__xeCJK_save_punct_dim:nNNn {#1} #3 #4 {#2}
- \__xeCJK_save_punct_skip:nNNnnn {#1} #3 #4
- {#2}
- { \l__xeCJK_original_margin_dim - \l__xeCJK_kerning_margin_dim }
+ \__xeCJK_save_punct_dim:nNNn {#1} #4 #5 { \l__xeCJK_tmp_dim }
+ \__xeCJK_save_punct_skip:nNNnnn {#1} #4 #5
+ { \l__xeCJK_tmp_dim }
+ { \l__xeCJK_margin_dim - \l__xeCJK_kerning_margin_dim }
{ \l__xeCJK_kerning_margin_dim - \l__xeCJK_minimum_bound_dim }
}
\cs_new_nopar:Npn \__xeCJK_original_kerning_margin:NN #1#2
@@ -2792,10 +2710,10 @@
\dim_eval:n
{
\__xeCJK_use_punct_dim:nNN
- { \__xeCJK_punct_if_right:NTF #1 { glue } { bound } } \c__xeCJK_right_tl #1
+ { \__xeCJK_punct_if_right:NTF #1 { margin } { bound } } \c__xeCJK_right_tl #1
+
\__xeCJK_use_punct_dim:nNN
- { \__xeCJK_punct_if_right:NTF #2 { bound } { glue } } \c__xeCJK_left_tl #2
+ { \__xeCJK_punct_if_right:NTF #2 { bound } { margin } } \c__xeCJK_left_tl #2
}
}
\cs_new_nopar:Npn \__xeCJK_calc_kerning_margin:NN #1#2
@@ -2818,7 +2736,7 @@
\dim_compare:nNnTF \l__xeCJK_kerning_total_width_dim < \c_max_dim
{ \__xeCJK_calc_kerning_margin:nNN \l__xeCJK_kerning_total_width_dim }
{
- \fp_compare:nNnTF \l__xeCJK_kerning_total_ratio_fp ? \c_zero_fp
+ \fp_if_nan:nTF { \l__xeCJK_kerning_total_ratio_fp }
{
\xeCJK_if_same_class:NNTF #1 #2
{ \__xeCJK_kerning_width_or_ratio:nNN { same } }
@@ -2842,14 +2760,14 @@
\dim_compare:nNnTF { \use:c { l__xeCJK_#1_align_margin_dim } } < \c_max_dim
{ \use:c { l__xeCJK_#1_align_margin_dim } }
{
- \fp_compare:nNnTF { \use:c { l__xeCJK_#1_align_ratio_fp } } ? \c_zero_fp
+ \fp_if_nan:nTF { \use:c { l__xeCJK_#1_align_ratio_fp } }
{
\dim_compare:nNnTF \l__xeCJK_kerning_margin_width_dim < \c_max_dim
{ \l__xeCJK_kerning_margin_width_dim \use_none:n }
{ \fp_use:N \l__xeCJK_kerning_margin_ratio_fp \use:n }
}
{ \fp_use:c { l__xeCJK_#1_align_ratio_fp } \use:n }
- { \l__xeCJK_original_margin_dim }
+ { \l__xeCJK_margin_dim }
}
}
\cs_new_nopar:Npn \__xeCJK_punct_min_bound:NN #1#2
@@ -2872,10 +2790,10 @@
{
(#1)
- ( \__xeCJK_use_punct_dim:nNN
- { \__xeCJK_punct_if_right:NTF #2 { bound } { glue } }
+ { \__xeCJK_punct_if_right:NTF #2 { bound } { margin } }
\c__xeCJK_left_tl #2 )
- ( \__xeCJK_use_punct_dim:nNN
- { \__xeCJK_punct_if_right:NTF #3 { glue } { bound } }
+ { \__xeCJK_punct_if_right:NTF #3 { margin } { bound } }
\c__xeCJK_right_tl #3 )
- ( \__xeCJK_use_punct_dim:nN { dimen } #2 )
- ( \__xeCJK_use_punct_dim:nN { dimen } #3 )
@@ -3375,22 +3293,31 @@
{ \__xeCJK_font_csname:n { \CJK@family } }
\cs_new_protected_nopar:Npn \xeCJK_select_font:
{
- \exp_args:Nc \cs_if_exist_use:NF { \l_xeCJK_current_font_tl }
- {
- \__xeCJK_family_use:n { \l_xeCJK_family_tl }
- \xeCJK_font_gset_to_current:c { \l_xeCJK_current_font_tl }
- }
+ \__xeCJK_select_font:cn
+ { \l_xeCJK_current_font_tl }
+ { \l_xeCJK_family_tl }
}
+\cs_new_protected_nopar:Npn \__xeCJK_select_font:Nn #1#2
+ {
+ \cs_if_exist:NF #1 { \__xeCJK_font_initial:Nn #1 {#2} }
+ #1
+ }
+\cs_generate_variant:Nn \__xeCJK_select_font:Nn { c }
\tl_new:N \l__xeCJK_current_coor_tl
\cs_new_eq:NN \xeCJK@setfont \xeCJK_select_font:
+\cs_new_protected_nopar:Npn \__xeCJK_font_initial:Nn #1#2
+ {
+ \group_begin:
+ \__xeCJK_family_use:n {#2}
+ \xeCJK_font_gset_to_current:N #1
+ \group_end:
+ }
\cs_new_eq:NN \xeCJK_select_punct_font: \xeCJK_select_font:
\cs_new_protected_nopar:Npn \__xeCJK_select_punct_font_aux:
{
- \exp_args:Nc \cs_if_exist_use:NF { \l_xeCJK_current_punct_font_tl }
- {
- \__xeCJK_family_use:n { \l_xeCJK_punct_family_tl }
- \xeCJK_font_gset_to_current:c { \l_xeCJK_current_punct_font_tl }
- }
+ \__xeCJK_select_font:cn
+ { \l_xeCJK_current_punct_font_tl }
+ { \l_xeCJK_punct_family_tl }
}
\tl_new:N \CJK@punctfamily
\tl_new:N \l_xeCJK_punct_family_tl
@@ -3412,14 +3339,22 @@
\__xeCJK_msg_new:nn { CJK-block } { Switch~from~block~`#1'~to~`#2'. }
\cs_new_protected_nopar:Npn \xeCJK_select_font:n #1
{
- \exp_args:Nc \cs_if_exist_use:NF
+ \__xeCJK_select_font:cnn
{ \__xeCJK_font_csname:n { \CJK@family/#1 } }
- {
- \xeCJK_block_family:nn { \l_xeCJK_family_tl } {#1}
- \__xeCJK_family_use:n { \l_xeCJK_family_tl/#1 }
- \xeCJK_font_gset_to_current:c
- { \__xeCJK_font_csname:n { \CJK@family/#1 } }
- }
+ { \l_xeCJK_family_tl }
+ {#1}
+ }
+\cs_new_protected_nopar:Npn \__xeCJK_select_font:Nnn #1#2#3
+ {
+ \cs_if_exist:NF #1
+ { \__xeCJK_block_font_initial:Nnn #1 {#2} {#3} }
+ #1
+ }
+\cs_generate_variant:Nn \__xeCJK_select_font:Nnn { c }
+\cs_new_protected_nopar:Npn \__xeCJK_block_font_initial:Nnn #1#2#3
+ {
+ \xeCJK_block_family:nn {#2} {#3}
+ \__xeCJK_font_initial:Nn #1 { #2/#3 }
}
\cs_new_protected_nopar:Npn \xeCJK_block_family:nn #1#2
{
@@ -3437,20 +3372,47 @@
{ xeCJK/family/#1 }
\cs_new_nopar:Npn \__xeCJK_family_nfss_csname:n #1
{ xeCJK/family/nfss/#1 }
-\cs_new_nopar:Npn \__xeCJK_family_use:n #1
+\cs_new_protected_nopar:Npn \__xeCJK_family_use:n #1
{ \use:c { \__xeCJK_family_nfss_csname:n {#1} } }
\cs_new_protected_nopar:Npn \__xeCJK_gset_family_nfss_cs:nn #1#2
{
\prop_gput:Nnn \g__xeCJK_family_name_prop {#1} {#2}
\cs_gset_protected_nopar:cpx
{ \__xeCJK_family_nfss_csname:n {#1} }
+ { \__xeCJK_nfss_family:nn { \c__xeCJK_encoding_tl } {#2} }
+ }
+\cs_generate_variant:Nn \__xeCJK_gset_family_nfss_cs:nn { xx }
+\cs_if_exist:NTF \fontseriesforce
+ {
+ \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:nn #1#2
{
- \exp_not:N \fontencoding { \c__xeCJK_encoding_tl }
- \tl_set:Nn \exp_not:N \f@family {#2}
- \exp_not:N \selectfont
+ \fontencoding {#1}
+ \str_if_eq:eeF { \f@series } { \bfdefault }
+ {
+ \str_case_e:nn { \f@family }
+ {
+ { \rmdefault } { \__xeCJK_nfss_series:n { rm } }
+ { \sfdefault } { \__xeCJK_nfss_series:n { sf } }
+ { \ttdefault } { \__xeCJK_nfss_series:n { tt } }
+ }
+ }
+ \fontfamily {#2}
+ \selectfont
+ }
+ \cs_new_protected_nopar:Npn \__xeCJK_nfss_series:n #1
+ {
+ \str_if_eq:eeT { \f@series } { \use:c { bfseries@#1 } }
+ { \fontseriesforce { \bfdefault } }
+ }
+ }
+ {
+ \cs_new_protected_nopar:Npn \__xeCJK_nfss_family:nn #1#2
+ {
+ \fontencoding {#1}
+ \tl_set:Nn \f@family {#2}
+ \selectfont
}
}
-\cs_generate_variant:Nn \__xeCJK_gset_family_nfss_cs:nn { xx }
\prg_new_protected_conditional:Npnn \xeCJK_family_if_exist:n #1 { T , F , TF }
{
\prop_get:NnNTF \g__xeCJK_family_name_prop
@@ -3532,7 +3494,7 @@
\tl_new:N \CJK@family
\cs_new_protected_nopar:Npn \__xeCJK_gobble_CJKfamily:
{ \cs_set_eq:NN \CJKfamily \__xeCJK_gobble_CJKfamily:wn }
-\DeclareExpandableDocumentCommand \__xeCJK_gobble_CJKfamily:wn { t+ t- m } { }
+\NewExpandableDocumentCommand \__xeCJK_gobble_CJKfamily:wn { t+ t- m } { }
\cs_new_protected_nopar:Npn \xeCJK_family_if_exist_use:n #1
{
\xeCJK_family_if_exist:nTF {#1}
@@ -3597,26 +3559,28 @@
{
\__xeCJK_pass_args:nnnn
{ \xeCJK_set_family:nnn { \CJKrmdefault } } {#1} {#2}
- { \normalfont }
+ { \__xeCJK_preamble_family:n { \CJKrmdefault } }
}
\cs_new_eq:NN \setCJKromanfont \setCJKmainfont
\NewDocumentCommand \setCJKsansfont { o m }
{
\__xeCJK_pass_args:nnnn
{ \xeCJK_set_family:nnn { \CJKsfdefault } } {#1} {#2}
- { \normalfont }
+ { \__xeCJK_preamble_family:n { \CJKsfdefault } }
}
\NewDocumentCommand \setCJKmonofont { o m }
{
\__xeCJK_pass_args:nnnn
{ \xeCJK_set_family:nnn { \CJKttdefault } } {#1} {#2}
- { \normalfont }
+ { \__xeCJK_preamble_family:n { \CJKttdefault } }
}
\@onlypreamble \setCJKmainfont
\@onlypreamble \setCJKmathfont
\@onlypreamble \setCJKsansfont
\@onlypreamble \setCJKmonofont
\@onlypreamble \setCJKromanfont
+\cs_new_protected_nopar:Npn \__xeCJK_preamble_family:n #1
+ { \str_if_eq:eeT {#1} { \CJKfamilydefault } { \normalfont } }
\NewDocumentCommand \setCJKfamilyfont { m o m }
{
\__xeCJK_pass_args:nnnn
@@ -3912,12 +3876,12 @@
\cs_new_protected_nopar:Npn \xeCJK_declare_mathfont:nn #1#2
{
\xeCJK_declare_symbol_font:nnnnn {#1} { \c__xeCJK_encoding_tl }
- {#2} { \mddefault } { \updefault }
+ {#2} { \mddefault } { \shapedefault }
\cs_if_free:cF
- { \c__xeCJK_encoding_tl/#2/\bfdefault/\updefault }
+ { \c__xeCJK_encoding_tl/#2/\bfdefault/\shapedefault }
{
\SetSymbolFont {#1} { bold } { \c__xeCJK_encoding_tl }
- {#2} { \bfdefault } { \updefault }
+ {#2} { \bfdefault } { \shapedefault }
}
\prop_gput:Nnx \g__xeCJK_fam_prop {#2} { \exp_not:c { sym #1 } }
}
@@ -4220,41 +4184,51 @@
}
\fp_new:N \l__xeCJK_scale_factor_fp
\prop_new:N \g__xeCJK_scale_family_prop
-\cs_new_protected_nopar:Npn \xeCJK_visible_space:
+\cs_new_protected_nopar:Npn \xeCJK_setup_visible_space:
{
\xeCJK_make_boundary:
\xeCJK_glyph_if_exist:NTF { ^^^^2423 }
- { ^^^^2423 }
+ { \tl_set:Nn \l__xeCJK_visible_space_tl { ^^^^2423 } }
{
\int_compare:nNnTF { \tex_XeTeXfonttype:D \tex_font:D } = \c_zero_int
{
- \str_if_eq:eeTF { \f@family } { \ttdefault }
- { \c_catcode_other_space_tl }
- { \textvisiblespace }
+ \tl_set:Nx \l__xeCJK_visible_space_tl
+ {
+ \str_if_eq:eeTF { \f@family } { \ttdefault }
+ { \c_catcode_other_space_tl }
+ { \exp_not:N \textvisiblespace }
+ }
}
- { \xeCJK_visible_space_fallback: }
+ { \__xeCJK_visible_space_fallback: }
}
+ \cs_set_eq:NN \@xobeysp \l__xeCJK_visible_space_tl
}
-\AtEndOfPackage
- { \cs_gset_eq:NN \fontspec_visible_space: \xeCJK_visible_space: }
-\cs_new_protected_nopar:Npn \xeCJK_visible_space_fallback:
- { {
- \cs_if_exist_use:cF { xeCJK/space/\curr@fontshape/\f@size }
- { \xeCJK_set_visible_space_font: }
- ^^^^2423
- } }
-\cs_new_protected_nopar:Npn \xeCJK_set_visible_space_font:
+\tl_new:N \l__xeCJK_visible_space_tl
+\cs_set_eq:NN \@setupverbvisiblespace \xeCJK_setup_visible_space:
+\cs_new_protected_nopar:Npn \__xeCJK_visible_space_fallback:
{
- \tl_set:Nx \l__xeCJK_current_coor_tl
+ \exp_args:Nc \__xeCJK_visible_space_fallback_auxi:N
{ xeCJK/space/\curr@fontshape/\f@size }
- \exp_args:No \__xeCJK_set_visible_space_size:n
- { \dim_use:N \tex_fontdimen:D 2 ~ \tex_font:D }
- \xeCJK_font_gset_to_current:c { \l__xeCJK_current_coor_tl }
+ }
+\cs_new_protected_nopar:Npn \__xeCJK_visible_space_fallback_auxi:N #1
+ {
+ \cs_if_exist:NF #1
+ { \__xeCJK_visible_space_fallback_auxii:N #1 }
+ \tl_set:Nn \l__xeCJK_visible_space_tl {#1}
+ }
+\cs_new_protected_nopar:Npn \__xeCJK_visible_space_fallback_auxii:N #1
+ {
+ \group_begin:
+ \exp_args:No \__xeCJK_set_visible_space_size:n
+ { \dim_use:N \tex_fontdimen:D 2 ~ \tex_font:D }
+ \cs_new_protected_nopar:Npx #1
+ { \group_begin: \tex_the:D \tex_font:D ^^^^2423 \group_end: }
+ \group_end:
}
\cs_new_protected_nopar:Npn \__xeCJK_set_visible_space_size:n #1
{
- \fontencoding { \g_fontspec_encoding_tl }
- \tl_set:Nx \f@family { lmtt }
+ \fontencoding { \UnicodeEncodingName }
+ \tl_set:Nn \f@family { lmtt }
\selectfont
\dim_compare:nNnF {#1} = { \tex_fontdimen:D 2 ~ \tex_font:D }
{
@@ -4354,7 +4328,7 @@
PunctStyle = quanjiao ,
NewLineCS = { \par \[ } ,
EnvCS = { \begin \end } ,
- WidowPenalty = 1000 ,
+ WidowPenalty = { 10 000 } ,
NoBreakCS = { \footnote \footnotemark \nobreak } ,
KaiMingPunct = { ^^^^3002 ^^^^ff0e ^^^^ff1f ^^^^ff01 } ,
LongPunct = { ^^^^2014 ^^^^2e3a ^^^^2025 ^^^^2026 } ,
@@ -4364,7 +4338,7 @@
\defaultCJKfontfeatures { Script = CJK }
\xeCJKsetwidth { ^^^^2013 } { 0.5 em }
\ProcessKeysOptions { xeCJK / options }
-\RequirePackage { fontspec } [ 2019/03/15 ]
+\RequirePackage { fontspec } [ 2020/02/03 ]
\tl_const:Nx \c__xeCJK_encoding_tl { \g_fontspec_encoding_tl }
\keys_define:nn { xeCJK / options }
{
@@ -4373,7 +4347,7 @@
}
\__xeCJK_msg_new:nn { option-invalid }
{
- The~`#1'~option~only~can~be~set~in~the~optional~argument~to~the\\
+ The~`#1'~option~can~only~be~set~in~the~optional~argument~to~the\\
\token_to_str:N \usepackage \ command~when~xeCJK~is~being~loaded.\\\\
Please~do~not~set~it~via~the~\token_to_str:N \xeCJKsetup \ command.
}
@@ -4420,33 +4394,6 @@
\xeCJK_set_char_class:nnn {#1} {#2} {#3}
\xeCJKResetPunctClass
}
-\cs_new_protected_nopar:Npn \xeCJK_fix_hbar:
- {
- \cs_if_free:NF \symlegacymaths
- {
- \group_begin:
- \cs_set_nopar:Npn \__xeCJK_tmp:w
- { { \mathchar '26 \mkern -9mu h } }
- \exp_after:wN \group_end:
- \if_meaning:w \__xeCJK_tmp:w \hbar
- \cs_set_protected_nopar:Npx \hbar
- { {
- \mathchar
- \int_eval:n { \symlegacymaths * 256 + '26 } ~
- \mkern -9mu h
- } }
- \fi:
- }
- }
-\cs_if_exist:NTF \fontspec_maybe_setup_maths:
- {
- \cs_gset_protected_nopar:Npx \fontspec_maybe_setup_maths:
- {
- \exp_not:o { \fontspec_maybe_setup_maths: }
- \xeCJK_fix_hbar:
- }
- }
- { \AtBeginDocument { \xeCJK_fix_hbar: } }
\cs_new_protected_nopar:Npn \xeCJK@update@fam
{
\addto@hook \everymath
@@ -4486,20 +4433,6 @@
{ \cs_if_exist_p:N \Url@MathSetup }
{ \tl_put_right:Nn \Url@MathSetup { \xeCJK@update@fam } }
}
-\@ifpackagelater { fontspec } { 2014/06/21 } { }
- {
- \cs_gset_protected_nopar:Npx \fontspec_setup_maths:
- {
- \exp_not:o
- {
- \fontspec_setup_maths:
- \bool_lazy_or:nnT
- { \tl_if_empty_p:N \g__fontspec_bfmathrm_tl }
- { \tl_if_empty_p:N \g_fontspec_bfmathrm_tl }
- { \DeclareSymbolFontAlphabet \mathrm { operators } }
- }
- }
- }
\cs_new_protected_nopar:Npn \__xeCJK_math_robust:N #1
{
\group_begin: \exp_args:NcNc \group_end:
@@ -4566,59 +4499,40 @@
\__xeCJK_math_robust:N \endmath
}
\__xeCJK_math_robust:N \ensuremath
-\__xeCJK_msg_new:nn { conflict-package }
- {
- The~`#1'~package~is~too~old. \\
- Please~update~an~up~to~date~version~of~it\\
- using~your~TeX~package~manager~or~from~CTAN.
- }
-\xeCJK_if_package_loaded:nTF { realscripts }
+\cs_if_exist:NTF \@rmfamilyhook
{
- \@ifpackagelater { realscripts } { 2010/10/10 } { }
+ \cs_set_eq:NN \xeCJK@family \xeCJK_switch_family:x
+ \g@addto@macro \@rmfamilyhook { \xeCJK@family { \CJKrmdefault } }
+ \g@addto@macro \@sffamilyhook { \xeCJK@family { \CJKsfdefault } }
+ \g@addto@macro \@ttfamilyhook { \xeCJK@family { \CJKttdefault } }
+ \exp_args:Nc \g@addto@macro
{
- \__xeCJK_error:nx { conflict-package }
- {
- \xeCJK_if_package_loaded:nTF { xltxtra }
- { xltxtra } { realscripts }
- }
+ \cs_if_exist:NTF \@defaultfamilyhook
+ { @defaultfamilyhook } { normalfont ~ }
}
+ { \xeCJK@family { \CJKfamilydefault } }
}
{
- \cs_new_eq:NN \__xeCJK_dim_max:nn \dim_max:nn
- \cs_new_eq:NN \__xeCJK_dim_min:nn \dim_min:nn
- \__xeCJK_at_end_preamble:n
+ \RenewDocumentCommand \fontfamily { m }
{
- \xeCJK_if_package_loaded:nT { realscripts }
- {
- \@ifpackagelater { realscripts } { 2010/10/10 } { }
- {
- \cs_gset_eq:NN \dim_max:nn \__xeCJK_dim_max:nn
- \cs_gset_eq:NN \dim_min:nn \__xeCJK_dim_min:nn
- }
- }
- \cs_undefine:N \__xeCJK_dim_max:nn
- \cs_undefine:N \__xeCJK_dim_min:nn
+ \tl_set:Nx \f@family {#1}
+ \xeCJK@fontfamily {#1}
}
- }
-\RenewDocumentCommand \fontfamily { m }
- {
- \tl_set:Nx \f@family {#1}
- \xeCJK@fontfamily {#1}
- }
-\cs_new_protected_nopar:Npn \xeCJK@fontfamily #1
- {
- \str_if_eq:nnTF {#1} { \familydefault }
- { \xeCJK_switch_family:x { \CJKfamilydefault } }
- { \__xeCJK_update_family_aux: }
- }
-\cs_new_protected_nopar:Npn \__xeCJK_update_family_aux:
- {
- \str_case_e:nn { \f@family }
+ \cs_new_protected_nopar:Npn \xeCJK@fontfamily #1
{
- { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
- { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
- { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
- { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ \str_if_eq:nnTF {#1} { \familydefault }
+ { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ { \__xeCJK_update_family_aux: }
+ }
+ \cs_new_protected_nopar:Npn \__xeCJK_update_family_aux:
+ {
+ \str_case_e:nn { \f@family }
+ {
+ { \rmdefault } { \xeCJK_switch_family:x { \CJKrmdefault } }
+ { \sfdefault } { \xeCJK_switch_family:x { \CJKsfdefault } }
+ { \ttdefault } { \xeCJK_switch_family:x { \CJKttdefault } }
+ { \familydefault } { \xeCJK_switch_family:x { \CJKfamilydefault } }
+ }
}
}
\cs_new_eq:NN \xeCJK@fix@penalty \fix@penalty
@@ -4908,22 +4822,6 @@
{ \cs_if_exist_p:N \icprotect }
{ \exp_after:wN \tex_let:D \cs:w cprotect \cs_end: \icprotect }
}
-\cs_if_eq:NNTF \ifCTEX@fntef \tex_iftrue:D
- { \AtEndOfPackage { \RequirePackage { xeCJKfntef } } }
- {
- \__xeCJK_at_end_preamble:n
- {
- \xeCJK_if_package_loaded:nF { xeCJKfntef }
- {
- \xeCJK_if_package_loaded:nTF { CJKfntef }
- { \RequirePackage { xeCJKfntef } }
- {
- \xeCJK_if_package_loaded:nT { ulem }
- { \RequirePackage { xeCJKfntef } }
- }
- }
- }
- }
\__xeCJK_at_end_preamble:n
{
\xeCJK_if_package_loaded:nT { listings }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xeCJKfntef.sty new/tex/xelatex/xecjk/xeCJKfntef.sty
--- old/tex/xelatex/xecjk/xeCJKfntef.sty 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xeCJKfntef.sty 2020-02-18 23:31:44.000000000 +0100
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `fntef')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,17 +29,15 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{xeCJK font effect}
\ProvidesExplPackage{xeCJKfntef}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
\PassOptionsToPackage { normalem } { ulem }
\DeclareOption* { \PassOptionsToPackage { \CurrentOption } { ulem } }
\ProcessOptions \scan_stop:
\RequirePackage { xeCJK }
\RequirePackage { ulem }
-\file_if_exist:nT { CJKfntef.sty }
- { \RequirePackage { CJKfntef } }
\addto@hook \UL@hook { \xeCJK_hook_for_ulem: }
\cs_new_protected_nopar:Npn \xeCJK_hook_for_ulem:
{
@@ -427,7 +425,6 @@
\UL@stop
\__xeCJK_ulem_skip_punct_begin:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl #1
- \__xeCJK_punct_offset:NN \c__xeCJK_left_tl #1
\UL@start
}
{ \__xeCJK_ulem_Default_and_FullLeft_glue:N #1 }
@@ -452,7 +449,6 @@
\__xeCJK_ulem_skip_punct_begin:
\__xeCJK_ulem_punct_ccglue:
\__xeCJK_punct_glue:NN \c__xeCJK_left_tl #1
- \__xeCJK_punct_offset:NN \c__xeCJK_left_tl #1
\UL@start
\__xeCJK_ulem_class_group_begin:
\xeCJK_select_punct_font:
@@ -553,7 +549,6 @@
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
\UL@stop
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_ulem_skip_punct_end:
\UL@start
@@ -567,7 +562,6 @@
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
\UL@stop
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_ulem_skip_punct_end:
\UL@start
@@ -582,7 +576,6 @@
\__xeCJK_punct_rule:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\xeCJK_class_group_end:
\UL@stop
- \__xeCJK_punct_offset:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_punct_glue:NN \c__xeCJK_right_tl \g__xeCJK_last_punct_tl
\__xeCJK_ulem_punct_ccglue:
\__xeCJK_ulem_skip_punct_end:
@@ -653,7 +646,7 @@
\xeCJK_ulem_boot:NNNn #1#2#3 {#4}
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \CJKunderline { s t- s o }
+\NewDocumentCommand \CJKunderline { s t- s o }
{
\xeCJK_ulem_group_begin:
\xeCJK_fntef_boot:nnNNNn { underline } { uline } #1#2#3 {#4}
@@ -669,9 +662,9 @@
}
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \varCJKunderline { }
+\NewDocumentCommand \varCJKunderline { }
{ \CJKunderline - }
-\DeclareDocumentCommand \CJKunderwave { s t- s o }
+\NewDocumentCommand \CJKunderwave { s t- s o }
{
\xeCJK_ulem_group_begin:
\xeCJK_fntef_boot:nnNNNn { underwave } { uwave } #1#2#3 {#4}
@@ -681,7 +674,7 @@
{ \l__xeCJK_uwave_format_tl \l__xeCJK_uwave_symbol_tl }
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \CJKunderdblline { s t- s o }
+\NewDocumentCommand \CJKunderdblline { s t- s o }
{
\xeCJK_ulem_group_begin:
\xeCJK_fntef_boot:nnNNNn { underdblline } { udbline } #1#2#3 {#4}
@@ -705,7 +698,7 @@
}
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \CJKsout { s t- s o }
+\NewDocumentCommand \CJKsout { s t- s o }
{
\xeCJK_ulem_group_begin:
\xeCJK_fntef_boot:nnNNNn { sout } { sout } #1#2#3 {#4}
@@ -724,7 +717,7 @@
}
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \CJKxout { s t- s o }
+\NewDocumentCommand \CJKxout { s t- s o }
{
\xeCJK_ulem_group_begin:
\xeCJK_fntef_boot:nnNNNn { xout } { xout } #1#2#3 {#4}
@@ -741,7 +734,7 @@
}
\xeCJK_ulem_on:n
}
-\DeclareDocumentCommand \CJKunderanyline { s t- s o m m }
+\NewDocumentCommand \CJKunderanyline { s t- s o m m }
{
\xeCJK_ulem_group_begin:
\xeCJK_ulem_boot:NNNn #1#2#3 {#4}
@@ -931,12 +924,12 @@
xout / format = \color { blue }
}
}
-\DeclareDocumentCommand \CJKunderanysymbol { o m m m }
+\NewDocumentCommand \CJKunderanysymbol { o m m m }
{
\xeCJK_under_symbol:nnnnnn { symbol } { symbol } {#1} {#2} {#3} {#4}
\tex_ignorespaces:D
}
-\DeclareDocumentCommand \CJKunderdot { o m }
+\NewDocumentCommand \CJKunderdot { o m }
{
\xeCJK_under_symbol:nnnnnn { underdot } { udot }
{#1}
@@ -1040,7 +1033,7 @@
\box_use:N \l__xeCJK_under_symbol_box
\xeCJK_no_break: \__xeCJK_under_CJKsymbol:N
}
-\DeclareDocumentEnvironment { CJKfilltwosides } { O { c } m }
+\NewDocumentEnvironment { CJKfilltwosides } { O { c } m }
{
\use:x { \exp_not:N \minipage [#1] { \dim_eval:n {#2} } }
\cs_set_eq:NN \CJKglue \xeCJK_fntef_hfilll:
@@ -1049,7 +1042,7 @@
\endminipage
\ignorespacesafterend
}
-\DeclareDocumentEnvironment { CJKfilltwosides* } { O { c } m +b }
+\NewDocumentEnvironment { CJKfilltwosides* } { O { c } m +b }
{
\mode_leave_vertical:
\cs_set_eq:NN \CJKglue \xeCJK_fntef_hfilll:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xunicode-addon.sty new/tex/xelatex/xecjk/xunicode-addon.sty
--- old/tex/xelatex/xecjk/xunicode-addon.sty 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xunicode-addon.sty 2020-02-18 23:31:44.000000000 +0100
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunicode')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -29,10 +29,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{addon file for xunicode}
\ProvidesExplPackage{xunicode-addon}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
\bool_lazy_or:nnF
{ \sys_if_engine_xetex_p: }
{ \sys_if_engine_luatex_p: }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecjk/xunicode-extra.def new/tex/xelatex/xecjk/xunicode-extra.def
--- old/tex/xelatex/xecjk/xunicode-extra.def 2019-04-07 23:28:36.000000000 +0200
+++ new/tex/xelatex/xecjk/xunicode-extra.def 2020-02-18 23:31:44.000000000 +0100
@@ -7,8 +7,8 @@
%% xeCJK.dtx (with options: `xunextra')
%%
%% Copyright (C) 2007--2010 by Wenchang Sun <sunwch(a)nankai.edu.cn>
-%% Copyright (C) 2009--2019 by Leo Liu <leoliu.pku(a)gmail.com>
-%% Copyright (C) 2012--2019 by Qing Lee <sobenlee(a)gmail.com>
+%% Copyright (C) 2009--2020 by Leo Liu <leoliu.pku(a)gmail.com>
+%% Copyright (C) 2012--2020 by Qing Lee <sobenlee(a)gmail.com>
%% ----------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
@@ -27,10 +27,10 @@
%%
%% ----------------------------------------------------------------------
%%
-\GetIdInfo$Id: xeCJK.dtx 8be031f 2019-04-07 23:30:14 +0800 Qing Lee <sobenlee(a)gmail.com> $
+\GetIdInfo$Id: xeCJK.dtx 165cecc 2020-02-18 20:38:34 +0800 Qing Lee <sobenlee(a)gmail.com> $
{extra definition for xunicode}
\ProvidesExplFile{xunicode-extra.def}
- {\ExplFileDate}{3.7.2}{\ExplFileDescription}
+ {\ExplFileDate}{3.8.2}{\ExplFileDescription}
\DeclareUTFSymbol\texthyphenationpoint{"2027}
\DeclareUTFSymbol\texttwoemdash{"2E3A}
\DeclareUTFComposite\textsuperscript
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xecjk.tlpobj new/tlpkg/tlpobj/xecjk.tlpobj
--- old/tlpkg/tlpobj/xecjk.tlpobj 2019-04-08 01:40:33.000000000 +0200
+++ new/tlpkg/tlpobj/xecjk.tlpobj 2020-02-19 01:55:59.000000000 +0100
@@ -1,13 +1,13 @@
name xecjk
category Package
-revision 50852
+revision 53835
shortdesc Support for CJK documents in XeLaTeX
relocated 1
longdesc A LaTeX package for typesetting CJK documents in the way users
longdesc have become used to, in the CJK package. The package requires a
longdesc current version of xtemplate (and hence of the current LaTeX3
longdesc development environment).
-runfiles size=131
+runfiles size=130
RELOC/fonts/misc/xetex/fontmapping/xecjk/full-stop.map
RELOC/fonts/misc/xetex/fontmapping/xecjk/full-stop.tec
RELOC/fonts/misc/xetex/fontmapping/xecjk/fullwidth-stop.map
@@ -27,7 +27,6 @@
catalogue-contact-repository https://github.com/CTeX-org/ctex-kit
catalogue-contact-support https://github.com/CTeX-org/ctex-kit/issues
catalogue-ctan /macros/xetex/latex/xecjk
-catalogue-date 2019-04-07 19:45:54 +0200
catalogue-license lppl1.3c
catalogue-topics chinese japanese korean xetex expl3
-catalogue-version 3.7.2
+catalogue-version 3.8.2
++++++ xecyr.doc.tar.xz ++++++
++++ 3352 lines of diff (skipped)
++++++ xecyr.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/xecyr/xecyr.sty new/tex/xelatex/xecyr/xecyr.sty
--- old/tex/xelatex/xecyr/xecyr.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/xelatex/xecyr/xecyr.sty 2019-10-07 23:05:00.000000000 +0200
@@ -0,0 +1,336 @@
+\ProvidesPackage{xecyr}%
+ [2019/10/04 v1.2 Definitions for Cyrillic Babel and XeLaTeX/LuaTeX compatibility]
+
+\RequirePackage{ifluatex}
+\RequirePackage{ifxetex}
+
+\newif\if@EXT
+\DeclareOption{ext}{\@EXTtrue}
+\DeclareOption{noext}{\@EXTfalse}
+\newif\if@MIS
+\DeclareOption{mis}{\@MIStrue}
+\DeclareOption{nomis}{\@MISfalse}
+
+\ExecuteOptions{ext,nomis}
+\ProcessOptions
+
+\if@MIS
+ \RequirePackage{misccorr}
+\fi
+
+\ifluatex
+ \if@EXT
+ \RequirePackage{luatextra}
+ \defaultfontfeatures{Mapping=tex-text}
+ \fi
+\else
+ \ifxetex
+ \if@EXT
+ \RequirePackage{xltxtra}
+ \defaultfontfeatures{Mapping=tex-text}
+ \fi
+ \else % pdflatex/inputenc hack
+ \RequirePackage[utf8]{inputenc}
+ \def\setmainfont#1{}
+ \def\setsansfont#1{}
+ \def\setmonofont#1{}
+ \endinput
+ \fi
+\fi
+
+\@ifpackageloaded{xunicode}{}{\RequirePackage{xunicode}}
+
+%%% Cyrillic letter TeX definitions for XeTeX/LuaTeX
+% This definition set is complete for all Slavic Cyrillic
+% languages (Russian, Ukrainian, Belorussian,
+% Rusyn, Serbian, Macedonian and Bulgarian alphabets).
+%
+% It has not been confirmed as complete, but might be, for those
+% non-Slavic Cyrillic languages:
+% Ossetian, Khalka, Buryat, Kalmyk, Kyrgyz, Tatar, Uzbek
+% Azerbaijani, Kazakh, Abkhaz, Chukchi.
+
+%%% Part I
+%%% Cyrillic letters defined as a continuous stretch
+%%% in Unicode and most common 8-bit encodings which define them:
+
+\DeclareUTFcharacter[\UTFencname]{x0410}{\CYRA} % А
+\DeclareUTFcharacter[\UTFencname]{x0430}{\cyra} % а
+\DeclareUTFcharacter[\UTFencname]{x0411}{\CYRB} % Б
+\DeclareUTFcharacter[\UTFencname]{x0431}{\cyrb} % б
+\DeclareUTFcharacter[\UTFencname]{x0412}{\CYRV} % В
+\DeclareUTFcharacter[\UTFencname]{x0432}{\cyrv} % в
+\DeclareUTFcharacter[\UTFencname]{x0413}{\CYRG} % Г
+\DeclareUTFcharacter[\UTFencname]{x0433}{\cyrg} % г
+\DeclareUTFcharacter[\UTFencname]{x0414}{\CYRD} % Д
+\DeclareUTFcharacter[\UTFencname]{x0434}{\cyrd} % д
+\DeclareUTFcharacter[\UTFencname]{x0415}{\CYRE} % Е
+\DeclareUTFcharacter[\UTFencname]{x0435}{\cyre} % е
+\DeclareUTFcharacter[\UTFencname]{x0416}{\CYRZH} % Ж
+\DeclareUTFcharacter[\UTFencname]{x0436}{\cyrzh} % ж
+\DeclareUTFcharacter[\UTFencname]{x0417}{\CYRZ} % З
+\DeclareUTFcharacter[\UTFencname]{x0437}{\cyrz} % з
+\DeclareUTFcharacter[\UTFencname]{x0418}{\CYRI} % И
+\DeclareUTFcharacter[\UTFencname]{x0438}{\cyri} % и
+\DeclareUTFcharacter[\UTFencname]{x0419}{\CYRISHRT} % Й
+\DeclareUTFcharacter[\UTFencname]{x0439}{\cyrishrt} % й
+\DeclareUTFcharacter[\UTFencname]{x041A}{\CYRK} % К
+\DeclareUTFcharacter[\UTFencname]{x043A}{\cyrk} % к
+\DeclareUTFcharacter[\UTFencname]{x041B}{\CYRL} % Л
+\DeclareUTFcharacter[\UTFencname]{x043B}{\cyrl} % л
+\DeclareUTFcharacter[\UTFencname]{x041C}{\CYRM} % М
+\DeclareUTFcharacter[\UTFencname]{x043C}{\cyrm} % м
+\DeclareUTFcharacter[\UTFencname]{x041D}{\CYRN} % Н
+\DeclareUTFcharacter[\UTFencname]{x043D}{\cyrn} % н
+\DeclareUTFcharacter[\UTFencname]{x041E}{\CYRO} % О
+\DeclareUTFcharacter[\UTFencname]{x043E}{\cyro} % о
+\DeclareUTFcharacter[\UTFencname]{x041F}{\CYRP} % П
+\DeclareUTFcharacter[\UTFencname]{x043F}{\cyrp} % п
+\DeclareUTFcharacter[\UTFencname]{x0420}{\CYRR} % Р
+\DeclareUTFcharacter[\UTFencname]{x0440}{\cyrr} % р
+\DeclareUTFcharacter[\UTFencname]{x0421}{\CYRS} % С
+\DeclareUTFcharacter[\UTFencname]{x0441}{\cyrs} % с
+\DeclareUTFcharacter[\UTFencname]{x0422}{\CYRT} % Т
+\DeclareUTFcharacter[\UTFencname]{x0442}{\cyrt} % т
+\DeclareUTFcharacter[\UTFencname]{x0423}{\CYRU} % У
+\DeclareUTFcharacter[\UTFencname]{x0443}{\cyru} % у
+\DeclareUTFcharacter[\UTFencname]{x0424}{\CYRF} % Ф
+\DeclareUTFcharacter[\UTFencname]{x0444}{\cyrf} % ф
+\DeclareUTFcharacter[\UTFencname]{x0425}{\CYRH} % Х
+\DeclareUTFcharacter[\UTFencname]{x0445}{\cyrh} % х
+\DeclareUTFcharacter[\UTFencname]{x0426}{\CYRC} % Ц
+\DeclareUTFcharacter[\UTFencname]{x0446}{\cyrc} % ц
+\DeclareUTFcharacter[\UTFencname]{x0427}{\CYRCH} % Ч
+\DeclareUTFcharacter[\UTFencname]{x0447}{\cyrch} % ч
+\DeclareUTFcharacter[\UTFencname]{x0428}{\CYRSH} % Ш
+\DeclareUTFcharacter[\UTFencname]{x0448}{\cyrsh} % ш
+\DeclareUTFcharacter[\UTFencname]{x0429}{\CYRSHCH} % Щ
+\DeclareUTFcharacter[\UTFencname]{x0449}{\cyrshch} % щ
+\DeclareUTFcharacter[\UTFencname]{x042A}{\CYRHRDSN} % Ъ
+\DeclareUTFcharacter[\UTFencname]{x044A}{\cyrhrdsn} % ъ
+\DeclareUTFcharacter[\UTFencname]{x042B}{\CYRERY} % Ы
+\DeclareUTFcharacter[\UTFencname]{x044B}{\cyrery} % ы
+\DeclareUTFcharacter[\UTFencname]{x042C}{\CYRSFTSN} % Ь
+\DeclareUTFcharacter[\UTFencname]{x044C}{\cyrsftsn} % ь
+\DeclareUTFcharacter[\UTFencname]{x042D}{\CYREREV} % Э
+\DeclareUTFcharacter[\UTFencname]{x044D}{\cyrerev} % э
+\DeclareUTFcharacter[\UTFencname]{x042E}{\CYRYU} % Ю
+\DeclareUTFcharacter[\UTFencname]{x044E}{\cyryu} % ю
+\DeclareUTFcharacter[\UTFencname]{x042F}{\CYRYA} % Я
+\DeclareUTFcharacter[\UTFencname]{x044F}{\cyrya} % я
+
+%%% Part II
+%%% Cyrillic letters not defined as continuous stretches,
+%%% but available in common 8-bit cyrillic encodings,
+%%% like cp1251 and iso-8859-5, sorted by languages
+%%% they're used in for ease of checking:
+
+% Common to many languages:
+\DeclareUTFcharacter[\UTFencname]{x0401}{\CYRYO} % Ё
+\DeclareUTFcharacter[\UTFencname]{x0451}{\cyryo} % ё
+% Belorussian-Uzbek:
+\DeclareUTFcharacter[\UTFencname]{x040E}{\CYRUSHRT} % Ў
+\DeclareUTFcharacter[\UTFencname]{x045E}{\cyrushrt} % ў
+% Ukrainian-Rusyn:
+\DeclareUTFcharacter[\UTFencname]{x0490}{\CYRGUP} % Ґ
+\DeclareUTFcharacter[\UTFencname]{x0491}{\cyrgup} % ґ
+\DeclareUTFcharacter[\UTFencname]{x0407}{\CYRYI} % Ї
+\DeclareUTFcharacter[\UTFencname]{x0457}{\cyryi} % ї
+\DeclareUTFcharacter[\UTFencname]{x0404}{\CYRIE} % Є
+\DeclareUTFcharacter[\UTFencname]{x0454}{\cyrie} % є
+% Ukrainian-Belorussian-Rusyn-Kazakh:
+\DeclareUTFcharacter[\UTFencname]{x0406}{\CYRII} % І
+\DeclareUTFcharacter[\UTFencname]{x0456}{\cyrii} % і
+% Serbian-Macedonian-Azerbaijani:
+\DeclareUTFcharacter[\UTFencname]{x0408}{\CYRJE} % Ј
+\DeclareUTFcharacter[\UTFencname]{x0458}{\cyrje} % ј
+% Serbian-Macedonian-Abkhaz:
+\DeclareUTFcharacter[\UTFencname]{x040F}{\CYRDZHE} % Џ
+\DeclareUTFcharacter[\UTFencname]{x045F}{\cyrdzhe} % џ
+% Serbian-Macedonian:
+\DeclareUTFcharacter[\UTFencname]{x0409}{\CYRLJE} % Љ
+\DeclareUTFcharacter[\UTFencname]{x0459}{\cyrlje} % љ
+\DeclareUTFcharacter[\UTFencname]{x040A}{\CYRNJE} % Њ
+\DeclareUTFcharacter[\UTFencname]{x045A}{\cyrnje} % њ
+% Serbian:
+\DeclareUTFcharacter[\UTFencname]{x0402}{\CYRDJE} % Ђ
+\DeclareUTFcharacter[\UTFencname]{x0452}{\cyrdje} % ђ
+\DeclareUTFcharacter[\UTFencname]{x040B}{\CYRTSHE} % Ћ
+\DeclareUTFcharacter[\UTFencname]{x045B}{\cyrtshe} % ћ
+% Macedonian:
+\DeclareUTFcharacter[\UTFencname]{x0405}{\CYRDZE} % Ѕ
+\DeclareUTFcharacter[\UTFencname]{x0455}{\cyrdze} % ѕ
+\DeclareUTFcharacter[\UTFencname]{x0403}{\CYRGJE} % Ѓ
+\DeclareUTFcharacter[\UTFencname]{x0453}{\cyrgje} % ѓ
+\DeclareUTFcharacter[\UTFencname]{x040C}{\CYRKJE} % Ќ
+\DeclareUTFcharacter[\UTFencname]{x045C}{\cyrkje} % ќ
+
+%%% Part III
+%%% Non-Slavic Cyrillic letters, waiting for their experts
+%%% to be confirmed as correct.
+%%% From here on, we're out of the frequently used 8-bit land
+%%% and into mostly Unicode territory.
+
+% Azerbaijani-Abkhaz-Kalmyk-Kazakh-Tatar:
+\DeclareUTFcharacter[\UTFencname]{x04D8}{\CYRSCHWA} % Ә
+\DeclareUTFcharacter[\UTFencname]{x04D9}{\cyrschwa} % ә
+% Azerbaijani-Kyrgyz-Buryat-Kazakh-Tatar:
+\DeclareUTFcharacter[\UTFencname]{x04BA}{\CYRSHHA} % Һ
+\DeclareUTFcharacter[\UTFencname]{x04BB}{\cyrshha} % һ
+% Azerbaijani-Kyrgyz-Buryat-Kalmyk-Kazakh-Tatar:
+\DeclareUTFcharacter[\UTFencname]{x04E8}{\CYROTLD} % Ө
+\DeclareUTFcharacter[\UTFencname]{x04E9}{\cyrotld} % ө
+\DeclareUTFcharacter[\UTFencname]{x04AE}{\CYRY} % Ү
+\DeclareUTFcharacter[\UTFencname]{x04AF}{\cyry} % ү
+% Azerbaijani-Tajik-Kazakh-Uzbek:
+\DeclareUTFcharacter[\UTFencname]{x0492}{\CYRGHCRS} % Ғ
+\DeclareUTFcharacter[\UTFencname]{x0493}{\cyrghcrs} % ғ
+% Tajik-Abkhaz-Kazakh-Uzbek:
+\DeclareUTFcharacter[\UTFencname]{x049A}{\CYRKDSC} % Қ
+\DeclareUTFcharacter[\UTFencname]{x049B}{\cyrkdsc} % қ
+% Tajik-Abkhaz-Uzbek:
+\DeclareUTFcharacter[\UTFencname]{x04B2}{\CYRHDSC} % Ҳ
+\DeclareUTFcharacter[\UTFencname]{x04B3}{\cyrhdsc} % ҳ
+% Tajik-Abkhaz:
+\DeclareUTFcharacter[\UTFencname]{x04B6}{\CYRCHRDSC} % Ҷ
+\DeclareUTFcharacter[\UTFencname]{x04B7}{\cyrchrdsc} % ҷ
+% Kalmyk-Kyrguz-Tatar:
+\DeclareUTFcharacter[\UTFencname]{x04A2}{\CYRNDSC} % Ң
+\DeclareUTFcharacter[\UTFencname]{x04A3}{\cyrndsc} % ң
+% Kalmyk-Tatar:
+\DeclareUTFcharacter[\UTFencname]{x0496}{\CYRZHDSC} % Җ
+\DeclareUTFcharacter[\UTFencname]{x0497}{\cyrzhdsc} % җ
+% Ossetian:
+\DeclareUTFcharacter[\UTFencname]{x04D4}{\CYRAE} % Ӕ
+\DeclareUTFcharacter[\UTFencname]{x04D5}{\cyrae} % ӕ
+% Azerbaijani:
+\DeclareUTFcharacter[\UTFencname]{x04B8}{\CYRCHVCRS} % Ҹ
+\DeclareUTFcharacter[\UTFencname]{x04B9}{\cyrchvcrs} % ҹ
+\DeclareUTFcharacter[\UTFencname]{x049C}{\CYRKVCRS} % Ҝ
+\DeclareUTFcharacter[\UTFencname]{x049D}{\cyrkvcrs} % ҝ
+% Kazakh:
+\DeclareUTFcharacter[\UTFencname]{x04B0}{\CYRYHCRS} % Ұ
+\DeclareUTFcharacter[\UTFencname]{x04B1}{\cyryhcrs} % ұ
+% Abkhaz:
+\DeclareUTFcharacter[\UTFencname]{x0494}{\CYRGHK} % Ҕ
+\DeclareUTFcharacter[\UTFencname]{x0495}{\cyrghk} % ҕ
+\DeclareUTFcharacter[\UTFencname]{x04E0}{\CYRABHDZE} % Ӡ
+\DeclareUTFcharacter[\UTFencname]{x04E1}{\cyrabhdze} % ӡ
+\DeclareUTFcharacter[\UTFencname]{x049E}{\CYRKHCRS} % Ҟ
+\DeclareUTFcharacter[\UTFencname]{x049F}{\cyrkhcrs} % ҟ
+\DeclareUTFcharacter[\UTFencname]{x04A6}{\CYRPHK} % Ҧ
+\DeclareUTFcharacter[\UTFencname]{x04A7}{\cyrphk} % ҧ
+\DeclareUTFcharacter[\UTFencname]{x04AC}{\CYRTDSC} % Ҭ
+\DeclareUTFcharacter[\UTFencname]{x04AD}{\cyrtdsc} % ҭ
+\DeclareUTFcharacter[\UTFencname]{x04B4}{\CYRTETSE} % Ҵ
+\DeclareUTFcharacter[\UTFencname]{x04B5}{\cyrtetse} % ҵ
+\DeclareUTFcharacter[\UTFencname]{x04BC}{\CYRABHCH} % Ҽ
+\DeclareUTFcharacter[\UTFencname]{x04BD}{\cyrabhch} % ҽ
+\DeclareUTFcharacter[\UTFencname]{x04BE}{\CYRABHCHDSC} % Ҿ
+\DeclareUTFcharacter[\UTFencname]{x04BF}{\cyrabhchdsc} % ҿ
+\DeclareUTFcharacter[\UTFencname]{x04A8}{\CYRABHHA} % Ҩ
+\DeclareUTFcharacter[\UTFencname]{x04A9}{\cyrabhha} % ҩ
+% Chukchi:
+\DeclareUTFcharacter[\UTFencname]{x04C3}{\CYRKHK} % Ӄ
+\DeclareUTFcharacter[\UTFencname]{x04C4}{\cyrkhk} % ӄ
+\DeclareUTFcharacter[\UTFencname]{x04C7}{\CYRNHK} % Ӈ
+\DeclareUTFcharacter[\UTFencname]{x04C8}{\cyrnhk} % ӈ
+
+%% P.S. Tajik and Chuvash, while mentioned,
+%% have letters which are apparently missing and are NOT complete.
+
+%%% Part IV
+%%% Historical letters, needed to support old orthographies.
+\DeclareUTFcharacter[\UTFencname]{x0462}{\CYRYAT} % Ѣ
+\DeclareUTFcharacter[\UTFencname]{x0463}{\cyryat} % ѣ
+\DeclareUTFcharacter[\UTFencname]{x046A}{\CYRBYUS} % Ѫ
+\DeclareUTFcharacter[\UTFencname]{x046B}{\cyrbyus} % ѫ
+\DeclareUTFcharacter[\UTFencname]{x0474}{\CYRIZH} % Ѵ
+\DeclareUTFcharacter[\UTFencname]{x0475}{\cyrizh} % ѵ
+\DeclareUTFcharacter[\UTFencname]{x0472}{\CYRFITA} % Ѳ
+\DeclareUTFcharacter[\UTFencname]{x0473}{\cyrfita} % ѳ
+
+%%% Part V
+%%% UNRECOGNISED NON-SLAVIC CYRILLIC LETTERS
+%%% Belong to languages not mentioned herein.
+
+\DeclareUTFcharacter[\UTFencname]{x04C0}{\CYRpalochka} % Ӏ
+\DeclareUTFcharacter[\UTFencname]{x0498}{\CYRZDSC} % Ҙ
+\DeclareUTFcharacter[\UTFencname]{x0499}{\cyrzdsc} % ҙ
+\DeclareUTFcharacter[\UTFencname]{x04A0}{\CYRKBEAK} % Ҡ
+\DeclareUTFcharacter[\UTFencname]{x04A1}{\cyrkbeak} % ҡ
+\DeclareUTFcharacter[\UTFencname]{x04A4}{\CYRNG} % Ҥ
+\DeclareUTFcharacter[\UTFencname]{x04A5}{\cyrng} % ҥ
+\DeclareUTFcharacter[\UTFencname]{x04AA}{\CYRSDSC} % Ҫ
+\DeclareUTFcharacter[\UTFencname]{x04AB}{\cyrsdsc} % ҫ
+\DeclareUTFcharacter[\UTFencname]{x04CB}{\CYRCHLDSC} % Ӌ
+\DeclareUTFcharacter[\UTFencname]{x04CC}{\cyrchldsc} % ӌ
+
+%% These are probably improperly named either in TeX or Unicode,
+%% since their Unicode names and TeX names do not match.
+%% TeX definitely treats them as the same symbol though.
+\DeclareUTFcharacter[\UTFencname]{x04CD}{\CYRMDSC} % Ӎ
+\DeclareUTFcharacter[\UTFencname]{x04CE}{\cyrmdsc} % ӎ
+\DeclareUTFcharacter[\UTFencname]{x04C5}{\CYRLDSC} % Ӆ
+\DeclareUTFcharacter[\UTFencname]{x04C6}{\cyrldsc} % ӆ
+
+%% These two letters are part of proposed Unicode for Kurdish
+%% and their codepoints may or may not change upon inclusion.
+\DeclareUTFcharacter[\UTFencname]{x051A}{\CYRQ}
+\DeclareUTFcharacter[\UTFencname]{x051B}{\cyrq}
+\DeclareUTFcharacter[\UTFencname]{x051C}{\CYRW}
+\DeclareUTFcharacter[\UTFencname]{x051D}{\cyrw}
+
+%%% Part VII
+%%% PUNCTUATION AND UNCLEAR CASES
+%%% Exotic (punctuation, letters...)
+%%% (this list is probably incomplete)
+
+% A dash - Defined in cyrillic.mtx to be emdash
+% and should have been emdash all along.
+\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
+
+% Exotic angle brackets.
+% Might still be unprintable for you.
+\DeclareUTFcharacter[\UTFencname]{x27E8}{\cyrlangle}
+\DeclareUTFcharacter[\UTFencname]{x27E9}{\cyrrangle}
+
+% This particular association is not certain but I guess
+% we'll hear about it when someone trips over it.
+\DeclareUTFcharacter[\UTFencname]{x0510}{\CYREPS}
+\DeclareUTFcharacter[\UTFencname]{x0511}{\cyreps}
+
+% Can't confirm those, but I'm positive the codepoints are correct:
+\DeclareUTFcharacter[\UTFencname]{x04F6}{\CYRGDSC}
+\DeclareUTFcharacter[\UTFencname]{x04F7}{\cyrgdsc}
+\DeclareUTFcharacter[\UTFencname]{x04FC}{\CYRHHK}
+\DeclareUTFcharacter[\UTFencname]{x04FD}{\cyrhhk}
+\DeclareUTFcharacter[\UTFencname]{x0512}{\CYRLHK}
+\DeclareUTFcharacter[\UTFencname]{x0513}{\cyrlhk}
+
+% I could not assign these in a way that would make sense,
+% since I couldn't find matches in cyrillic unicode table.
+
+%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRNLHK}
+%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrnlhk}
+%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRRDSC}
+%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrrdsc}
+
+% Oddities:
+% I don't see a letter like that in Unicode cyrillic table.
+% I've no idea what is it doing in a cyrillic encoding either.
+%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRDELTA}
+%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrdelta}
+
+% Quotes
+% Ligatures << and >> are working only with the last versions of "tex-text.map"
+% and "tex-text.tec" (http://scripts.sil.org/svn-view/xetex/TRUNK)
+\DeclareUTFcharacter[\UTFencname]{x00AB}{\flqq}
+\DeclareUTFcharacter[\UTFencname]{x00BB}{\frqq}
+\DeclareUTFcharacter[\UTFencname]{x201E}{\glqq}
+\DeclareUTFcharacter[\UTFencname]{x201C}{\grqq}
+
+% To make it (and "--- -like shortcuts) work, "xecyr" must be loaded _after_ babel.
+\def\cyrdash{\hbox to.8em{--\hss--}}
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex new/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex
--- old/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex 2008-03-10 01:27:31.000000000 +0100
+++ new/texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,59 +0,0 @@
-% xu-ruenhyph.tex
-% Wrapper for XeTeX to read combined Russian/English hyphenation patterns
-% Alexey Shipunov, 2008/02/16-08-19
-% Public domain
-
-\begingroup
-
-% Please uncomment the pattern value you need before creating a new
-% format file containing Russian hyphenation patterns:
-
-\ifx\Pattern\undefined
-\def\Pattern{al}
-%\def\Pattern{as}
-%\def\Pattern{ct}
-%\def\Pattern{dv}
-%\def\Pattern{mg}
-%\def\Pattern{vl}
-%\def\Pattern{zn}
-\fi
-
-% For non-XeTeX use, also check the encoding options in ruhyphen.tex
-
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
-
- \input hyphen
- \input enrhm2
- \input ruhyphen
-
-\else
-
- \let\PATTERNS=\patterns
- \def\patterns{%
- \XeTeXinputencoding "KOI8-R"
- \PATTERNS
- }
-
- \input hyphen
- \input enrhm2
- \input ruhyph\Pattern
- \input cyryo\Pattern
-
- % additional patterns from ruhyphen.tex, converted to Unicode
- \PATTERNS{.^^^^043d^^^^04358 8^^^^043d^^^^0435.}
- \PATTERNS{8^^^^0431^^^^044a. 8^^^^0432^^^^044a. 8^^^^0433^^^^044a.
- 8^^^^0434^^^^044a. 8^^^^0436^^^^044a. 8^^^^0437^^^^044a.
- 8^^^^043a^^^^044a. 8^^^^043b^^^^044a. 8^^^^043c^^^^044a.
- 8^^^^043d^^^^044a. 8^^^^043f^^^^044a. 8^^^^0440^^^^044a.
- 8^^^^0441^^^^044a. 8^^^^0442^^^^044a. 8^^^^0444^^^^044a.
- 8^^^^0445^^^^044a. 8^^^^0446^^^^044a. 8^^^^0447^^^^044a.
- 8^^^^0448^^^^044a. 8^^^^0449^^^^044a.}
-
-\fi
-
-\endgroup
-
-\lefthyphenmin2 % settings copied from ruhyphen.tex
-\righthyphenmin2
-
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/xelatex/xecyr/xecyr.sty new/texmf-dist/tex/xelatex/xecyr/xecyr.sty
--- old/texmf-dist/tex/xelatex/xecyr/xecyr.sty 2010-10-27 02:16:58.000000000 +0200
+++ new/texmf-dist/tex/xelatex/xecyr/xecyr.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,321 +0,0 @@
-% Modified from Evgenie Medvedev <medvedev at project7.ru> by A. Shipunov (plantago(a)herba.msu.ru)
-
-\ProvidesPackage{xecyr}%
- [2008/03/08 v1.0 Definitions for Cyrillic Babel/XeLaTeX compatibility]
-
-\newif\if@EXT
-\DeclareOption{ext}{\@EXTtrue}
-\DeclareOption{noext}{\@EXTfalse}
-\newif\if@MIS
-\DeclareOption{mis}{\@MIStrue}
-\DeclareOption{nomis}{\@MISfalse}
-
-\ExecuteOptions{ext,nomis}
-\ProcessOptions
-
-\if@MIS
- \RequirePackage{misccorr}
- \XeTeXinputencoding "KOI8-R"
-\fi
-
-\if@EXT
- \PassOptionsToPackage{cm-default}{fontspec}
- \RequirePackage{xltxtra}
-\fi
-
-\RequirePackage{xunicode}
-
-%%% Cyrillic letter TeX definitions for XeTeX
-% This definition set is complete for all Slavic Cyrillic
-% languages (Russian, Ukrainian, Belorussian,
-% Rusyn, Serbian, Macedonian and Bulgarian alphabets).
-%
-% It has not been confirmed as complete, but might be, for those
-% non-Slavic Cyrillic languages:
-% Ossetian, Khalka, Buryat, Kalmyk, Kyrgyz, Tatar, Uzbek
-% Azerbaijani, Kazakh, Abkhaz, Chukchi.
-
-%%% Part I
-%%% Cyrillic letters defined as a continuous stretch
-%%% in Unicode and most common 8-bit encodings which define them:
-
-\DeclareUTFcharacter[\UTFencname]{x0410}{\CYRA} % А
-\DeclareUTFcharacter[\UTFencname]{x0430}{\cyra} % а
-\DeclareUTFcharacter[\UTFencname]{x0411}{\CYRB} % Б
-\DeclareUTFcharacter[\UTFencname]{x0431}{\cyrb} % б
-\DeclareUTFcharacter[\UTFencname]{x0412}{\CYRV} % В
-\DeclareUTFcharacter[\UTFencname]{x0432}{\cyrv} % в
-\DeclareUTFcharacter[\UTFencname]{x0413}{\CYRG} % Г
-\DeclareUTFcharacter[\UTFencname]{x0433}{\cyrg} % г
-\DeclareUTFcharacter[\UTFencname]{x0414}{\CYRD} % Д
-\DeclareUTFcharacter[\UTFencname]{x0434}{\cyrd} % д
-\DeclareUTFcharacter[\UTFencname]{x0415}{\CYRE} % Е
-\DeclareUTFcharacter[\UTFencname]{x0435}{\cyre} % е
-\DeclareUTFcharacter[\UTFencname]{x0416}{\CYRZH} % Ж
-\DeclareUTFcharacter[\UTFencname]{x0436}{\cyrzh} % ж
-\DeclareUTFcharacter[\UTFencname]{x0417}{\CYRZ} % З
-\DeclareUTFcharacter[\UTFencname]{x0437}{\cyrz} % з
-\DeclareUTFcharacter[\UTFencname]{x0418}{\CYRI} % И
-\DeclareUTFcharacter[\UTFencname]{x0438}{\cyri} % и
-\DeclareUTFcharacter[\UTFencname]{x0419}{\CYRISHRT} % Й
-\DeclareUTFcharacter[\UTFencname]{x0439}{\cyrishrt} % й
-\DeclareUTFcharacter[\UTFencname]{x041A}{\CYRK} % К
-\DeclareUTFcharacter[\UTFencname]{x043A}{\cyrk} % к
-\DeclareUTFcharacter[\UTFencname]{x041B}{\CYRL} % Л
-\DeclareUTFcharacter[\UTFencname]{x043B}{\cyrl} % л
-\DeclareUTFcharacter[\UTFencname]{x041C}{\CYRM} % М
-\DeclareUTFcharacter[\UTFencname]{x043C}{\cyrm} % м
-\DeclareUTFcharacter[\UTFencname]{x041D}{\CYRN} % Н
-\DeclareUTFcharacter[\UTFencname]{x043D}{\cyrn} % н
-\DeclareUTFcharacter[\UTFencname]{x041E}{\CYRO} % О
-\DeclareUTFcharacter[\UTFencname]{x043E}{\cyro} % о
-\DeclareUTFcharacter[\UTFencname]{x041F}{\CYRP} % П
-\DeclareUTFcharacter[\UTFencname]{x043F}{\cyrp} % п
-\DeclareUTFcharacter[\UTFencname]{x0420}{\CYRR} % Р
-\DeclareUTFcharacter[\UTFencname]{x0440}{\cyrr} % р
-\DeclareUTFcharacter[\UTFencname]{x0421}{\CYRS} % С
-\DeclareUTFcharacter[\UTFencname]{x0441}{\cyrs} % с
-\DeclareUTFcharacter[\UTFencname]{x0422}{\CYRT} % Т
-\DeclareUTFcharacter[\UTFencname]{x0442}{\cyrt} % т
-\DeclareUTFcharacter[\UTFencname]{x0423}{\CYRU} % У
-\DeclareUTFcharacter[\UTFencname]{x0443}{\cyru} % у
-\DeclareUTFcharacter[\UTFencname]{x0424}{\CYRF} % Ф
-\DeclareUTFcharacter[\UTFencname]{x0444}{\cyrf} % ф
-\DeclareUTFcharacter[\UTFencname]{x0425}{\CYRH} % Х
-\DeclareUTFcharacter[\UTFencname]{x0445}{\cyrh} % х
-\DeclareUTFcharacter[\UTFencname]{x0426}{\CYRC} % Ц
-\DeclareUTFcharacter[\UTFencname]{x0446}{\cyrc} % ц
-\DeclareUTFcharacter[\UTFencname]{x0427}{\CYRCH} % Ч
-\DeclareUTFcharacter[\UTFencname]{x0447}{\cyrch} % ч
-\DeclareUTFcharacter[\UTFencname]{x0428}{\CYRSH} % Ш
-\DeclareUTFcharacter[\UTFencname]{x0448}{\cyrsh} % ш
-\DeclareUTFcharacter[\UTFencname]{x0429}{\CYRSHCH} % Щ
-\DeclareUTFcharacter[\UTFencname]{x0449}{\cyrshch} % щ
-\DeclareUTFcharacter[\UTFencname]{x042A}{\CYRHRDSN} % Ъ
-\DeclareUTFcharacter[\UTFencname]{x044A}{\cyrhrdsn} % ъ
-\DeclareUTFcharacter[\UTFencname]{x042B}{\CYRERY} % Ы
-\DeclareUTFcharacter[\UTFencname]{x044B}{\cyrery} % ы
-\DeclareUTFcharacter[\UTFencname]{x042C}{\CYRSFTSN} % Ь
-\DeclareUTFcharacter[\UTFencname]{x044C}{\cyrsftsn} % ь
-\DeclareUTFcharacter[\UTFencname]{x042D}{\CYREREV} % Э
-\DeclareUTFcharacter[\UTFencname]{x044D}{\cyrerev} % э
-\DeclareUTFcharacter[\UTFencname]{x042E}{\CYRYU} % Ю
-\DeclareUTFcharacter[\UTFencname]{x044E}{\cyryu} % ю
-\DeclareUTFcharacter[\UTFencname]{x042F}{\CYRYA} % Я
-\DeclareUTFcharacter[\UTFencname]{x044F}{\cyrya} % я
-
-%%% Part II
-%%% Cyrillic letters not defined as continuous stretches,
-%%% but available in common 8-bit cyrillic encodings,
-%%% like cp1251 and iso-8859-5, sorted by languages
-%%% they're used in for ease of checking:
-
-% Common to many languages:
-\DeclareUTFcharacter[\UTFencname]{x0401}{\CYRYO} % Ё
-\DeclareUTFcharacter[\UTFencname]{x0451}{\cyryo} % ё
-% Belorussian-Uzbek:
-\DeclareUTFcharacter[\UTFencname]{x040E}{\CYRUSHRT} % Ў
-\DeclareUTFcharacter[\UTFencname]{x045E}{\cyrushrt} % ў
-% Ukrainian-Rusyn:
-\DeclareUTFcharacter[\UTFencname]{x0490}{\CYRGUP} % Ґ
-\DeclareUTFcharacter[\UTFencname]{x0491}{\cyrgup} % ґ
-\DeclareUTFcharacter[\UTFencname]{x0407}{\CYRYI} % Ї
-\DeclareUTFcharacter[\UTFencname]{x0457}{\cyryi} % ї
-\DeclareUTFcharacter[\UTFencname]{x0404}{\CYRIE} % Є
-\DeclareUTFcharacter[\UTFencname]{x0454}{\cyrie} % є
-% Ukrainian-Belorussian-Rusyn-Kazakh:
-\DeclareUTFcharacter[\UTFencname]{x0406}{\CYRII} % І
-\DeclareUTFcharacter[\UTFencname]{x0456}{\cyrii} % і
-% Serbian-Macedonian-Azerbaijani:
-\DeclareUTFcharacter[\UTFencname]{x0408}{\CYRJE} % Ј
-\DeclareUTFcharacter[\UTFencname]{x0458}{\cyrje} % ј
-% Serbian-Macedonian-Abkhaz:
-\DeclareUTFcharacter[\UTFencname]{x040F}{\CYRDZHE} % Џ
-\DeclareUTFcharacter[\UTFencname]{x045F}{\cyrdzhe} % џ
-% Serbian-Macedonian:
-\DeclareUTFcharacter[\UTFencname]{x0409}{\CYRLJE} % Љ
-\DeclareUTFcharacter[\UTFencname]{x0459}{\cyrlje} % љ
-\DeclareUTFcharacter[\UTFencname]{x040A}{\CYRNJE} % Њ
-\DeclareUTFcharacter[\UTFencname]{x045A}{\cyrnje} % њ
-% Serbian:
-\DeclareUTFcharacter[\UTFencname]{x0402}{\CYRDJE} % Ђ
-\DeclareUTFcharacter[\UTFencname]{x0452}{\cyrdje} % ђ
-\DeclareUTFcharacter[\UTFencname]{x040B}{\CYRTSHE} % Ћ
-\DeclareUTFcharacter[\UTFencname]{x045B}{\cyrtshe} % ћ
-% Macedonian:
-\DeclareUTFcharacter[\UTFencname]{x0405}{\CYRDZE} % Ѕ
-\DeclareUTFcharacter[\UTFencname]{x0455}{\cyrdze} % ѕ
-\DeclareUTFcharacter[\UTFencname]{x0403}{\CYRGJE} % Ѓ
-\DeclareUTFcharacter[\UTFencname]{x0453}{\cyrgje} % ѓ
-\DeclareUTFcharacter[\UTFencname]{x040C}{\CYRKJE} % Ќ
-\DeclareUTFcharacter[\UTFencname]{x045C}{\cyrkje} % ќ
-
-%%% Part III
-%%% Non-Slavic Cyrillic letters, waiting for their experts
-%%% to be confirmed as correct.
-%%% From here on, we're out of the frequently used 8-bit land
-%%% and into mostly Unicode territory.
-
-% Azerbaijani-Abkhaz-Kalmyk-Kazakh-Tatar:
-\DeclareUTFcharacter[\UTFencname]{x04D8}{\CYRSCHWA} % Ә
-\DeclareUTFcharacter[\UTFencname]{x04D9}{\cyrschwa} % ә
-% Azerbaijani-Kyrgyz-Buryat-Kazakh-Tatar:
-\DeclareUTFcharacter[\UTFencname]{x04BA}{\CYRSHHA} % Һ
-\DeclareUTFcharacter[\UTFencname]{x04BB}{\cyrshha} % һ
-% Azerbaijani-Kyrgyz-Buryat-Kalmyk-Kazakh-Tatar:
-\DeclareUTFcharacter[\UTFencname]{x04E8}{\CYROTLD} % Ө
-\DeclareUTFcharacter[\UTFencname]{x04E9}{\cyrotld} % ө
-\DeclareUTFcharacter[\UTFencname]{x04AE}{\CYRY} % Ү
-\DeclareUTFcharacter[\UTFencname]{x04AF}{\cyry} % ү
-% Azerbaijani-Tajik-Kazakh-Uzbek:
-\DeclareUTFcharacter[\UTFencname]{x0492}{\CYRGHCRS} % Ғ
-\DeclareUTFcharacter[\UTFencname]{x0493}{\cyrghcrs} % ғ
-% Tajik-Abkhaz-Kazakh-Uzbek:
-\DeclareUTFcharacter[\UTFencname]{x049A}{\CYRKDSC} % Қ
-\DeclareUTFcharacter[\UTFencname]{x049B}{\cyrkdsc} % қ
-% Tajik-Abkhaz-Uzbek:
-\DeclareUTFcharacter[\UTFencname]{x04B2}{\CYRHDSC} % Ҳ
-\DeclareUTFcharacter[\UTFencname]{x04B3}{\cyrhdsc} % ҳ
-% Tajik-Abkhaz:
-\DeclareUTFcharacter[\UTFencname]{x04B6}{\CYRCHRDSC} % Ҷ
-\DeclareUTFcharacter[\UTFencname]{x04B7}{\cyrchrdsc} % ҷ
-% Kalmyk-Kyrguz-Tatar:
-\DeclareUTFcharacter[\UTFencname]{x04A2}{\CYRNDSC} % Ң
-\DeclareUTFcharacter[\UTFencname]{x04A3}{\cyrndsc} % ң
-% Kalmyk-Tatar:
-\DeclareUTFcharacter[\UTFencname]{x0496}{\CYRZHDSC} % Җ
-\DeclareUTFcharacter[\UTFencname]{x0497}{\cyrzhdsc} % җ
-% Ossetian:
-\DeclareUTFcharacter[\UTFencname]{x04D4}{\CYRAE} % Ӕ
-\DeclareUTFcharacter[\UTFencname]{x04D5}{\cyrae} % ӕ
-% Azerbaijani:
-\DeclareUTFcharacter[\UTFencname]{x04B8}{\CYRCHVCRS} % Ҹ
-\DeclareUTFcharacter[\UTFencname]{x04B9}{\cyrchvcrs} % ҹ
-\DeclareUTFcharacter[\UTFencname]{x049C}{\CYRKVCRS} % Ҝ
-\DeclareUTFcharacter[\UTFencname]{x049D}{\cyrkvcrs} % ҝ
-% Kazakh:
-\DeclareUTFcharacter[\UTFencname]{x04B0}{\CYRYHCRS} % Ұ
-\DeclareUTFcharacter[\UTFencname]{x04B1}{\cyryhcrs} % ұ
-% Abkhaz:
-\DeclareUTFcharacter[\UTFencname]{x0494}{\CYRGHK} % Ҕ
-\DeclareUTFcharacter[\UTFencname]{x0495}{\cyrghk} % ҕ
-\DeclareUTFcharacter[\UTFencname]{x04E0}{\CYRABHDZE} % Ӡ
-\DeclareUTFcharacter[\UTFencname]{x04E1}{\cyrabhdze} % ӡ
-\DeclareUTFcharacter[\UTFencname]{x049E}{\CYRKHCRS} % Ҟ
-\DeclareUTFcharacter[\UTFencname]{x049F}{\cyrkhcrs} % ҟ
-\DeclareUTFcharacter[\UTFencname]{x04A6}{\CYRPHK} % Ҧ
-\DeclareUTFcharacter[\UTFencname]{x04A7}{\cyrphk} % ҧ
-\DeclareUTFcharacter[\UTFencname]{x04AC}{\CYRTDSC} % Ҭ
-\DeclareUTFcharacter[\UTFencname]{x04AD}{\cyrtdsc} % ҭ
-\DeclareUTFcharacter[\UTFencname]{x04B4}{\CYRTETSE} % Ҵ
-\DeclareUTFcharacter[\UTFencname]{x04B5}{\cyrtetse} % ҵ
-\DeclareUTFcharacter[\UTFencname]{x04BC}{\CYRABHCH} % Ҽ
-\DeclareUTFcharacter[\UTFencname]{x04BD}{\cyrabhch} % ҽ
-\DeclareUTFcharacter[\UTFencname]{x04BE}{\CYRABHCHDSC} % Ҿ
-\DeclareUTFcharacter[\UTFencname]{x04BF}{\cyrabhchdsc} % ҿ
-\DeclareUTFcharacter[\UTFencname]{x04A8}{\CYRABHHA} % Ҩ
-\DeclareUTFcharacter[\UTFencname]{x04A9}{\cyrabhha} % ҩ
-% Chukchi:
-\DeclareUTFcharacter[\UTFencname]{x04C3}{\CYRKHK} % Ӄ
-\DeclareUTFcharacter[\UTFencname]{x04C4}{\cyrkhk} % ӄ
-\DeclareUTFcharacter[\UTFencname]{x04C7}{\CYRNHK} % Ӈ
-\DeclareUTFcharacter[\UTFencname]{x04C8}{\cyrnhk} % ӈ
-
-%% P.S. Tajik and Chuvash, while mentioned,
-%% have letters which are apparently missing and are NOT complete.
-
-%%% Part IV
-%%% Historical letters, needed to support old orthographies.
-\DeclareUTFcharacter[\UTFencname]{x0462}{\CYRYAT} % Ѣ
-\DeclareUTFcharacter[\UTFencname]{x0463}{\cyryat} % ѣ
-\DeclareUTFcharacter[\UTFencname]{x046A}{\CYRBYUS} % Ѫ
-\DeclareUTFcharacter[\UTFencname]{x046B}{\cyrbyus} % ѫ
-\DeclareUTFcharacter[\UTFencname]{x0474}{\CYRIZH} % Ѵ
-\DeclareUTFcharacter[\UTFencname]{x0475}{\cyrizh} % ѵ
-\DeclareUTFcharacter[\UTFencname]{x0472}{\CYRFITA} % Ѳ
-\DeclareUTFcharacter[\UTFencname]{x0473}{\cyrfita} % ѳ
-
-%%% Part V
-%%% UNRECOGNISED NON-SLAVIC CYRILLIC LETTERS
-%%% Belong to languages not mentioned herein.
-
-\DeclareUTFcharacter[\UTFencname]{x04C0}{\CYRpalochka} % Ӏ
-\DeclareUTFcharacter[\UTFencname]{x0498}{\CYRZDSC} % Ҙ
-\DeclareUTFcharacter[\UTFencname]{x0499}{\cyrzdsc} % ҙ
-\DeclareUTFcharacter[\UTFencname]{x04A0}{\CYRKBEAK} % Ҡ
-\DeclareUTFcharacter[\UTFencname]{x04A1}{\cyrkbeak} % ҡ
-\DeclareUTFcharacter[\UTFencname]{x04A4}{\CYRNG} % Ҥ
-\DeclareUTFcharacter[\UTFencname]{x04A5}{\cyrng} % ҥ
-\DeclareUTFcharacter[\UTFencname]{x04AA}{\CYRSDSC} % Ҫ
-\DeclareUTFcharacter[\UTFencname]{x04AB}{\cyrsdsc} % ҫ
-\DeclareUTFcharacter[\UTFencname]{x04CB}{\CYRCHLDSC} % Ӌ
-\DeclareUTFcharacter[\UTFencname]{x04CC}{\cyrchldsc} % ӌ
-
-%% These are probably improperly named either in TeX or Unicode,
-%% since their Unicode names and TeX names do not match.
-%% TeX definitely treats them as the same symbol though.
-\DeclareUTFcharacter[\UTFencname]{x04CD}{\CYRMDSC} % Ӎ
-\DeclareUTFcharacter[\UTFencname]{x04CE}{\cyrmdsc} % ӎ
-\DeclareUTFcharacter[\UTFencname]{x04C5}{\CYRLDSC} % Ӆ
-\DeclareUTFcharacter[\UTFencname]{x04C6}{\cyrldsc} % ӆ
-
-%% These two letters are part of proposed Unicode for Kurdish
-%% and their codepoints may or may not change upon inclusion.
-\DeclareUTFcharacter[\UTFencname]{x051A}{\CYRQ}
-\DeclareUTFcharacter[\UTFencname]{x051B}{\cyrq}
-\DeclareUTFcharacter[\UTFencname]{x051C}{\CYRW}
-\DeclareUTFcharacter[\UTFencname]{x051D}{\cyrw}
-
-%%% Part VII
-%%% PUNCTUATION AND UNCLEAR CASES
-%%% Exotic (punctuation, letters...)
-%%% (this list is probably incomplete)
-
-% A dash - Defined in cyrillic.mtx to be emdash
-% and should have been emdash all along.
-\DeclareUTFcharacter[\UTFencname]{x2014}{\cyrdash}
-
-% Exotic angle brackets.
-% Might still be unprintable for you.
-\DeclareUTFcharacter[\UTFencname]{x27E8}{\cyrlangle}
-\DeclareUTFcharacter[\UTFencname]{x27E9}{\cyrrangle}
-
-% This particular association is not certain but I guess
-% we'll hear about it when someone trips over it.
-\DeclareUTFcharacter[\UTFencname]{x0510}{\CYREPS}
-\DeclareUTFcharacter[\UTFencname]{x0511}{\cyreps}
-
-% Can't confirm those, but I'm positive the codepoints are correct:
-\DeclareUTFcharacter[\UTFencname]{x04F6}{\CYRGDSC}
-\DeclareUTFcharacter[\UTFencname]{x04F7}{\cyrgdsc}
-\DeclareUTFcharacter[\UTFencname]{x04FC}{\CYRHHK}
-\DeclareUTFcharacter[\UTFencname]{x04FD}{\cyrhhk}
-\DeclareUTFcharacter[\UTFencname]{x0512}{\CYRLHK}
-\DeclareUTFcharacter[\UTFencname]{x0513}{\cyrlhk}
-
-% I could not assign these in a way that would make sense,
-% since I couldn't find matches in cyrillic unicode table.
-
-%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRNLHK}
-%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrnlhk}
-%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRRDSC}
-%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrrdsc}
-
-% Oddities:
-% I don't see a letter like that in Unicode cyrillic table.
-% I've no idea what is it doing in a cyrillic encoding either.
-%\DeclareUTFcharacter[\UTFencname]{x????}{\CYRDELTA}
-%\DeclareUTFcharacter[\UTFencname]{x????}{\cyrdelta}
-
-% Quotes
-% Ligatures << and >> are working only with the last versions of "tex-text.map"
-% and "tex-text.tec" (http://scripts.sil.org/svn-view/xetex/TRUNK)
-\DeclareUTFcharacter[\UTFencname]{x00AB}{\flqq}
-\DeclareUTFcharacter[\UTFencname]{x00BB}{\frqq}
-\DeclareUTFcharacter[\UTFencname]{x201E}{\glqq}
-\DeclareUTFcharacter[\UTFencname]{x201C}{\grqq}
-
-% To make it (and "--- -like shortcuts) work, "xecyr" must be loaded _after_ babel.
-\def\cyrdash{\hbox to.8em{--\hss--}}
-
-\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xecyr.tlpobj new/tlpkg/tlpobj/xecyr.tlpobj
--- old/tlpkg/tlpobj/xecyr.tlpobj 2019-02-28 04:15:32.000000000 +0100
+++ new/tlpkg/tlpobj/xecyr.tlpobj 2020-03-15 02:48:17.000000000 +0100
@@ -1,15 +1,13 @@
name xecyr
category Package
-revision 20221
+revision 54308
shortdesc Using Cyrillic languages in XeTeX
+relocated 1
longdesc Helper tools for using Cyrillic languages with XeLaTeX and
longdesc babel.
-depend xecyr.ARCH
-runfiles size=5
- texmf-dist/tex/generic/xecyr/xu-ruenhyph.tex
- texmf-dist/tex/xelatex/xecyr/xecyr.sty
+runfiles size=4
+ RELOC/tex/xelatex/xecyr/xecyr.sty
catalogue-ctan /macros/xetex/latex/xecyr
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-license lppl1.3
catalogue-topics cyrillic xetex
-catalogue-version 1.1
+catalogue-version 1.2
++++++ xepersian.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/xepersian/README new/doc/xelatex/xepersian/README
--- old/doc/xelatex/xepersian/README 2019-03-03 23:12:40.000000000 +0100
+++ new/doc/xelatex/xepersian/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-____________________
-The XePersian package
-v22.6
-
-The xepersian package provides a convenient interface for
-typesetting Persian and English texts in LaTeX, using XeTeX
-engine.
-
-If you want to report any bugs or typos and corrections in the
-documentation, or ask for any new features, or suggest any
-improvements, or ask any questions about the package, then
-please use the issue tracker:
-
- <https://github.com/vafa-ac/xepersian/issues>
-
-In doing so, please always explain your issue well enough, and always
-include a minimal working example showing the issue.
-
-Current version release date: 2019/03/03
-______________
-Vafa Khalighi
-
-Copyright (c) 2008--2019
-Distributed under the LaTeX Project Public License
-It may be distributed and/or modified under the LaTeX Project Public License,
-version 1.3c or higher (your choice). The latest version of
-this license is at: http://www.latex-project.org/lppl.txt
-
-This work is “author-maintained” (as per LPPL maintenance status)
-by Vafa Khalighi.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/xepersian/README.txt new/doc/xelatex/xepersian/README.txt
--- old/doc/xelatex/xepersian/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/xepersian/README.txt 2020-02-01 23:12:02.000000000 +0100
@@ -0,0 +1,31 @@
+____________________
+The XePersian package
+v22.8
+
+The xepersian package provides a convenient interface for
+typesetting Persian and English texts in LaTeX, using XeTeX
+engine.
+
+If you want to report any bugs or typos and corrections in the
+documentation, or ask for any new features, or suggest any
+improvements, or ask any questions about the package, then
+please use the issue tracker:
+
+ <https://github.com/bidi-tex/xepersian/issues>
+
+In doing so, please always explain your issue well enough, and always
+include a minimal working example showing the issue.
+
+Current version release date: 2020-01-31
+______________
+
+Copyright (c) Vafa Khalighi 2007-2019
+ bidi-tex GitHub Organisation 2018-2020
+
+Distributed under the LaTeX Project Public License
+It may be distributed and/or modified under the LaTeX Project Public License,
+version 1.3c or higher (your choice). The latest version of
+this license is at: http://www.latex-project.org/lppl.txt
+
+This work is “author-maintained” (as per LPPL maintenance status)
+by bidi-tex GitHub Organisation.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/xepersian/ftxe-0.12.py new/doc/xelatex/xepersian/ftxe-0.12.py
--- old/doc/xelatex/xepersian/ftxe-0.12.py 2016-10-08 00:28:23.000000000 +0200
+++ new/doc/xelatex/xepersian/ftxe-0.12.py 2019-05-01 00:35:35.000000000 +0200
@@ -1,4 +1,4 @@
-# This program is free software: you can redistribute it and/or modify
+# This program is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
Binary files old/doc/xelatex/xepersian/xepersian-doc.pdf and new/doc/xelatex/xepersian/xepersian-doc.pdf differ
Binary files old/doc/xelatex/xepersian/xepersian.pdf and new/doc/xelatex/xepersian/xepersian.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xepersian.doc.tlpobj new/tlpkg/tlpobj/xepersian.doc.tlpobj
--- old/tlpkg/tlpobj/xepersian.doc.tlpobj 2019-03-04 02:24:25.000000000 +0100
+++ new/tlpkg/tlpobj/xepersian.doc.tlpobj 2020-02-02 01:58:20.000000000 +0100
@@ -1,10 +1,10 @@
name xepersian.doc
category Package
-revision 50213
+revision 53625
shortdesc doc files of xepersian
relocated 1
-docfiles size=315
- RELOC/doc/xelatex/xepersian/README
+docfiles size=302
+ RELOC/doc/xelatex/xepersian/README.txt
RELOC/doc/xelatex/xepersian/dkun-0.3.py
RELOC/doc/xelatex/xepersian/dkun-0.4.py
RELOC/doc/xelatex/xepersian/ftxe-0.12.py
++++++ xepersian.tar.xz ++++++
++++ 2956 lines of diff (skipped)
++++++ xesearch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xesearch/README new/doc/xetex/xesearch/README
--- old/doc/xetex/xesearch/README 2009-11-17 02:34:23.000000000 +0100
+++ new/doc/xetex/xesearch/README 2019-08-19 22:30:58.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README file for xesearch.sty v.0.1.
+This is the README file for xesearch.sty v.0.2.
Read xesearch.pdf for the documentation.
t-xeseach.tex is a third party file to use
XeSearch in ConTeXt.
@@ -16,7 +16,7 @@
To typeset the documentation, run XeLaTeX
on xesearch.tex with the 'produce' option
-commented out on line 5.
+commented out on line 8.
To create xesearch.sty and t-xesearch.teX,
run (Xe)LaTeX again, but uncomment 'produce'
@@ -24,6 +24,10 @@
Licensing of this package is covered by LPPL.
-Any reaction is welcome: zappathustra(a)free.fr
+Originally written by Paul Isambert, the package is
+now maintained by Yuri Robbers.
+
+Any reaction is welcome: yuri.robbers(a)gmail.com
+
+Yuri Robbers
-Paul Isambert
\ No newline at end of file
Binary files old/doc/xetex/xesearch/xesearch.pdf and new/doc/xetex/xesearch/xesearch.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xesearch/xesearch.tex new/doc/xetex/xesearch/xesearch.tex
--- old/doc/xetex/xesearch/xesearch.tex 2009-11-17 02:34:23.000000000 +0100
+++ new/doc/xetex/xesearch/xesearch.tex 2019-08-19 22:30:58.000000000 +0200
@@ -5,11 +5,11 @@
\ifnum\month<10 \edef\month{0\the\month}\else \edef\month{\the\month}\fi
\ifnum\day<10 \edef\day{0\the\day}\else \edef\day{\the\day}\fi
\documentclass[article(11pt),%
-%produce,% Uncomment this line to produce xesearch.sty
+% produce,% Uncomment this line to produce xesearch.sty
index]{codedoc}
% CodeDoc declaration
-\ProduceFile{xesearch.sty}[xesearch][v.0.1][\the\year/\month/\day]
+\ProduceFile{xesearch.sty}[xesearch][v.0.2][\the\year/\month/\day]
@@ -408,7 +408,16 @@
\parindent0pt
\Change{\FileDate}
{%
-Corrected for ConTeXt (thanks to Wolfgang Schuster):\par
+Corrected for new versions of the XeTeX executable (thanks to Yuri Robbers):\par
+The XeTeX executable now has an increased number of character classes to 4096. This
+has been accomodated by also increasing xesearch's upper bound from 255 to 4095. Not
+changing xesearch would result in an error. For compatibility with other versions of
+the executable, this solution has been implemented using system primitives rather than
+hard coded numbers.
+}
+\Change{2009/11/04}
+{%
+v.0.1 Corrected for ConTeXt (thanks to Wolfgang Schuster):\par
Now there's a third party file, \texttt{t-xesearch.tex}, so that
xesearch can be properly loaded with \texttt{\bslash usemodule[xesearch]}.\par
The clash between ConTeXt's \texttt{\bslash unexpanded} macro and XeTeX's
@@ -2041,9 +2050,9 @@
out of which letters and delimiters will be taken.
�
/
-\chardef\xs@NatDel=255
-\chardef\xs@lrDel=254
-\chardef\xs@Classes=253
+\chardef\xs@NatDel=\e@alloc@intercharclass@top
+\chardef\xs@lrDel=\numexpr\e@alloc@intercharclass@top-1\relax
+\chardef\xs@Classes=\numexpr\e@alloc@intercharclass@top-2\relax
\chardef\xs@Classless=0
\XeTeXinterchartoks\xs@lrDel\xs@Classless={\xs@LearnLetter}
\XeTeXinterchartoks\xs@NatDel\xs@Classless={\xs@LearnLetter}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xesearch.doc.tlpobj new/tlpkg/tlpobj/xesearch.doc.tlpobj
--- old/tlpkg/tlpobj/xesearch.doc.tlpobj 2019-02-28 04:15:33.000000000 +0100
+++ new/tlpkg/tlpobj/xesearch.doc.tlpobj 2019-08-20 01:54:01.000000000 +0200
@@ -1,9 +1,9 @@
name xesearch.doc
category Package
-revision 16041
+revision 51908
shortdesc doc files of xesearch
relocated 1
-docfiles size=191
+docfiles size=170
RELOC/doc/xetex/xesearch/README
RELOC/doc/xetex/xesearch/xesearch.pdf
RELOC/doc/xetex/xesearch/xesearch.tex
++++++ xesearch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xesearch/t-xesearch.tex new/tex/xetex/xesearch/t-xesearch.tex
--- old/tex/xetex/xesearch/t-xesearch.tex 2009-11-17 02:34:23.000000000 +0100
+++ new/tex/xetex/xesearch/t-xesearch.tex 2019-08-19 22:30:58.000000000 +0200
@@ -5,11 +5,11 @@
% without the `produce' option.
%
% SOURCE: xesearch.tex
-% DATE: 2009.11.04
+% DATE: 2019.04.24
% VERSION: v.0.1
%D \module
%D [ file=t-xesearch,
-%D version=2009.11.04,
+%D version=2019.04.24,
%D title=\CONTEXT\ User Module,
%D subtitle=XeSearch,
%D author=Paul Isambert,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xesearch/xesearch.sty new/tex/xetex/xesearch/xesearch.sty
--- old/tex/xetex/xesearch/xesearch.sty 2009-11-17 02:34:23.000000000 +0100
+++ new/tex/xetex/xesearch/xesearch.sty 2019-08-19 22:30:58.000000000 +0200
@@ -5,8 +5,8 @@
% without the `produce' option.
%
% SOURCE: xesearch.tex
-% DATE: 2009/11/04
-% VERSION: v.0.1
+% DATE: 2019/04/24
+% VERSION: v.0.2
\ifx\csname XeTeXrevision\endcsname\relax
\errmessage{You need XeTeX to run xesearch. It won't be loaded.}
\expandafter\endinput
@@ -39,7 +39,7 @@
\xs@ChangeCatcodes
\ifdefined\ProvidesPackage
\def\xs@err#1{\PackageError{xesearch}{#1}{}}
- \ProvidesPackage{xesearch}[2009/11/04 v.0.1 Searching documents.]
+ \ProvidesPackage{xesearch}[2019/04/24 v.0.2 Searching documents.]
\else
\def\MessageBreak{^^J}
\def\xs@err#1{%
@@ -84,9 +84,9 @@
\newif\ifxs@Match
\newtoks\xs@DefToks
\newtoks\xs@NoReplaceToks
-\chardef\xs@NatDel=255
-\chardef\xs@lrDel=254
-\chardef\xs@Classes=253
+\chardef\xs@NatDel=\e@alloc@intercharclass@top
+\chardef\xs@lrDel=\numexpr\e@alloc@intercharclass@top-1\relax
+\chardef\xs@Classes=\numexpr\e@alloc@intercharclass@top-2\relax
\chardef\xs@Classless=0
\XeTeXinterchartoks\xs@lrDel\xs@Classless={\xs@LearnLetter}
\XeTeXinterchartoks\xs@NatDel\xs@Classless={\xs@LearnLetter}
@@ -1038,7 +1038,7 @@
}
\def\xs@SearchOne#1{%
\ifx#1\xs@end
- \let\xs@next\relax
+ \let\xs@next\relax^^I
\else
\let\xs@next\xs@SearchOne
\expandafter\def\csname xs@#1@WhatNext\endcsname##1\xs@end,{}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xesearch.tlpobj new/tlpkg/tlpobj/xesearch.tlpobj
--- old/tlpkg/tlpobj/xesearch.tlpobj 2019-02-28 04:15:33.000000000 +0100
+++ new/tlpkg/tlpobj/xesearch.tlpobj 2019-08-20 01:54:01.000000000 +0200
@@ -1,6 +1,6 @@
name xesearch
category Package
-revision 16041
+revision 51908
shortdesc A string finder for XeTeX
relocated 1
longdesc The package finds strings (e.g. (parts of) words or phrases)
@@ -16,6 +16,7 @@
RELOC/tex/xetex/xesearch/xesearch.sty
catalogue-also toolbox etoolbox etextools
catalogue-ctan /macros/xetex/generic/xesearch
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-08-17 18:03:17 +0200
catalogue-license lppl
catalogue-topics string xetex
+catalogue-version 0.2
++++++ xetex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/xelatex.man1.pdf and new/texmf-dist/doc/man/man1/xelatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/xetex.1 new/texmf-dist/doc/man/man1/xetex.1
--- old/texmf-dist/doc/man/man1/xetex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/xetex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH XETEX 1 "10 July 2018" "Web2C 2019"
+.TH XETEX 1 "10 July 2018" "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/xetex.man1.pdf and new/texmf-dist/doc/man/man1/xetex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xetex.doc.tlpobj new/tlpkg/tlpobj/xetex.doc.tlpobj
--- old/tlpkg/tlpobj/xetex.doc.tlpobj 2019-03-27 02:29:20.000000000 +0100
+++ new/tlpkg/tlpobj/xetex.doc.tlpobj 2020-03-14 01:44:25.000000000 +0100
@@ -1,6 +1,6 @@
name xetex.doc
category TLCore
-revision 50602
+revision 54276
shortdesc doc files of xetex
docfiles size=170
texmf-dist/doc/man/man1/xelatex.1
++++++ xetex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xetex.tlpobj new/tlpkg/tlpobj/xetex.tlpobj
--- old/tlpkg/tlpobj/xetex.tlpobj 2019-03-27 02:29:20.000000000 +0100
+++ new/tlpkg/tlpobj/xetex.tlpobj 2020-03-14 01:44:25.000000000 +0100
@@ -1,6 +1,6 @@
name xetex
category TLCore
-revision 50602
+revision 54276
shortdesc An extended variant of TeX for use with Unicode sources
longdesc XeTeX is a TeX typesetting engine using Unicode and supporting
longdesc modern font technologies such as OpenType, TrueType or Apple
@@ -25,10 +25,12 @@
depend etex
depend plain
depend babel
+depend l3kernel
depend latex-fonts
+depend lm
depend xetex.ARCH
execute AddFormat name=xetex engine=xetex patterns=language.def options="-etex xetex.ini" fmttriggers=cm,hyphen-base,tex-ini-files,unicode-data,etex,plain
-execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=cm,hyphen-base,tex-ini-files,unicode-data,babel,latex,latex-fonts
+execute AddFormat name=xelatex engine=xetex patterns=language.dat options="-etex xelatex.ini" fmttriggers=cm,hyphen-base,tex-ini-files,unicode-data,babel,l3kernel,latex,latex-fonts,lm
postaction script file=tlpkg/tlpostcode/xetex.pl
runfiles size=6
texmf-dist/fonts/misc/xetex/fontmapping/base/qx-unicode.map
@@ -41,6 +43,5 @@
catalogue-contact-home http://tug.org/xetex
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/xetexdir
catalogue-contact-support http://lists.tug.org/xetex
-catalogue-date 2018-12-26 09:45:23 +0100
catalogue-license other-free
catalogue-topics engine
++++++ xetex_conf.dif ++++++
---
tlpkg/tlpostcode/xetex.pl | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- tlpkg/tlpostcode/xetex.pl
+++ tlpkg/tlpostcode/xetex.pl 2020-03-30 07:29:08.995431714 +0000
@@ -98,7 +98,7 @@ sub do_install {
<fontconfig>
';
for my $t (qw/opentype truetype type1/) {
- print FONTSCONF " <dir>$texdir/texmf-dist/fonts/$t</dir>\n";
+ print FONTSCONF " <dir>$texdir/fonts/$t</dir>\n";
}
print FONTSCONF "</fontconfig>\n";
close(FONTSCONF)
++++++ xetexko.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xetexko/ChangeLog new/doc/xetex/xetexko/ChangeLog
--- old/doc/xetex/xetexko/ChangeLog 2018-08-08 23:06:27.000000000 +0200
+++ new/doc/xetex/xetexko/ChangeLog 2020-02-17 23:18:35.000000000 +0100
@@ -1,3 +1,17 @@
+2020-02-17 Dohyun Kim <nomos at ktug org>
+
+ Version 2.23
+
+ * xetexko-font.sty: unbatang/undotum as default hangul fonts;
+ suppress bx font warnings and make \bfseries work again;
+ use latex's newly introduced \@{rm,sf,tt,default}familyhook
+
+2019-12-01 Dohyun Kim <nomos at ktug org>
+
+ Version 2.22
+
+ * xetexko-font.sty: expl3 deprecation removals
+
2018-08-08 Dohyun Kim <nomos at ktug org>
Version 2.21
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xetexko/README new/doc/xetex/xetexko/README
--- old/doc/xetex/xetexko/README 2018-08-08 23:06:27.000000000 +0200
+++ new/doc/xetex/xetexko/README 2020-02-17 23:18:35.000000000 +0100
@@ -1,4 +1,4 @@
-XeTeX-ko Package version 2.21 (2018/08/08)
+XeTeX-ko Package version 2.23 (2020/02/17)
=========================================
XeTeX-ko is a macro package for Xe(La)TeX which supports typesetting
@@ -75,7 +75,7 @@
Load Hanja captions. Also adjusts spacing as [hangul] option does.
Note that [unfonts] option is removed starting with v2.10, and so
-Nanum TrueType will be used when no Hangul/Hanja font is declared.
+Un TrueType will be used when no Hangul/Hanja font is declared.
Hangul Font Commands
Binary files old/doc/xetex/xetexko/xetexko-doc.pdf and new/doc/xetex/xetexko/xetexko-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xetexko/xetexko-doc.tex new/doc/xetex/xetexko/xetexko-doc.tex
--- old/doc/xetex/xetexko/xetexko-doc.tex 2018-08-08 23:06:27.000000000 +0200
+++ new/doc/xetex/xetexko/xetexko-doc.tex 2020-02-17 23:18:35.000000000 +0100
@@ -7,15 +7,20 @@
\documentclass[a4paper]{article}
\usepackage[hmargin=3.8cm]{geometry}
\usepackage[hangul]{xetexko}
+\defaultfontfeatures+{Script=Hangul, Language=Korean}
\setmainhangulfont{Noto Serif CJK KR}[
- Script=Hangul, Language=Korean,
- UprightFont=* Light,
- BoldFont=* Bold,
+ UprightFont=* Light, BoldFont=* Bold,
]
\setsanshangulfont{Noto Sans CJK KR}[
- Script=Hangul, Language=Korean,
UprightFont=* DemiLight,
]
+\setmathhangulfont{Noto Sans CJK KR}[
+ SizeFeatures={
+ {Size=-6, Font=* Medium},
+ {Size=6-9, Font=*},
+ {Size=9-, Font=* DemiLight},
+ },
+]
\usepackage{xetexko-hanging, hologo, xcolor, ulem}
\usepackage[bookmarksnumbered,hidelinks]{hyperref}
@@ -54,12 +59,13 @@
\def\hemph#1{\textsf{\bfseries #1}}
\def\hparen#1{{\small\hangulparens(#1)}}
\def\hparens#1{\leavevmode\unskip---{\small #1}---\ignorespaces}
+\def\keyword#1{\leavevmode\marginpar{\hfuzz\maxdimen\footnotesize\cs{#1}}}
\begin{document}
\title{\xetexko\ 간단 매뉴얼}
\author{Dohyun Kim \normalsize <\texttt{nomos at ktug org}> \and
\normalsize <\url{http://github.com/dohyunkim/xetexko}>}
-\date{Version 2.21\quad 2018/08/08}
+\date{Version 2.23\quad 2020/02/17}
\maketitle
\begin{quote}\small
@@ -95,16 +101,16 @@
\item \hyperref[sec:fontopts]
{\cs{defaulthangulfontfeatures}와 \cs{defaulthanjafontfeatures}
명령이 생겼다.}
- \item[v2.9]---
- \item \hyperref[sec:fontcmds]
- {영문폰트에 한글·한자 자형이 없고 한글·한자 폰트도 따로 지시하지 않았다면
- 나눔 트루타입을 한글·한자 글꼴의 기본값으로 사용한다.}
\item[v2.10]---
\item 패키지 옵션 \texttt{[unfonts]}를 더는 지원하지 않는다. 이 옵션을
- 사용한 기존 문서는 기본 글꼴인 나눔 트루타입으로 식자될 것이다.
+ 사용한 기존 문서는 기본 글꼴인 은글꼴 트루타입으로 식자될 것이다.
\item[v2.13]---
\item \hyperref[sec:verttype]
{\texttt{horizontal} 환경이 추가되었다.}
+ \item[v2.23]---
+ \item \hyperref[sec:fontcmds]
+ {디폴트 한글 폰트가 나눔글꼴에서 은글꼴로 변경되었다.}
+
\end{itemize}
\end{quote}
@@ -137,7 +143,7 @@
\section{\xetexko\ 부르기}\label{sec:loading}
\xetexko\ 로드하기: \cs{usepackage\{xetexko\}} 혹은 \cs{usepackage\{kotex\}}.
-이 명령으로 fontspec 및 xunicode 패키지도 함께 불러들인다.
+이 명령으로 fontspec 패키지도 함께 불러들인다.
fontspec에 옵션을 주려면 \xetexko를 부르기 전에 fontspec을 따로 로드하면 된다.
\begin{plaintex}
@@ -146,10 +152,10 @@
패키지 옵션:
\begin{description}\hangulquotes
-\item[ hangul ] `제1장' `표' `차례' 등 한글 표제를 이용한다.
+\item[ hangul ] `제~1~장' `표' `차례' 등 한글 표제를 이용한다.
절 제목 이하에는 한글 표제가 붙지 않고 숫자로만 표현된다.
한글이 주된 언어라고 인식하여 줄간격 조정도 수행한다.
-\item[ hanja ] `第1章' `表' `目次' 등 한자 표제를 이용한다.
+\item[ hanja ] `第~1~章' `表' `目次' 등 한자 표제를 이용한다.
절 제목 이하에는 한자 표제가 붙지 않고 숫자로만 표현된다.
한글이 주된 언어라고 인식하여 줄간격 조정도 수행한다.
\end{description}
@@ -173,9 +179,8 @@
한글폰트를 따로 지정하지 않으면 영문폰트가 한글에도 사용된다.
한자폰트를 따로 지정하지 않으면 한글폰트가 한자에도 적용된다.
\LaTeX 에서는 영문폰트에 한글·한자 글리프가 없고 한글·한자 폰트도 따로
-지시하지 않았다면 \hemph{나눔 트루타입을 한글·한자 글꼴의 기본값}으로
-사용한다.\footnote{나눔 글꼴을 찾을 수 없다면 바탕/돋움 글꼴을 이용하고
- 그마저도 없다면 한글·한자가 식자되지 않을 뿐, 에러를 발생시키지는 않는다.}
+지시하지 않았다면 \hemph{은바탕/은돋움 트루타입}을 한글·한자 글꼴의 기본값으로
+사용한다.
\begin{plaintex}
플레인텍이라면 다음처럼 한다.
@@ -186,6 +191,7 @@
\end{verbatim}
\end{plaintex}
+\keyword{fallbackhanjafont}%
\cs{fallbackhanjafont}를 정의해두면 \hemph{한자 글꼴에도 없는 한자}를
이 글꼴에서 찾아 식자한다. \verb|\newfontfamily| 명령 등으로 정의한다.
@@ -214,6 +220,7 @@
참고로, 한자와 한글을 같은 글꼴로 식자하고 싶을 때 글꼴 설정을
번거롭게 두 번 할 필요 없이 한글 글꼴만 설정한 뒤 간단히
+\keyword{hanjabyhangulfont}%
\cs{hanjabyhangulfont}를 선언하면 된다.%
\footnote{앞 절의 main/sans 글꼴 명령들과 달리 한글 폰트가 자동으로
한자에도 적용되지 않는다는 말이다. 어쨌든 이미 한자 폰트가 지정돼 있는
@@ -410,7 +417,10 @@
폰트가 이런 기능을 제공해야만 가능한 일이다.\footnote{%
이런 기능을 제공하는 폰트로는 윈도즈~8에 번들된 맑은고딕이
있으며 공개폰트로는 은바탕, 함초롬~LVT, Source Han Sans (본고딕),
-Noto Sans CJK, 나눔명조옛한글, 나눔바른고딕옛한글 등이 있다.}
+Source Han Serif (본명조), Noto Sans CJK, Noto Serif CJK,
+나눔명조옛한글, 나눔바른고딕옛한글, KoPubWorld 바탕, KoPubWorld 돋움 등이 있다.
+또한 \textsf{\char"1112\char"119E\char"11AB글}에 번들된 함초롬 글꼴에도
+최근 옛한글 지원이 추가되었다.}
\begin{figure}
\begin{example}
@@ -442,24 +452,25 @@
\section{세로쓰기}\label{sec:verttype}
세로쓰기를 위한 글꼴 지정은 다음과 같다.
-역시 고급 오픈타입 기능을 이용하는 것이므로
-폰트가 이를 지원해야 한다.%
-\footnote{만일 폰트의 세로쓰기 글자폭이 가로쓰기와 다르다면
+역시 고급 오픈타입 기능을 이용하는 것이므로 폰트가 이를 지원해야 한다.%
+\footnote{폰트의 세로쓰기 글자폭이 가로쓰기와 다르다면
\cs{verticalem=1.05em} 같은 선언을 미리 해두는 게 좋다.}
\begin{verbatim}
- \setmainhangulfont{Adobe Myungjo Std}[ Vertical=RotatedGlyphs ]
+ \setmainhangulfont{Noto Sans CJK KR}[
+ Vertical=Alternates, RawFeature=vertical ]
\end{verbatim}
+\keyword{verticaltypesetting}%
문서 전체를 세로쓰기할 때 \cs{verticaltypesetting}을 선언하면
-면주는 그대로 두고 본문만 세로쓰기한다.\footnote{당연히 면주의 글꼴에는
+면주는 그대로 두고 본문만 세로쓰기한다.\footnote{면주의 글꼴에는
\texttt{Vertical} 옵션이 없어야 할 것이다.
면주 글꼴을 따로 지정하는 것은 사용자의 몫이다. }
-문서의 일부를 세로쓰기 하려면 vertical 환경을 이용한다.
+문서의 일부를 세로쓰기 하려면 \verb|vertical| 환경을 이용한다.
vertical 환경의 인자는 세로쓰기 박스의 세로 길이이다.
보통 그 뒤에 세로쓰기에 사용할 글꼴 명령이 온다.
\begin{figure}
\begin{example}
\hfil\begin{vertical}{16em}
- \sffamily\addhangulfontfeatures{Vertical=RotatedGlyphs,CharRaise=.5ex,
+ \sffamily\addhangulfontfeatures{Vertical=Alternates,CharRaise=.5ex,
RawFeature=vertical}
\hanjabyhangulfont \parindent-1em\leftskip1em
\noindent 님의 침묵 (The Silent Beloved)
@@ -480,7 +491,8 @@
\begin{verbatim}
\begin{vertical}{12em}
- \hangulfontspec{Adobe Myungjo Std}[ Vertical=RotatedGlyphs ]
+ \hangulfontspec{Noto Sans CJK KR}[
+ Vertical=Alternates, RawFeature=vertical ]
세로쓰기로 식자할 부분
\end{vertical}
\end{verbatim}
@@ -493,24 +505,25 @@
\begin{plaintex}
플레인텍이라면,
\begin{verbatim}
- \vertical{16em}\hangulfont="Adobe Myungjo Std:vertical"
+ \vertical{16em}\hangulfont="Noto Sans CJK KR:vertical;+vert"
세로쓰기로 식자할 부분
\endvertical
\end{verbatim}
\end{plaintex}
-세로쓰기 도중에 문서의 일부를 가로쓰기하려면 horizontal 환경을 이용하라.
+세로쓰기 도중에 문서의 일부를 가로쓰기로 삽입하려면
+\verb|horizontal| 환경을 이용한다.
horizontal 환경에는 가로쓰기 박스의 너비를 인자로 주어야 한다.
가로쓰기 영역의 폰트 설정은 사용자의 몫이다.
\section{고문헌·일본어·중국어}
띄어쓰기가 없는 옛문헌이나 일본어 단락 따위를 삽입할 때
-japanese 혹은 chinese 환경을 선언하는 것이 좋다.
+\verb|japanese| 혹은 \verb|chinese| 환경을 선언하는 것이 좋다.
들여쓰기\footnote {들여쓰기 기본값은 japanese는 1em 이고 chinese는 2em 이다.}
및 자간 조절이 자동으로 이루어지며
사용자가 입력한 불필요한 공백도 없애준다.
-Schinese 환경은 chinese의 다른 이름이다.
-Tchinese도 제공하는데 중국어 번체 글꼴을 사용한다면 이 환경을 이용하라.
+\verb|Schinese| 환경은 chinese의 다른 이름이다.
+\verb|Tchinese|도 제공하는데 중국어 번체 글꼴을 사용한다면 이 환경을 이용하라.
일반적으로 우리 고문헌 조판에는 japanese 환경이 더 적합하다.
\begin{figure}
@@ -526,9 +539,9 @@
\caption{고문헌 조판 보기. japanese 환경을 이용했다.}\label{fig:ancientdoc}
\end{figure}
+\keyword{inhibitglue}%
\cs{inhibitglue} 명령은 일본어 등 환경에서 가끔 유용한데,
-해당 지점에 자동 삽입되는 공백을 영(zero)으로
-만들어준다.
+해당 지점에 자동 삽입되는 공백을 영(zero)으로 만들어준다.
\section{매달린 구두점}
마침표, 쉼표, 인용부호를 판면 바깥에 식자하여 행 끝에 매달리게 만든다.
@@ -565,7 +578,11 @@
수식 한글은 따로 설정하지 않으면 문서의 기본 글꼴을 따라가지만
굳이 설정하려면 다음과 같이 한다. 이 명령은 플레인텍에서도 쓸 수 있다.
\begin{verbatim}
- \setmathhangulfont{NanumGothic}
+ \setmathhangulfont{Noto Sans CJK KR}[
+ SizeFeatures={ {Size=-6, Font=* Medium},
+ {Size=6-9, Font=*},
+ {Size=9-, Font=* DemiLight} }
+ ]
\end{verbatim}
현재 한글만 쓸 수 있게 설정되어 있다.
한자도 수식에 직접 입력하려면 사용자는
@@ -588,6 +605,7 @@
\end{verbatim}
\section{드러냄표}
+\keyword{dotemph}%
\dotemph{드러냄표} 강조도 \kotex 과 대동소이하다.
기본은 글자 위에 점을 찍는 형태이나 다음 명령을 이용해 개인적으로 선호하는
기호를 드러냄표로 쓸 수 있다.
@@ -620,7 +638,8 @@
플레인텍에서는 패키지 로드 후 사용자가 \cs{xetexkoulemsupport}
명령을 내려주어야 한다.
\end{plaintex}
-%\hfill \fboxsep=-\fboxrule \fbox{\vbox to1em{\hbox to1em{\hss}\vss}}
+
+\hfill \fboxsep=-\fboxrule \fbox{\vbox to1em{\hbox to1em{\hss}\vss}}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xetexko.doc.tlpobj new/tlpkg/tlpobj/xetexko.doc.tlpobj
--- old/tlpkg/tlpobj/xetexko.doc.tlpobj 2019-02-28 04:18:28.000000000 +0100
+++ new/tlpkg/tlpobj/xetexko.doc.tlpobj 2020-02-18 01:54:48.000000000 +0100
@@ -1,9 +1,9 @@
name xetexko.doc
category Package
-revision 48378
+revision 53826
shortdesc doc files of xetexko
relocated 1
-docfiles size=65
+docfiles size=67
RELOC/doc/xetex/xetexko/ChangeLog
RELOC/doc/xetex/xetexko/README
RELOC/doc/xetex/xetexko/xetexko-doc.pdf
++++++ xetexko.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko-font.sty new/tex/xetex/xetexko/xetexko-font.sty
--- old/tex/xetex/xetexko/xetexko-font.sty 2018-08-08 23:06:27.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko-font.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko-font.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -10,11 +10,10 @@
% and version 1.3c or later is part of all distributions of LaTeX
% version 2006/05/20 or later.
-\ProvidesPackage{xetexko-font}[2018/08/08 v2.21 LaTeX Font commands for XeTeX-ko]
+\NeedsTeXFormat{LaTeX2e}[2020/02/02]
+\ProvidesPackage{xetexko-font}[2020/02/17 v2.23 LaTeX Font commands for XeTeX-ko]
-\let\xetexko@f@size\f@size
-\RequirePackage{fontspec}[2018/07/30]
-\let\f@size\xetexko@f@size
+\RequirePackage{fontspec}[2020/02/03]
%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% for old hangul rendering
@@ -25,30 +24,35 @@
% hangul font options
\tl_new:N \l_xtxko_font_opts_tl
\tl_new:N \l_xtxko_font_opts_init_tl
+\tl_new:N \l_xtxko_hangul_font_opts_init_tl
+\tl_new:N \l_xtxko_hanja_font_opts_init_tl
+\tl_new:N \l_xtxko_rem_tl
+\int_const:Nn \c__xtxko_one_int { 1 }
+\int_const:Nn \c__xtxko_two_int { 2 }
\tl_set:Nn \l_xtxko_font_opts_init_tl
{
- \tl_clear:N \xetexkointerhchar
- \tl_clear:N \xetexkolowerexclamation
- \tl_clear:N \xetexkolowerperiod
- \tl_clear:N \xetexkolowercomma
- \tl_clear:N \xetexkolowerquestion
- \tl_clear:N \xetexkopostexclamationkern
- \tl_clear:N \xetexkopostperiodkern
- \tl_clear:N \xetexkopostcommakern
- \tl_clear:N \xetexkopostquestionkern
- \tl_clear:N \xetexkopreexclamationkern
- \tl_clear:N \xetexkopreperiodkern
- \tl_clear:N \xetexkoprecommakern
- \tl_clear:N \xetexkoprequestionkern
- \tl_clear:N \xetexkoquoteraise
- \tl_clear:N \xetexkoquotewidth
- \tl_clear:N \xetexkocharraise
- \tl_set:Nn \xetexkohu {0.05em}
- \tl_set:Nn \xetexkopostmathskip {\dim_eval:n {\xetexkohu*2}}
+ \cs_set_eq:NN \xetexkointerhchar \c_empty_tl
+ \cs_set_eq:NN \xetexkolowerexclamation \c_empty_tl
+ \cs_set_eq:NN \xetexkolowerperiod \c_empty_tl
+ \cs_set_eq:NN \xetexkolowercomma \c_empty_tl
+ \cs_set_eq:NN \xetexkolowerquestion \c_empty_tl
+ \cs_set_eq:NN \xetexkopostexclamationkern \c_empty_tl
+ \cs_set_eq:NN \xetexkopostperiodkern \c_empty_tl
+ \cs_set_eq:NN \xetexkopostcommakern \c_empty_tl
+ \cs_set_eq:NN \xetexkopostquestionkern \c_empty_tl
+ \cs_set_eq:NN \xetexkopreexclamationkern \c_empty_tl
+ \cs_set_eq:NN \xetexkopreperiodkern \c_empty_tl
+ \cs_set_eq:NN \xetexkoprecommakern \c_empty_tl
+ \cs_set_eq:NN \xetexkoprequestionkern \c_empty_tl
+ \cs_set_eq:NN \xetexkoquoteraise \c_empty_tl
+ \cs_set_eq:NN \xetexkoquotewidth \c_empty_tl
+ \cs_set_eq:NN \xetexkocharraise \c_empty_tl
+ \cs_set_nopar:Npn \xetexkohu {0.05em}
+ \cs_set_nopar:Npn \xetexkopostmathskip {\dim_eval:n {\xetexkohu*2}}
}
\cs_new:Nn \__xtxko_add_font_opt:Nn
{
- \tl_put_right:Nn \l_xtxko_font_opts_tl { \tl_set:Nn #1 {#2} }
+ \tl_put_right:Nn \l_xtxko_font_opts_tl { \cs_set_nopar:Npn #1 {#2} }
}
\keys_define:nn { xtxko-font }
{
@@ -93,7 +97,6 @@
PunctRaise .meta:n = { lowerperiod = { \dim_eval:n {-#1} } } ,
CharRaise .meta:n = { charraise = {#1} } ,
}
-\tl_new:N \l_xtxko_rem_tl
\tl_set_eq:NN \l_xtxko_hangul_font_opts_init_tl \l_xtxko_font_opts_init_tl
\cs_new:Nn \__xtxko_hangul_assign_font_opts:n
{
@@ -108,73 +111,113 @@
}
\cs_new:Nn \__xtxko_def_XKhan__fonts:nnn
{
- \tl_if_eq:NNF #1 \relax
+ \cs_if_eq:NNF #1 \relax
{
- \tl_if_eq:ccT \familydefault #2
+ \str_if_eq:eeT \familydefault #2
{
- \tl_if_eq:NNTF \XKhangulfont #1
+ \cs_if_eq:NNTF \XKhangulfont #1
{
- \tl_set:Nn #1
+ \cs_set_nopar:Npn #1
{
\XK@storeltnfont
- \chardef\XKcurrentfont \c_one #3
+ \chardef\XKcurrentfont \c__xtxko_one_int #3
\XK@storecjkfont
}
}
{
- \tl_set:Nn #1
+ \cs_set_nopar:Npn #1
{
\XK@storeltnfont
- \chardef\XKcurrentfont \c_two #3
+ \chardef\XKcurrentfont \c__xtxko_two_int #3
\XK@storecjkfont
}
}
+ \cs_if_eq:NNTF \rmdefault #2
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@rm@korean@font
+ }
+ {
+ \cs_if_eq:NNTF \sfdefault #2
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@sf@korean@font
+ }
+ {
+ \cs_set_eq:NN \XK@default@korean@font \XK@tt@korean@font
+ }
+ }
}
}
}
+% suppress bx font warnings
+\cs_new_nopar:Npn \l_xetexko_pacify_bfseries {
+ \tl_map_inline:nn { \mddefault \bfdefault }
+ {
+ \cs_if_exist:cF { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\updefault }
+ {
+ \cs_set_eq:cc
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\updefault }
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/##1/\shapedefault }
+ }
+ }
+ \tl_map_inline:nn { \shapedefault \updefault \itdefault \sldefault }
+ {
+ \cs_if_exist:cF { \g_fontspec_encoding_tl/\l_fontspec_family_tl/bx/##1 }
+ {
+ \cs_set_eq:cc
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/bx/##1 }
+ { \g_fontspec_encoding_tl/\l_fontspec_family_tl/\bfdefault/##1 }
+ }
+ }
+}
%%%%%%%%%%%%%%%%%%%%
% user font commands
\DeclareDocumentCommand \setmainhangulfont { O{} m O{} }
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \kormainfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hangul_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \kormainfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \kormainfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \rmdefault \kormainfont
\ignorespaces
}
\DeclareDocumentCommand \setsanshangulfont { O{} m O{} }
{
- \__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \korsansfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hangul_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \korsansfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \korsansfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \sfdefault \korsansfont
\ignorespaces
}
\DeclareDocumentCommand \setmonohangulfont { O{} m O{} }
{
- \setfontfamily \kormonofont [#1,#3] {#2}
+ \setfontfamily \kormonofont {#2} [#1,#3]
+ \l_xetexko_pacify_bfseries
\__xtxko_def_XKhan__fonts:nnn \XKhangulfont \ttdefault \kormonofont
\ignorespaces
}
\DeclareDocumentCommand \setmainhanjafont { O{} m O{} }
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \hnjmainfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hanja_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \hnjmainfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \hnjmainfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \rmdefault \hnjmainfont
\ignorespaces
}
\DeclareDocumentCommand \setsanshanjafont { O{} m O{} }
{
- \__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \hnjsansfont [\l_xtxko_rem_tl] {#2}
+ \__xtxko_hanja_assign_font_opts:n {Ligatures=TeX,#1,#3}
+ \setfontfamily \hnjsansfont {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \hnjsansfont \l_xtxko_font_opts_tl
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \sfdefault \hnjsansfont
\ignorespaces
}
\DeclareDocumentCommand \setmonohanjafont { O{} m O{} }
{
- \setfontfamily \hnjmonofont [#1,#3] {#2}
+ \setfontfamily \hnjmonofont {#2} [#1,#3]
+ \l_xetexko_pacify_bfseries
\__xtxko_def_XKhan__fonts:nnn \XKhanjafont \ttdefault \hnjmonofont
\ignorespaces
}
@@ -182,12 +225,13 @@
\DeclareDocumentCommand \adhochangulfont { O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#1,#3}
- \setfontfamily \XK@adhoc@hangul@font [\l_xtxko_rem_tl] {#2}
+ \setfontfamily \XK@adhoc@hangul@font {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \XK@adhoc@hangul@font \l_xtxko_font_opts_tl
- \tl_set:Nn \XKhangulfont
+ \cs_set_nopar:Npn \XKhangulfont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_one
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_one_int
\XK@adhoc@hangul@font
\XK@storecjkfont
}
@@ -197,12 +241,13 @@
\DeclareDocumentCommand \adhochanjafont { O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#1,#3}
- \setfontfamily \XK@adhoc@hanja@font [\l_xtxko_rem_tl] {#2}
+ \setfontfamily \XK@adhoc@hanja@font {#2} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
\tl_put_right:NV \XK@adhoc@hanja@font \l_xtxko_font_opts_tl
- \tl_set:Nn \XKhanjafont
+ \cs_set_nopar:Npn \XKhanjafont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_two
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_two_int
\XK@adhoc@hanja@font
\XK@storecjkfont
}
@@ -213,16 +258,15 @@
\DeclareDocumentCommand \newhangulfontfamily { m O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#2,#4}
- \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 }
- [\l_xtxko_rem_tl] {#3}
- \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
- \l_xtxko_font_opts_tl
+ \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
+ \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
- \tl_set:Nn \XKhangulfont
+ \cs_set_nopar:Npn \XKhangulfont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_one
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_one_int
\use:c { XK@newfont@family \token_to_str:N #1 }
\XK@storecjkfont
}
@@ -231,16 +275,15 @@
\DeclareDocumentCommand \newhanjafontfamily { m O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#2,#4}
- \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 }
- [\l_xtxko_rem_tl] {#3}
- \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
- \l_xtxko_font_opts_tl
+ \exp_args:Nc \setfontfamily { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \l_xetexko_pacify_bfseries
+ \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
- \tl_set:Nn \XKhanjafont
+ \cs_set_nopar:Npn \XKhanjafont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_two
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_two_int
\use:c { XK@newfont@family \token_to_str:N #1 }
\XK@storecjkfont
}
@@ -249,16 +292,14 @@
\DeclareDocumentCommand \newhangulfontface { m O{} m O{} }
{
\__xtxko_hangul_assign_font_opts:n {#2,#4}
- \exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 }
- [\l_xtxko_rem_tl] {#3}
- \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
- \l_xtxko_font_opts_tl
+ \exp_args:Nc \setfontface { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
- \tl_set:Nn \XKhangulfont
+ \cs_set_nopar:Npn \XKhangulfont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_one
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_one_int
\use:c { XK@newfont@family \token_to_str:N #1 }
\XK@storecjkfont
}
@@ -267,33 +308,52 @@
\DeclareDocumentCommand \newhanjafontface { m O{} m O{} }
{
\__xtxko_hanja_assign_font_opts:n {#2,#4}
- \exp_args:Nc \newfontface { XK@newfont@family \token_to_str:N #1 }
- [\l_xtxko_rem_tl] {#3}
- \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 }
- \l_xtxko_font_opts_tl
+ \exp_args:Nc \setfontface { XK@newfont@family \token_to_str:N #1 } {#3} [\l_xtxko_rem_tl]
+ \tl_put_right:cV { XK@newfont@family \token_to_str:N #1 } \l_xtxko_font_opts_tl
\DeclareRobustCommand #1
{
- \tl_set:Nn \XKhanjafont
+ \cs_set_nopar:Npn \XKhanjafont
{
\XK@storeltnfont
- \tl_set_eq:NN \XKcurrentfont \c_two
+ \cs_set_eq:NN \XKcurrentfont \c__xtxko_two_int
\use:c { XK@newfont@family \token_to_str:N #1 }
\XK@storecjkfont
}
}
}
%% add{hangul,hanja}fontfeature[s]
+\cs_set_nopar:Npn \xetexkopacifybfseries {
+ \tl_map_inline:nn { \mddefault \bfdefault }
+ {
+ \cs_if_exist:cF { \f@encoding/\f@family/##1/\updefault }
+ {
+ \cs_gset_eq:cc
+ { \f@encoding/\f@family/##1/\updefault }
+ { \f@encoding/\f@family/##1/\shapedefault }
+ }
+ }
+ \tl_map_inline:nn { \shapedefault \updefault \itdefault \sldefault }
+ {
+ \cs_if_exist:cF { \f@encoding/\f@family/bx/##1 }
+ {
+ \cs_gset_eq:cc
+ { \f@encoding/\f@family/bx/##1 }
+ { \f@encoding/\f@family/\bfdefault/##1 }
+ }
+ }
+}
\DeclareDocumentCommand \addhangulfontfeature { m }
{
\group_begin:
- \XKhangulfont
+ \fontseries\mddefault\fontshape\shapedefault \XKhangulfont
\tl_clear:N \l_xtxko_font_opts_tl
\keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rem_tl
\addfontfeature {\l_xtxko_rem_tl}
+ \xetexkopacifybfseries
\use:x
{
\group_end:
- \exp_not:N \tl_set:Nn \exp_not:N \XKhangulfont
+ \exp_not:N \cs_set_nopar:Npn \exp_not:N \XKhangulfont
{
\exp_not:V \XKhangulfont
\exp_not:N \fontfamily { \f@family } \exp_not:N \selectfont
@@ -307,14 +367,15 @@
\DeclareDocumentCommand \addhanjafontfeature { m }
{
\group_begin:
- \XKhanjafont
+ \fontseries\mddefault\fontshape\shapedefault \XKhanjafont
\tl_clear:N \l_xtxko_font_opts_tl
\keys_set_known:nxN { xtxko-font } {#1} \l_xtxko_rem_tl
\addfontfeature {\l_xtxko_rem_tl}
+ \xetexkopacifybfseries
\use:x
{
\group_end:
- \exp_not:N \tl_set:Nn \exp_not:N \XKhanjafont
+ \exp_not:N \cs_set_nopar:Npn \exp_not:N \XKhanjafont
{
\exp_not:V \XKhanjafont
\exp_not:N \fontfamily { \f@family } \exp_not:N \selectfont
@@ -325,12 +386,7 @@
\ignorespaces
}
\cs_set_eq:NN \addhanjafontfeatures \addhanjafontfeature
-%% default font features
-\defaultfontfeatures
- [
- \kormainfont, \korsansfont, \hnjmainfont, \hnjsansfont,
- ]
- {Ligatures=TeX}
+%% default hangul font features
\DeclareDocumentCommand \defaulthangulfontfeatures { t+ o m } % o is ignored
{
\IfBooleanTF {#1}
@@ -359,6 +415,7 @@
\DeclareDocumentCommand \setmathhangulfont { O{} m O{} }
{
\fontspec_set_family:Nnn \xetexko@math@hangul@family {#1,#3} {#2}
+ \l_xetexko_pacify_bfseries
}
%%%%%%%%%%%%%%%%%%%%
%% xetexkofontregime
@@ -378,27 +435,6 @@
\use:c { #2marks }
\keys_set:nn { xtxko-char } { #1,#3 }
}
-%% fontspec 2018
-\RenewDocumentCommand \setmainfont { O{} m O{} }
- {
- \__fontspec_main_setmainfont:nn {#1,#3} {#2}
- \protected\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
- \ignorespaces
- }
-\RenewDocumentCommand \setsansfont { O{} m O{} }
- {
- \__fontspec_main_setsansfont:nn {#1,#3} {#2}
- \protected\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
- \ignorespaces
- }
-\RenewDocumentCommand \setmonofont { O{} m O{} }
- {
- \__fontspec_main_setmonofont:nn {#1,#3} {#2}
- \protected\edef\ttfamily{\unexpanded\expandafter{\ttfamily\XK@tt@korean@font
- \disablehangulspacing}}
- \ignorespaces
- }
-\cs_set_eq:NN \setromanfont \setmainfont
\ExplSyntaxOff
%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -468,103 +504,64 @@
\XK@storecjkfont
}%
\fi
+ \disablehangulspacing
}
-\protected\edef\rmfamily{\unexpanded\expandafter{\rmfamily\XK@rm@korean@font}}
-\protected\edef\sffamily{\unexpanded\expandafter{\sffamily\XK@sf@korean@font}}
-\protected\edef\ttfamily{\unexpanded\expandafter{\ttfamily
- \XK@tt@korean@font\disablehangulspacing
-}}
+% using latex 2020's font family hooks
+\edef\@rmfamilyhook{\unexpanded\expandafter{\@rmfamilyhook \XK@rm@korean@font}}
+\edef\@sffamilyhook{\unexpanded\expandafter{\@sffamilyhook \XK@sf@korean@font}}
+\edef\@ttfamilyhook{\unexpanded\expandafter{\@ttfamilyhook \XK@tt@korean@font}}
+\edef\@defaultfamilyhook{\unexpanded\expandafter{\@defaultfamilyhook
+ \XK@default@korean@font }}
+\let\XK@default@korean@font\relax
+
\edef\verbatim@font{\unexpanded\expandafter{\verbatim@font
\disablehangulspacingandlinebreak
\let\XKstoreprevfont\XKlatinfont
}}
% for default font loading
-\def\XKiffontisaccessible#1#2#3{%
- \begingroup
- \suppressfontnotfounderror\@ne
- \font\x="#1" at 10pt
- \expandafter
- \endgroup
- \ifx\x\nullfont #3\else #2\fi
-}
-\def\XKiffonthasunichar#1#2#3#4{%
- \begingroup #1\expandafter\endgroup
+\def\XKiffontfamilyhasunichar#1#2#3#4{%
+ \begingroup \fontfamily{#1}\selectfont\expandafter\endgroup
\iffontchar\font"#2\relax #3\else #4\fi
}
\AtBeginDocument{%
%%%%%%%%%%%%%%%%%%%%%%%%%%
- % default main hangul: nanummyeongjo, batang if absent
+ % default main hangul: unbatang
\ifdefined\kormainfont\else
- \XKiffonthasunichar{\fontfamily\rmdefault\selectfont}{AC00}
+ \XKiffontfamilyhasunichar{\rmdefault}{AC00}
{\let\kormainfont\relax}
- {\XKiffontisaccessible{NanumMyeongjoExtraBold}
- {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType,BoldFont=*ExtraBold]}
- {\XKiffontisaccessible{NanumMyeongjo}
- {\setmainhangulfont{NanumMyeongjo}[Renderer=OpenType]}
- {\XKiffontisaccessible{Batang}
- {\setmainhangulfont{Batang}[AutoFakeBold]}
- {\let\kormainfont\relax}%
- }%
- }%
- }%
- \fi
- % default main hanja: nanumgothic, batang if absent
- \ifdefined\hnjmainfont\else
- \XKiffonthasunichar{\kormainfont}{4E00}
- {\let\hnjmainfont\kormainfont}
- {\XKiffontisaccessible{NanumGothic}
- {\setmainhanjafont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Batang}
- {\setmainhanjafont{Batang}[AutoFakeBold]}
- {\let\hnjmainfont\kormainfont}%
- }%
+ {\IfFontExistsTF{UnBatang.ttf}
+ {\setmainhangulfont{UnBatang.ttf}[BoldFont=UnBatangBold.ttf]}
+ {\let\kormainfont\relax}%
}%
\fi
- % default sans hangul: nanumgothic, dotum if absent
+ \ifdefined\hnjmainfont\else \let\hnjmainfont\kormainfont \fi
+
+ % default sans hangul: undotum
\ifdefined\korsansfont\else
- \XKiffonthasunichar{\fontfamily\sfdefault\selectfont}{AC00}
+ \XKiffontfamilyhasunichar{\sfdefault}{AC00}
{\let\korsansfont\relax}
- {\XKiffontisaccessible{NanumGothic}
- {\setsanshangulfont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Dotum}
- {\setsanshangulfont{Dotum}[AutoFakeBold]}
- {\let\korsansfont\relax}%
- }%
- }%
- \fi
- % default sans hanja: nanumgothic, dotum if absent
- \ifdefined\hnjsansfont\else
- \XKiffonthasunichar{\korsansfont}{4E00}
- {\let\hnjsansfont\korsansfont}
- {\XKiffontisaccessible{NanumGothic}
- {\setsanshanjafont{NanumGothic}[Renderer=OpenType]}
- {\XKiffontisaccessible{Dotum}
- {\setsanshanjafont{Dotum}[AutoFakeBold]}
- {\let\hnjsansfont\korsansfont}%
- }%
+ {\IfFontExistsTF{UnDotum.ttf}
+ {\setsanshangulfont{UnDotum.ttf}[BoldFont=UnDotumBold.ttf]}
+ {\let\korsansfont\relax}%
}%
\fi
+ \ifdefined\hnjsansfont\else \let\hnjsansfont\korsansfont \fi
+
\ifdefined\kormonofont\else \let\kormonofont\korsansfont \fi
\ifdefined\hnjmonofont\else \let\hnjmonofont\kormonofont \fi
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% reset hangul font and normalfont
-\expandafter\ifx\familydefault\rmdefault
- \XK@rm@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@rm@korean@font}}
-\else \expandafter\ifx\familydefault\sfdefault
- \XK@sf@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@sf@korean@font}}
-\else
- \XK@tt@korean@font
- \protected\edef\normalfont{\unexpanded\expandafter{\normalfont
- \XK@tt@korean@font}}
-\fi\fi
-\let\reset@font\normalfont
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ % reset hangul font and normalfont
+ \expandafter\ifx\familydefault\sfdefault
+ \let\XK@default@korean@font\XK@sf@korean@font
+ \else \expandafter\ifx\familydefault\ttdefault
+ \let\XK@default@korean@font\XK@tt@korean@font
+ \else
+ \let\XK@default@korean@font\XK@rm@korean@font
+ \fi\fi
+ \XK@default@korean@font
%%%%%%%%%%%%%%%%%%%%%
% hangul in math mode
\begingroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko-hanging.sty new/tex/xetex/xetexko/xetexko-hanging.sty
--- old/tex/xetex/xetexko/xetexko-hanging.sty 2018-04-06 23:37:37.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko-hanging.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko-hanging.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-hanging}
- [2018/04/06 v2.18 Hanging punctuations for XeTeX-ko]
+ [2020/02/17 v2.23 Hanging punctuations for XeTeX-ko]
\fi
\chardef\catcodeofATcharacter\catcode`@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko-josa.sty new/tex/xetex/xetexko/xetexko-josa.sty
--- old/tex/xetex/xetexko/xetexko-josa.sty 2018-04-06 23:37:37.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko-josa.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko-josa.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko-josa}[2018/04/06 v2.18 Auto-josa for XeTeX-ko]
+ \ProvidesPackage{xetexko-josa}[2020/02/17 v2.23 Auto-josa for XeTeX-ko]
\fi
\unless\ifcsname @tempcnta\endcsname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko-space.sty new/tex/xetex/xetexko/xetexko-space.sty
--- old/tex/xetex/xetexko/xetexko-space.sty 2018-04-30 19:05:30.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko-space.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko-space.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-space}
- [2018/04/19 v2.19 Spacings and fonts for XeTeX-ko]
+ [2020/02/17 v2.23 Spacings and fonts for XeTeX-ko]
\fi
%%% we need XeTeX > 0.997
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko-vertical.sty new/tex/xetex/xetexko/xetexko-vertical.sty
--- old/tex/xetex/xetexko/xetexko-vertical.sty 2018-04-06 23:37:37.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko-vertical.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko-vertical.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,7 +13,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
\ProvidesPackage{xetexko-vertical}
- [2018/04/06 v2.18 Vertical environment for XeTeX-ko]
+ [2020/02/17 v2.23 Vertical environment for XeTeX-ko]
\fi
% do not veticalize headline/footline
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xetex/xetexko/xetexko.sty new/tex/xetex/xetexko/xetexko.sty
--- old/tex/xetex/xetexko/xetexko.sty 2018-04-30 19:05:30.000000000 +0200
+++ new/tex/xetex/xetexko/xetexko.sty 2020-02-17 23:18:35.000000000 +0100
@@ -1,6 +1,6 @@
% xetexko.sty
%
-% Copyright (c) 2013-2018 Dohyun Kim <nomos at ktug org>
+% Copyright (c) 2013-2020 Dohyun Kim <nomos at ktug org>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -12,7 +12,7 @@
\begingroup\expandafter\expandafter\expandafter\endgroup
\expandafter\ifx\csname ProvidesPackage\endcsname\relax\else
- \ProvidesPackage{xetexko}[2018/04/19 v2.19 Typesetting Korean with XeTeX]
+ \ProvidesPackage{xetexko}[2020/02/17 v2.23 Typesetting Korean with XeTeX]
\fi
\begingroup\expandafter\expandafter\expandafter\endgroup
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xetexko.tlpobj new/tlpkg/tlpobj/xetexko.tlpobj
--- old/tlpkg/tlpobj/xetexko.tlpobj 2019-02-28 04:18:28.000000000 +0100
+++ new/tlpkg/tlpobj/xetexko.tlpobj 2020-02-18 01:54:48.000000000 +0100
@@ -1,13 +1,13 @@
name xetexko
category Package
-revision 48378
+revision 53826
shortdesc Typeset Korean with Xe(La)TeX
relocated 1
longdesc The package supports typesetting Korean documents (including
longdesc old Hangul texts), using XeTeX. It enhances the existing
longdesc support, in XeTeX, providing features that provide quality
-longdesc typesetting. This package requires cjk-ko package for its full
-longdesc functionality.
+longdesc typesetting. This package requires the cjk-ko package for its
+longdesc full functionality.
runfiles size=78
RELOC/tex/xetex/xetexko/hanja_hangul.tab
RELOC/tex/xetex/xetexko/hanjacom_hangul.tab
@@ -20,7 +20,6 @@
RELOC/tex/xetex/xetexko/xetexko.sty
catalogue-contact-repository https://github.com/dohyunkim/xetexko
catalogue-ctan /macros/xetex/generic/xetexko
-catalogue-date 2018-08-08 09:37:17 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics korean xetex
-catalogue-version 2.21
+catalogue-version 2.23
++++++ xetexref.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xetexref/README.txt new/doc/xetex/xetexref/README.txt
--- old/doc/xetex/xetexref/README.txt 2019-03-05 23:33:18.000000000 +0100
+++ new/doc/xetex/xetexref/README.txt 2019-12-09 22:52:18.000000000 +0100
@@ -17,6 +17,7 @@
## Legalities
Copyright 2007-2019 Will Robertson
+Copyright 2019 Hironobu Yamashita
Copyright 2018 Joseph Wright
Copyright 2011-2017 Karl Berry
Copyright 2013 Khaled Hosny.
Binary files old/doc/xetex/xetexref/xetex-reference.pdf and new/doc/xetex/xetexref/xetex-reference.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xetex/xetexref/xetex-reference.tex new/doc/xetex/xetexref/xetex-reference.tex
--- old/doc/xetex/xetexref/xetex-reference.tex 2019-03-05 23:33:18.000000000 +0100
+++ new/doc/xetex/xetexref/xetex-reference.tex 2019-12-09 22:52:18.000000000 +0100
@@ -1,6 +1,4 @@
-% Copyright 2007-2017 Will Robertson
-% Copyright 2011 Karl Berry
-% Copyright 2013 Khaled Hosny
+% Copyright for this work included in README.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -21,7 +19,7 @@
\title{The \xetex reference guide\\\url{https://ctan.org/pkg/xetexref}}
\author{Will Robertson \and Khaled Hosny \and Karl Berry}
-\date{2019-03-05}
+\date{\VERSION}
\suppressfontnotfounderror=1
@@ -555,6 +553,13 @@
\XeTeXuseglyphmetrics=1 \fbox{a}\fbox{A}\fbox{j}\fbox{J}
\end{example}
+\cmd|\XeTeXgenerateactualtext|
+\xarg{integer}
+\desc{Controls the output of \texttt{/ActualText} entry. Default is 0.
+When set to 1, the \texttt{/ActualText} entry is added to the output PDF
+for better copy/paste and search in PDF viewers.}
+\endcmd
+
\subsection{OpenType fonts}
\cmd|\XeTeXOTcountscripts|
@@ -887,7 +892,8 @@
\cmd|\Ucharcat|
\xarg{number}
\xarg{catcode}
-\desc{Expands to a character token with slot \meta{number} and \meta{catcode} specified.}
+\desc{Expands to a character token with slot \meta{number} and \meta{catcode} specified.
+The values allowed for \meta{catcode} are: 1--4, 6--8 and 10--13.}
\endcmd
\begin{example}
@@ -922,11 +928,11 @@
\opteq
\xarg{interchar class}
\desc{Assigns a class corresponding to \xarg{interchar class} (range
-0–255) to a \xarg{char slot}. Most characters are class 0 by
+0–4095) to a \xarg{char slot}. Most characters are class 0 by
default. Class 1 is for CJK ideographs, classes 2 and 3 are CJK
-punctuation. The boundary of a text string is considered class 255,
+punctuation. The boundary of a text string is considered class 4095,
wherever there is a boundary between a ‘run’ of characters and something
-else — glue, kern, math, box, etc. Special case class 256 is ignored;
+else — glue, kern, math, box, etc. Special case class 4096 is ignored;
useful for diacritics so I’m told.}
\endcmd
@@ -1170,6 +1176,12 @@
\subsection{Programming}
+\cmd|\expanded|
+\xarg{general text}
+\desc{Carries out full expansion of a token list like \texttt{\char`\\message},
+but it is still expandable.}
+\endcmd
+
\cmd|\ifincsname...(\else...)\fi|
\desc{\tex conditional to branch true if the expansion occurs within
\texttt{\char`\\csname ... \char`\\endcsname}.}
@@ -1212,9 +1224,9 @@
\xarg{arg one}
\xarg{arg two}
\desc{Compares the full expansion of the two token list
-arguments. Expands to zero if they are the same, less than one if the
+arguments. Expands to zero if they are the same, $-1$ if the
first argument sorts lower (lexicographically) than the second argument,
-and greater than one if vice versa.}
+and~$1$ if vice versa.}
\endcmd
\begin{example}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xetexref.doc.tlpobj new/tlpkg/tlpobj/xetexref.doc.tlpobj
--- old/tlpkg/tlpobj/xetexref.doc.tlpobj 2019-03-06 02:24:30.000000000 +0100
+++ new/tlpkg/tlpobj/xetexref.doc.tlpobj 2019-12-10 01:55:09.000000000 +0100
@@ -1,9 +1,9 @@
name xetexref.doc
category Package
-revision 50244
+revision 53068
shortdesc doc files of xetexref
relocated 1
-docfiles size=49
+docfiles size=48
RELOC/doc/xetex/xetexref/README.txt
RELOC/doc/xetex/xetexref/xetex-reference.pdf
RELOC/doc/xetex/xetexref/xetex-reference.tex
++++++ xfakebold.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xfakebold/Changes new/doc/latex/xfakebold/Changes
--- old/doc/latex/xfakebold/Changes 2018-08-22 23:31:55.000000000 +0200
+++ new/doc/latex/xfakebold/Changes 2019-12-30 23:18:02.000000000 +0100
@@ -1,5 +1,7 @@
xfakebold.sty ----------------
+v 0.06 2019-12-29 support for xetex and ptex with (x)dvipdfmx
+v 0.05 2019-09-21 fix pdflatex
v 0.04 2018-08-21 typo in \fake@bold
v 0.03 2018-08-07 small fixes and typos in the documentation
v 0.02 2018-07-25 fix bug in pdflatex part
Binary files old/doc/latex/xfakebold/xfakebold-doc.pdf and new/doc/latex/xfakebold/xfakebold-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xfakebold/xfakebold-doc.tex new/doc/latex/xfakebold/xfakebold-doc.tex
--- old/doc/latex/xfakebold/xfakebold-doc.tex 2018-08-22 23:31:55.000000000 +0200
+++ new/doc/latex/xfakebold/xfakebold-doc.tex 2019-12-30 23:18:02.000000000 +0100
@@ -1,14 +1,18 @@
-% $Id: xfakebold-doc.tex 793 2018-08-06 16:39:25Z herbert $
+% $Id: xfakebold-doc.tex 1125 2019-12-29 21:34:19Z herbert $
\listfiles
\documentclass[english]{article}
\usepackage{dejavu-otf}
+\usepackage{xfp}
+\ExplSyntaxOn
+\let\PI\c_pi_fp
+\ExplSyntaxOff
\usepackage{xfakebold}
\usepackage{graphicx}
%\pdfcompresslevel=0
\usepackage{babel}
\usepackage[a4paper,tmargin=1cm,bmargin=1.5cm,includeheadfoot]{geometry}
\usepackage{listings}
-\title{\texttt{xfakebold}, v. 0.04\\ using bold characters with \texttt{pdflatex} or \texttt{lualatex}}
+\title{\texttt{xfakebold}, v. 0.06\\ using bold characters with\\ \texttt{pdflatex}, \texttt{lualatex} or \texttt{xelatex}}
\author{Herbert Voß}
\lstset{basicstyle=\ttfamily\small,language={[LaTeX]TeX},frame=lrtb}
@@ -21,13 +25,13 @@
\begin{abstract}
The package fakes a vector font with outline characters by the text render of PDF.
It writes directly into the pdf output with \verb|\pdfliteral| (pdflatex ) or \verb|\pdfextension| \verb|literal|
-(lualatex). The package defines two macros which can be used in text and in math mode. However, for the text
+(lualatex) or \verb|\special| (xelatex). The package defines two macros which can be used in text and in math mode. However, for the text
mode one should use the bold version of the text font which should be available in most cases. This is different to the
math mode where only some free math fonts provide a bold version.
\end{abstract}
\vfill
-\small Thanks to: Will Robertson;
+\small Thanks to: Will Robertson; Yusuke Terada;
%\meaning\setBold
%\meaning\unsetBold
@@ -37,6 +41,8 @@
\section{How does it work?}
PDF knows different text render modes for outline fonts.
+\ifxetex\else% Only for the test run with xelatex
+
\def\OFF{\pdfextension literal direct { 0 Tr 0 w }\relax}
\def\Verb|#1|{\texttt{\{#1\}}}
@@ -49,7 +55,7 @@
\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0 w |} \tabular{l}\pdfextension literal direct { 2 Tr 0 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
\makebox[3cm][l]{Mode 2 \Verb| 2 Tr 0.3 w |} \tabular{l}\pdfextension literal direct { 2 Tr 0.3 w }\scalebox{10}{OTTO} OTTO\OFF\endtabular
-
+\fi
In mode 0 the character is filled but without drawing its outline which can be seen when printing in mode 1, where
the linewidth of the outline is the smallest one which the system allows. Setting the linewidth to 0.3\,bp, which is
@@ -58,7 +64,7 @@
makes it more bold.
-\section{Optional argument}
+\section{Optional package argument}
The only package option is \verb|bold| which is preset by 0.3, which is the linewidth of
the outlines of the characters.
@@ -68,65 +74,156 @@
makes the characters more bold.
+\section{The macros}
+
+\begin{lstlisting}
+\setBold[<optional value>]
+\unsetBold
+\end{lstlisting}
+
+Without using the optional argument the default setting is used.
+
+
+
+
\section{The example code}
+The following examples use the value for $\pi$, defined in \LaTeX3 as \verb|\c_pi_fp|. To get rid of
+the L3-syntax we define a new variable:
+
+\begin{lstlisting}
+\ExplSyntaxOn
+\let\PI\c_pi_fp
+\ExplSyntaxOff
+\end{lstlisting}
+
+\subsection{Default setting}
\begin{lstlisting}
\documentclass{article}
\usepackage{xfakebold}
\begin{document}
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\setBold\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\unsetBold\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\end{document}
\end{lstlisting}
-\section{The output}
+\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\setBold\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\unsetBold\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+
+
+\section{Loading the package with another value}
+
+\begin{lstlisting}
+\documentclass{article}
+\usepackage[bold=1]{xfakebold}
+\begin{document}
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\setBold\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
\unsetBold\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\end{document}
+\end{lstlisting}
+\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
-\vspace{2cm}\noindent
-The same for \verb|\usepackage[bold=1]{xfakebold}|:
+\ifxetex\special{pdf:literal direct 2 Tr 1 w }%
+\else\pdfextension literal direct { 2 Tr 1 w }\relax\fi
+\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
-\gdef\setBold{\pdfextension literal direct { 2 Tr 1 w }\relax}
-\gdef\unsetBold{\pdfextension literal direct { 0 Tr 0 w }\relax}
+\ifxetex\special{pdf:literal direct 0 Tr 0 w }%
+\else\pdfextension literal direct { 0 Tr 0 w }\relax\fi
\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
-\setBold\noindent
+\section{Using the optional argument of the macro}
+
+\begin{lstlisting}
+\documentclass{article}
+\usepackage{xfakebold}
+\begin{document}
+\setBold[0.01]\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
-\unsetBold\noindent
+\setBold[0.2]\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+
+\setBold[0.6]\noindent
An example:
-$\pi^{\pi}=\directlua{tex.print(math.pi^math.pi)}$ and
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\unsetBold
+\setBold\noindent% Using the deafult value
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\unsetBold
+\end{document}
+\end{lstlisting}
+\setBold[0.01]\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+
+\setBold[0.2]\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+
+\setBold[0.6]\noindent
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\unsetBold
+
+\setBold\noindent% Using the deafult value
+An example:
+$\pi^{\pi}=\fpeval{\PI^\PI}$ and
+$\displaystyle\int\limits_1^{\infty}\frac1{x^2}\symup dx=1$
+\unsetBold
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xfakebold.doc.tlpobj new/tlpkg/tlpobj/xfakebold.doc.tlpobj
--- old/tlpkg/tlpobj/xfakebold.doc.tlpobj 2019-02-28 04:18:28.000000000 +0100
+++ new/tlpkg/tlpobj/xfakebold.doc.tlpobj 2020-04-19 18:10:21.000000000 +0200
@@ -1,9 +1,9 @@
name xfakebold.doc
category Package
-revision 48460
+revision 54779
shortdesc doc files of xfakebold
relocated 1
-docfiles size=24
+docfiles size=28
RELOC/doc/latex/xfakebold/Changes
RELOC/doc/latex/xfakebold/README
RELOC/doc/latex/xfakebold/xfakebold-doc.pdf
++++++ xfakebold.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xfakebold/xfakebold.sty new/tex/latex/xfakebold/xfakebold.sty
--- old/tex/latex/xfakebold/xfakebold.sty 2018-08-22 23:31:55.000000000 +0200
+++ new/tex/latex/xfakebold/xfakebold.sty 2019-12-30 23:18:02.000000000 +0100
@@ -1,8 +1,8 @@
-% $Id: xfakebold.sty 793 2018-08-06 16:39:25Z herbert $
+% $Id: xfakebold.sty 1125 2019-12-29 21:34:19Z herbert $
%%
%% This is file `xfakebold.sty',
%%
-%% Copyright (C) 2018 Herbert Voss
+%% Copyright (C) 1919, 2020 Herbert Voss
%%
%% It may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3c
@@ -13,40 +13,82 @@
%% version 2005/12/01 or later.
%%
%%
-\ProvidesPackage{xfakebold}[2018/08/21 v0.04 using bold characters]
-\RequirePackage{ifluatex,ifxetex,xkeyval}
-
-\def\setBold{}
-\def\unsetBold{}
-\def\fake(a)bold{0.3}%
-
-\DeclareOptionX{bold}{%
- \def\fake@bold{#1}%
- \ifdim\fake@bold pt > \p@
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{xfakebold}[1919/12/29 v0.06 using bold characters]
+\RequirePackage{xkeyval}
+
+\@ifpackagelater{iftex}{2019/10/24}{%
+ \RequirePackage{ifxetex,ifluatex,ifpdf}
+}{%
+ \RequirePackage{iftex}
+}
+
+\def\fkbld(a)bold{0.3 }%
+
+\def\fkbld@checkboldness#1{%
+ \ifdim#1pt > \z@
+ \def\fkbld@bold{#1 }%
\else
- \PackageWarning{fakebold}{The value must be greater than 0. Will chooose 0.3}%
- \def\fake(a)bold{0.3}%
- \fi}
-
-\ProcessOptionsX
-
-\ifxetex
- \typeout{We have XeTeX}%
- \PackageWarning{fakebold}%
- {^^J No LuaTeX or PDFTeX running!
- ^^J For Xe(La)TeX use the FakeBold option from package fontspec!
- \def\fake@bold{-1}}%
-\fi
-
-\ifluatex
- \def\setBold{\pdfextension literal direct { 2 Tr \fake@bold\space w }\relax}
- \def\unsetBold{\pdfextension literal direct { 0 Tr 0 w }\relax}
- \typeout{We have LuaTeX}%
-\else
- \ifdim\fake@bold pt < \p@ \else
- \def\setBold{\pdfliteral direct { 2 Tr \fake@bold\space w }\relax}
- \def\unsetBold{\pdfliteral direct { 0 Tr 0 w }\relax}
- \typeout{We have pdfTeX}%
+ \PackageWarning{fakebold}{The value must be greater than 0. Will choose 0.3 instead!}%
+ \def\fkbld(a)bold{0.3 }%
+ \fi
+}
+
+\DeclareOptionX{bold}{\fkbld@checkboldness{#1}}
+
+\ProcessOptionsX*
+
+\newcommand\setBold[1][]{%
+ \begingroup
+ \if$#1$\else
+ \fkbld@checkboldness{#1}%
+ \fi
+ \ifxetex
+ \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
+ \else
+ \ifluatex
+ \pdfextension literal direct { 2 Tr \fkbld@bold w }\relax
+ \else
+ \ifpdftex
+ \ifnum\pdfoutput=\@ne
+ \pdfliteral direct { 2 Tr #1 w }\relax
+ \else
+ \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
+ \fi
+ \else
+ \ifpdf
+ \PackageWarning{fakebold}{!Unsupported engine! fakebold is disabled.}
+ \else
+ \special{pdf:literal direct 2 Tr \fkbld@bold w }\relax
+ \fi
+ \fi
+ \fi
+ \fi
+ \endgroup
+ \ignorespaces
+}
+\newcommand\unsetBold{%
+ \ifxetex
+ \special{pdf:literal direct 0 Tr 0 w }\relax
+ \else
+ \ifluatex
+ \pdfextension literal direct { 0 Tr 0 w }\relax
+ \else
+ \ifpdftex
+ \ifnum\pdfoutput=\@ne
+ \pdfliteral direct { 0 Tr 0 w }\relax
+ \else
+ \special{pdf:literal direct 0 Tr 0 w }\relax
+ \fi
+ \else
+ \ifpdf
+ \else
+ \special{pdf:literal direct 0 Tr 0 w }\relax
+ \fi
+ \fi
+ \fi
\fi
-\fi
+ \ignorespaces
+}
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xfakebold.tlpobj new/tlpkg/tlpobj/xfakebold.tlpobj
--- old/tlpkg/tlpobj/xfakebold.tlpobj 2019-02-28 04:18:28.000000000 +0100
+++ new/tlpkg/tlpobj/xfakebold.tlpobj 2020-04-19 18:10:21.000000000 +0200
@@ -1,6 +1,6 @@
name xfakebold
category Package
-revision 48460
+revision 54779
shortdesc Fake a regular font for bold characters
relocated 1
longdesc This package uses PDF's text rendering to modify the linewidth
@@ -9,10 +9,10 @@
longdesc package works both in text and in math mode, for pdfLaTeX as
longdesc well as for LuaLaTeX. The package depends on ifluatex, ifxetex,
longdesc and xkeyval.
+depend iftex
runfiles size=1
RELOC/tex/latex/xfakebold/xfakebold.sty
catalogue-ctan /macros/latex/contrib/xfakebold
-catalogue-date 2018-08-22 15:59:18 +0200
catalogue-license lppl1.3c
catalogue-topics font-supp-misc font-util pdf-feat
-catalogue-version 0.04
+catalogue-version 0.06
++++++ xindex.doc.tar.xz ++++++
++++ 1795 lines of diff (skipped)
++++++ xindex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/xindex/xindex.lua new/texmf-dist/scripts/xindex/xindex.lua
--- old/texmf-dist/scripts/xindex/xindex.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/scripts/xindex/xindex.lua 2019-11-22 23:19:47.000000000 +0100
@@ -8,7 +8,7 @@
-----------------------------------------------------------------------
xindex = xindex or { }
- local version = 0.10
+ local version = 0.19
xindex.version = version
--xindex.self = "xindex"
@@ -29,6 +29,8 @@
kpse.set_program_name("luatex")
+local f = kpse.find_file("lualibs.lua")
+print ("filename "..f)
require("lualibs") -- all part of LuaTeX
require('unicode')
require('string')
@@ -156,13 +158,20 @@
cfg = require(Config_File)
writeLog(2," ... done\n",0)
+-- Create the character list maps for faster sorting
+
+alphabet_lower_map = CreateCharListMap(alphabet_lower)
+alphabet_upper_map = CreateCharListMap(alphabet_upper)
+
local esc_char = args.escapechar
writeLog(2,"Escapechar = "..esc_char.."\n",1)
escape_chars = { -- by default " is the escape char
- {esc_char..'"', '//escapedquote//', '\\"{}' },
- {esc_char..'@', '//escapedat//', '@' },
- {esc_char..'|', '//escapedvert//', "|" },
- {esc_char..'!', '//scapedexcl//', '!' }
+ {esc_char..'"', '//escapedquote//', '\\"{}' },
+ {esc_char..'@', '//escapedat//', '@' },
+ {esc_char..'|', '//escapedvert//', '|' },
+ {esc_char..'!', '//scapedexcl//', '!' },
+ {esc_char..'(', '//escapedparenleft//', '(' },
+ {esc_char..')', '//escapedparenright//',')' }
}
language = string.lower(args["language"])
@@ -197,4 +206,3 @@
logFile:close()
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua new/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua 2019-11-22 23:19:47.000000000 +0100
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.10,
+ version = 0.20,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -15,10 +15,12 @@
}
escape_chars = { -- by default " is the escape char
- {'""', "\\escapedquote", "\"{}" },
- {'"@', "\\escapedat", "@" },
- {'"|', "\\escapedvert", "|" },
- {'"!', "\\escapedexcl", "!" }
+ {'""', "\\escapedquote", '\"{}' },
+ {'"@', "\\escapedat", "@" },
+ {'"|', "\\escapedvert", "|" },
+ {'"!', "\\escapedexcl", "!" },
+ {'"(', "\\escapedparenleft", "(" },
+ {'")', "\\escapedparenright", ")" }
}
itemPageDelimiter = "," -- Hello, 14
@@ -29,12 +31,15 @@
sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item
pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17"
indexOpening = "" -- commands after \begin{theindex}
+rangeSymbol = "--"
+idxnewletter = "\\textbf" -- Only valid if -n is not set
--[[
Each character's position in this array-like table determines its 'priority'.
Several characters in the same slot have the same 'priority'.
]]
+
alphabet_lower = { -- for sorting
{ ' ' }, -- only for internal tests
{ 'a', 'á', 'à', 'å', 'æ', },
@@ -42,24 +47,24 @@
{ 'b' },
{ 'c', 'ç' },
{ 'd' },
- { 'e', 'é', 'è', 'ë' },
+ { 'e', 'é', 'è', 'ë', 'ê' },
{ 'f' },
{ 'g' },
{ 'h' },
- { 'i', 'í', 'ì', 'ï' },
+ { 'i', 'í', 'ì', 'î', 'ï' },
{ 'j' },
{ 'k' },
{ 'l' },
{ 'm' },
{ 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ø', 'œ'},
+ { 'o', 'ó', 'ò', 'ô', 'ø', 'œ', 'ø'},
{ 'oe', 'ö' },
{ 'p' },
{ 'q' },
{ 'r' },
{ 's', 'š', 'ß' },
{ 't' },
- { 'u', 'ú', 'ù' },
+ { 'u', 'ú', 'ù', 'û'},
{ 'ue', 'ü' },
{ 'v' },
{ 'w' },
@@ -69,29 +74,29 @@
}
alphabet_upper = { -- for sorting
{ ' ' },
- { 'A', 'Á', 'À', 'Å', 'Æ'},
+ { 'A', 'Á', 'À', 'Å', 'Æ', 'Â'},
{ 'AE', 'Ä'},
{ 'B' },
{ 'C', 'Ç' },
{ 'D' },
- { 'E', 'È', 'È', 'Ë' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
{ 'F' },
{ 'G' },
{ 'H' },
- { 'I', 'Í', 'Ì', 'Ï' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
{ 'J' },
{ 'K' },
{ 'L' },
{ 'M' },
{ 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ø','Œ' },
+ { 'O', 'Ó', 'Ò', 'Ø','Œ', 'Ø', 'Ô' },
{ 'OE', 'Ö' },
{ 'P' },
{ 'Q' },
{ 'R' },
{ 'S', 'Š' },
{ 'T' },
- { 'U', 'Ú', 'Ù' },
+ { 'U', 'Ú', 'Ù', 'Û' },
{ 'UE', 'Ü' },
{ 'V' },
{ 'W' },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua new/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-HAdW-eKO.lua 2019-11-22 23:19:47.000000000 +0100
@@ -9,7 +9,7 @@
-- configuration for index files of the Heidelberger Akademie der Wissenschaften
if not modules then modules = { } end modules ['xindex-HAdW-eKO'] = {
- version = 0.10,
+ version = 0.20,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -26,9 +26,18 @@
sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item
pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17"
indexOpening = "" -- commands after \begin{theindex}
+rangeSymbol = "--"
+idxnewletter = "\\textbf" -- Only valid if -n is not set
case_sensitive = false -- speeds up running
+folium = {
+ de = {"f.", "ff."},
+ en = {"f.", "ff."},
+ fr = {"\\,sq","\\,sqq"},
+}
+
+
--[[
Each character's position in this array-like table determines its 'priority'.
Several characters in the same slot have the same 'priority'.
@@ -92,6 +101,8 @@
{ 'Z' }
}
+--alphabet_lower_map = CreateCharListMap(alphabet_lower)-- jetzt in xindex.lua
+--alphabet_upper_map = CreateCharListMap(alphabet_upper)
--\indexentry{Ackers, Carolus}{VII/1-715}
--\indexentry{Bremen!Adalbert I. von, Erzbischof}{VII/2/1-948}
@@ -213,7 +224,7 @@
function replaceRomanB(r)
local i = romanToNumber(r)
if i then return "!//"..string.format("%05d",i).."//."
- else return r
+ else return ("!"..r..".") -- to catch something Neuneburg!a.d. Weichsel
end
end
@@ -313,4 +324,3 @@
end
end
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-base.lua new/texmf-dist/tex/lualatex/xindex/xindex-base.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-base.lua 2019-11-22 23:19:47.000000000 +0100
@@ -6,7 +6,7 @@
-- LICENSE: LPPL1.3
-----------------------------------------------------------------------
-local info = { version = 0.10}
+local info = { version = 0.20 }
-- check config
if pageNoPrefixDel ~= "" then
@@ -58,10 +58,25 @@
writeLog(1,"\n------------------ end list after getEntryAndPage() ------------------------\n",2)
writeLog(2,"Sorting entries: for LARGE idx files it can take some minutes ... \n",0)
-if SORTprehook then Index = SORTprehook(Index) end
+if SORTprehook then
+ writeLog(2, "PreHook begin\n", 0)
+ Index = SORTprehook(Index)
+ writeLog(2, "PreHook end\n", 0)
+end
+
+writeLog(2, "GenerateSortKeys begin\n", 0)
+GenerateSortKeys(Index)
+writeLog(2, "GenerateSortKeys end\n", 0)
+
k = 0
+writeLog(2, "Sort begin\n", 0)
table.sort(Index,UTFCompare)
-if SORTposthook then Index = SORTposthook(Index) end
+writeLog(2, "Sort end\n", 0)
+if SORTposthook then
+ writeLog(2, "PostHook begin\n", 0)
+ Index = SORTposthook(Index)
+ writeLog(2, "PostHook end\n", 0)
+end
writeLog(1,"\n------------------ Start list after table.sort(Index,UTFCompare)------------\n",2)
printList(Index,2)
@@ -85,7 +100,6 @@
writeLog(2,"done\n",0)
-
writeLog(2,"Replace @-operator ...\n",0)
writeLog(1,"------------------ Start list before compressEntryList(Index)------------\n",1)
writeLog(1,require 'xindex-pretty'.dump(Index),3) -- only for internal dump
@@ -106,6 +120,9 @@
end
]] -- no more needed, we redo the setting
+if SORTendhook then
+ NewIndex = SORTendhook(NewIndex)
+end
outFile:write("\n")
outFile:write("\\begin{theindex}\n")
@@ -128,7 +145,7 @@
local oldChar = ""
local excl = 0 -- number of ! symbols in one entry
local lastItems = {"","",""}
-
+indLines = 0
writeLog(2,"Start writing .ind file ... \n",0)
-- first the special cases for symbols and numbers:
@@ -155,10 +172,12 @@
if charType == 0 then
numbers = false
symbols = true
+ letters = false
end
if charType == 1 then
numbers = true
symbols = false
+ letters = false
end
if charType > 1 then
numbers = false
@@ -170,7 +189,7 @@
if firstSLine then
firstSLine = false
if not no_headings then
- outFile:write("\\textbf{"..index_header[1].."}")
+ outFile:write("\\par"..idxnewletter.."{"..index_header[1].."}")
if (labelPrefix == "") then
outFile:write("\\label{xindex-"..index_header[1].."}\n\\nopagebreak[4]\n")
else
@@ -192,7 +211,7 @@
firstNLine = false
outFile:write("\n\\indexspace\n")
if not no_headings then
- outFile:write("\\textbf{"..index_header[2].."}")
+ outFile:write(idxnewletter.."{"..index_header[2].."}")
if (labelPrefix == "") then
outFile:write("\\label{xindex-"..index_header[2].."}\n\\nopagebreak[4]\n")
else
@@ -213,7 +232,7 @@
if (currentChar ~= oldChar) and (charType == 2) then
outFile:write("\n\\indexspace\n")
if not no_headings then
- outFile:write("\\textbf{"..currentChar.."}")
+ outFile:write(idxnewletter.."{"..currentChar.."}")
if (labelPrefix == '""') then
outFile:write("\\label{xindex-"..currentChar.."}\n\\nopagebreak[4]\n")
else
@@ -232,6 +251,7 @@
end
end
outFile:write("\\end{theindex}\n")
+writeLog(2,indLines.." lines of data wrote into the .ind file\n",0)
outFile:close()
writeLog(2,"\ndone! closing program\n",0)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua new/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-cfg-common.lua 2019-11-22 23:19:47.000000000 +0100
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg-common'] = {
- version = 0.10,
+ version = 0.20,
comment = "configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -27,3 +27,102 @@
fr = {"\\,sq","\\,sqq"},
}
+alphabet_uppercase = {
+ { 'α', 'Α' },
+ { 'β', 'Β' },
+ { 'ϐ', 'ϐ' },
+ { 'γ', 'Γ' },
+ { 'δ', 'Δ' },
+ { 'ε', 'Ε' },
+ { 'ζ', 'Ζ' },
+ { 'η', 'Η' },
+ { 'θ', 'Θ' },
+ { 'ι', 'Ι' },
+ { 'κ', 'Κ' },
+ { 'λ', 'Λ' },
+ { 'μ', 'Μ' },
+ { 'ν', 'Ν' },
+ { 'ξ', 'Ξ' },
+ { 'ο', 'Ο' },
+ { 'π', 'Π' },
+ { 'ρ', 'Ρ' },
+ { 'σ', 'Σ' },
+ { 'ς', 'ς' },
+ { 'τ', 'Τ' },
+ { 'υ', 'Υ' },
+ { 'φ', 'Φ' },
+ { 'χ', 'Χ' },
+ { 'ψ', 'Ψ' },
+ { 'ω', 'Ω' },
+--
+ { 'a', 'A' },
+ { 'b', 'B' },
+ { 'c', 'C' },
+ { 'd', 'D' },
+ { 'e', 'E' },
+ { 'f', 'F' },
+ { 'g', 'G' },
+ { 'h', 'H' },
+ { 'i', 'I' },
+ { 'j', 'J' },
+ { 'k', 'K' },
+ { 'l', 'L' },
+ { 'm', 'M' },
+ { 'n', 'N' },
+ { 'o', 'O' },
+ { 'p', 'P' },
+ { 'q', 'Q' },
+ { 'r', 'R' },
+ { 's', 'S' },
+ { 't', 'T' },
+ { 'u', 'U' },
+ { 'v', 'V' },
+ { 'w', 'W' },
+ { 'x', 'X' },
+ { 'y', 'Y' },
+ { 'z', 'Z' },
+--
+ { 'а', 'А' },
+ { 'б', 'Б' },
+ { 'в', 'В' },
+ { 'г', 'Г' },
+ { 'д', 'Д' },
+ { 'е', 'Е' },
+ { 'ж', 'Ж' },
+ { 'з', 'З' },
+ { 'и', 'И' },
+ { 'й', 'Й' },
+ { 'к', 'К' },
+ { 'л', 'Л' },
+ { 'м', 'М' },
+ { 'н', 'Н' },
+ { 'о', 'О' },
+ { 'п', 'П' },
+ { 'р', 'Р' },
+ { 'с', 'С' },
+ { 'т', 'Т' },
+ { 'у', 'У' },
+ { 'ф', 'Ф' },
+ { 'х', 'Х' },
+ { 'ц', 'Ц' },
+ { 'ч', 'Ч' },
+ { 'ш', 'Ш' },
+ { 'щ', 'Щ' },
+ { 'ъ', 'Ъ' },
+ { 'ы', 'Ы' },
+ { 'ь', 'Ь' },
+ { 'э', 'Э' },
+ { 'ю', 'Ю' },
+ { 'я', 'Я' }
+}
+
+local function create_map(char_list)
+ local map = {}
+ for i, pair in ipairs(char_list) do
+ map[pair[1]] = pair[2]
+ end
+ return map
+end
+
+alphabet_uppercase_map = create_map(alphabet_uppercase)
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua new/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-cfg.lua 2019-11-22 23:19:47.000000000 +0100
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.10,
+ version = 0.20,
comment = "main configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -18,11 +18,12 @@
compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
fCompress = true -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
minCompress = 3 -- 14--17 or
+rangeSymbol = "--"
numericPage = true -- for non numerical pagenumbers, like "VI-17"
sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item
pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!!
indexOpening = "" -- commands after \begin{theindex}
-
+idxnewletter = "\\textbf" -- Only valid if -n is not set
--[[
Each character's position in this array-like table determines its 'priority'.
@@ -30,21 +31,21 @@
]]
alphabet_lower = { -- for sorting
{ ' ' }, -- only for internal tests
- { 'a', 'á', 'à', 'ä', 'å', 'æ', },
+ { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', },
{ 'b' },
{ 'c', 'ç' },
{ 'd' },
- { 'e', 'é', 'è', 'ë' },
+ { 'e', 'é', 'è', 'ë', 'ê' },
{ 'f' },
{ 'g' },
{ 'h' },
- { 'i', 'í', 'ì', 'ï' },
+ { 'i', 'í', 'ì', 'î', 'ï' },
{ 'j' },
{ 'k' },
{ 'l' },
{ 'm' },
{ 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ö', 'ø', 'œ'},
+ { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'},
{ 'p' },
{ 'q' },
{ 'r' },
@@ -59,31 +60,30 @@
}
alphabet_upper = { -- for sorting
{ ' ' },
- { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'},
+ { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' },
{ 'B' },
{ 'C', 'Ç' },
{ 'D' },
- { 'E', 'È', 'È', 'Ë' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
{ 'F' },
{ 'G' },
{ 'H' },
- { 'I', 'Í', 'Ì', 'Ï' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
{ 'J' },
{ 'K' },
{ 'L' },
{ 'M' },
{ 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ' },
+ { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'},
{ 'P' },
{ 'Q' },
{ 'R' },
{ 'S', 'Š' },
{ 'T' },
- { 'U', 'Ú', 'Ù', 'Ü' },
+ { 'U', 'Ú', 'Ù', 'Ü', 'Û' },
{ 'V' },
{ 'W' },
{ 'X' },
{ 'Y', 'Ý', 'Ÿ' },
{ 'Z', 'Ž' }
}
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua new/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-dtk.lua 2019-11-22 23:19:47.000000000 +0100
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-cfg'] = {
- version = 0.10,
+ version = 0.20,
comment = "DTK configuration to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -21,6 +21,7 @@
numericPage = true -- for non numerical pagenumbers, like "VI-17"
sublabels = {"","","",""} -- for the sub(sub(sub-items
pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!!
+rangeSymbol = "--"
indexOpening = "" --[[\providecommand*\lettergroupDefault[1]{}
\providecommand*\lettergroup[1]{%
\par\textbf{#1}\par
@@ -35,64 +36,63 @@
]]
alphabet_lower = { -- for sorting
{ ' ' }, -- only for internal tests
- { 'a', 'á', 'à', 'ä'},
+ { 'a', 'á', 'à', 'ä', 'â', 'å', 'æ', },
{ 'b' },
- { 'c' },
+ { 'c', 'ç' },
{ 'd' },
- { 'e', 'é', 'è', 'ë' },
+ { 'e', 'é', 'è', 'ë', 'ê' },
{ 'f' },
{ 'g' },
{ 'h' },
- { 'i', 'í', 'ì', 'ï' },
+ { 'i', 'í', 'ì', 'î', 'ï' },
{ 'j' },
{ 'k' },
{ 'l' },
{ 'm' },
{ 'n', 'ñ' },
- { 'o', 'ó', 'ò', 'ö' },
+ { 'o', 'ó', 'ò', 'ö', 'ô', 'ø', 'œ', 'ø'},
{ 'p' },
{ 'q' },
{ 'r' },
- { 's' },
+ { 's', 'š', 'ß' },
{ 't' },
- { 'u', 'ú', 'ù', 'ü' },
+ { 'u', 'ú', 'ù', 'ü' , 'û'},
{ 'v' },
{ 'w' },
{ 'x' },
- { 'y' },
- { 'z' }
+ { 'y', 'ý', 'ÿ' },
+ { 'z', 'ž' }
}
alphabet_upper = { -- for sorting
{ ' ' },
- { 'A', 'Á', 'À', 'Ä'},
+ { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ', 'Â' },
{ 'B' },
- { 'C' },
+ { 'C', 'Ç' },
{ 'D' },
- { 'E', 'È', 'È', 'ë' },
+ { 'E', 'È', 'É', 'Ë', 'Ê' },
{ 'F' },
{ 'G' },
{ 'H' },
- { 'I', 'Í', 'Ì', 'ï' },
+ { 'I', 'Í', 'Ì', 'Ï', 'Î' },
{ 'J' },
{ 'K' },
{ 'L' },
{ 'M' },
{ 'N', 'Ñ' },
- { 'O', 'Ó', 'Ò', 'Ö' },
+ { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ', 'Ø', 'Ô'},
{ 'P' },
{ 'Q' },
{ 'R' },
- { 'S' },
+ { 'S', 'Š' },
{ 'T' },
- { 'U', 'Ú', 'Ù', 'Ü' },
+ { 'U', 'Ú', 'Ù', 'Ü', 'Û' },
{ 'V' },
{ 'W' },
{ 'X' },
- { 'Y' },
- { 'Z' }
+ { 'Y', 'Ý', 'Ÿ' },
+ { 'Z', 'Ž' }
}
-
function specialGetPageList(v,hyperpage)
local Pages = {}
if v["pages"] then
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua new/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-lapp.lua 2019-11-22 23:19:47.000000000 +0100
@@ -28,7 +28,7 @@
--~ n 2
--------------------------------
if not modules then modules = { } end modules ['xindex-lapp'] = {
- version = 0.10,
+ version = 0.20,
comment = "read parameter for xindex.lua",
author = "Steve Donovan",
copyright = "Steve Donovan",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-lib.lua new/texmf-dist/tex/lualatex/xindex/xindex-lib.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-lib.lua 2019-11-22 23:19:47.000000000 +0100
@@ -7,7 +7,7 @@
-----------------------------------------------------------------------
if not modules then modules = { } end modules ['xindex-lib'] = {
- version = 0.10,
+ version = 0.20,
comment = "main library to xindex.lua",
author = "Herbert Voss",
copyright = "Herbert Voss",
@@ -19,16 +19,24 @@
local Letters = "ÄÖÜäöüabcdefghijklmnopqrstuvwxyzßABCDEFGHIJKLMNOPQRSTUVWXYZ"
local Digits = "0123456789"
--- Looks up the character `character´ in the alphabet and returns its 'normalization' for sorting
-local function get_normalized_char( CharList, character )
+function CreateCharListMap(CharList)
+ local map = {}
for i, alphabet_entry in ipairs(CharList) do
- for _, alphabet_char in ipairs(alphabet_entry) do
- if character == alphabet_char then
- return alphabet_entry[1]
+ local first_char
+ for j, alphabet_char in ipairs(alphabet_entry) do
+ if j == 1 then
+ first_char = alphabet_char
+ else
+ map[alphabet_char] = first_char
end
end
end
- return character
+ return map
+end
+
+-- Looks up the character `character´ in the alphabet and returns its 'normalization' for sorting
+local function get_normalized_char( CharListMap, character )
+ return CharListMap[character] or character
end
function Lower(strOrig) -- return UTF string.lower
@@ -47,51 +55,67 @@
function NormalizedLower(strOrig) -- return normalized UTF string.lower (ä -> a)
local str = ""
for i=1, utf.len(strOrig) do
- local c = get_normalized_char(alphabet_lower,utf.sub(strOrig,i,i))
+ local c = get_normalized_char(alphabet_lower_map,utf.sub(strOrig,i,i))
str = str..string.lower(c)
end
return str
end
function NormalizedUpper(strOrig) -- return normalized UTF string.upper (ä -> A)
- local str = ""
+ local str = {}
+ local c
for i=1, utf.len(strOrig) do
- local c = get_normalized_char(alphabet_lower,utf.sub(strOrig,i,i))
- str = str..string.upper(c)
+ c = get_normalized_char(alphabet_lower_map,utf.sub(strOrig,i,i))
+ str[#str + 1] = c
end
- strOrig = str
- str = ""
+ strOrig = table.concat(str)
+ str = {}
for i=1, utf.len(strOrig) do
- local c = get_normalized_char(alphabet_upper,utf.sub(strOrig,i,i))
- str = str..string.upper(c)
+ c = get_normalized_char(alphabet_upper_map,utf.sub(strOrig,i,i))
+ c = NormalizedUppercase(c)
+ str[#str + 1] = c
end
- return str
+ return table.concat(str)
+end
+
+function NormalizedUppercase(chr) -- return normalized UTF uppercase letter
+ return alphabet_uppercase_map[chr] or chr
end
function NormalizedChars(strOrig) -- return normalized UTF string (ä -> a) with first as upper case
- local c = string.upper(get_normalized_char(alphabet_lower,utf.sub(strOrig,1,1)))
- local str = c
- for i=2, utf.len(strOrig) do
- c = get_normalized_char(alphabet_lower,utf.sub(strOrig,i,i))
- str = str..c
- end
- local strOrigTrue = strOrig
- strOrig = str
- c = string.upper(get_normalized_char(alphabet_upper,utf.sub(strOrig,1,1)))
- str = c
- for i=2, utf.len(strOrig) do
- c = get_normalized_char(alphabet_upper,utf.sub(strOrig,i,i))
- str = str..c
- end
+ local c = get_normalized_char(alphabet_lower_map,utf.sub(strOrig,1,1))
+ c = get_normalized_char(alphabet_upper_map, c)
+ c = string.upper(c)
+ local str = { c }
+ for ch in string.utfcharacters(utf.sub(strOrig, 2)) do
+ c = get_normalized_char(alphabet_lower_map, ch)
+ c = get_normalized_char(alphabet_upper_map, c)
+ str[#str + 1] = c
+ end
+ return table.concat(str)
+end
+
+-- local strOrigTrue = strOrig
+-- strOrig = table.concat(str)
+-- c = string.upper(get_normalized_char(alphabet_upper,utf.sub(strOrig,1,1)))
+-- str = { c }
+-- for i=2, utf.len(strOrig) do
+-- c = get_normalized_char(alphabet_upper,utf.sub(strOrig,i,i))
+-- str[#str + 1] = c
+-- end
+-- for ch in string.utfcharacters(strOrig, 2) do
+-- str[#str + 1] = get_normalized_char(alphabet_upper, ch)
+-- end
-- print(strOrigTrue.." -> "..str)
- return str
-end
+-- return table.concat(str)
+--end
function checkVert(str) -- get the | part
local vert = string.find(str,"|",1,true)
if (vert) then
vertStr = string.sub(str,vert+1)
str = string.sub(str,1,vert-1)
+print(vertStr)
return (vertStr)
else
return ("")
@@ -181,7 +205,7 @@
if a[i]-a[i-1] > 1 then -- not next page
lastPage = a[i-1] -- new start for a sequence search
if lastPage - firstPage >= minCompress then -- sequence found
- b[#b+1]= tostring(firstPage).."--"..tostring(lastPage)
+ b[#b+1]= tostring(firstPage)..rangeSymbol..tostring(lastPage)
else
b[#b+1]= firstPage
if (firstPage ~= lastPage) then b[#b+1]= lastPage end
@@ -190,7 +214,7 @@
end
end
if a[#a] - firstPage > 2 then -- test file end
- b[#b+1]= tostring(firstPage).."--"..tostring(a[#a])
+ b[#b+1]= tostring(firstPage)..rangeSymbol..tostring(a[#a])
else
b[#b+1]= firstPage
if (firstPage ~= a[#a]) then b[#b+1]= a[#a] end
@@ -225,7 +249,7 @@
elseif paraClose then
lastPage = v["pages"][1]["number"]
newEntries[#newEntries+1] = { Entry = v["Entry"],
- pages = {{ number = firstPage.."--"..lastPage,
+ pages = {{ number = firstPage..rangeSymbol..lastPage,
special = deleteOpenClose(v["pages"][1]["special"])}},
sortChar= v["sortChar"],
Macro = v["Macro"]
@@ -240,15 +264,21 @@
end
function replaceVerticalChar(v)
--- res, _ = string.gsub(v:gsub('|[()]$', ''), '|[()]?', ' \\')
--- return res
if not v:match('|') then
return v,""
else
- return v:gsub('|.*',''), v:match('|.*'):gsub('|','\\'):gsub("%s+", "") -- part before, part after | without spaces
+ return v:gsub('|.*',''), v:match('|.*'):gsub('|','\\')--:gsub("%s+", "") -- part before, part after | without spaces
end
end
+--local ignore = "'`'"
+
+function ignoreLetters( c )
+ return (c:gsub("["..ignore.."]+", ""):match("^%s*(.-)%s*$"))
+end
+-- somestring:match("^%s*(.-)%s*$") --trim function
+
+
function getEntryAndPage(w, nextW, EntryList)
-- \indexentry{Aachen, Johann von}{VII/1-215}
-- \indexentry {Document@\idxtextClasses !IEEEtran@{\sfffffamily IEEEtran}}{185}
@@ -358,10 +388,14 @@
end -- only one pageno
if #pages == 2 then -- only two pages
if tonumber(pages[1]["number"]) and tonumber(pages[2]["number"]) then
- if ((tonumber(pages[2]["number"]) - tonumber(pages[1]["number"])) == 1) and
- (pages[1]["special"] == pages[2]["special"]) then
- pages[1]["number"] = pages[1]["number"].."f"
- pages[2] = nil
+ if ((tonumber(pages[2]["number"]) - tonumber(pages[1]["number"])) == 1) and (pages[1]["special"] == pages[2]["special"]) then
+ if fCompress then
+ pages[1]["number"] = pages[1]["number"]..page_folium[1]
+ pages[2] = nil
+ elseif minCompress == 1 then
+ pages[1]["number"] = pages[1]["number"]..rangeSymbol..pages[2]["number"]
+ pages[2] = nil
+ end
-- elseif (pages[1]["number"] == pages[2]["number"]) and
-- (pages[1]["special"] == pages[2]["special"]) then
-- pages[2] = nil
@@ -374,7 +408,7 @@
local startIndex
local newPages = {} -- { pages[1], pages[2], ... }
local series = {} -- { pages[1], pages[2], ... }
- if tonumber(pages[1]["number"]) then -- if a number we start with seconf page
+ if tonumber(pages[1]["number"]) then -- if a number we start with second page
newPages = {}
series = {pages[1]}
startIndex = 2
@@ -392,9 +426,9 @@
elseif (#series == 1) then -- no -f page -> only one page -> output
newPages[#newPages+1] = series[1]
series = {pages[i]}
- elseif (#series > minCompress) then -- we found series od f pages like 11, 12, 13, 14
+ elseif (#series > minCompress) then -- we found series or f pages like 11, 12, 13, 14
-- the sequenz gets the special from the first page
- newPages[#newPages+1] = { number = series[1]["number"].."--"..series[#series]["number"], special = series[1]["special"]} -- first..last
+ newPages[#newPages+1] = { number = series[1]["number"]..rangeSymbol..series[#series]["number"], special = series[1]["special"]} -- first..last
series = {pages[i]}
else -- series < minCompress
if fCompress then
@@ -433,7 +467,7 @@
series = {pages[i]}
else -- current page is non numeric
if (#series > minCompress) then -- we found a page series
- newPages[#newPages+1] = { number = series[1]["number"].."--"..series[#series]["number"], -- first..last
+ newPages[#newPages+1] = { number = series[1]["number"]..rangeSymbol..series[#series]["number"], -- first..last
special =series[1]["special"] }
series = {pages[i]}
else -- series < minCompress
@@ -485,7 +519,7 @@
end
function getCharType(c)
--- print ("getCharType c="..c..": codepoint="..utf8.codepoint(c))
+-- print ("getCharType c="..tostring(c).." "..type(c)..": codepoint="..utf8.codepoint(c))
local category = get_category(utf8.codepoint(c))
-- print ("getCharType: "..category)
if category == "Nd" then return 1
@@ -508,31 +542,42 @@
-- str = "\indexentry {foo}{bar}"
-- first, second = str:match('{([^}]*)}%s*{([^}]*)}') -> foo, bar
-function UTFCompare(a,b)
--- a, b are something like \indexentry{foo}{bar}
--- writeLog(1,"UTFCompare: "..a["Entry"]..", "..a["pages"][1]["number"].." - "..b["Entry"]..", "..b["pages"][1]["number"].."\n",2)
--- k = k + 1
--- if (k % 50) == 0 then writeLog(1,".",1) end
- local A,B,Apage,Bpage
+function GenerateSortKey(a)
+ local A, Apage
if numericPage then
if tonumber(a["pages"][1]["number"]) then
Apage = string.format("%09d",a["pages"][1]["number"])
else
Apage = string.format("%09d",romanToNumber(a["pages"][1]["number"]))
end
- if tonumber(b["pages"][1]["number"]) then
- Bpage = string.format("%09d",b["pages"][1]["number"])
- else
- Bpage = string.format("%09d",romanToNumber(b["pages"][1]["number"]))
- end
else
Apage = string.format("%09s",a["pages"][1]["number"])
- Bpage = string.format("%09s",b["pages"][1]["number"])
end
- A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty
- B = NormalizedChars(getSortString(b["Entry"].." "..Bpage..b["pages"][1]["special"]):gsub('!',''))
--- A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!','')) -- replace! by empty
--- B = NormalizedUpper(getSortString(b["Entry"].." "..Bpage..b["pages"][1]["special"]):gsub('!',''))
+ if no_caseSensitive then
+ A = NormalizedUpper(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty
+ a["SortKey"] = A
+ else
+ A = NormalizedChars(getSortString(a["Entry"].." "..Apage..a["pages"][1]["special"]):gsub('!',' ')) -- replace! by empty
+ a["SortKey"] = A
+ end
+ -- return A
+end
+
+function GenerateSortKeys(Index)
+ for _, entry in ipairs(Index) do
+ GenerateSortKey(entry)
+ end
+end
+
+function UTFCompare(a,b)
+-- a, b are something like \indexentry{foo}{bar}
+-- writeLog(1,"UTFCompare: "..a["Entry"]..", "..a["pages"][1]["number"].." - "..b["Entry"]..", "..b["pages"][1]["number"].."\n",2)
+-- k = k + 1
+-- if (k % 50) == 0 then writeLog(1,".",1) end
+
+ local A = a["SortKey"]
+ local B = b["SortKey"]
+
writeLog(1,"UTFCompare: A--B "..A.."--"..B.."\n",2)
-- print(A,B)
--[[
@@ -583,8 +628,8 @@
-- now we have some special page numbers
A = tostring(a0)
B = tostring(b0)
- A1 = A:find("--",1,true) or A:find("f",1,true) -- sequence or folio pages
- B1 = B:find("--",1,true) or B:find("f",1,true)
+ A1 = A:find(rangeSymbol,1,true) or A:find("f",1,true) -- sequence or folio pages
+ B1 = B:find(rangeSymbol,1,true) or B:find("f",1,true)
if A1 then a0 = tonumber(A:sub(1,A1-1)) end
if B1 then b0 = tonumber(B:sub(1,B1-1)) end
return tonumber(a0) < tonumber(b0) -- numeric
@@ -720,11 +765,12 @@
end
function getItem(str,n)
- if n >= 0 then
+
+ if (n >= 0) and str then
local item = (str:gsub("!.*", "%0!")
:gsub("[^!]*!", "", n)
:match("^([^!]*)!") )
- writeLog(1,"getItem ("..str..", "..n..") = "..item.."\n",2)
+-- writeLog(1,"getItem ("..str..", "..n..") = "..item.."\n",2)
return item
end
end
@@ -835,7 +881,7 @@
for i, str0 in ipairs(escape_chars) do -- undo the escape char setting
str = str:gsub(str0[2],str0[3])
end
- outFile:write(str)
+ outFile:write(str); indLines=indLines+1
lastItems = {}
lastItems[1] = Entry
else
@@ -859,7 +905,7 @@
for i, str0 in ipairs(escape_chars) do -- undo the escape char setting
str = string.gsub(str,str0[2],str0[3])
end
- outFile:write(str)
+ outFile:write(str); indLines=indLines+1
lastItems[i] = currentItems[i]
else
writeLog(1,"itemOutput: currentItems[i]: "..currentItems[i].."= lastItems[i]: "..lastItems[i].."\n",2)
@@ -887,7 +933,13 @@
return Ct(idx):match(expr)
end
+local SortStringCache = {}
function getSortString(Entry)
+ local sortString = SortStringCache[Entry]
+ if sortString ~= nil then
+ return sortString
+ end
+
local t = match(Entry)
-- require 'xindex-pretty'.dump(t) -- only for internal dump
local data = t[1]
@@ -900,6 +952,7 @@
data = data..t[i]
end
end
+ SortStringCache[Entry] = data
return data
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua new/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-04-07 23:21:59.000000000 +0200
+++ new/texmf-dist/tex/lualatex/xindex/xindex-pretty.lua 2019-11-22 23:19:47.000000000 +0100
@@ -5,7 +5,7 @@
--
if not modules then modules = { } end modules ['xindex-pretty'] = {
- version = 0.10,
+ version = 0.20,
comment = "dump a Lua table for debugging",
author = "Steve Donovan",
copyright = "Steve Donovan",
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua new/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
--- old/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/tex/lualatex/xindex/xindex-yannis.lua 2019-11-22 23:19:47.000000000 +0100
@@ -0,0 +1,260 @@
+-----------------------------------------------------------------------
+-- FILE: xindex-yannis.lua
+-- DESCRIPTION: configuration file for xindex.lua
+-- REQUIREMENTS:
+-- AUTHOR: Herbert Voß
+-- LICENSE: LPPL1.3
+-----------------------------------------------------------------------
+
+if not modules then modules = { } end modules ['xindex-yannis'] = {
+ version = 0.20,
+ comment = "main configuration to xindex.lua",
+ author = "Herbert Voss",
+ copyright = "Herbert Voss",
+ license = "LPPL 1.3"
+}
+
+itemPageDelimiter = "," -- Hello, 14
+compressPages = true -- something like 12--15, instaead of 12,13,14,15. the |( ... |) syntax is still valid
+fCompress = false -- 3f -> page 3, 4 and 3ff -> page 3, 4, 5
+minCompress = 2 -- 14--17 or
+rangeSymbol = "-" -- 14-17 instead of --
+numericPage = true -- for non numerical pagenumbers, like "VI-17"
+sublabels = {"", "-\\,", "--\\,", "---\\,"} -- for the (sub(sub(sub-items first one is for item
+pageNoPrefixDel = "" -- a delimiter for page numbers like "VI-17" -- not used !!!
+indexOpening = "" -- commands after \begin{theindex}
+idxnewletter = "\\textbf" -- Only valid if -n is not set
+
+
+--[[
+ Each character's position in this array-like table determines its 'priority'.
+ Several characters in the same slot have the same 'priority'.
+]]
+alphabet_lower = { -- for sorting
+ { 'α', 'ά', 'ὰ', 'ᾶ', 'ἀ', 'ἄ', 'ἂ', 'ἆ', 'ἁ', 'ἅ', 'ἃ', 'ἇ', 'ᾳ', 'ᾴ', 'ᾲ', 'ᾷ', 'ᾀ', 'ᾄ', 'ᾂ', 'ᾆ', 'ᾁ', 'ᾅ', 'ᾃ', 'ᾇ' },
+ { 'β', 'ϐ' },
+ { 'γ' },
+ { 'δ' },
+ { 'ε', 'έ', 'ὲ', 'ἐ', 'ἔ', 'ἒ', 'ἑ', 'ἕ', 'ἓ' },
+ { 'ζ' },
+ { 'η', 'ή', 'ὴ', 'ῆ', 'ἠ', 'ἤ', 'ἢ', 'ἦ', 'ἡ', 'ἥ', 'ἣ', 'ἧ', 'ῃ', 'ῄ', 'ῂ', 'ῇ', 'ᾐ', 'ᾔ', 'ᾒ', 'ᾖ', 'ᾑ', 'ᾕ', 'ᾓ', 'ᾗ' },
+ { 'θ' },
+ { 'ι', 'ί', 'ὶ', 'ῖ', 'ἰ', 'ἴ', 'ἲ', 'ἶ', 'ἱ', 'ἵ', 'ἳ', 'ἷ', 'ϊ', 'ΐ', 'ῒ', 'ῗ' },
+ { 'κ' },
+ { 'λ' },
+ { 'μ' },
+ { 'ν' },
+ { 'ξ' },
+ { 'ο', 'ό', 'ὸ', 'ὀ', 'ὄ', 'ὂ', 'ὁ', 'ὅ', 'ὃ' },
+ { 'π' },
+ { 'ρ' },
+ { 'σ', 'ς' },
+ { 'τ' },
+ { 'υ', 'ύ', 'ὺ', 'ῦ', 'ὐ', 'ὔ', 'ὒ', 'ὖ', 'ὑ', 'ὕ', 'ὓ', 'ὗ', 'ϋ', 'ΰ', 'ῢ', 'ῧ' },
+ { 'φ' },
+ { 'χ' },
+ { 'ψ' },
+ { 'ω', 'ώ', 'ὼ', 'ῶ', 'ὠ', 'ὤ', 'ὢ', 'ὦ', 'ὡ', 'ὥ', 'ὣ', 'ὧ', 'ῳ', 'ῴ', 'ῲ', 'ῷ', 'ᾠ', 'ᾤ', 'ᾢ', 'ᾦ', 'ᾡ', 'ᾥ', 'ᾣ', 'ᾧ' },
+ { 'a', 'á', 'à', 'ä', 'å', 'æ', },
+ { 'b' },
+ { 'c', 'ç' },
+ { 'd' },
+ { 'e', 'é', 'è', 'ë' },
+ { 'f' },
+ { 'g' },
+ { 'h' },
+ { 'i', 'í', 'ì', 'ï' },
+ { 'j' },
+ { 'k' },
+ { 'l' },
+ { 'm' },
+ { 'n', 'ñ' },
+ { 'o', 'ó', 'ò', 'ö', 'ø', 'œ'},
+ { 'p' },
+ { 'q' },
+ { 'r' },
+ { 's', 'š', 'ß' },
+ { 't' },
+ { 'u', 'ú', 'ù', 'ü' },
+ { 'v' },
+ { 'w' },
+ { 'x' },
+ { 'y', 'ý', 'ÿ' },
+ { 'z', 'ž' },
+ { 'а' },
+ { 'б' },
+ { 'в' },
+ { 'г', 'ѓ' },
+ { 'д' },
+ { 'е', 'ё' },
+ { 'ж' },
+ { 'з' },
+ { 'и', 'і' },
+ { 'й' },
+ { 'к' },
+ { 'л' },
+ { 'м' },
+ { 'н' },
+ { 'о' },
+ { 'п' },
+ { 'р' },
+ { 'с' },
+ { 'т' },
+ { 'у' },
+ { 'ф' },
+ { 'х' },
+ { 'ц' },
+ { 'ч' },
+ { 'ш' },
+ { 'щ' },
+ { 'ъ' },
+ { 'ы' },
+ { 'ь' },
+ { 'э' },
+ { 'ю' },
+ { 'я' },
+}
+alphabet_upper = { -- for sorting
+ { 'Α', 'Ά', 'Ἀ', 'Ἄ', 'Ἂ', 'Ἆ', 'Ἁ', 'Ἅ', 'Ἃ', 'Ἇ', 'ᾼ', 'ᾈ', 'ᾌ', 'ᾊ', 'ᾎ', 'ᾉ', 'ᾍ', 'ᾋ', 'ᾏ' },
+ { 'Β' },
+ { 'Γ' },
+ { 'Δ' },
+ { 'Ε', 'Έ', 'Ἐ', 'Ἔ', 'Ἒ', 'Ἑ', 'Ἕ', 'Ἓ' },
+ { 'Ζ' },
+ { 'Η', 'Ή', 'Ἠ', 'Ἤ', 'Ἢ', 'Ἦ', 'Ἡ', 'Ἥ', 'Ἣ', 'Ἧ', 'ῌ', 'ᾘ', 'ᾜ', 'ᾚ', 'ᾞ', 'ᾙ', 'ᾝ', 'ᾟ' },
+ { 'Θ' },
+ { 'Ι', 'Ί', 'Ἰ', 'Ἴ', 'Ἲ', 'Ἶ', 'Ἱ', 'Ἵ', 'Ἳ', 'Ἷ', 'Ϊ' },
+ { 'Κ' },
+ { 'Λ' },
+ { 'Μ' },
+ { 'Ν' },
+ { 'Ξ' },
+ { 'Ο', 'Ό', 'Ὀ', 'Ὄ', 'Ὂ', 'Ὁ', 'Ὅ', 'Ὃ' },
+ { 'Π' },
+ { 'Ρ' },
+ { 'Σ' },
+ { 'Τ' },
+ { 'Υ', 'Ύ', 'Ὑ', 'Ὕ', 'Ὓ', 'Ὗ', 'Ϋ' },
+ { 'Φ' },
+ { 'Χ' },
+ { 'Ψ' },
+ { 'Ω', 'Ώ', 'Ὠ', 'Ὤ', 'Ὢ', 'Ὦ', 'Ὡ', 'Ὥ', 'Ὣ', 'Ὧ', 'ῼ', 'ᾩ', 'ᾭ', 'ᾫ', 'ᾯ', 'ᾨ', 'ᾬ', 'ᾪ', 'ᾮ' },
+ { 'A', 'Á', 'À', 'Ä', 'Å', 'Æ'},
+ { 'B' },
+ { 'C', 'Ç' },
+ { 'D' },
+ { 'E', 'È', 'È', 'Ë' },
+ { 'F' },
+ { 'G' },
+ { 'H' },
+ { 'I', 'Í', 'Ì', 'Ï' },
+ { 'J' },
+ { 'K' },
+ { 'L' },
+ { 'M' },
+ { 'N', 'Ñ' },
+ { 'O', 'Ó', 'Ò', 'Ö', 'Ø','Œ' },
+ { 'P' },
+ { 'Q' },
+ { 'R' },
+ { 'S', 'Š' },
+ { 'T' },
+ { 'U', 'Ú', 'Ù', 'Ü' },
+ { 'V' },
+ { 'W' },
+ { 'X' },
+ { 'Y', 'Ý', 'Ÿ' },
+ { 'Z', 'Ž' },
+ { 'А' },
+ { 'Б' },
+ { 'В' },
+ { 'Г', 'Ѓ' },
+ { 'Д' },
+ { 'Е', 'Ё' },
+ { 'Ж' },
+ { 'З' },
+ { 'И', 'І' },
+ { 'Й' },
+ { 'К' },
+ { 'Л' },
+ { 'М' },
+ { 'Н' },
+ { 'О' },
+ { 'П' },
+ { 'Р' },
+ { 'С' },
+ { 'Т' },
+ { 'У' },
+ { 'Ф' },
+ { 'Х' },
+ { 'Ц' },
+ { 'Ч' },
+ { 'Ш' },
+ { 'Щ' },
+ { 'Ъ' },
+ { 'Ы' },
+ { 'Ь' },
+ { 'Э' },
+ { 'Ю' },
+ { 'Я' },
+}
+
+
+function SORTendhook(list)
+ print ("We have "..#list.." total list entries")
+ local greek = {}
+ local latin = {}
+ local cyrillic = {}
+ local symbols = {}
+ local numbers = {}
+ local others = {}
+ local firstChar, charType
+ local firstCharNumber
+ local v
+ for i=1,#list do
+ v = list[i]
+ firstChar = NormalizedUppercase(utf.sub(v["sortChar"],1,1))
+ v["sortChar"] = firstChar -- to be sure it is an uppercase unicode char
+ firstCharNumber = string.utfvalue(firstChar)
+ charType = getCharType(firstChar)
+-- print (utf.sub(v["sortChar"],1,1).."->"..firstChar.." ("..firstCharNumber..") ".." ("..charType..")")
+ if charType == 0 then
+ symbols[#symbols+1] = v
+ elseif charType == 1 then
+ numbers[#numbers+1] = v
+ elseif firstCharNumber > 0x052F then -- 0x052F is last cyrillic character
+ others[#others+1] = v
+ elseif firstCharNumber >= 0x0400 then -- 0x0400-0x052F cyrillic characters
+ cyrillic[#cyrillic+1] = v
+ elseif firstCharNumber <= 0x03FF then -- 0x03FF is last greek character
+ if firstCharNumber >= 0x0370 then
+ greek[#greek+1] = v -- 0x0370-0x03FF greek characters
+ elseif firstCharNumber <= 0x024F then
+ if firstCharNumber >= 0x041 then -- 0x041-0x024F latin character
+ latin[#latin+1] = v
+ else
+ others[#others+1] = v -- everything else
+ end
+ end
+ end
+ end
+ print ("We have "..#greek.." Greek entries")
+ print ("We have "..#latin.." Latin entries")
+ print ("We have "..#cyrillic.." Cyrillic entries")
+ print ("We have "..#symbols.." Symbol entries")
+ print ("We have "..#numbers.." Number entries")
+ print ("We have "..#others.." other entries")
+ list = {}
+ for i = 1,#greek do list[#list+1] = greek[i] end
+ list[#list]["Macro"] = "\\vspace{1cm}"
+ for i = 1,#latin do list[#list+1] = latin[i] end
+ list[#list]["Macro"] = "\\vspace{1cm}"
+ for i = 1,#cyrillic do list[#list+1] = cyrillic[i] end
+ list[#list]["Macro"] = "\\vspace{1cm}"
+ for i = 1,#symbols do list[#list+1] = symbols[i] end
+ for i = 1,#numbers do list[#list+1] = numbers[i] end
+ for i = 1,#others do list[#list+1] = others[i] end
+ print ("Sorted "..#list.." entries")
+ return list
+end
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xindex.tlpobj new/tlpkg/tlpobj/xindex.tlpobj
--- old/tlpkg/tlpobj/xindex.tlpobj 2019-04-08 01:40:53.000000000 +0200
+++ new/tlpkg/tlpobj/xindex.tlpobj 2019-11-23 01:54:44.000000000 +0100
@@ -1,12 +1,12 @@
name xindex
category Package
-revision 50842
+revision 52892
shortdesc Unicode compatible index generation
longdesc This package provides a unicode compatible index programm for
longdesc LaTeX. It needs Lua 5.3, which will be included in at least
longdesc LuaTeX 1.09 (TeX Live 2019).
depend xindex.ARCH
-runfiles size=47
+runfiles size=51
texmf-dist/scripts/xindex/xindex.lua
texmf-dist/tex/latex/xindex/xindex.sty
texmf-dist/tex/lualatex/xindex/xindex-DIN2.lua
@@ -19,10 +19,11 @@
texmf-dist/tex/lualatex/xindex/xindex-lib.lua
texmf-dist/tex/lualatex/xindex/xindex-pretty.lua
texmf-dist/tex/lualatex/xindex/xindex-unicode.lua
+ texmf-dist/tex/lualatex/xindex/xindex-yannis.lua
catalogue-contact-bugs https://gitlab.com/hvoss49/xindex/issues
catalogue-contact-repository https://gitlab.com/hvoss49/xindex
catalogue-ctan /indexing/xindex
-catalogue-date 2019-04-07 20:34:49 +0200
+catalogue-date 2019-11-22 19:39:46 +0100
catalogue-license lppl1.3
catalogue-topics index use-lua
-catalogue-version 0.10
+catalogue-version 0.20
++++++ xint.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/xint/CHANGES.html new/doc/generic/xint/CHANGES.html
--- old/doc/generic/xint/CHANGES.html 2019-04-07 23:22:39.000000000 +0200
+++ new/doc/generic/xint/CHANGES.html 2020-02-26 23:09:41.000000000 +0100
@@ -4,7 +4,7 @@
<meta charset="utf-8" />
<meta name="generator" content="pandoc" />
<meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
- <meta name="author" content="xint 1.3e" />
+ <meta name="author" content="xint 1.4b" />
<title>CHANGE LOG</title>
<style type="text/css">
code{white-space: pre-wrap;}
@@ -25,124 +25,144 @@
<body>
<header>
<h1 class="title">CHANGE LOG</h1>
-<p class="author">xint 1.3e</p>
-<p class="date">2019/04/05</p>
+<p class="author">xint 1.4b</p>
+<p class="date">2020/02/25</p>
</header>
<nav id="TOC">
<ul>
-<li><a href="#e-20190405"><code>1.3e (2019/04/05)</code></a><ul>
-<li><a href="#incompatible-changes">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features">Improvements and new features</a></li>
+<li><a href="#b-20200225"><code>1.4b (2020/02/25)</code></a><ul>
+<li><a href="#future">Future</a></li>
+<li><a href="#new-features">New features</a></li>
<li><a href="#bug-fixes">Bug fixes</a></li>
</ul></li>
-<li><a href="#d-20190106"><code>1.3d (2019/01/06)</code></a><ul>
-<li><a href="#incompatible-changes-1">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-1">Improvements and new features</a></li>
+<li><a href="#a-20200219"><code>1.4a (2020/02/19)</code></a><ul>
+<li><a href="#breaking-changes">Breaking changes</a></li>
+<li><a href="#new-features-1">New features</a></li>
<li><a href="#bug-fixes-1">Bug fixes</a></li>
</ul></li>
-<li><a href="#c-20180617"><code>1.3c (2018/06/17)</code></a><ul>
-<li><a href="#improvements-and-new-features-2">Improvements and new features</a></li>
+<li><a href="#section"><code>1.4 (2020/01/31)</code></a><ul>
+<li><a href="#breaking-changes-1">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features">Improvements and new features</a></li>
<li><a href="#bug-fixes-2">Bug fixes</a></li>
+<li><a href="#todo">TODO</a></li>
</ul></li>
-<li><a href="#b-20180518"><code>1.3b (2018/05/18)</code></a><ul>
+<li><a href="#f-20190910"><code>1.3f (2019/09/10)</code></a><ul>
+<li><a href="#improvements-and-new-features-1">Improvements and new features</a></li>
+<li><a href="#bug-fixes-3">Bug fixes</a></li>
+</ul></li>
+<li><a href="#e-20190405"><code>1.3e (2019/04/05)</code></a><ul>
+<li><a href="#breaking-changes-2">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-2">Improvements and new features</a></li>
+<li><a href="#bug-fixes-4">Bug fixes</a></li>
+</ul></li>
+<li><a href="#d-20190106"><code>1.3d (2019/01/06)</code></a><ul>
+<li><a href="#breaking-changes-3">Breaking changes</a></li>
<li><a href="#improvements-and-new-features-3">Improvements and new features</a></li>
+<li><a href="#bug-fixes-5">Bug fixes</a></li>
</ul></li>
-<li><a href="#a-20180307"><code>1.3a (2018/03/07)</code></a><ul>
-<li><a href="#removed">Removed</a></li>
+<li><a href="#c-20180617"><code>1.3c (2018/06/17)</code></a><ul>
<li><a href="#improvements-and-new-features-4">Improvements and new features</a></li>
-<li><a href="#bug-fixes-3">Bug fixes</a></li>
+<li><a href="#bug-fixes-6">Bug fixes</a></li>
</ul></li>
-<li><a href="#section"><code>1.3 (2018/03/01)</code></a><ul>
-<li><a href="#incompatible-changes-2">Incompatible changes</a></li>
+<li><a href="#b-20180518"><code>1.3b (2018/05/18)</code></a><ul>
<li><a href="#improvements-and-new-features-5">Improvements and new features</a></li>
</ul></li>
-<li><a href="#q-20180206"><code>1.2q (2018/02/06)</code></a><ul>
+<li><a href="#a-20180307"><code>1.3a (2018/03/07)</code></a><ul>
+<li><a href="#removed">Removed</a></li>
<li><a href="#improvements-and-new-features-6">Improvements and new features</a></li>
-<li><a href="#bug-fixes-4">Bug fixes</a></li>
+<li><a href="#bug-fixes-7">Bug fixes</a></li>
</ul></li>
-<li><a href="#p-20171205"><code>1.2p (2017/12/05)</code></a><ul>
-<li><a href="#incompatible-changes-3">Incompatible changes</a></li>
+<li><a href="#section-1"><code>1.3 (2018/03/01)</code></a><ul>
+<li><a href="#breaking-changes-4">Breaking changes</a></li>
<li><a href="#improvements-and-new-features-7">Improvements and new features</a></li>
-<li><a href="#bug-fixes-5">Bug fixes</a></li>
+</ul></li>
+<li><a href="#q-20180206"><code>1.2q (2018/02/06)</code></a><ul>
+<li><a href="#improvements-and-new-features-8">Improvements and new features</a></li>
+<li><a href="#bug-fixes-8">Bug fixes</a></li>
+</ul></li>
+<li><a href="#p-20171205"><code>1.2p (2017/12/05)</code></a><ul>
+<li><a href="#breaking-changes-5">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-9">Improvements and new features</a></li>
+<li><a href="#bug-fixes-9">Bug fixes</a></li>
</ul></li>
<li><a href="#o-20170829"><code>1.2o (2017/08/29)</code></a><ul>
-<li><a href="#incompatible-changes-4">Incompatible changes</a></li>
+<li><a href="#breaking-changes-6">Breaking changes</a></li>
<li><a href="#deprecated">Deprecated</a></li>
</ul></li>
<li><a href="#n-20170806"><code>1.2n (2017/08/06)</code></a><ul>
-<li><a href="#incompatible-changes-5">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-8">Improvements and new features</a></li>
+<li><a href="#breaking-changes-7">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-10">Improvements and new features</a></li>
</ul></li>
<li><a href="#m-20170731"><code>1.2m (2017/07/31)</code></a><ul>
-<li><a href="#incompatible-changes-6">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-9">Improvements and new features</a></li>
-<li><a href="#bug-fixes-6">Bug fixes</a></li>
+<li><a href="#breaking-changes-8">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-11">Improvements and new features</a></li>
+<li><a href="#bug-fixes-10">Bug fixes</a></li>
</ul></li>
<li><a href="#l-20170726"><code>1.2l (2017/07/26)</code></a><ul>
<li><a href="#removed-1">Removed</a></li>
-<li><a href="#improvements-and-new-features-10">Improvements and new features</a></li>
-<li><a href="#bug-fixes-7">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-12">Improvements and new features</a></li>
+<li><a href="#bug-fixes-11">Bug fixes</a></li>
</ul></li>
<li><a href="#k-20170106"><code>1.2k (2017/01/06)</code></a><ul>
-<li><a href="#incompatible-changes-7">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-11">Improvements and new features</a></li>
-<li><a href="#bug-fixes-8">Bug fixes</a></li>
+<li><a href="#breaking-changes-9">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-13">Improvements and new features</a></li>
+<li><a href="#bug-fixes-12">Bug fixes</a></li>
</ul></li>
<li><a href="#j-20161222"><code>1.2j (2016/12/22)</code></a><ul>
-<li><a href="#improvements-and-new-features-12">Improvements and new features</a></li>
-<li><a href="#bug-fixes-9">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-14">Improvements and new features</a></li>
+<li><a href="#bug-fixes-13">Bug fixes</a></li>
</ul></li>
<li><a href="#i-20161213"><code>1.2i (2016/12/13)</code></a><ul>
-<li><a href="#incompatible-changes-8">Incompatible changes</a></li>
+<li><a href="#breaking-changes-10">Breaking changes</a></li>
<li><a href="#removed-2">Removed</a></li>
-<li><a href="#improvements-and-new-features-13">Improvements and new features</a></li>
-<li><a href="#bug-fixes-10">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-15">Improvements and new features</a></li>
+<li><a href="#bug-fixes-14">Bug fixes</a></li>
</ul></li>
<li><a href="#h-20161120"><code>1.2h (2016/11/20)</code></a><ul>
-<li><a href="#improvements-and-new-features-14">Improvements and new features</a></li>
-<li><a href="#bug-fixes-11">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-16">Improvements and new features</a></li>
+<li><a href="#bug-fixes-15">Bug fixes</a></li>
</ul></li>
<li><a href="#g-20160319"><code>1.2g (2016/03/19)</code></a><ul>
-<li><a href="#incompatible-changes-9">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-15">Improvements and new features</a></li>
+<li><a href="#breaking-changes-11">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-17">Improvements and new features</a></li>
</ul></li>
<li><a href="#f-20160312"><code>1.2f (2016/03/12)</code></a><ul>
-<li><a href="#incompatible-changes-10">Incompatible changes</a></li>
-<li><a href="#improvements-and-new-features-16">Improvements and new features</a></li>
-<li><a href="#bug-fixes-12">Bug fixes</a></li>
+<li><a href="#breaking-changes-12">Breaking changes</a></li>
+<li><a href="#improvements-and-new-features-18">Improvements and new features</a></li>
+<li><a href="#bug-fixes-16">Bug fixes</a></li>
</ul></li>
<li><a href="#e-20151122"><code>1.2e (2015/11/22)</code></a><ul>
-<li><a href="#improvements-and-new-features-17">Improvements and new features</a></li>
-<li><a href="#bug-fixes-13">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-19">Improvements and new features</a></li>
+<li><a href="#bug-fixes-17">Bug fixes</a></li>
</ul></li>
<li><a href="#d-20151118"><code>1.2d (2015/11/18)</code></a><ul>
-<li><a href="#improvements-and-new-features-18">Improvements and new features</a></li>
-<li><a href="#bug-fixes-14">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-20">Improvements and new features</a></li>
+<li><a href="#bug-fixes-18">Bug fixes</a></li>
</ul></li>
<li><a href="#c-20151116"><code>1.2c (2015/11/16)</code></a><ul>
-<li><a href="#improvements-and-new-features-19">Improvements and new features</a></li>
-<li><a href="#bug-fixes-15">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-21">Improvements and new features</a></li>
+<li><a href="#bug-fixes-19">Bug fixes</a></li>
</ul></li>
<li><a href="#b-20151029"><code>1.2b (2015/10/29)</code></a><ul>
-<li><a href="#bug-fixes-16">Bug fixes</a></li>
+<li><a href="#bug-fixes-20">Bug fixes</a></li>
</ul></li>
<li><a href="#a-20151019"><code>1.2a (2015/10/19)</code></a><ul>
-<li><a href="#improvements-and-new-features-20">Improvements and new features</a></li>
-<li><a href="#bug-fixes-17">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-22">Improvements and new features</a></li>
+<li><a href="#bug-fixes-21">Bug fixes</a></li>
</ul></li>
-<li><a href="#section-1"><code>1.2 (2015/10/10)</code></a><ul>
+<li><a href="#section-2"><code>1.2 (2015/10/10)</code></a><ul>
<li><a href="#removed-3">Removed</a></li>
-<li><a href="#improvements-and-new-features-21">Improvements and new features</a></li>
+<li><a href="#improvements-and-new-features-23">Improvements and new features</a></li>
</ul></li>
<li><a href="#c-20150912"><code>1.1c (2015/09/12)</code></a></li>
<li><a href="#b-20150831"><code>1.1b (2015/08/31)</code></a></li>
<li><a href="#a-20141107"><code>1.1a (2014/11/07)</code></a></li>
-<li><a href="#section-2"><code>1.1 (2014/10/28)</code></a><ul>
-<li><a href="#incompatible-changes-11">Incompatible changes</a></li>
+<li><a href="#section-3"><code>1.1 (2014/10/28)</code></a><ul>
+<li><a href="#breaking-changes-13">Breaking changes</a></li>
<li><a href="#removed-4">Removed</a></li>
<li><a href="#deprecated-1">Deprecated</a></li>
-<li><a href="#improvements-and-new-features-22">Improvements and new features</a></li>
-<li><a href="#bug-fixes-18">Bug fixes</a></li>
+<li><a href="#improvements-and-new-features-24">Improvements and new features</a></li>
+<li><a href="#bug-fixes-22">Bug fixes</a></li>
</ul></li>
<li><a href="#n-20140401"><code>1.09n (2014/04/01)</code></a></li>
<li><a href="#m-20140226"><code>1.09m (2014/02/26)</code></a></li>
@@ -160,46 +180,149 @@
<li><a href="#a-20130924"><code>1.09a (2013/09/24)</code></a></li>
<li><a href="#b-20130614"><code>1.08b (2013/06/14)</code></a></li>
<li><a href="#a-20130611"><code>1.08a (2013/06/11)</code></a></li>
-<li><a href="#section-3"><code>1.08 (2013/06/07)</code></a></li>
-<li><a href="#section-4"><code>1.07 (2013/05/25)</code></a></li>
+<li><a href="#section-4"><code>1.08 (2013/06/07)</code></a></li>
+<li><a href="#section-5"><code>1.07 (2013/05/25)</code></a></li>
<li><a href="#b-20130514"><code>1.06b (2013/05/14)</code></a></li>
-<li><a href="#section-5"><code>1.06 (2013/05/07)</code></a></li>
-<li><a href="#section-6"><code>1.05 (2013/05/01)</code></a></li>
-<li><a href="#section-7"><code>1.04 (2013/04/25)</code></a></li>
-<li><a href="#section-8"><code>1.03 (2013/04/14)</code></a></li>
-<li><a href="#section-9"><code>1.0 (2013/03/28)</code></a></li>
+<li><a href="#section-6"><code>1.06 (2013/05/07)</code></a></li>
+<li><a href="#section-7"><code>1.05 (2013/05/01)</code></a></li>
+<li><a href="#section-8"><code>1.04 (2013/04/25)</code></a></li>
+<li><a href="#section-9"><code>1.03 (2013/04/14)</code></a></li>
+<li><a href="#section-10"><code>1.0 (2013/03/28)</code></a></li>
</ul>
</nav>
-<pre><code>Source: xint.dtx 1.3e 2019/04/05 (doc 2019/04/05)
+<pre><code>Source: xint.dtx 1.4b 2020/02/25 (doc 2020/02/25)
Author: Jean-Francois Burnol
Info: Expandable operations on big integers, decimals, fractions
-License: LPPL 1.3e</code></pre>
-<h2 id="e-20190405"><code>1.3e (2019/04/05)</code></h2>
-<h3 id="incompatible-changes">Incompatible changes</h3>
+License: LPPL 1.3c</code></pre>
+<h2 id="b-20200225"><code>1.4b (2020/02/25)</code></h2>
+<p>All changes regard the <strong>xintexpr</strong> module.</p>
+<h3 id="future">Future</h3>
+<ul>
+<li><p><code>&</code>, <code>|</code>, (as Boolean operators) and <code>=</code> (as equality test) have long been deprecated in favour of <code>&&</code>, <code>||</code> and <code>==</code>. They will be removed at next major release.</p></li>
+<li><p>At next major release the power operators <code>**</code> and <code>^</code> will turn from left to right associative. I.e. <code>2**2**3</code> will give <code>256</code>, not <code>64</code>. This is to match with Python and l3fp.</p></li>
+<li><p><code>\thexintexpr</code> et al. (introduced at <code>1.2h</code> but not documented anymore for some time) will be removed at next major release. The original <code>\xinttheexpr</code> et al. have always been so much better names. Besides, since <code>1.4</code>, <code>\xintexpr</code> can be used directly in typesetting flow.</p></li>
+</ul>
+<h3 id="new-features">New features</h3>
+<ul>
+<li><p>Function <code>zip()</code> is modeled on Python’s function of the same name.</p></li>
+<li><p>Function <code>flat()</code> removes all nesting to produce a “one-dimensional” list having the exact same leaves (some possibly empty) as the original (in the same order).</p></li>
+<li><p>Chaining of comparison operators (e.g. <code>x<y<z</code>) as in Python (but all comparisons are done even if one is found false) and l3fp.</p></li>
+<li><p>Strangely, it was possible since <code>1.4</code>’s <code>\xintFracToSciE</code> to configure the separator between mantissas and exponents in the output of <code>\xinteval</code> but this did not modify the output of <code>\xintfloateval</code>. This is now fixed via the added <code>\xintPFloatE</code>.</p></li>
+</ul>
+<h3 id="bug-fixes">Bug fixes</h3>
+<ul>
+<li><code>\xintieval{[D]...}</code> with a negative <code>D</code> (a feature added at <code>1.4a</code>) used erroneously a catcode 12 <code>e</code> in output. And its customization via <code>\xintFracToSciE</code> remained without effect.</li>
+</ul>
+<h2 id="a-20200219"><code>1.4a (2020/02/19)</code></h2>
+<h3 id="breaking-changes">Breaking changes</h3>
+<ul>
+<li><strong>xintexpr</strong>: the macros implementing customization of <code>\xintthealign</code> have modified meanings and names.</li>
+</ul>
+<h3 id="new-features-1">New features</h3>
<ul>
-<li>When defining functions, sub-expressions can only use the <code>\xint(float)expr...\relax</code> syntax. One can <em>not</em> use there the <code>\xint(float)eval</code> wrappers (anyhow they add overhead and can be replaced with the lower level syntax).</li>
+<li><p><strong>xintexpr</strong>: <code>\xintthespaceseparated</code> (serves to provide suitable input to PS-Tricks <code>\listplot</code>).</p></li>
+<li><p><strong>xintexpr</strong>: the optional argument <code>[D]</code> to <code>\xintieval/\xintiexpr</code> can be negative, with the same meaning as the non-negative case, i.e. rounding to an integer multiple of <code>10^(-D)</code>.</p>
+<p>The same applies to the functions <code>trunc()</code> and <code>round()</code>. And to the <code>\xintTrunc</code>, <code>\xintRound</code>, <code>\xintiTrunc</code>, and <code>\xintiRound</code> macros of <strong>xintfrac</strong>.</p></li>
+</ul>
+<h3 id="bug-fixes-1">Bug fixes</h3>
+<ul>
+<li><p><strong>xintexpr</strong>: usage of <code>round()</code> and <code>trunc()</code> within <code>\xintdeffunc</code> got broken at <code>1.4</code>.</p></li>
+<li><p><strong>xintexpr</strong>: <code>add()</code> and <code>mul()</code> were supposedly accepting the <code>omit</code>, <code>abort</code> and <code>break()</code> keywords since <code>1.4</code> but this was broken.</p></li>
+</ul>
+<h2 id="section"><code>1.4 (2020/01/31)</code></h2>
+<h3 id="breaking-changes-1">Breaking changes</h3>
+<p>Please note that this list may still be incomplete. If not otherly specified all items regard the <strong>xintexpr</strong> module.</p>
+<ul>
+<li><p>The <code>\expanded</code> primitive (TeXLive 2019) is <strong>required</strong>. This does not affect the macro layer <strong>xintcore</strong>, <strong>xint</strong>, <strong>xintfrac</strong>, <strong>xinttools</strong> (yet).</p></li>
+<li><p>Formerly square brackets <code>[...]</code> were, on their own, not different from parentheses (and thus disappeared from the output), but they are now a genuine constructor of nested lists. For example <code>\xinteval{1, [2, [3, 4]], 5}</code> produces <code>1, [2, [3, 4]], 5</code> (recall this is free bloatware).</p></li>
+<li><p>The output of <code>\xinteval</code> has changed (besides containing brackets). It does not use anymore the so-called <em>raw</em> <strong>xintfrac</strong> format, i.e. things such as <code>A/B[N]</code> (which can still be used in input but are discouraged in <strong>xintexpr</strong> context), but scientific notation <code>AeN/B</code>. As formerly, the denominator is printed only if <code>B>1</code> and the scientific part is dropped if the exponent vanishes. In this way the output of <code>\xinteval</code> can be pasted to alternative software.</p></li>
+<li><p>The output format of <code>\xinthe\xintboolexpr</code> also has changed. It uses <code>True</code> and <code>False</code> (which are accepted on input), and this can easily be configured otherwise (also <code>true</code> and <code>false</code> are accepted on input).</p></li>
+<li><p>The “broadcasting” (as it turned out, à la <code>NumPy</code>) of scalar operations on one-dimensional “lists”, e.g <code>3*[1,3,5,7]+10</code> acting itemwise is <strong>dropped</strong>. It is hoped to implement such operations again in stronger form in future releases. Pre-existing alternative syntax is available, also to produce the bracketed (cf. next item) <code>[13,19,25,31]</code> which will be the output in future.</p></li>
+<li><p>The <code>divmod()</code> function now produces on output such a bracketed pair, but simultaneous assignment such as <code>\xintdefvar xq, xr = divmod(a,b);</code> will work transparently.</p></li>
+<li><p>The syntax for using conditionals in function declarations has changed. Now, one <em>must</em> use the <code>?</code> and <code>??</code> short-circuit boolean branching operators whereas in the past it was explained that the syntax had to use the <code>if()</code> and <code>ifsgn()</code> functions.</p></li>
+<li><p>Macros <code>\xintGCD</code>, <code>\xintLCM</code>, <code>\xintGCDof</code> and <code>\xintLCMof</code> formerly provided by <strong>xintgcd</strong> got moved to <strong>xintfrac</strong> (which is not loaded by <strong>xintgcd</strong>). Moreover, they were extended to handle general fractions on input but this also means that their output is now obiding by the raw <strong>xintfrac</strong> format. The integer only <code>\xintiiGCD</code>, <code>\xintiiLCM</code> also got moved out of <strong>xintgcd</strong>, but to <strong>xint</strong> which is now loaded automatically by <strong>xintgcd</strong>. The few remaining macros of <strong>xintgcd</strong> at least do not need other imports as <strong>xintgcd</strong> now loads also automatically <strong>xinttools</strong> which is a dependency for two of them.</p></li>
</ul>
<h3 id="improvements-and-new-features">Improvements and new features</h3>
+<p>Please note that this list is currently incomplete. For more information look at the user manual and the documented source code <code>sourcexint.pdf</code>.</p>
+<p>Unless otherwise specified all changes commented upon here regard <strong>xintexpr</strong>. Important: all the new syntax is to be considered experimental. The author may change some names in future release, or even the interface (whether to use semi-colons or colons etc…).</p>
+<ul>
+<li><p>The <code>\csname</code> encapsulation technique used since <strong>xintexpr</strong> initial release (<code>1.07 2013/05/25</code>) to move around possibly large data during expansion-only operations is replaced with methods based on the <code>\expanded</code> engine primitive. The latter is available in all major engines since TeXLive 2019.</p>
+<p>Formerly, and with default memory settings, one would typically saturate the string pool memory after about of the order of 50,000 independent floating point evaluations of expressions of average complexity on 16-digits numbers.</p>
+<p>There is thus no string pool memory impact at all but one can now hit TeX’s main memory limit (which typically stands at 5,000,000 words) from defining large variables or generating on the fly large data. TeX distributions have a configuration file allowing to enlarge TeX memory parameters and regenerate the (eTeX based) formats.</p></li>
+<li><p>The package supports input and output of arbitrarily <em>nested lists</em>, a.k.a. <em>oples</em> or <em>nlists</em>, with <code>[...]</code> as the constructor of <em>bracketed lists</em>, a.k.a <em>nut-ples</em>. Operations on these objects (as briefly surveyed in later items) are inspired from syntax and functionalities of <code>NumPy</code>’s <em>ndarrays</em>. Our <em>oples</em> (hence also their packaged form <em>nut-ples</em>) may have <em>leaves</em> at varying depths rather than obeying an N-dimensional hyperrectangular shape. But the syntax does provide specific constructors for <em>ndlists</em> (i.e. hyperrectangular <em>oples</em> or <em>nut-ples</em>).</p>
+<p>In a (distant?) future, perhaps <strong>xintexpr</strong> itself or a third-party package will provide an interface, say <code>\xintstorearray</code>, <code>\xintgetarray</code>, to store (which can not be expandable) and retrieve (which can be expandable and thus be embedded inside expressions parsed by <code>\xintexpr</code>, <code>\xintiiexpr</code> or <code>\xintfloatexpr</code>) such <em>ndlists</em> from TeX memory. This is why the package does not use the word <em>ndarray</em> and reserves it for such memory stored objects.</p></li>
+<li><p>The <code>*</code> serves as <em>unpacking</em> operator on <em>nut-ples</em>, i.e. reversing the <code>[]</code> bracketing of an <em>ople</em>.</p></li>
+<li><p><em>oples</em> have no exact equivalent in <code>Python</code>. For example <strong>xintexpr</strong> allows <code>foo(Var1, x)</code> if <code>foo</code> is a function of 4 variables and <code>Var1</code> is a variable producing a length 3 <em>ople</em>, or <code>foo(Var2)</code> if <code>Var2</code> is a variable producing a length 4 <em>ople</em>. Python would require here to use explicitly the <code>*</code>-unpacking notation on some “packed” objects.</p>
+<p>Variable and function values may be <em>oples</em> (even <em>nil</em>), but in function declarations variables must stand for <em>one-ples</em>, i.e. either <em>numbers</em> or <em>nut-ples</em> (as there is no non-ambiguous way to split e.g. 5 arguments into two separate <em>oples</em>).</p></li>
+<li><p>Simultaneous assignment to at least two variables via <code>\xintdefvar</code> et al. automatically unpacks the assigned value if it is a <em>one-ple</em>. If this value was in fact a <em>number</em>, low-level errors will result shortly afterwards as no check is done if the unpacking was illicit. (Such checks exist in the codebase, but have not yet been integrated into <code>\xintdefvar</code> by laziness).</p></li>
+<li><p>The <code>NumPy</code> concept and syntax for nested slicing and item selection are implemented. Currently <em>stepping</em> and the <em>Ellipsis object</em> are not yet available. Only so-called basic slicing is currently supported. (The author has not yet read the section of <code>NumPy</code> documentation on so-called <em>advanced indexing</em>).</p></li>
+<li><p>The <em>broadcasting</em> of scalar operations, such as itemwise addition or multiplication of <em>nut-ples</em> of the same shape is <strong>not yet implemented</strong>.</p></li>
+<li><p>Slicing and indexing apply also at top level to the <em>oples</em> with behaviour conforming to intuitive expectations (see user manual); if it turns out the <em>ople</em> is in fact a <em>nut-ple</em>, the top-level slicing/indexing switches to the <code>Python/NumPy</code> conventions, i.e. it operates inside the brackets for slicing and removes brackets if indexing.</p></li>
+<li><p>The syntax <code>ndseq(expression in x, y, ..., x = values; y = values; ...)</code> constructs a (bracketed) <em>ndlist</em> by evaluation the expression on all possible Cartesian n-uples, where the first variable indexes the first axis, the second the next, etc…</p></li>
+<li><p>The <code>ndmap(foo, values1; values2; ...; valuesN)</code> syntax constructs a (bracketed) <em>ndlist</em> by evaluating the function <code>foo</code> on all elements of the cartesian product of the given (one-dimensional) value lists.</p></li>
+<li><p>The two concepts of <code>\xintdeffunc</code> (for recursive definitions) and <code>\xintdefefunc</code> (for functions which expand immediately in other function declarations) have been merged. The <code>\xintdefefunc</code> et al. are deprecated and kept as aliases for <code>\xintdeffunc</code> et al.</p></li>
+<li><p><code>\xintdefufunc</code> allows to define so-called <em>universal functions</em>, i.e. functions <code>foo</code> such that <code>foo(myople)</code> will apply itemwise at arbitrary depth in the nested structure. The function <code>foo</code> is allowed to produce from a scalar an <em>ople</em>…</p></li>
+<li><p>The variables in function declarations can now be multi-letter words.</p></li>
+<li><p>The last positional variable in a function declaration can be prefixed with a <code>*</code> meaning exactly as in Python (<em>variadic</em> function argument) that it stands for a one-dimensional <em>nut-ple</em> receiving all remaining arguments from the function call beyond the first positional ones. It is thus an optional argument, but syntax for named optional arguments with default values is not yet implemented.</p></li>
+<li><p>Dummy variables used in constructors can also be multi-letter words, if they have been declared as such.</p></li>
+<li><p>In variable and function declarations, if the expression contains inner semi-colons, it is not needed anymore to brace them to avoid mis-interpretation as the final semi-colon which is mandated by the syntax to serve as expression terminator.</p></li>
+<li><p><code>subsm(expression, var1 = value1; var2 = value2; ...)</code> provides a leaner syntax for multiple substitutions; they must be independent, though.</p></li>
+<li><p><code>subsn(expression, var1 = value1; var2 = value2; ...)</code> provides a leaner syntax for nested substitutions, i.e., each <code>valueJ</code> may be an expression using the dummy variables <code>varK</code> with <code>K>J</code>. And finally of course the evaluated expression can refer to all variables.</p></li>
+<li><p><code>\xintthealign\xintexpr...\relax</code> (or with <code>\xintfloatexpr</code> or <code>\xintiiexpr</code> or <code>\xintboolexpr</code>…) will use a TeX alignment to display <em>oples</em>. The output (for regular N-dimensional lists) looks very similar to what <code>Python/NumPy</code> produces in interactive session. This is entirely configurable and can also be set-up to be used for writing into external files.</p>
+<p>Attention that <code>\xintthealign</code> only works if followed by <code>\xintexpr</code> et al., not by <code>\xinteval{}</code>.</p></li>
+<li><p>It is now possible to use <code>\xintexpr...\relax</code> directly for typesetting. The syntax <code>\xinteval{...}</code> or <code>\xintthe\xintexpr...\relax</code> is needed only if one wants the expansion to give the explicit digits, but <code>\xintexpr...\relax</code> by itself will typeset as would have the other ones. Further it can be used in so-called moving arguments, because when output to an external file it uses only characters with standard catcodes (and produces the same protected and re-tokenizable result it would in an <code>\edef</code>.)</p>
+<p>As formerly, <code>\xintexpr...\relax</code> is the preferred way to include an expression into another one. Using <code>\xinteval</code> is a waste because it forces the outer parser to re-digest all the digits (or now also the square brackets).</p></li>
+<li><p>The output format of <code>\xintfloateval</code> with scientific notation has not changed (apart from possible presence of bracketed lists), but the author hesitates because the <em>prettifying</em> it does by default is not really adapted to display of arrays (see <code>\xintthealign</code>). Anyway, this is configurable by the user. It is possible to specify whether to use <code>e</code> or <code>E</code>.</p></li>
+<li><p>Function declarations are able to parse a much wider part of the syntax, but some severe limitations remain. Refer to the user manual for related information.</p></li>
+<li><p>We have made an effort on some error messages, and when working interactively in a shell it may even be sometimes possible to insert for example a correct variable or function name in place of the not recognized one. But don’t expect miracles when trying to intervene in the midst of a purely expandable expansion…</p></li>
+</ul>
+<h3 id="bug-fixes-2">Bug fixes</h3>
+<p>Bugs? Those identified in <code>1.3f</code> were almost features. As per <code>1.4</code> the code base of <strong>xintexpr</strong> received multiple successive core refactorings and added numerous new features, and our test suite although significantly enlarged is not yet extensive enough. Please report bugs by mail.</p>
+<h3 id="todo">TODO</h3>
+<ul>
+<li><p>The long delayed overhaul of how floating point numbers are handled is delayed again. It has remained basically identical to its initial provisory version from <code>1.07 2013/05/25</code> (which was based upon what was originally only a set of expandable macros for computations with big integers), and suffers from the author lack of knowledge of the notion of “data type” in modern programming. Indeed, he never took a CS class, and disables JavaScript in his browser (or allows only select non-tracking scripts, a rare beast in modern days).</p></li>
+<li><p>Prior to integrating all of <code>NumPy</code>, it is envisioned to start with matrix algebra first.</p></li>
+</ul>
+<h2 id="f-20190910"><code>1.3f (2019/09/10)</code></h2>
+<h3 id="improvements-and-new-features-1">Improvements and new features</h3>
+<ul>
+<li><p><strong>xintfrac</strong>: <code>\xintDigits = P;</code> syntax (i.e. without a colon) is now accepted in addition to <code>\xintDigits := P;</code>.</p>
+<p>Document that the ending semi-colon can not be an active character and that it has always been allowed to use in its place a non-expanding token e.g. <code>\xintDigits := 32\relax</code>.</p>
+<p>Add <code>\xintSetDigits</code>.</p></li>
+<li><p><strong>xintexpr</strong>: add starred variants <code>\xintDigits*</code> and <code>\xintSetDigits*</code> which execute <code>\xintreloadxinttrig</code>.</p>
+<p>Revert 1.3e ban on usage of <code>\xinteval</code> et al. inside expressions by <code>\xintdeffunc</code>. And make them usable also inside macro definitions via <code>\xintNewExpr</code>.</p></li>
+</ul>
+<h3 id="bug-fixes-3">Bug fixes</h3>
+<ul>
+<li><p><strong>xintexpr</strong>: fix bug preventing usage of <code>\xintdefefunc</code> to define a function without variables.</p>
+<p>Fix some issue with <code>\xintfloatexpr[D]..\relax</code> if used inside an expression parsed by <code>\xintdeffunc</code> et al.</p></li>
+</ul>
+<h2 id="e-20190405"><code>1.3e (2019/04/05)</code></h2>
+<h3 id="breaking-changes-2">Breaking changes</h3>
+<ul>
+<li>(<em>reverted at 1.3f</em>) When defining functions, sub-expressions can only use the <code>\xint(float)expr...\relax</code> syntax. One can not use there the <code>\xint(float)eval</code> wrappers.</li>
+</ul>
+<h3 id="improvements-and-new-features-2">Improvements and new features</h3>
<ul>
-<li>The <strong>xinttrig</strong> library is automatically loaded by <strong>xintexpr</strong>. It provides direct and inverse trigonometrical functions using either degrees or radians with a precision of up to (a bit less than) 60 digits. It is for the most part implemented using high level user interface, but will probably get some optimizations in future (and perhaps extension to more digits).</li>
-<li>The <strong>xintlog</strong> library is automatically loaded by <strong>xintexpr</strong>. It uses <a href="http://ctan.org/pkg/poormanlog">poormanlog</a> to provide logarithms and exponentials with almost 9 digits of precision. Extended precision is for a future release.</li>
+<li><p>The <strong>xinttrig</strong> library is automatically loaded by <strong>xintexpr</strong>. It provides direct and inverse trigonometrical functions using either degrees or radians with a precision of up to (a bit less than) 60 digits. It is for the most part implemented using high level user interface, but will probably get some optimizations in future (and perhaps extension to more digits).</p></li>
+<li><p>The <strong>xintlog</strong> library is automatically loaded by <strong>xintexpr</strong>. It uses <a href="http://ctan.org/pkg/poormanlog">poormanlog</a> to provide logarithms and exponentials with almost 9 digits of precision. Extended precision is for a future release.</p></li>
<li><p><strong>xintexpr</strong>: <code>\xintdefefunc</code>, <code>\xintdeffloatefunc</code>, <code>\xintdefiiefunc</code> define functions which are not protected against expansion in the definition of other functions; refer to <code>xint.pdf</code> for the related explanations.</p>
-Notice that whole area of <code>\xintdef(e)func</code>, <code>\xintNewExpr</code>, <code>\xintNewFunction</code> is complex and to be considered still as work in progress as it has a number of shortcomings.</li>
-<li><strong>xintexpr</strong>: <code>inv()</code>, <code>ilog10()</code>, <code>sfloat()</code>, behaviour of <code>qfloat()</code> slightly modified.</li>
-<li><strong>xintexpr</strong>: <code>\xintensuredummy</code>, <code>\xintrestorelettervar</code>.</li>
+<p>Notice that whole area of <code>\xintdef(e)func</code>, <code>\xintNewExpr</code>, <code>\xintNewFunction</code> is complex and to be considered still as work in progress as it has a number of shortcomings.</p></li>
+<li><p><strong>xintexpr</strong>: <code>inv()</code>, <code>ilog10()</code>, <code>sfloat()</code>, behaviour of <code>qfloat()</code> slightly modified.</p></li>
+<li><p><strong>xintexpr</strong>: <code>\xintensuredummy</code>, <code>\xintrestorelettervar</code>.</p></li>
<li><p>The optional argument of <code>\xintfloatexpr</code> or <code>\xintfloateval</code> (it must be at start of braced argument) can be negative; it then means to trim (and round) from the output at float precision that many least significant digits.</p></li>
</ul>
-<h3 id="bug-fixes">Bug fixes</h3>
+<h3 id="bug-fixes-4">Bug fixes</h3>
<ul>
<li>Some bugfixes related to user functions with no variables at all; they were dysfunctional.</li>
</ul>
<h2 id="d-20190106"><code>1.3d (2019/01/06)</code></h2>
-<h3 id="incompatible-changes-1">Incompatible changes</h3>
+<h3 id="breaking-changes-3">Breaking changes</h3>
<ul>
<li><p><strong>xintexpr</strong>: the <code>gcd()</code> and <code>lcm()</code> functions formerly converted their arguments to integers via <code>\xintNum</code>. They now handle general input with no such modification.</p></li>
<li><p><strong>xintexpr</strong>: former <code>\xinteval</code>, <code>\xintieval</code>, <code>\xintiieval</code>, and <code>\xintfloateval</code> renamed to <code>\xintexpro</code>, <code>\xintiexpro</code>, <code>\xintiiexpro</code>, and <code>\xintfloatexpro</code>.</p></li>
</ul>
-<h3 id="improvements-and-new-features-1">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-3">Improvements and new features</h3>
<ul>
<li><p><strong>xintexpr</strong>: the <code>gcd()</code> and <code>lcm()</code> multi-arguments functions have been refactored to handle general fractions. The dependency on <strong>xintgcd</strong> is removed.</p></li>
<li><p><strong>xintexpr</strong>: three-way branching <code>\xintifsgnexpr</code>, <code>\xintifsgnfloatexpr</code>, <code>\xintifsgniiexpr</code> conditional macros.</p></li>
@@ -208,12 +331,12 @@
<li><p><strong>xintexpr</strong>: functions <code>isone()</code> and <code>isint()</code>.</p></li>
<li><p><strong>xintexpr</strong>: <code>\xinteval</code>, <code>\xintieval</code>, <code>\xintiieval</code>, and <code>\xintfloateval</code> as synonyms to <code>\xinttheexpr...\relax</code> etc…, but with the (comma-separated) expression as a usual braced macro argument.</p></li>
</ul>
-<h3 id="bug-fixes-1">Bug fixes</h3>
+<h3 id="bug-fixes-5">Bug fixes</h3>
<ul>
<li><strong>xintcore</strong>, <strong>xintexpr</strong> : division in <code>\xintiiexpr</code> was broken for a zero dividend and a one-digit divisor (e.g. <code>0//7</code>) since <code>1.2p</code> due to a bug in <code>\xintiiDivMod</code> for such arguments. The bug was signaled (thanks to Kpym for report) and fixed shortly after <code>1.3c</code> release but I then completely forgot to upload a bugfix release to CTAN at that time, apologies for that.</li>
</ul>
<h2 id="c-20180617"><code>1.3c (2018/06/17)</code></h2>
-<h3 id="improvements-and-new-features-2">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-4">Improvements and new features</h3>
<ul>
<li><p><strong>xintexpr</strong>: with <code>\xintglobaldefstrue</code>, <code>\xintdefvar</code>, <code>\xintdeffunc</code>, <code>\xintNewExpr</code> et al. make definitions with global scope.</p></li>
<li><p><strong>xintexpr</strong>: <code>qraw()</code> for fast input of (very many) comma separated numbers (in suitable raw format).</p></li>
@@ -221,12 +344,12 @@
<li><p><strong>xintexpr</strong>: <code>\xintdefvar</code>, <code>\xintdeffunc</code> and their variants try to set the catcode of the semi-colon which delimits their arguments; of course this will not work if that catcode is already frozen.</p></li>
<li><p><code>\xintUniformDeviate</code> is better documented and <code>sourcexint.pdf</code> is better hyperlinked and includes indices for the macros defined by each package.</p></li>
</ul>
-<h3 id="bug-fixes-2">Bug fixes</h3>
+<h3 id="bug-fixes-6">Bug fixes</h3>
<ul>
<li><strong>xintfrac</strong>: since <code>1.3</code> release, it loaded <strong>xintgcd</strong> in contradiction to what the documentation says (hence also <strong>xintexpr</strong> loaded <strong>xintgcd</strong> automatically). There is no actual dependency so the loading is removed for now.</li>
</ul>
<h2 id="b-20180518"><code>1.3b (2018/05/18)</code></h2>
-<h3 id="improvements-and-new-features-3">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-5">Improvements and new features</h3>
<p>All additions related to randomness are marked as work-in-progress. They require an engine providing the <code>\(pdf)uniformdeviate</code> primitive.</p>
<ul>
<li><p><strong>xintkernel</strong>: <code>\xintUniformDeviate</code>.</p></li>
@@ -241,41 +364,41 @@
<ul>
<li><strong>xintcore</strong>, <strong>xint</strong>, <strong>xintfrac</strong>: removal of the internal macros which were used at <code>1.2o</code> to add a deprecation mechanism; all deprecated macros have been removed at <code>1.3</code> so there was no reason to keep the code used for deprecating them.</li>
</ul>
-<h3 id="improvements-and-new-features-4">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-6">Improvements and new features</h3>
<ul>
<li><p><strong>xintexpr</strong>: new conditionals <code>ifone()</code> and <code>ifint()</code>.</p></li>
<li><p><strong>xintfrac</strong>: <code>\xintREZ</code> is faster on inputs having one hundred digits or more.</p></li>
<li><p>Added to the user manual mention of macros such as <code>\xintDivFloor</code>, <code>\xintMod</code>, <code>\xintModTrunc</code>, which had been left out so far.</p></li>
</ul>
-<h3 id="bug-fixes-3">Bug fixes</h3>
+<h3 id="bug-fixes-7">Bug fixes</h3>
<ul>
<li><strong>xintexpr</strong>: the mechanism for adjunction to the expression parsers of user defined functions was refactored and improved at previous release <code>1.3</code>: in particular recursive definitions became possible. But an oversight made these recursive functions quite inefficient (to remain polite.) This release fixes the problem.</li>
</ul>
-<h2 id="section"><code>1.3 (2018/03/01)</code></h2>
-<h3 id="incompatible-changes-2">Incompatible changes</h3>
+<h2 id="section-1"><code>1.3 (2018/03/01)</code></h2>
+<h3 id="breaking-changes-4">Breaking changes</h3>
<ul>
<li><p><strong>xintcore</strong>, <strong>xint</strong>, <strong>xintfrac</strong>: all macros deprecated at <code>1.2o</code> got removed.</p></li>
<li><p><strong>xintfrac</strong>: addition and subtraction of <code>a/b</code> and <code>c/d</code> now use the l.c.m. of the denominators. Similarly the macro supporting the modulo operator <code>/:</code> uses a l.c.m. for the denominator of the result.</p></li>
<li><p><strong>xintexpr</strong>: the addition, subtraction, modulo <code>/:</code>, and the <code>mod()</code> and <code>divmod()</code> functions produce generally smaller denominators (see previous item).</p></li>
<li><p><strong>xintexpr</strong>: formerly, the internal macros which are internally associated to user-declared functions were using comma separated parameter texts. They now do not use such commas (their meanings, which may again change in future, are written for information to the log under <code>\xintverbosetrue</code>).</p></li>
</ul>
-<h3 id="improvements-and-new-features-5">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-7">Improvements and new features</h3>
<ul>
<li><p><strong>xintexpr</strong>: user-defined functions may now be of a recursive nature. This was made possible by a refactoring of the <code>\xintNewExpr</code> mechanism. It became both leaner and more extensive than formerly.</p></li>
<li><p><strong>xintfrac</strong>: new macros <code>\xintPIrr</code> and <code>\xintDecToString</code>. The latter is a backport of a <code>polexpr 0.4</code> utility, and it is to be considered unstable.</p></li>
<li><p><strong>xintexpr</strong>: new function <code>preduce()</code> associated with <code>\xintPIrr</code>.</p></li>
</ul>
<h2 id="q-20180206"><code>1.2q (2018/02/06)</code></h2>
-<h3 id="improvements-and-new-features-6">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-8">Improvements and new features</h3>
<ul>
<li><strong>xintexpr</strong>: tacit multiplication extended to cases such as <code>3!4!5!</code> or <code>(1+2)3</code>.</li>
</ul>
-<h3 id="bug-fixes-4">Bug fixes</h3>
+<h3 id="bug-fixes-8">Bug fixes</h3>
<ul>
<li><strong>xintcore</strong>: sadly, refactoring at <code>1.2l</code> of subtraction left an extra character in an inner macro causing breakage in some rare circumstances. This should not have escaped our test suite!</li>
</ul>
<h2 id="p-20171205"><code>1.2p (2017/12/05)</code></h2>
-<h3 id="incompatible-changes-3">Incompatible changes</h3>
+<h3 id="breaking-changes-5">Breaking changes</h3>
<ul>
<li><p><strong>xintgcd</strong>: <code>\xintBezout{a}{b}</code>’s output consists of <code>{u}{v}{d}</code> with <code>u*a+v*b==d</code>, with <code>d</code> the GCD. Formerly it was <code>{a}{b}{u}{v}{d}</code>, and with <code>u*a-v*b==d</code>.</p></li>
<li><p><strong>xintgcd</strong>: <code>\xintBezout{0}{0}</code> expands to <code>{0}{0}{0}</code>. Formerly (since <code>1.2l</code>) it raised <code>InvalidOperation</code>.</p></li>
@@ -283,13 +406,13 @@
<li><p><strong>xintfrac</strong>: <code>\xintMod</code> is now associated with floored division. The former meaning is available as <code>\xintModTrunc</code>.</p></li>
<li><p><strong>xintexpr</strong>: the <code>//</code> operator and its associated modulo <code>'mod'</code> (or <code>/:</code>) now correspond to floored division, like the Python language <code>//</code>, <code>%</code>, and <code>divmod(x, y)</code>. Formerly they had been associated to truncated division. This is breaking change for operands of opposite signs.</p></li>
</ul>
-<h3 id="improvements-and-new-features-7">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-9">Improvements and new features</h3>
<ul>
<li><p><strong>xinttools</strong>: <code>\xintListWithSep</code>, which had remained unchanged since its introduction at <code>1.04 (2013/04/25)</code>, was rewritten for increased speed.</p></li>
<li><p><strong>xintexpr</strong>: <code>\xintdefvar</code>’s syntax is extended to allow simultaneous assignments. Examples: <code>\xintdefvar x1, x2, x3 := 1, 3**10, 3**20;</code> or <code>\xintdefiivar A, B := B, A 'mod' B;</code> for already defined variables <code>A</code> and <code>B</code>.</p></li>
<li><p><strong>xintexpr</strong>: added <code>divmod()</code> to the built-in functions. It is associated with floored division, like the Python language <code>divmod()</code>. Related support macros added to <strong>xintcore</strong>, and <strong>xintfrac</strong>.</p></li>
</ul>
-<h3 id="bug-fixes-5">Bug fixes</h3>
+<h3 id="bug-fixes-9">Bug fixes</h3>
<ul>
<li><p><strong>xintgcd</strong>: <code>\xintBezout{6}{3}</code> (for example) expanded to <code>{6}{3}{-0}{-1}{3}</code>, but the <code>-0</code> should have been <code>0</code>.</p></li>
<li><p><strong>xintgcd</strong>: it still used macro <code>\xintiAbs</code> although the latter had been deprecated from <strong>xintcore</strong>.</p></li>
@@ -297,7 +420,7 @@
<li><p>various documentation fixes; in particular, the partial dependency of <strong>xintcfrac</strong> on <strong>xinttools</strong> had not been mentioned.</p></li>
</ul>
<h2 id="o-20170829"><code>1.2o (2017/08/29)</code></h2>
-<h3 id="incompatible-changes-4">Incompatible changes</h3>
+<h3 id="breaking-changes-6">Breaking changes</h3>
<ul>
<li><strong>xint</strong>: <code>\xintAND</code>, <code>\xintOR</code>, … and similar Boolean logic macros do not apply anymore <code>\xintNum</code> (or <code>\xintRaw</code> if <strong>xintfrac</strong> is loaded), to their arguments (often, from internal usage of <code>\xintSgn</code>), but only f-expand them (using e.g. <code>\xintiiSgn</code>). This is kept un-modified even if loading <strong>xintfrac</strong>.</li>
</ul>
@@ -313,26 +436,26 @@
<li><p><strong>xint</strong>: <code>\xintNot</code> was renamed to <code>\xintNOT</code>, former denomination is deprecated. See also item about Boolean logic macros in the <em>Incompatible Changes</em> section.</p></li>
</ul>
<h2 id="n-20170806"><code>1.2n (2017/08/06)</code></h2>
-<h3 id="incompatible-changes-5">Incompatible changes</h3>
+<h3 id="breaking-changes-7">Breaking changes</h3>
<ul>
<li><strong>xintbinhex</strong> does not load package <strong>xintcore</strong> anymore, but only <strong>xintkernel</strong>.</li>
</ul>
-<h3 id="improvements-and-new-features-8">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-10">Improvements and new features</h3>
<ul>
<li><p><strong>xintbinhex</strong> has only <strong>xintkernel</strong> as dependency.</p></li>
<li><p>Macros of <strong>xintbinhex</strong> have been improved for speed and increased maximal sizes of allowable inputs.</p></li>
</ul>
<h2 id="m-20170731"><code>1.2m (2017/07/31)</code></h2>
-<h3 id="incompatible-changes-6">Incompatible changes</h3>
+<h3 id="breaking-changes-8">Breaking changes</h3>
<ul>
<li><p><strong>xintbinhex</strong>: the length of the input is now limited. The maximum size depends on the macro and ranges from about <code>4000</code> to about <code>19900</code> digits.</p></li>
<li><p><strong>xintbinhex</strong>: <code>\xintCHexToBin</code> is now the variant of <code>\xintHexToBin</code> which does not remove leading binary zeroes: <code>N</code> hex-digits give on output exactly <code>4N</code> binary digits.</p></li>
</ul>
-<h3 id="improvements-and-new-features-9">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-11">Improvements and new features</h3>
<ul>
<li><strong>xintbinhex</strong>: all macros have been rewritten using techniques from the 1.2 release (they had remained unmodified since <code>1.08</code> of <code>2013/06/07</code>.) The new macros are faster but limited to a few thousand digits. The <code>1.08</code> routines could handle tens of thousands of digits, but not in a reasonable time.</li>
</ul>
-<h3 id="bug-fixes-6">Bug fixes</h3>
+<h3 id="bug-fixes-10">Bug fixes</h3>
<ul>
<li><p>user manual: the <code>Changes</code> section wrongly stated at <code>1.2l</code> that the macros of <strong>xintbinhex</strong> had been made robust against non terminated input such as <code>\number\mathcode`\-</code>. Unfortunately the author fell into the trap of believing his own documentation and he forgot to actually implement the change. Now done.</p></li>
<li><p>user manual: the PDF bookmarks were messed up.</p></li>
@@ -344,7 +467,7 @@
<li><p><code>\xintiiSumExpr</code>, <code>\xintiiPrdExpr</code> (<strong>xint</strong>) and <code>\xintSumExpr</code>, <code>\xintPrdExpr</code> (<strong>xintfrac</strong>). They had not been formally deprecated, but had been left un-documented since <code>1.09d (2013/10/22)</code>.</p></li>
<li><p>internal macro <code>\xint_gob_til_xint_relax</code> removed.</p></li>
</ul>
-<h3 id="improvements-and-new-features-10">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-12">Improvements and new features</h3>
<ul>
<li><p>the underscore character <code>_</code> is accepted by the <strong>xintexpr</strong> parsers as a digit separator (the space character already could be used for improved readability of big numbers). It is not allowed as <em>first</em> character of a number, as it would then be mis-interpreted as the start of a possible variable name.</p></li>
<li><p>some refactoring in <strong>xintcore</strong> auxiliary routines and in <code>\xintiiSub</code> and <code>\xintiiCmp</code> for some small efficiency gains.</p></li>
@@ -353,33 +476,33 @@
<p>The situation with expressions is unchanged: syntax such as <code>\xintexpr \numexpr1+2\relax</code> is illegal as the ending <code>\relax</code> token will get swallowed by the <code>\numexpr</code>; but it is needed by the <code>xintexpr</code>-ession parser, hence the parser will expand forward and presumably end with in an “illegal token” error, or provoke some low-level TeX error (N.B.: a closing brace <code>}</code> for example can not terminate an <code>xintexpr</code>-ession, the parser must find a <code>\relax</code> token at some point). Thus there must be in this example a second <code>\relax</code>.</p></li>
<li><p>experimental code for error conditions; there is no complete user interface yet, it is done in preparation for next major release and is completely unstable and undocumented.</p></li>
</ul>
-<h3 id="bug-fixes-7">Bug fixes</h3>
+<h3 id="bug-fixes-11">Bug fixes</h3>
<ul>
<li><p><strong>xintbinhex</strong>: since <code>1.2 (2015/10/10)</code>, <code>\xintHexToDec</code> was broken due to an undefined macro (it was in <code>xint.sty</code>, but the module by itself is supposedly dependent only upon <code>xintcore.sty</code>).</p></li>
<li><p><strong>xintgcd</strong>: macro <code>\xintBezout</code> produced partially wrong output if one of its two arguments was zero.</p></li>
<li><p><strong>xintfrac</strong>: the manual said one could use directly <code>\numexpr</code> compatible expressions in arithmetic macros (without even a <code>\numexpr</code> encapsulation) if they were expressed with up to 8 tokens. There was a bug if these 8 tokens evaluated to zero. The bug has been fixed, and up to 9 tokens are now accepted. But it is simpler to use <code>\the\numexpr</code> prefix and not to worry about the token count… The ending <code>\relax</code> is now un-needed.</p></li>
</ul>
<h2 id="k-20170106"><code>1.2k (2017/01/06)</code></h2>
-<h3 id="incompatible-changes-7">Incompatible changes</h3>
+<h3 id="breaking-changes-9">Breaking changes</h3>
<ul>
<li><p>macro <code>\xintFloat</code> which rounds its input to a floating point number does <em>not</em> print anymore <code>10.0...0eN</code> to signal an upwards rounding to the next power of ten. The mantissa has in all cases except the zero input exactly one digit before the decimal mark.</p></li>
<li><p>some floating point computations may differ in the least significant digits, due to a change in the rounding algorithm applied to macro arguments expressed as fractions and to an improvement in precision regarding half-integer powers in expressions. See next.</p></li>
</ul>
-<h3 id="improvements-and-new-features-11">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-13">Improvements and new features</h3>
<ul>
<li><p>the initial rounding to the target precision <code>P</code> which is applied by the floating point macros from <strong>xintfrac</strong> to their arguments achieves the <em>exact (aka correct) rounding</em> even for inputs which are fractions with more than <code>P+2</code> digits in their numerators and denominators (<code>>1</code>.) Hence the computed values depend only on the arguments as rational numbers and not upon their representatives. This is not relevant to <em>expressions</em> (<strong>xintexpr</strong>), because the <code>\xintfloatexpr</code> parser sees there <code>/</code> as an operator and does not (apart from special constructs) get to manipulate fractions as such.</p></li>
<li><p><code>\xintnewdummy</code> is public interface to a <code>1.2e</code> macro which serves to declare any given catcode 11 character as a dummy variable for expressions (<strong>xintexpr</strong>). This is useful for Unicode engines (the Latin letters being already all pre-declared as dummy variables.)</p></li>
<li><p>added <code>\xintiSqrtR</code>, there was only <code>\xintiiSqrtR</code> alongside <code>\xintiSqrt</code> and <code>\xintiiSqrt</code> (<strong>xint</strong>).</p></li>
<li><p>added non public <code>\xintLastItem:f:csv</code> to <strong>xinttools</strong> for faster <code>last()</code> function, and improved <code>\xintNewExpr</code> compatibility. Also <code>\xintFirstItem:f:csv</code>.</p></li>
</ul>
-<h3 id="bug-fixes-8">Bug fixes</h3>
+<h3 id="bug-fixes-12">Bug fixes</h3>
<ul>
<li><p>the <code>1.2f</code> half-integer powers computed within <code>\xintfloatexpr</code> had a silly rounding to the target precision just <em>before</em> the final square-root extraction, thus possibly losing some precision. The <code>1.2k</code> implementation keeps guard digits for this final square root extraction. As for integer exponents, it is guaranteed that the computed value differs from the exact one by less than <code>0.52 ulp</code> (for inputs having at most <code>\xinttheDigits</code> digits.)</p></li>
<li><p>more regressions from <code>1.2i</code> were fixed: <code>\xintLen</code> (<strong>xint</strong>, <strong>xintfrac</strong>) and <code>\xintDouble</code> (<strong>xintcore</strong>) had forgotten that their argument was allowed to be negative. A regression test suite is now in place and is being slowly expanded to cover more macros.</p></li>
<li><p><code>\xintiiSquareRoot{0}</code> now produces <code>{1}{1}</code>, which fits better the general documented behaviour of this macro than <code>11</code>.</p></li>
</ul>
<h2 id="j-20161222"><code>1.2j (2016/12/22)</code></h2>
-<h3 id="improvements-and-new-features-12">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-14">Improvements and new features</h3>
<ul>
<li><p><strong>xinttools</strong> and <strong>xintexpr</strong>:</p>
<ol type="1">
@@ -388,12 +511,12 @@
</ol></li>
<li><p>significant documentations tweaks (inclusive of suppressing things!), and among them two beautiful hyperlinked tables with both horizontal and vertical rules which bring the documentation of the <strong>xintexpr</strong> syntax to a kind of awe-inspiring perfection… except that implementation of some math functions is still lacking.</p></li>
</ul>
-<h3 id="bug-fixes-9">Bug fixes</h3>
+<h3 id="bug-fixes-13">Bug fixes</h3>
<ul>
<li>fix two <code>1.2i</code> regressions caused by undefined macros (<code>\xintNthElt</code> in certain branches and <code>[list][N]</code> item extraction in certain cases.) The test files existed but were not executed prior to release. Automation in progress.</li>
</ul>
<h2 id="i-20161213"><code>1.2i (2016/12/13)</code></h2>
-<h3 id="incompatible-changes-8">Incompatible changes</h3>
+<h3 id="breaking-changes-10">Breaking changes</h3>
<ul>
<li><code>\xintDecSplit</code> second argument must have no sign (former code replaced it with its absolute value, a sign now may cause an error.)</li>
</ul>
@@ -401,7 +524,7 @@
<ul>
<li>deprecated macros <code>\xintifTrue</code>, <code>\xintifTrueFalse</code>, <code>\xintQuo</code>, <code>\xintRem</code>, <code>\xintquo</code>, <code>\xintrem</code>.</li>
</ul>
-<h3 id="improvements-and-new-features-13">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-15">Improvements and new features</h3>
<ul>
<li><p><strong>xintkernel</strong>: <code>\xintLength</code> is faster. New macros:</p>
<ul>
@@ -420,17 +543,17 @@
<li><p>the documentation has again been (slightly) re-organized; it has a new sub-section on the Miller-Rabin primality test, to illustrate some use of <code>\xintNewFunction</code> for recursive definitions.</p></li>
<li><p>the documentation has dropped the LaTeX “command” terminology (which had been used initially in 2013 for some forgotten reasons and should have been removed long ago) and uses only the more apt “macro”, as after all, all of <strong>xint</strong> is about expansion of macros (plus the use of <code>\numexpr</code>).</p></li>
</ul>
-<h3 id="bug-fixes-10">Bug fixes</h3>
+<h3 id="bug-fixes-14">Bug fixes</h3>
<ul>
<li><code>\xintDecSplitL</code> and <code>\xintDecSplitR</code> from <strong>xint</strong> produced their output in a spurious brace pair (bug introduced in <code>1.2f</code>).</li>
</ul>
<h2 id="h-20161120"><code>1.2h (2016/11/20)</code></h2>
-<h3 id="improvements-and-new-features-14">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-16">Improvements and new features</h3>
<ul>
<li><p>new macro <code>\xintNewFunction</code> in <strong>xintexpr</strong> which allows to extend the parser syntax with functions in situations where <code>\xintdeffunc</code> is not usable (typically, because dummy variables are used over a not yet determined range of values because it depends on the variables).</p></li>
<li><p>after three years of strict obedience to <code>xint</code> prefix, now <code>\thexintexpr</code>, <code>\thexintiexpr</code>, <code>\thexintfloatexpr</code>, and <code>\thexintiiexpr</code> are provided as synonyms to <code>\xinttheexpr</code>, etc…</p></li>
</ul>
-<h3 id="bug-fixes-11">Bug fixes</h3>
+<h3 id="bug-fixes-15">Bug fixes</h3>
<ul>
<li><p>the <code>(cond)?{foo}{bar}</code> operator from <strong>xintexpr</strong> mis-behaved in certain circumstances (such as an empty <code>foo</code>).</p></li>
<li><p>the <strong>xintexpr</strong> <code>1.2f</code> <code>binomial</code> function (which uses <code>\xintiiBinomial</code> from <strong>xint.sty</strong> or <code>\xintFloatBinomial</code> from <strong>xintfrac.sty</strong>) deliberately raised an error for <code>binomial(x,y)</code> with <code>y<0</code> or <code>x<y</code>. This was unfortunate, and it now simply evaluates to zero in such cases.</p></li>
@@ -438,12 +561,12 @@
<li><p>the <code>add</code> and <code>mul</code> from <strong>xintexpr</strong>, which work with dummy variables since <code>1.1</code>, raised an error since <code>1.2c 2015/11/16</code> when the dummy variable was given an empty range (or list) of values, rather than producing respectively <code>0</code> and <code>1</code> as formerly.</p></li>
</ul>
<h2 id="g-20160319"><code>1.2g (2016/03/19)</code></h2>
-<h3 id="incompatible-changes-9">Incompatible changes</h3>
+<h3 id="breaking-changes-11">Breaking changes</h3>
<ul>
<li><p>inside expressions, list item selector <code>[L][n]</code> counts starting at zero, not at one. This is more coherent with <code>[L][a:b]</code> which was already exactly like in Python since its introduction. A function len(L) replaces earlier <code>[L][0]</code>.</p></li>
<li><p>former <code>iter</code> keyword now called <code>iterr</code>. Indeed it matched with <code>rrseq</code>, the new <code>iter</code> (which was somehow missing from <code>1.1</code>) is the one matching <code>rseq</code>. Allows to iterate more easily with a “list” variable.</p></li>
</ul>
-<h3 id="improvements-and-new-features-15">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-17">Improvements and new features</h3>
<ul>
<li><p>in <strong>xintexpr.sty</strong>: list selectors <code>[L][n]</code> and <code>[L][a:b]</code> are more efficient: the earlier <code>1.1</code> routines did back and forth conversions from comma separated values to braced tokens, the <code>1.2g</code> routines use macros from <strong>xinttools.sty</strong> handling directly the encountered lists of comma separated values.</p></li>
<li><p>in <strong>xinttools.sty</strong>: slight improvements in the efficiency of the <code>\xintNthElt</code>, <code>\xintKeep</code>, <code>\xintTrim</code> routines and new routines handling directly comma separated values. The latter are not included in the user manual (they are not <code>\long</code>, they don’t make efforts to preserve some braces, do not worry about spaces, all those worries being irrelevant to the use in expressions for list selectors).</p></li>
@@ -452,11 +575,11 @@
<li><p>the syntax of expressions is described in a devoted chapter of the documentation; an example shows how to implement (expandably) the Brent-Salamin algorithm for computation of Pi using <code>iter</code> in a float expression.</p></li>
</ul>
<h2 id="f-20160312"><code>1.2f (2016/03/12)</code></h2>
-<h3 id="incompatible-changes-10">Incompatible changes</h3>
+<h3 id="breaking-changes-12">Breaking changes</h3>
<ul>
<li>no more <code>\xintFac</code> macro but <code>\xintiFac/\xintiiFac/\xintFloatFac</code>.</li>
</ul>
-<h3 id="improvements-and-new-features-16">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-18">Improvements and new features</h3>
<ul>
<li><p>functions <code>binomial</code>, <code>pfactorial</code> and <code>factorial</code> in both integer and float versions.</p></li>
<li><p>macros <code>\xintiiBinomial</code>, <code>\xintiiPFactorial</code> (<strong>xint.sty</strong>) and <code>\xintFloatBinomial</code>, <code>\xintFloatPFactorial</code> (<strong>xintfrac.sty</strong>). Improvements to <code>\xintFloatFac</code>.</p></li>
@@ -470,69 +593,69 @@
<li><p>(TeXperts only) the macros defined (internally) from <code>\xintdeffunc</code> et al. constructs do not incorporate an initial <code>\romannumeral</code> anymore.</p></li>
<li><p>renewed desperate efforts at improving the documentation by random shuffling of sections and well thought additions; cuts were considered and even performed.</p></li>
</ul>
-<h3 id="bug-fixes-12">Bug fixes</h3>
+<h3 id="bug-fixes-16">Bug fixes</h3>
<ul>
<li><p>squaring macro <code>\xintSqr</code> from <strong>xintfrac.sty</strong> was broken due to a misspelled sub-macro name. Dates back to <code>1.1</code> release of <code>2014/10/28</code> <code>:-((</code>.</p></li>
<li><p><code>1.2c</code>’s fix to the subtraction bug from <code>1.2</code> introduced another bug, which in some cases could create leading zeroes in the output, or even worse. This could invalidate other routines using subtractions, like <code>\xintiiSquareRoot</code>.</p></li>
<li><p>the comparison operators were not recognized by <code>\xintNewIIExpr</code> and <code>\xintdefiifunc</code> constructs.</p></li>
</ul>
<h2 id="e-20151122"><code>1.2e (2015/11/22)</code></h2>
-<h3 id="improvements-and-new-features-17">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-19">Improvements and new features</h3>
<ul>
<li><p>macro <code>\xintunassignvar</code>.</p></li>
<li><p>slight modifications of the logged messages in case of <code>\xintverbosetrue</code>.</p></li>
<li><p>a space in <code>\xintdeffunc f(x)<space>:= expression ;</code> is now accepted.</p></li>
<li><p>documentation enhancements: the <em>Quick Sort</em> section with its included code samples has been entirely re-written; the <em>Commands of the xintexpr package</em> section has been extended and reviewed entirely.</p></li>
</ul>
-<h3 id="bug-fixes-13">Bug fixes</h3>
+<h3 id="bug-fixes-17">Bug fixes</h3>
<ul>
<li><p>in <strong>xintfrac</strong>: the <code>\xintFloatFac</code> from release <code>1.2</code> parsed its argument only through <code>\numexpr</code> but it should have used <code>\xintNum</code>.</p></li>
<li><p>in <strong>xintexpr</strong>: release <code>1.2d</code> had broken the recognition of sub-expressions immediately after variable names (with tacit multiplication).</p></li>
<li><p>in <strong>xintexpr</strong>: contrarily to what <code>1.2d</code> documentation said, tacit multiplication was not yet always done with enhanced precedence. Now yes.</p></li>
</ul>
<h2 id="d-20151118"><code>1.2d (2015/11/18)</code></h2>
-<h3 id="improvements-and-new-features-18">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-20">Improvements and new features</h3>
<ul>
<li><p>the function definitions done by <code>\xintdeffunc</code> et al., as well as the macro declarations by <code>\xintNewExpr</code> et al. now have only local scope.</p></li>
<li><p>tacit multiplication applies to more cases, for example (x+y)z, and always ties more than standard * infix operator, e.g. x/2y is like x/(2*y).</p></li>
<li><p>some documentation enhancements, particularly in the chapter on xintexpr.sty, and also in the code source comments.</p></li>
</ul>
-<h3 id="bug-fixes-14">Bug fixes</h3>
+<h3 id="bug-fixes-18">Bug fixes</h3>
<ul>
<li>in <strong>xintcore</strong>: release <code>1.2c</code> had inadvertently broken the <code>\xintiiDivRound</code> macro.</li>
</ul>
<h2 id="c-20151116"><code>1.2c (2015/11/16)</code></h2>
-<h3 id="improvements-and-new-features-19">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-21">Improvements and new features</h3>
<ul>
<li><p>macros <code>\xintdeffunc</code>, <code>\xintdefiifunc</code>, <code>\xintdeffloatfunc</code> and boolean <code>\ifxintverbose</code>.</p></li>
<li><p>on-going code improvements and documentation enhancements, but stopped in order to issue this bugfix release.</p></li>
</ul>
-<h3 id="bug-fixes-15">Bug fixes</h3>
+<h3 id="bug-fixes-19">Bug fixes</h3>
<ul>
<li>in <strong>xintcore</strong>: recent release <code>1.2</code> introduced a bug in the subtraction (happened when 00000001 was found under certain circumstances at certain mod 8 locations).</li>
</ul>
<h2 id="b-20151029"><code>1.2b (2015/10/29)</code></h2>
-<h3 id="bug-fixes-16">Bug fixes</h3>
+<h3 id="bug-fixes-20">Bug fixes</h3>
<ul>
<li>in <strong>xintcore</strong>: recent release <code>1.2</code> introduced a bug in the division macros, causing a crash when the divisor started with 99999999 (it was attempted to use with 1+99999999 a subroutine expecting only 8-digits numbers).</li>
</ul>
<h2 id="a-20151019"><code>1.2a (2015/10/19)</code></h2>
-<h3 id="improvements-and-new-features-20">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-22">Improvements and new features</h3>
<ul>
<li><p>added <code>\xintKeepUnbraced</code>, <code>\xintTrimUnbraced</code> (<strong>xinttools</strong>) and fixed documentation of <code>\xintKeep</code> and <code>\xintTrim</code> regarding brace stripping.</p></li>
<li><p>added <code>\xintiiMaxof/\xintiiMinof</code> (<strong>xint</strong>).</p></li>
<li><p>TeX hackers only: replaced all code uses of <code>\romannumeral-`0</code> by the quicker <code>\romannumeral`&&@</code> (<code>^</code> being used as letter, had to find another character usable with catcode 7).</p></li>
</ul>
-<h3 id="bug-fixes-17">Bug fixes</h3>
+<h3 id="bug-fixes-21">Bug fixes</h3>
<ul>
<li>in <strong>xintexpr</strong>: recent release <code>1.2</code> introduced a bad bug in the parsing of decimal numbers and as a result <code>\xinttheexpr 0.01\relax</code> expanded to <code>0</code> ! (sigh…)</li>
</ul>
-<h2 id="section-1"><code>1.2 (2015/10/10)</code></h2>
+<h2 id="section-2"><code>1.2 (2015/10/10)</code></h2>
<h3 id="removed-3">Removed</h3>
<ul>
<li>the macros <code>\xintAdd</code>, <code>\xintSub</code>, <code>\xintMul</code>, <code>\xintMax</code>, <code>\xintMin</code>, <code>\xintMaxof</code>, <code>\xintMinof</code> are removed from package <strong>xint</strong>, and only exist in the versions from <strong>xintfrac</strong>. With only <strong>xintcore</strong> or <strong>xint</strong> loaded, one <em>must</em> use <code>\xintiiAdd</code>, <code>\xintiiSub</code>, …, or <code>\xintiAdd</code>, <code>\xintiSub</code>, etc…</li>
</ul>
-<h3 id="improvements-and-new-features-21">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-23">Improvements and new features</h3>
<ul>
<li><p>the basic arithmetic implemented in <strong>xintcore</strong> has been entirely rewritten. The mathematics remains the elementary school one, but the <code>TeX</code> implementation achieves higher speed (except, regarding addition/subtraction, for numbers up to about thirty digits), the gains becoming quite significant for numbers with hundreds of digits.</p></li>
<li><p>the inputs must have less than 19959 digits. But computations with thousands of digits take time.</p></li>
@@ -565,8 +688,8 @@
<li><p>added the previously mentioned <code>ii</code> macros, and some others from <code>1.1</code>, to the user manual. But their main usage is internal to <code>\xintiiexpr</code>, to skip unnecessary overheads.</p></li>
<li><p>various typographical fixes throughout the documentation, and a bit of clean up of the code comments. Improved <code>\Factors</code> example of nested <code>subs</code>, <code>rseq</code>, <code>iter</code> in <code>\xintiiexpr</code>.</p></li>
</ul>
-<h2 id="section-2"><code>1.1 (2014/10/28)</code></h2>
-<h3 id="incompatible-changes-11">Incompatible changes</h3>
+<h2 id="section-3"><code>1.1 (2014/10/28)</code></h2>
+<h3 id="breaking-changes-13">Breaking changes</h3>
<ul>
<li><p>in <code>\xintiiexpr</code>, <code>/</code> does <em>rounded</em> division, rather than the Euclidean division (for positive arguments, this is truncated division). The <code>//</code> operator does truncated division,</p></li>
<li><p>the <code>:</code> operator for three-way branching is gone, replaced with <code>??</code>,</p></li>
@@ -586,7 +709,7 @@
<li><p><code>\xintMax</code>, <code>\xintMin</code>, <code>\xintAdd</code>, <code>\xintSub</code>, <code>\xintMul</code> (<strong>xint</strong>): their usage without <strong>xintfrac</strong> is deprecated; use <code>\xintiMax</code>, <code>\xintiMin</code>, <code>\xintiAdd</code>, <code>\xintiSub</code>, <code>\xintiMul</code>.</p></li>
<li><p>the <code>&</code> and <code>|</code> as Boolean operators in <code>xintexpr</code>-essions are deprecated in favour of <code>&&</code> and <code>||</code>. The single letter operators might be assigned some other meaning in some later release (bitwise operations, perhaps). Do not use them.</p></li>
</ul>
-<h3 id="improvements-and-new-features-22">Improvements and new features</h3>
+<h3 id="improvements-and-new-features-24">Improvements and new features</h3>
<ul>
<li><p>new package <strong>xintcore</strong> has been split off <strong>xint</strong>. It contains the core arithmetic macros (it is loaded by LaTeX package <strong>bnumexpr</strong>),</p></li>
<li><p>neither <strong>xint</strong> nor <strong>xintfrac</strong> load <strong>xinttools</strong>. Only <strong>xintexpr</strong> does,</p></li>
@@ -624,7 +747,7 @@
<li><p><code>\xintthecoords</code> converts a comma separated list of an even number of items to the format expected by the <code>TikZ</code> <code>coordinates</code> syntax,</p></li>
<li><p>completely new version <code>\xintNewExpr</code>, <code>protect</code> function to handle external macros. The dollar sign <code>$</code> for place holders is not accepted anymore, only the standard macro parameter <code>#</code>. Not all constructs are compatible with <code>\xintNewExpr</code>.</p></li>
</ul>
-<h3 id="bug-fixes-18">Bug fixes</h3>
+<h3 id="bug-fixes-22">Bug fixes</h3>
<ul>
<li><p><code>\xintZapFirstSpaces</code> hence also <code>\xintZapSpaces</code> from package <strong>xinttools</strong> were buggy when used with an argument either empty or containing only space tokens.</p></li>
<li><p><code>\xintiiexpr</code> did not strip leading zeroes, hence <code>\xinttheiiexpr 001+1\relax</code> did not obtain the expected result …</p></li>
@@ -767,12 +890,12 @@
<li><p>Better management by <code>\xintCmp</code>, <code>\xintMax</code>, <code>\xintMin</code> and <code>\xintGeq</code> of inputs having big powers of ten in them.</p></li>
<li><p>Macros for floating point numbers added to the <strong>xintseries</strong> package.</p></li>
</ul>
-<h2 id="section-3"><code>1.08 (2013/06/07)</code></h2>
+<h2 id="section-4"><code>1.08 (2013/06/07)</code></h2>
<ul>
<li><p>(<strong>xint</strong> and <strong>xintfrac</strong>) Macros for extraction of square roots, for floating point numbers (<code>\xintFloatSqrt</code>), and integers (<code>\xintiSqrt</code>).</p></li>
<li><p>new package <strong>xintbinhex</strong> providing <em>conversion routines</em> to and from binary and hexadecimal bases.</p></li>
</ul>
-<h2 id="section-4"><code>1.07 (2013/05/25)</code></h2>
+<h2 id="section-5"><code>1.07 (2013/05/25)</code></h2>
<ul>
<li><p>The <strong>xintexpr</strong> package is a new core constituent (which loads automatically <strong>xintfrac</strong> and <strong>xint</strong>) and implements the expandable expanding parser</p>
<pre><code>\xintexpr . . . \relax,</code></pre>
@@ -787,16 +910,16 @@
<ul>
<li>Minor code and documentation improvements. Everywhere in the source code, a more modern underscore has replaced the @ sign.</li>
</ul>
-<h2 id="section-5"><code>1.06 (2013/05/07)</code></h2>
+<h2 id="section-6"><code>1.06 (2013/05/07)</code></h2>
<ul>
<li><p>Some code improvements, particularly for macros of <strong>xint</strong> doing loops.</p></li>
<li><p>New utilities in <strong>xint</strong> for expandable manipulations of lists:</p>
<pre><code>\xintNthElt, \xintCSVtoList, \xintRevWithBraces</code></pre></li>
<li><p>The macros did only a double expansion of their arguments. They now fully expand them (using <code>\romannumeral-`0</code>). Furthermore, in the case of arguments constrained to obey the TeX bounds they will be inserted inside a <code>\numexpr..\relax</code>, hence completely expanded, one may use count registers, even infix arithmetic operations, etc…</p></li>
</ul>
-<h2 id="section-6"><code>1.05 (2013/05/01)</code></h2>
+<h2 id="section-7"><code>1.05 (2013/05/01)</code></h2>
<p>Minor changes and additions to <strong>xintfrac</strong> and <strong>xintcfrac</strong>.</p>
-<h2 id="section-7"><code>1.04 (2013/04/25)</code></h2>
+<h2 id="section-8"><code>1.04 (2013/04/25)</code></h2>
<ul>
<li><p>New component <strong>xintcfrac</strong> devoted to continued fractions.</p></li>
<li><p><strong>xint</strong>: faster division.</p></li>
@@ -806,13 +929,13 @@
<li><p><code>tex xint.dtx</code> extracts style files (no need for a <code>xint.ins</code>).</p></li>
<li><p>Bug fix (<strong>xintfrac</strong>): <code>\xintIrr {0}</code> crashed.</p></li>
</ul>
-<h2 id="section-8"><code>1.03 (2013/04/14)</code></h2>
+<h2 id="section-9"><code>1.03 (2013/04/14)</code></h2>
<ul>
<li><p>New modules <strong>xintfrac</strong> (expandable operations on fractions) and <strong>xintseries</strong> (expandable partial sums with xint package).</p></li>
<li><p>Slightly improved division and faster multiplication (the best ordering of the arguments is chosen automatically).</p></li>
<li><p>Added illustration of Machin algorithm to the documentation.</p></li>
</ul>
-<h2 id="section-9"><code>1.0 (2013/03/28)</code></h2>
+<h2 id="section-10"><code>1.0 (2013/03/28)</code></h2>
<p>Initial announcement:</p>
<blockquote>
<p>The <strong>xint</strong> package implements with expandable TeX macros the basic arithmetic operations of addition, subtraction, multiplication and division, as applied to arbitrarily long numbers represented as chains of digits with an optional minus sign.</p>
Binary files old/doc/generic/xint/CHANGES.pdf and new/doc/generic/xint/CHANGES.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/xint/README new/doc/generic/xint/README
--- old/doc/generic/xint/README 2019-04-07 23:22:39.000000000 +0200
+++ new/doc/generic/xint/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,205 +0,0 @@
- Source: xint.dtx 1.3e 2019/04/05 (doc 2019/04/05)
- Author: Jean-Francois Burnol
- Info: Expandable operations on big integers, decimals, fractions
- License: LPPL 1.3e
-
-This README is also available as README.pdf and README.html.
-
-Change log is to be found in CHANGES.pdf or CHANGES.html.
-
-The user manual is xint.pdf, and the commented source code is available
-as sourcexint.pdf.
-
-
-
-AIM
-
-
-The basic aim is provide _expandable_ computations on integers,
-fractions, and floating point numbers. For example
-
- \xinttheexpr reduce(37189719/183618963+11390170/17310720)^17\relax
-
-will evaluate exactly the fraction; the result has 462 characters
-(including the fraction slash.) One can also work with dummy variables:
-
- \xinttheexpr mul(add(x(x+1)(x+2), x=y..y+15), y=171286,98762,9296)\relax
-
-evaluates to 15979066346135829902328007959448563667099190784.
-
-Float computations are possible at an adjustable precision (default 16).
-
- \xintDigits:=48;\xintthefloatexpr 123_456_789^1_000.5\relax
- ->3.63692761822782679930738270515740797370813691938e8095
-
-(as this example shows the underscore character can be used to separate
-visually digits, one can also use the space character for that purpose).
-
-Square-root and the four operations achieve correct rounding in the
-given arbitrary precision.
-
-Trigonometric functions (direct and inverse) are available with a
-maximal precision of 60 digits.
-
-Logarithms and exponentials are available using the poormanlog package
-which provides only 8 or 9 digits of precision. This will be increased
-in future.
-
-
-
-USAGE
-
-
-It is possible to use the package both with Plain (\input xintexpr.sty)
-or with LaTeX (\usepackage{xintexpr}).
-
-
-With LaTeX
-
- \usepackage{xint} % expandable arithmetic with big integers
- \usepackage{xintfrac} % decimal numbers, fractions, floats
- \usepackage{xinttools} % expandable and non expandable loops
- \usepackage{xintexpr} % expressions with infix operators
-
-The xinttrig and xintlog packages are loaded automatically by xintexpr
-and will refuse to be loaded directly.
-
-Further packages: xintbinhex, xintgcd, xintseries and xintcfrac.
-
-Main dependencies are handled automatically. For example xintexpr
-automatically loads xinttools and xintfrac (which itself loads xint).
-Hexadecimal input requires explicit loading of xintbinhex.
-
-Package xintcore is the subset of xint providing only the five
-operations on big integers: \xintiiAdd, \xintiiMul, …
-
-The LaTeX package bnumexpr defines a more light-weight parser of
-arithmetical expressions using big integers, which supports only the
-four operations, the modulo operation, the power operation, and the
-factorial. By default it uses the macros from xintcore but this can be
-customized.
-
-The LaTeX package polexpr is based upon xintexpr and allows formal
-algebra with polynomials, and finding all real roots with arbitrary
-precision.
-
-
-With TeX
-
-One does for example:
-
- \input xintexpr.sty
-
-This will automatically load xintfrac.sty, xinttrig.sty, xintlog.sty and
-xinttools.sty. The packages may be loaded in any catcode context such
-that letters, digits, \ and % have their standard catcodes.
-
-xintcore.sty and xinttools.sty both import xintkernel.sty which has the
-catcode handler and package identifier and defines a few utilities such
-as \oodef/\fdef, \xint_dothis/\xint_orthat, or \xintLength.
-
-Since 1.3b, xintkernel.sty also provides \xintUniformDeviate which is a
-wrapper of the engine \pdfuniformdeviate or \uniformdeviate done to
-guarantee more uniformity of the pseudo-random integers.
-
-
-
-INSTALLATION
-
-
-Method A: using the package manager of your TeX distribution
-
-xint is included in TeXLive (hence also MacTeX) and MikTeX.
-
-There can be a few days of delay between apparition of a new version on
-CTAN and availability via the distribution package manager.
-
-
-Method B: manual installation using xint.tds.zip and unzip
-
-Assumes a GNU/Linux-like system (or Mac OS X).
-
-1. obtain xint.tds.zip from CTAN:
- http://mirror.ctan.org/install/macros/generic/xint.tds.zip
-
-2. cd to the download repertory and issue:
-
- unzip xint.tds.zip -d <TEXMF>
-
- where <TEXMF> is a suitable TDS-compliant destination repertory. For
- example, with TeXLive:
-
- - Linux, standard access rights, hence sudo is needed,
- installation into the “local” tree:
-
- sudo unzip xint.tds.zip -d /usr/local/texlive/texmf-local
- sudo texhash /usr/local/texlive/texmf-local
-
- - Mac OS X, installation into user home folder (no sudo needed,
- and it is recommended to not have a ls-R file there, hence no
- texhash):
-
- unzip xint.tds.zip -d ~/Library/texmf
-
-
-Method C: manual installation using Makefile and xint.dtx
-
-The Makefile automatizes rebuilding from xint.dtx all documentation
-files as well as xint.tds.zip. It is for GNU/Linux-like (inc. Mac OS X)
-systems, with a teTeX like installation such as TeXLive. The Latexmk and
-Pandoc softwares are required to build all the documentation.
-
-1. obtain xint.dtx and Makefile from
- http://mirror.ctan.org/macros/generic/xint.
-
-2. put them in an otherwise empty working repertory, run make or
- equivalently make help for further instructions.
-
-
-Method D: installation starting with only xint.dtx
-
-Run etex xint.dtx to extract from xint.dtx all macro files as well as
-auxiliary files needed for building the documentation. Among them there
-is Makefile.mk. If you are on a GNU/Linux-type system, rename the file
-to Makefile and execute make on command line for further help. If you
-can’t use make read the contents of the Makefile for instructions.
-
-Finishing the installation in a TDS hierarchy:
-
-- move the style files to TDS:tex/generic/xint/
-
-- xint.dtx goes to TDS:source/generic/xint/
-
-- The documentation (xint.pdf, README.md,…) goes to
- TDS:doc/generic/xint/
-
-Depending on the destination, it may then be necessary to refresh a
-filename database.
-
-
-
-LICENSE
-
-
-Copyright (C) 2013-2019 by Jean-Francois Burnol
-
-This Work may be distributed and/or modified under the conditions of the
-LaTeX Project Public License version 1.3c. This version of this license
-is in
-
- http://www.latex-project.org/lppl/lppl-1-3c.txt
-
-and version 1.3 or later is part of all distributions of LaTeX version
-2005/12/01 or later.
-
-This Work has the LPPL maintenance status author-maintained.
-
-The Author of this Work is Jean-Francois Burnol.
-
-This Work consists of the source file xint.dtx and of its derived files:
-xintkernel.sty, xintcore.sty, xint.sty, xintfrac.sty, xintexpr.sty,
-xinttrig.sty, xintlog.sty, xintbinhex.sty, xintgcd.sty, xintseries.sty,
-xintcfrac.sty, xinttools.sty, xint.ins, xint.tex, README, README.md,
-README.html, README.pdf, CHANGES.md, CHANGES.html, CHANGES.pdf,
-pandoctpl.latex, doHTMLs.sh, doPDFs.sh, xint.dvi, xint.pdf, and
-Makefile.mk.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/xint/README.html new/doc/generic/xint/README.html
--- old/doc/generic/xint/README.html 2019-04-07 23:22:39.000000000 +0200
+++ new/doc/generic/xint/README.html 1970-01-01 01:00:00.000000000 +0100
@@ -1,133 +0,0 @@
-<!DOCTYPE html>
-<html xmlns="http://www.w3.org/1999/xhtml" lang="" xml:lang="">
-<head>
- <meta charset="utf-8" />
- <meta name="generator" content="pandoc" />
- <meta name="viewport" content="width=device-width, initial-scale=1.0, user-scalable=yes" />
- <meta name="author" content="xint 1.3e" />
- <title>README</title>
- <style type="text/css">
- code{white-space: pre-wrap;}
- span.smallcaps{font-variant: small-caps;}
- span.underline{text-decoration: underline;}
- div.column{display: inline-block; vertical-align: top; width: 50%;}
- </style>
- <style type="text/css">
- body{margin-left : 10%; margin-right : 15%; margin-top: 4ex; font-size: 12pt;}
- pre {white-space: pre-wrap; }
- code {white-space: pre-wrap; }
- .mono {font-family: monospace;}
- </style>
- <!--[if lt IE 9]>
- <script src="//cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv-printshiv.min.js"></script>
- <![endif]-->
-</head>
-<body>
-<header>
-<h1 class="title">README</h1>
-<p class="author">xint 1.3e</p>
-<p class="date">2019/04/05</p>
-</header>
-<nav id="TOC">
-<ul>
-<li><a href="#aim">Aim</a></li>
-<li><a href="#usage">Usage</a><ul>
-<li><a href="#with-latex">With LaTeX</a></li>
-<li><a href="#with-tex">With TeX</a></li>
-</ul></li>
-<li><a href="#installation">Installation</a><ul>
-<li><a href="#method-a-using-the-package-manager-of-your-tex-distribution">Method A: using the package manager of your TeX distribution</a></li>
-<li><a href="#method-b-manual-installation-using-xint.tds.zip-and-unzip">Method B: manual installation using <code>xint.tds.zip</code> and <code>unzip</code></a></li>
-<li><a href="#method-c-manual-installation-using-makefile-and-xint.dtx">Method C: manual installation using <code>Makefile</code> and <code>xint.dtx</code></a></li>
-<li><a href="#method-d-installation-starting-with-only-xint.dtx">Method D: installation starting with only <code>xint.dtx</code></a></li>
-</ul></li>
-<li><a href="#license">License</a></li>
-</ul>
-</nav>
-<pre><code>Source: xint.dtx 1.3e 2019/04/05 (doc 2019/04/05)
-Author: Jean-Francois Burnol
-Info: Expandable operations on big integers, decimals, fractions
-License: LPPL 1.3e</code></pre>
-<p>This <code>README</code> is also available as <code>README.pdf</code> and <code>README.html</code>.</p>
-<p>Change log is to be found in <code>CHANGES.pdf</code> or <code>CHANGES.html</code>.</p>
-<p>The user manual is <code>xint.pdf</code>, and the commented source code is available as <code>sourcexint.pdf</code>.</p>
-<h1 id="aim">Aim</h1>
-<p>The basic aim is provide <em>expandable</em> computations on integers, fractions, and floating point numbers. For example</p>
-<pre><code>\xinttheexpr reduce(37189719/183618963+11390170/17310720)^17\relax</code></pre>
-<p>will evaluate exactly the fraction; the result has 462 characters (including the fraction slash.) One can also work with dummy variables:</p>
-<pre><code>\xinttheexpr mul(add(x(x+1)(x+2), x=y..y+15), y=171286,98762,9296)\relax</code></pre>
-<p>evaluates to <code>15979066346135829902328007959448563667099190784</code>.</p>
-<p>Float computations are possible at an adjustable precision (default 16).</p>
-<pre><code>\xintDigits:=48;\xintthefloatexpr 123_456_789^1_000.5\relax
-->3.63692761822782679930738270515740797370813691938e8095</code></pre>
-<p>(as this example shows the underscore character can be used to separate visually digits, one can also use the space character for that purpose).</p>
-<p>Square-root and the four operations achieve correct rounding in the given arbitrary precision.</p>
-<p>Trigonometric functions (direct and inverse) are available with a maximal precision of 60 digits.</p>
-<p>Logarithms and exponentials are available using the <a href="http://www.ctan.org/pkg/poormanlog">poormanlog</a> package which provides only 8 or 9 digits of precision. This will be increased in future.</p>
-<h1 id="usage">Usage</h1>
-<p>It is possible to use the package both with Plain (<code>\input xintexpr.sty</code>) or with LaTeX (<code>\usepackage{xintexpr}</code>).</p>
-<h2 id="with-latex">With LaTeX</h2>
-<pre><code>\usepackage{xint} % expandable arithmetic with big integers
-\usepackage{xintfrac} % decimal numbers, fractions, floats
-\usepackage{xinttools} % expandable and non expandable loops
-\usepackage{xintexpr} % expressions with infix operators</code></pre>
-<p>The <code>xinttrig</code> and <code>xintlog</code> packages are loaded automatically by <code>xintexpr</code> and will refuse to be loaded directly.</p>
-<p>Further packages: <code>xintbinhex</code>, <code>xintgcd</code>, <code>xintseries</code> and <code>xintcfrac</code>.</p>
-<p>Main dependencies are handled automatically. For example <code>xintexpr</code> automatically loads <code>xinttools</code> and <code>xintfrac</code> (which itself loads <code>xint</code>). Hexadecimal input requires explicit loading of <code>xintbinhex</code>.</p>
-<p>Package <code>xintcore</code> is the subset of <code>xint</code> providing only the five operations on big integers: <code>\xintiiAdd</code>, <code>\xintiiMul</code>, …</p>
-<p>The LaTeX package <a href="http://www.ctan.org/pkg/bnumexpr">bnumexpr</a> defines a more light-weight parser of arithmetical expressions using big integers, which supports only the four operations, the modulo operation, the power operation, and the factorial. By default it uses the macros from <code>xintcore</code> but this can be customized.</p>
-<p>The LaTeX package <a href="http://www.ctan.org/pkg/polexpr">polexpr</a> is based upon <code>xintexpr</code> and allows formal algebra with polynomials, and finding all real roots with arbitrary precision.</p>
-<h2 id="with-tex">With TeX</h2>
-<p>One does for example:</p>
-<pre><code>\input xintexpr.sty</code></pre>
-<p>This will automatically load <code>xintfrac.sty</code>, <code>xinttrig.sty</code>, <code>xintlog.sty</code> and <code>xinttools.sty</code>. The packages may be loaded in any catcode context such that letters, digits, <code>\</code> and <code>%</code> have their standard catcodes.</p>
-<p><code>xintcore.sty</code> and <code>xinttools.sty</code> both import <code>xintkernel.sty</code> which has the catcode handler and package identifier and defines a few utilities such as <code>\oodef/\fdef</code>, <code>\xint_dothis/\xint_orthat</code>, or <code>\xintLength</code>.</p>
-<p>Since <code>1.3b</code>, <code>xintkernel.sty</code> also provides <code>\xintUniformDeviate</code> which is a wrapper of the engine <code>\pdfuniformdeviate</code> or <code>\uniformdeviate</code> done to guarantee more uniformity of the pseudo-random integers.</p>
-<h1 id="installation">Installation</h1>
-<h2 id="method-a-using-the-package-manager-of-your-tex-distribution">Method A: using the package manager of your TeX distribution</h2>
-<p><code>xint</code> is included in <a href="http://tug.org/texlive/">TeXLive</a> (hence also <a href="http://tug.org/mactex/">MacTeX</a>) and <a href="http://www.miktex.org/">MikTeX</a>.</p>
-<p>There can be a few days of delay between apparition of a new version on <a href="http://www.ctan.org/pkg/xint">CTAN</a> and availability via the distribution package manager.</p>
-<h2 id="method-b-manual-installation-using-xint.tds.zip-and-unzip">Method B: manual installation using <code>xint.tds.zip</code> and <code>unzip</code></h2>
-<p>Assumes a GNU/Linux-like system (or Mac OS X).</p>
-<ol type="1">
-<li><p>obtain <code>xint.tds.zip</code> from CTAN: <a href="http://mirror.ctan.org/install/macros/generic/xint.tds.zip" class="uri">http://mirror.ctan.org/install/macros/generic/xint.tds.zip</a></p></li>
-<li><p>cd to the download repertory and issue:</p>
-<pre><code> unzip xint.tds.zip -d <TEXMF></code></pre>
-<p>where <code><TEXMF></code> is a suitable TDS-compliant destination repertory. For example, with TeXLive:</p>
-<ul>
-<li><p>Linux, standard access rights, hence sudo is needed, installation into the “local” tree:</p>
-<pre><code> sudo unzip xint.tds.zip -d /usr/local/texlive/texmf-local
- sudo texhash /usr/local/texlive/texmf-local</code></pre></li>
-<li><p>Mac OS X, installation into user home folder (no sudo needed, and it is recommended to not have a ls-R file there, hence no texhash):</p>
-<pre><code> unzip xint.tds.zip -d ~/Library/texmf</code></pre></li>
-</ul></li>
-</ol>
-<h2 id="method-c-manual-installation-using-makefile-and-xint.dtx">Method C: manual installation using <code>Makefile</code> and <code>xint.dtx</code></h2>
-<p>The Makefile automatizes rebuilding from <code>xint.dtx</code> all documentation files as well as <code>xint.tds.zip</code>. It is for GNU/Linux-like (inc. Mac OS X) systems, with a teTeX like installation such as TeXLive. The <a href="http://personal.psu.edu/jcc8/software/latexmk/">Latexmk</a> and <a href="http://johnmacfarlane.net/pandoc/">Pandoc</a> softwares are required to build all the documentation.</p>
-<ol type="1">
-<li><p>obtain <code>xint.dtx</code> and <code>Makefile</code> from <a href="http://mirror.ctan.org/macros/generic/xint" class="uri">http://mirror.ctan.org/macros/generic/xint</a>.</p></li>
-<li><p>put them in an otherwise empty working repertory, run <code>make</code> or equivalently <code>make help</code> for further instructions.</p></li>
-</ol>
-<h2 id="method-d-installation-starting-with-only-xint.dtx">Method D: installation starting with only <code>xint.dtx</code></h2>
-<p>Run <code>etex xint.dtx</code> to extract from <code>xint.dtx</code> all macro files as well as auxiliary files needed for building the documentation. Among them there is <code>Makefile.mk</code>. If you are on a GNU/Linux-type system, rename the file to <code>Makefile</code> and execute <code>make</code> on command line for further help. If you can’t use <code>make</code> read the contents of the <code>Makefile</code> for instructions.</p>
-<p>Finishing the installation in a TDS hierarchy:</p>
-<ul>
-<li><p>move the style files to <code>TDS:tex/generic/xint/</code></p></li>
-<li><p><code>xint.dtx</code> goes to <code>TDS:source/generic/xint/</code></p></li>
-<li><p>The documentation (xint.pdf, README.md,…) goes to <code>TDS:doc/generic/xint/</code></p></li>
-</ul>
-<p>Depending on the destination, it may then be necessary to refresh a filename database.</p>
-<h1 id="license">License</h1>
-<div class="mono">
-<p>Copyright (C) 2013-2019 by Jean-Francois Burnol</p>
-<p>This Work may be distributed and/or modified under the conditions of the LaTeX Project Public License version 1.3c. This version of this license is in</p>
-<blockquote>
-<p><a href="http://www.latex-project.org/lppl/lppl-1-3c.txt" class="uri">http://www.latex-project.org/lppl/lppl-1-3c.txt</a></p>
-</blockquote>
-<p>and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.</p>
-<p>This Work has the LPPL maintenance status <code>author-maintained</code>.</p>
-<p>The Author of this Work is Jean-Francois Burnol.</p>
-This Work consists of the source file xint.dtx and of its derived files: xintkernel.sty, xintcore.sty, xint.sty, xintfrac.sty, xintexpr.sty, xinttrig.sty, xintlog.sty, xintbinhex.sty, xintgcd.sty, xintseries.sty, xintcfrac.sty, xinttools.sty, xint.ins, xint.tex, README, README.md, README.html, README.pdf, CHANGES.md, CHANGES.html, CHANGES.pdf, pandoctpl.latex, doHTMLs.sh, doPDFs.sh, xint.dvi, xint.pdf, and Makefile.mk.
-</div>
-</body>
-</html>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/xint/README.md new/doc/generic/xint/README.md
--- old/doc/generic/xint/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/xint/README.md 2020-02-26 23:09:41.000000000 +0100
@@ -0,0 +1,127 @@
+% README
+% xint 1.4b
+% 2020/02/25
+
+ Source: xint.dtx 1.4b 2020/02/25 (doc 2020/02/25)
+ Author: Jean-Francois Burnol
+ Info: Expandable operations on big integers, decimals, fractions
+ License: LPPL 1.3c
+
+Aim and usage
+=============
+
+It is possible to use the package both with Plain (`\input xintexpr.sty`)
+or with the LaTeX macro format (`\usepackage{xintexpr}`).
+
+The basic aim is provide *expandable* computations on (arbitrily big)
+integers, fractions, and floating point numbers (at a user chosen
+precision). The four operations and the square-root extraction achieve
+so-called *correct rounding* for the given arbitrary precision.
+
+The syntax knows dummy variables, as in this example:
+
+ \xinteval{reduce(add(x/(x+7), x = 1000..1010))}
+
+which expands to:
+
+ 108959959329292321880648657/9974444716475301992902544
+
+Trigonometrical functions are available:
+
+ \xintDigits*:=48\relax
+
+ \xintfloateval{[-2] sind(37)}
+
+expands to:
+
+ 0.6018150231520482799179770004414898414256377098
+
+The [-2] means to round the result to 2 digits less than float precision:
+currently trigonometrical functions are mostly implemented at high level
+via the user interface for declaring functions and variables and have no
+way to use guard digits, hence the last two digits are often not
+accurate.
+
+Release `1.4` adds support for nested structures. For example:
+
+ \xintthealign\xintexpr ndseq(1/(i+j), i=1..5; j=1..5)\relax
+
+will print on the page (this is customizable, e.g. to use a pmatrix
+environnement rather):
+
+ [[ 1/2, 1/3, 1/4, 1/5, 1/6 ],
+ [ 1/3, 1/4, 1/5, 1/6, 1/7 ],
+ [ 1/4, 1/5, 1/6, 1/7, 1/8 ],
+ [ 1/5, 1/6, 1/7, 1/8, 1/9 ],
+ [ 1/6, 1/7, 1/8, 1/9, 1/10 ]]
+
+It is possible to declare "universal functions" (à la NumPy) which will
+act itemwise on all leaves of such "arrays". More features are planned
+such as providing an interface to algebra of matrices in this framework.
+
+Installation
+============
+
+`xint` is included in [TeXLive](http://tug.org/texlive/) (hence
+[MacTeX](http://tug.org/mactex/) also) and in
+[MikTeX](http://www.miktex.org/). Thus, use the package manager to
+update your distribution.
+
+Alternatives:
+
+- download
+ [`xint.tds.zip`](http://mirror.ctan.org/install/macros/generic/xint.tds.zip)
+ and install in a suitable TDS-compliant repertory via `unzip`. "admin"
+ privilges might be needed, as well as a file database rebuild (`texhash`).
+ For example, on macos x, installation into user home folder (no `sudo`,
+ and no `texhash` as it is recommended to not have a ls-R file there)
+
+ unzip xint.tds.zip -d ~/Library/texmf
+
+- all files can be extracted using `etex xint.dtx`, or `make` if the
+ `Makefile` included in the CTAN upload is present; see the file `INSTALL`,
+ if present, else read the help in extracted file `Makefile.mk`.
+
+Documentation
+=============
+
+`README.md`: this file
+
+`CHANGES.html`: change log as relevant to end users
+ (`texdoc --list xint`)
+
+`xint.pdf`: user manual
+
+`sourcexint.pdf`: commented source code
+ (`texdoc --list xint` or `texdoc sourcexint`)
+
+Requirements
+============
+
+Since release `1.4`, `xintexpr` requires the `\expanded` primitive. This
+is a functionality of all major TeX engines since TeXLive 2019.
+
+License
+=======
+
+Copyright (C) 2013-2020 by Jean-Francois Burnol
+
+This Work may be distributed and/or modified under the
+conditions of the LaTeX Project Public License version 1.3c.
+This version of this license is in
+
+> <http://www.latex-project.org/lppl/lppl-1-3c.txt>
+
+and version 1.3 or later is part of all distributions of
+LaTeX version 2005/12/01 or later.
+
+This Work has the LPPL maintenance status `author-maintained`.
+
+The Author of this Work is `Jean-Francois Burnol`.
+
+This Work consists of the files `Makefile`, `INSTALL`, and `xint.dtx`
+and its extracted and derived files inclusive of the documentation
+files `xint.pdf`, `sourcexint.pdf` and `CHANGES.html`.
+
+See `xint.pdf` for contact information.
+
Binary files old/doc/generic/xint/README.pdf and new/doc/generic/xint/README.pdf differ
Binary files old/doc/generic/xint/sourcexint.pdf and new/doc/generic/xint/sourcexint.pdf differ
Binary files old/doc/generic/xint/xint.pdf and new/doc/generic/xint/xint.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xint.doc.tlpobj new/tlpkg/tlpobj/xint.doc.tlpobj
--- old/tlpkg/tlpobj/xint.doc.tlpobj 2019-04-08 01:40:55.000000000 +0200
+++ new/tlpkg/tlpobj/xint.doc.tlpobj 2020-02-27 01:55:50.000000000 +0100
@@ -1,13 +1,10 @@
name xint.doc
category Package
-revision 50844
+revision 53930
shortdesc doc files of xint
relocated 1
-docfiles size=530
+docfiles size=516
RELOC/doc/generic/xint/CHANGES.html
- RELOC/doc/generic/xint/CHANGES.pdf
- RELOC/doc/generic/xint/README
- RELOC/doc/generic/xint/README.html
- RELOC/doc/generic/xint/README.pdf
+ RELOC/doc/generic/xint/README.md
RELOC/doc/generic/xint/sourcexint.pdf
RELOC/doc/generic/xint/xint.pdf
++++++ xint.tar.xz ++++++
++++ 8737 lines of diff (skipped)
++++++ xits.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xits/FONTLOG.txt new/doc/fonts/xits/FONTLOG.txt
--- old/doc/fonts/xits/FONTLOG.txt 2018-10-10 22:43:17.000000000 +0200
+++ new/doc/fonts/xits/FONTLOG.txt 2019-09-07 23:20:54.000000000 +0200
@@ -9,203 +9,17 @@
Basic Font Information
--------------------------
XITS is a Times-like typeface for mathematical and scientific publishing, based
-on STIX fonts project. The main mission of XITS is to provide a version of STIX
-fonts enriched with the OpenType MATH extension, making it suitable for high
-quality mathematic typesetting with OpenType MATH capable layout systems, like
-MS Office 2007 and the new TeX engines XeTeX and LuaTeX.
+on the STIX fonts project. The main mission of XITS is to provide a version of
+STIX fonts enriched with the OpenType MATH extension, making it suitable for
+high quality mathematical typesetting with OpenType MATH capable layout systems,
+like MS Office 2007 and later and the TeX engines XeTeX and LuaTeX.
-XITS development is currently hosted on:
+XITS development is currently hosted at:
http://github.com/alif-type/xits
Feature requests, bug reports and patches should be directed to our issue
tracker.
-XITS currently provides the following Unicode coverage:
-* XITS Math:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 37/208 (17.79%)
- IPA Extensions (U+0250-02AF): 91/96 (94.79%)
- Spacing Modifier Letters (U+02B0-02FF): 62/80 (77.50%)
- Combining Diacritical Marks (U+0300-036F): 73/112 (65.18%)
- Greek and Coptic (U+0370-03FF): 93/135 (68.89%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Arabic (U+0600-06FF): 30/255 (11.76%)
- Phonetic Extensions (U+1D00-1D7F): 3/128 (2.34%)
- Phonetic Extensions Supplement (U+1D80-1DBF): 8/64 (12.50%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 70/111 (63.06%)
- Superscripts and Subscripts (U+2070-209F): 1/42 (2.38%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 24/33 (72.73%)
- Letterlike Symbols (U+2100-214F): 60/80 (75.00%)
- Number Forms (U+2150-218F): 12/60 (20.00%)
- Arrows (U+2190-21FF): 103/112 (91.96%)
- Mathematical Operators (U+2200-22FF): 256/256 (100.00%)
- Miscellaneous Technical (U+2300-23FF): 90/256 (35.16%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 45/128 (35.16%)
- Block Elements (U+2580-259F): 8/32 (25.00%)
- Geometric Shapes (U+25A0-25FF): 96/96 (100.00%)
- Miscellaneous Symbols (U+2600-26FF): 55/256 (21.48%)
- Dingbats (U+2700-27BF): 30/192 (15.62%)
- Miscellaneous Mathematical Symbols-A (U+27C0-27EF): 45/48 (93.75%)
- Supplemental Arrows-A (U+27F0-27FF): 16/16 (100.00%)
- Supplemental Arrows-B (U+2900-297F): 128/128 (100.00%)
- Miscellaneous Mathematical Symbols-B (U+2980-29FF): 128/128 (100.00%)
- Supplemental Mathematical Operators (U+2A00-2AFF): 256/256 (100.00%)
- Miscellaneous Symbols and Arrows (U+2B00-2BFF): 64/250 (25.60%)
- CJK Symbols and Punctuation (U+3000-303F): 2/64 (3.12%)
- Hiragana (U+3040-309F): 1/93 (1.08%)
- Latin Extended-D (U+A720-A7FF): 2/163 (1.23%)
- Variation Selectors (U+FE00-FE0F): 1/16 (6.25%)
- Specials (U+FFF0-FFFF): 1/5 (20.00%)
- Mathematical Alphanumeric Symbols (U+1D400-1D7FF): 996/996 (100.00%)
- Arabic Mathematical Alphabetic Symbols (U+1EE00-1EEFF): 143/143 (100.00%)
-* XITS Math Bold:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 32/208 (15.38%)
- IPA Extensions (U+0250-02AF): 89/96 (92.71%)
- Spacing Modifier Letters (U+02B0-02FF): 61/80 (76.25%)
- Combining Diacritical Marks (U+0300-036F): 72/112 (64.29%)
- Greek and Coptic (U+0370-03FF): 93/135 (68.89%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Phonetic Extensions (U+1D00-1D7F): 3/128 (2.34%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 40/111 (36.04%)
- Superscripts and Subscripts (U+2070-209F): 1/42 (2.38%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 22/33 (66.67%)
- Letterlike Symbols (U+2100-214F): 54/80 (67.50%)
- Number Forms (U+2150-218F): 12/60 (20.00%)
- Arrows (U+2190-21FF): 82/112 (73.21%)
- Mathematical Operators (U+2200-22FF): 237/256 (92.58%)
- Miscellaneous Technical (U+2300-23FF): 15/256 (5.86%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 40/128 (31.25%)
- Geometric Shapes (U+25A0-25FF): 6/96 (6.25%)
- Miscellaneous Symbols (U+2600-26FF): 3/256 (1.17%)
- Miscellaneous Mathematical Symbols-A (U+27C0-27EF): 4/48 (8.33%)
- Miscellaneous Mathematical Symbols-B (U+2980-29FF): 10/128 (7.81%)
- Supplemental Mathematical Operators (U+2A00-2AFF): 58/256 (22.66%)
- Latin Extended-D (U+A720-A7FF): 1/163 (0.61%)
- Alphabetic Presentation Forms (U+FB00-FB4F): 5/58 (8.62%)
- Mathematical Alphanumeric Symbols (U+1D400-1D7FF): 920/996 (92.37%)
-* XITS:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 37/208 (17.79%)
- IPA Extensions (U+0250-02AF): 91/96 (94.79%)
- Spacing Modifier Letters (U+02B0-02FF): 61/80 (76.25%)
- Combining Diacritical Marks (U+0300-036F): 72/112 (64.29%)
- Greek and Coptic (U+0370-03FF): 93/135 (68.89%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Phonetic Extensions (U+1D00-1D7F): 3/128 (2.34%)
- Phonetic Extensions Supplement (U+1D80-1DBF): 8/64 (12.50%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 46/111 (41.44%)
- Superscripts and Subscripts (U+2070-209F): 1/42 (2.38%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 24/33 (72.73%)
- Letterlike Symbols (U+2100-214F): 60/80 (75.00%)
- Number Forms (U+2150-218F): 12/60 (20.00%)
- Arrows (U+2190-21FF): 103/112 (91.96%)
- Mathematical Operators (U+2200-22FF): 256/256 (100.00%)
- Miscellaneous Technical (U+2300-23FF): 61/256 (23.83%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 45/128 (35.16%)
- Block Elements (U+2580-259F): 8/32 (25.00%)
- Geometric Shapes (U+25A0-25FF): 96/96 (100.00%)
- Miscellaneous Symbols (U+2600-26FF): 55/256 (21.48%)
- Dingbats (U+2700-27BF): 30/192 (15.62%)
- Miscellaneous Mathematical Symbols-A (U+27C0-27EF): 45/48 (93.75%)
- Supplemental Arrows-A (U+27F0-27FF): 16/16 (100.00%)
- Supplemental Arrows-B (U+2900-297F): 128/128 (100.00%)
- Miscellaneous Mathematical Symbols-B (U+2980-29FF): 128/128 (100.00%)
- Supplemental Mathematical Operators (U+2A00-2AFF): 256/256 (100.00%)
- Miscellaneous Symbols and Arrows (U+2B00-2BFF): 64/250 (25.60%)
- CJK Symbols and Punctuation (U+3000-303F): 2/64 (3.12%)
- Hiragana (U+3040-309F): 1/93 (1.08%)
- Latin Extended-D (U+A720-A7FF): 2/163 (1.23%)
- Alphabetic Presentation Forms (U+FB00-FB4F): 5/58 (8.62%)
- Specials (U+FFF0-FFFF): 1/5 (20.00%)
-* XITS Bold:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 32/208 (15.38%)
- IPA Extensions (U+0250-02AF): 89/96 (92.71%)
- Spacing Modifier Letters (U+02B0-02FF): 61/80 (76.25%)
- Combining Diacritical Marks (U+0300-036F): 72/112 (64.29%)
- Greek and Coptic (U+0370-03FF): 93/135 (68.89%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Phonetic Extensions (U+1D00-1D7F): 3/128 (2.34%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 40/111 (36.04%)
- Superscripts and Subscripts (U+2070-209F): 1/42 (2.38%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 22/33 (66.67%)
- Letterlike Symbols (U+2100-214F): 38/80 (47.50%)
- Number Forms (U+2150-218F): 12/60 (20.00%)
- Arrows (U+2190-21FF): 82/112 (73.21%)
- Mathematical Operators (U+2200-22FF): 237/256 (92.58%)
- Miscellaneous Technical (U+2300-23FF): 15/256 (5.86%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 40/128 (31.25%)
- Geometric Shapes (U+25A0-25FF): 6/96 (6.25%)
- Miscellaneous Symbols (U+2600-26FF): 3/256 (1.17%)
- Miscellaneous Mathematical Symbols-A (U+27C0-27EF): 4/48 (8.33%)
- Miscellaneous Mathematical Symbols-B (U+2980-29FF): 10/128 (7.81%)
- Supplemental Mathematical Operators (U+2A00-2AFF): 58/256 (22.66%)
- Latin Extended-D (U+A720-A7FF): 1/163 (0.61%)
- Alphabetic Presentation Forms (U+FB00-FB4F): 5/58 (8.62%)
-* XITS Italic:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 32/208 (15.38%)
- IPA Extensions (U+0250-02AF): 89/96 (92.71%)
- Spacing Modifier Letters (U+02B0-02FF): 28/80 (35.00%)
- Greek and Coptic (U+0370-03FF): 92/135 (68.15%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 23/111 (20.72%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 20/33 (60.61%)
- Letterlike Symbols (U+2100-214F): 30/80 (37.50%)
- Mathematical Operators (U+2200-22FF): 2/256 (0.78%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 40/128 (31.25%)
- Alphabetic Presentation Forms (U+FB00-FB4F): 5/58 (8.62%)
-* XITS Bold Italic:
- Basic Latin (U+0000-007F): 95/95 (100.00%)
- Latin-1 Supplement (U+0080-00FF): 96/96 (100.00%)
- Latin Extended-A (U+0100-017F): 128/128 (100.00%)
- Latin Extended-B (U+0180-024F): 32/208 (15.38%)
- IPA Extensions (U+0250-02AF): 89/96 (92.71%)
- Spacing Modifier Letters (U+02B0-02FF): 28/80 (35.00%)
- Greek and Coptic (U+0370-03FF): 92/135 (68.15%)
- Cyrillic (U+0400-04FF): 102/256 (39.84%)
- Latin Extended Additional (U+1E00-1EFF): 8/256 (3.12%)
- General Punctuation (U+2000-206F): 23/111 (20.72%)
- Currency Symbols (U+20A0-20CF): 4/32 (12.50%)
- Combining Diacritical Marks for Symbols (U+20D0-20FF): 1/33 (3.03%)
- Letterlike Symbols (U+2100-214F): 29/80 (36.25%)
- Mathematical Operators (U+2200-22FF): 2/256 (0.78%)
- Control Pictures (U+2400-243F): 1/39 (2.56%)
- Enclosed Alphanumerics (U+2460-24FF): 62/160 (38.75%)
- Box Drawing (U+2500-257F): 40/128 (31.25%)
- Alphabetic Presentation Forms (U+FB00-FB4F): 5/58 (8.62%)
-
Information for Contributors
------------------------------
XITS is released under the OFL 1.1 - http://scripts.sil.org/OFL For information
@@ -220,8 +34,24 @@
ChangeLog
----------
-10 October 2018 (Khaled Hosny) <XITS> Version 1.200.1
-- Drop WOFF fonts from tarball uploaded to CTAN, they break XeTeX.
+7 September 2019 (Khaled Hosny) <XITS> Version 1.301
+- Add some small caps glyphs for a few missed accented characters.
+- Fix positions of superior and inferior figures.
+- Improve small caps kerning.
+
+30 August 2019 (Khaled Hosny) <XITS> Version 1.300
+- Fix mis-encoded U+1D9B as U+1D98.
+- Add top accent position to few accents in bold math font.
+- Add minute and second signs to italic font.
+- Add OpenType feature for superior figures.
+- Fix thickness of connector part in division symbol.
+- Add superior figures.
+- Add ffj ligature.
+- Fix displaced accented i glyphs.
+- Add small caps to regular font.
+- Add alternate old-style figures
+- Add T and S with comma below for Romanian.
+- Add scientific inferiors feature.
2 October 2018 (Khaled Hosny) <XITS> Version 1.200
- This is the final release with new features, from now only XITS is in
@@ -396,11 +226,16 @@
N: Khaled Hosny
E: khaledhosny(a)eglug.org
-W: http://github.com/alif-type
+W: https://github.com/alif-type
D: Engineer - OpenType MATH code
+N: Daniel Benjamin Miller
+E: dbmiller(a)dbmiller.org
+W: https://dbmiller.org
+D: Added and improved characters
+
N: STIX Fonts project
-E:
-W: http://www.stixfonts.org
+E: stix(a)aip.org
+W: https://www.stixfonts.org
D: Original authors
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xits/OFL-FAQ.txt new/doc/fonts/xits/OFL-FAQ.txt
--- old/doc/fonts/xits/OFL-FAQ.txt 2011-04-23 01:34:15.000000000 +0200
+++ new/doc/fonts/xits/OFL-FAQ.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,369 +0,0 @@
-OFL FAQ - Frequently Asked Questions about the SIL Open Font License (OFL)
-Version 1.1-update2 - 23 August 2010
-(See http://scripts.sil.org/OFL for updates)
-
-
-CONTENTS OF THIS FAQ
-1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-2 USING OFL FONTS FOR WEB PAGES AND ONLINE WEBFONT SERVICES
-3 MODIFYING OFL-LICENSED FONTS
-4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
-5 CHOOSING RESERVED FONT NAMES
-6 ABOUT THE FONTLOG
-7 MAKING CONTRIBUTIONS TO OFL PROJECTS
-8 ABOUT THE LICENSE ITSELF
-9 ABOUT SIL INTERNATIONAL
-APPENDIX A - FONTLOG EXAMPLE
-
-
-1 USING AND DISTRIBUTING FONTS LICENSED UNDER THE OFL
-
-1.1 Can I use the fonts for a book or other print publication?
-Yes. You can mention the font and author in the book's colophon if you wish, but that is not required.
-
-1.2 Can the fonts be included with Free/Libre and Open Source Software collections such as GNU/Linux and BSD distributions?
-Yes! Fonts licensed under the OFL can be freely included alongside other software under FLOSS (Free/Libre and Open Source Software) licenses. Since fonts are typically aggregated with, not merged into, existing software, there is little need to be concerned about incompatibility with existing software licenses. You may also repackage the fonts and the accompanying components in a .rpm or .deb package and include them in distribution CD/DVDs and online repositories. (Also see section 5.9 about rebuilding from source.)
-
-1.3 I want to distribute the fonts with my program. Does this mean my program also has to be Free/Libre and Open Source Software?
-No. Only the portions based on the Font Software are required to be released under the OFL. The intent of the license is to allow aggregation or bundling with software under restricted licensing as well.
-
-1.4 Can I sell a software package that includes these fonts?
-Yes, you can do this with both the Original Version and a Modified Version of the fonts. Examples of bundling made possible by the OFL would include: word processors, design and publishing applications, training and educational software, games and entertainment software, mobile device applications, etc.
-
-1.5 Can I include the fonts on a CD of freeware or commercial fonts?
-Yes, as long some other font or software is also on the disk, so the OFL font is not sold by itself.
-
-1.6 Why won't the OFL let me sell the fonts alone?
-The intent is to keep people from making money by simply redistributing the fonts. The only people who ought to profit directly from the fonts should be the original authors, and those authors have kindly given up potential direct income to distribute their fonts under the OFL. Please honour and respect their contribution!
-
-1.7 What about sharing OFL fonts with friends on a CD, DVD or USB stick?
-You are very welcome to share open fonts with friends, family and colleagues through removable media. Just remember to include the full font package, including any copyright notices and licensing information as available in OFL.txt. In the case where you sell the font, it has to come bundled with software.
-
-1.8 Can I host the fonts on a web site for others to use?
-Yes, as long as you make the full font package available. In most cases it may be best to point users to the main site that distributes the Original Version so they always get the most recent stable and complete version. See also discussion of webfonts in Section 2.
-
-1.9 Can I host the fonts on a server for use over our internal network?
-Yes. If the fonts are transferred from the server to the client computer by means that allow them to be used even if the computer is no longer attached to the network, the full package (copyright notices, licensing information, etc.) should be included.
-
-1.10 Does the full OFL license text always need to accompany the font?
-The only situation in which an OFL font can be distributed without the text of the OFL (either in a separate file or in font metadata), is when a font is embedded in a document or bundled within a program. In the case of metadata included within a font, it is legally sufficient to include only a link to the text of the OFL on http://scripts.sil.org/OFL, but we strongly recommend against this. Most modern font formats include metadata fields that will accept the full OFL text, and full inclusion increases the likelihood that users will understand and properly apply the license.
-
-1.11 What do you mean by 'embedding'? How does that differ from other means of distribution?
-By 'embedding' we mean inclusion of the font in a document or file in a way that makes extraction (and redistribution) difficult or clearly discouraged. In many cases the names of embedded fonts might also not be obvious to those reading the document, the font data format might be altered, and only a subset of the font - only the glyphs required for the text - might be included. Any other means of delivering a font to another person is considered 'distribution', and needs to be accompanied by any copyright notices and licensing information available in OFL.txt.
-
-1.12 So can I embed OFL fonts in my document?
-Yes, either in full or a subset. The restrictions regarding font modification and redistribution do not apply, as the font is not intended for use outside the document.
-
-1.13 Does embedding alter the license of the document itself?
-No. Referencing or embedding an OFL font in any document does not change the license of the document itself. The requirement for fonts to remain under the OFL does not apply to any document created using the fonts and their derivatives. Similarly, creating any kind of graphic using a font under OFL does not make the resulting artwork subject to the OFL.
-
-1.14 If OFL fonts are extracted from a document in which they are embedded (such as a PDF file), what can be done with them? Is this a risk to author(s)?
-The few utilities that can extract fonts embedded in a PDF will typically output limited amounts of outlines - not a complete font. To create a working font from this method is much more difficult and time consuming than finding the source of the original OFL font. So there is little chance that an OFL font would be extracted and redistributed inappropriately through this method. Even so, copyright laws address any misrepresentation of authorship. All Font Software released under the OFL and marked as such by the author(s) is intended to remain under this license regardless of the distribution method, and cannot be redistributed under any other license. We strongly discourage any font extraction - we recommend directly using the font sources instead - but if you extract font outlines from a document, please be considerate: use your common sense and respect the work of the author(s) and the licensing model.
-
-1.15 What about distributing fonts with a document? Within a compressed folder structure? Is it distribution, bundling or embedding?
-Certain document formats may allow the inclusion of an unmodified font within their file structure which consists of a compressed folder containing the various resources forming the document (such as pictures and thumbnails). Including fonts within such a structure is understood as being different from embedding but rather similar to bundling (or mere aggregation) which the license explicitly allows. In this case the font is conveyed unchanged whereas embedding a font usually transforms it from the original format. The OFL does not allow anyone to extract the font from such a structure to then redistribute it under another license. The explicit permission to redistribute and embed does not cancel the requirement for the Font Software to remain under the license chosen by its author(s).
-
-1.16 What about ebooks shipping with open fonts?
-The requirements differ depending on whether the fonts are linked, embedded or distributed (bundled or aggregated). Some ebook formats use web technologies to do font linking via @font-face, others are designed for font embedding, some use fonts distributed with the document or reading software, and a few rely solely on the fonts already present on the target system. The license requirements depend on the type of inclusion as discussed in 1.15.
-
-1.17 Can Font Software released under the OFL be subject to URL-based access restrictions methods or DRM (Digital Rights Management) mechanisms?
-Yes, but these issues are out-of-scope for the OFL. The license itself neither encourages their use nor prohibits them since such mechanisms are not implemented in the components of the Font Software but through external software. Such restrictions are put in place for many different purposes corresponding to various usage scenarios. One common example is to limit potentially dangerous cross-site scripting attacks. However, in the spirit of libre/open fonts and unrestricted writing systems, we strongly encourage open sharing and reuse of OFL fonts, and the establishment of an environment where such restrictions are unnecessary. Note that whether you wish to use such mechanisms or you prefer not to, you must still abide by the rules set forth by the OFL when using fonts released by their authors under this license. Derivative fonts must be licensed under the OFL, even if they are part of a service for which you charge fees and/or for which access to source code is restricted. You may not sell the fonts on their own - they must be part of a larger software package, bundle or subscription plan. For example, even if the OFL font is distributed in a software package or via an online service using a DRM mechanism, the user would still have the right to extract that font, use, study, modify and redistribute it under the OFL.
-
-1.18 I've come across a font released under the OFL. How can I easily get more information about the Original Version? How can I know where it stands compared to the Original Version or other Modified Versions?
-Consult the copyright statement(s) in the license for ways to contact the original authors. Consult the FONTLOG for information on how the font differs from the Original Version, and get in touch with the various contributors via the information in the acknowledgement section. Please consider using the Original Versions of the fonts whenever possible.
-
-1.19 What do you mean in condition 4? Can you provide examples of abusive promotion / endorsement / advertisement vs. normal acknowledgement?
-The intent is that the goodwill and reputation of the author(s) should not be used in a way that makes it sound like the original author(s) endorse or approve of a specific Modified Version or software bundle. For example, it would not be right to advertise a word processor by naming the author(s) in a listing of software features, or to promote a Modified Version on a web site by saying "designed by ...". However, it would be appropriate to acknowledge the author(s) if your software package has a list of people who deserve thanks. We realize that this can seem to be a grey area, but the standard used to judge an acknowledgement is that if the acknowledgement benefits the author(s) it is allowed, but if it primarily benefits other parties, or could reflect poorly on the author(s), then it is not.
-
-
-2 USING OFL FONTS FOR WEBPAGES AND ONLINE WEBFONT SERVICES
-
-2.1 Can I make webpages using these fonts?
-Yes! Go ahead! Using CSS (Cascading Style Sheets) is recommended. Your three best options:
-- referring directly in your stylesheet to open fonts which may be available on the user's system
-- providing links to download the full package of the font - either from your own website or from elsewhere - so users can install it themselves
-- using @font-face to distribute the font directly to browsers. This is recommended and explicitly allowed by the licensing model because it is distribution. The font file itself is distributed with other components of the webpage. It is not embedded in the webpage but referenced through a web address which will cause the browser to retrieve and use the corresponding font to render the webpage (see 1.11 and 1.15 for details related to embedding fonts into documents). As you take advantage of the @font-face cross-platform standard, be aware that webfonts are often tuned for a web environment and not intended for installation and use outside a browser. The reasons in favour of using webfonts are to allow design of dynamic text elements instead of static graphics, to make it easier for content to be localized and translated, indexed and searched, and all this with cross-platform open standards without depending on restricted extensions or plugins. You should check the CSS cascade (the order in which fonts are being called or delivered to your users) when testing.
-
-2.2 Can I make and use WOFF (Web Open Font Format) versions of OFL fonts?
-Yes, but you need to be careful. A change in font format normally is considered modification, and Reserved Font Names (RFNs) cannot be used. Because of the design of the WOFF format, however, it is possible to create a WOFF version that is not considered modification, and so would not require a name change. You are allowed to create, use and distribute a WOFF version of an OFL font without changing the font name, but only if:
-
-- the original font data remains unchanged except for WOFF compression, and
-- WOFF-specific metadata is either omitted altogether or present and includes, unaltered, the contents of all equivalent metadata in the original font.
-
-If the original font data or metadata is changed, or the WOFF-specific metadata is incomplete, the font must be considered a Modified Version, the OFL restrictions would apply and the name of the font must be changed: any RFNs cannot be used and copyright notices and licensing information must be included and cannot be deleted or modified. You must come up with a unique name - we recommend one corresponding to your domain or your particular web application. Be aware that only the original author(s) can use RFNs. This is to prevent collisions between a derivative tuned to your audience and the original upstream version and so to reduce confusion.
-
-Please note that most WOFF conversion tools and online services do not meet the two requirements listed above, and so their output must be considered a Modified Version. So be very careful and check to be sure that the tool or service you're using is compressing unchanged data and completely and accurately reflecting the original font metadata.
-
-2.3 What about other webfont formats such as EOT/EOTLite/CWT/etc.?
-In most cases these formats alter the original font data more than WOFF, and do not completely support appropriate metadata, so their use must be considered modification and RFNs may not be used.
-
-2.4 Can I make OFL fonts available through webfont online services?
-Yes, you are welcome to include OFL fonts in online webfont services as long as you properly meet all the conditions of the license. The origin and open status of the font should be clear among the other fonts you are hosting. Authorship, copyright notices and license information must be sufficiently visible to your users or subscribers so they know where the font comes from and the rights granted by the author(s). Make sure the font file contains the needed copyright notice(s) and licensing information in its metadata. Please double-check the accuracy of every field to prevent contradictory information. Other font formats, including EOT/EOTLite/CWT and superior alternatives like WOFF, already provide fields for this information. Remember that if you modify the font within your library or convert it to another format for any reason the OFL restrictions apply and you need to change the names accordingly. Please respect the author's wishes as expressed in the OFL and do not misrepresent original designers and their work. Don't lump quality open fonts together with dubious freeware or public domain fonts. Consider how you can best work with the original designers and foundries, support their efforts and generate goodwill that will benefit your service. (See 1.17 for details related to URL-based access restrictions methods or DRM mechanisms).
-
-2.5 Can I make and publish CMS themes or templates that use OFL fonts? Can I include the fonts themselves in the themes or templates? Can I sell the whole package?
-Yes, you are very welcome to integrate open fonts into themes and templates for your preferred CMS and make them more widely available. Be aware that you can only sell the fonts and your CMS add-on as part of a software bundle. (See 1.4 for details and examples about selling bundles).
-
-2.6 Some webfont formats and services provide ways of "optimising" the font for a particular website or web application; is that allowed?
-Yes, it is permitted, but remember that these optimised versions are Modified Versions and so must follow OFL requirements like appropriate renaming. Also you need to bear in mind the other important parameters beyond compression, speed and responsiveness: you need to consider the audience of your particular website or web application, as choosing some optimisation parameters may turn out to be less than ideal for them. Subsetting by removing certain glyphs or features may seriously limit functionality of the font in various languages used by your users. It may also introduce degradation of quality in the rendering or specific bugs on the various platforms compared to the original font. In other words, remember that one person's optimised font may be another person's missing feature. Various advanced typographic features are also available through CSS and may provide the desired effects without the need to modify the font.
-
-
-3 MODIFYING OFL-LICENSED FONTS
-
-3.1 Can I change the fonts? Are there any limitations to what things I can and cannot change?
-You are allowed to change anything, as long as such changes do not violate the terms of the license. In other words, you are not allowed to remove the copyright statement(s) from the font, but you could put additional information into it that covers your contribution.
-
-3.2 I have a font that needs a few extra glyphs - can I take them from an OFL licensed font and copy them into mine?
-Yes, but if you distribute that font to others it must be under the OFL, and include the information mentioned in condition 2 of the license.
-
-3.3 Can I charge people for my additional work? In other words, if I add a bunch of special glyphs and/or OpenType/Graphite code, can I sell the enhanced font?
-Not by itself. Derivative fonts must be released under the OFL and cannot be sold by themselves. It is permitted, however, to include them in a larger software package (such as text editors, office suites or operating systems), even if the larger package is sold. In that case, you are strongly encouraged, but not required, to also make that derived font easily and freely available outside of the larger package.
-
-3.4 Can I pay someone to enhance the fonts for my use and distribution?
-Yes. This is a good way to fund the further development of the fonts. Keep in mind, however, that if the font is distributed to others it must be under the OFL. You won't be able to recover your investment by exclusively selling the font, but you will be making a valuable contribution to the community. Please remember how you have benefited from the contributions of others.
-
-3.5 I need to make substantial revisions to the font to make it work with my program. It will be a lot of work, and a big investment, and I want to be sure that it can only be distributed with my program. Can I restrict its use?
-No. If you redistribute a Modified Version of the font it must be under the OFL. You may not restrict it in any way beyond what the OFL permits and requires. This is intended to ensure that all released improvements to the fonts become available to everyone. But you will likely get an edge over competitors by being the first to distribute a bundle with the enhancements. Again, please remember how you have benefited from the contributions of others.
-
-3.6 Do I have to make any derivative fonts (including extended source files, build scripts, documentation, etc.) publicly available?
-No, but please consider sharing your improvements with others. You may find that you receive in return more than what you gave.
-
-3.7 If a trademark is claimed in the OFL font, does that trademark need to remain in modified fonts?
-Yes, any trademark notices must remain in any derivative fonts to respect trademark laws, but you may add any additional trademarks you claim, officially registered or not. For example if an OFL font called "Foo" contains a notice that "Foo is a trademark of Acme", then if you rename the font to "Bar" when creating a Modified Version, the new trademark notice could say "Foo is a trademark of Acme Inc. - Bar is a trademark of Roadrunner Technologies Ltd.". Trademarks work alongside the OFL and are not subject to the terms of the licensing agreement. Please refer to the appropriate trademark laws.
-
-
-4 LICENSING YOUR ORIGINAL FONTS UNDER THE OFL
-
-4.1 Can I use the SIL OFL for my own fonts?
-Yes! We heartily encourage everyone to use the OFL to distribute their own original fonts. It is a carefully constructed license that allows great freedom along with enough artistic integrity protection for the work of the authors as well as clear rules for other contributors and those who redistribute the fonts. The licensing model is used successfully by various organisations, both for-profit and not-for-profit, to release fonts of varying levels of scope and complexity.
-
-4.2 What do I have to do to apply the OFL to my font?
-If you want to release your fonts under the OFL, we recommend you do the following:
-
-4.2.1 Put your copyright and Reserved Font Names information at the beginning of the main OFL.txt file in place of the dedicated placeholders. Include this file in your release package.
-
-4.2.2 Put your copyright and the OFL text with Reserved Font Names into your font files (the copyright and license fields). A link to the OFL text on the OFL web site is an acceptable (but not recommended) alternative. Also add this information to any other components (build scripts, glyph databases, documentation, test files, etc). Depending on the format of your fonts and sources, you can use template human-readable headers or machine-readable metadata.
-
-4.2.3 Write an initial FONTLOG.txt for your font and include it in the release package.
-
-4.2.4 Include the relevant practical documentation on the license by including the OFL-FAQ.txt in your package.
-
-4.3 Will you make my font OFL for me?
-We won't do the work for you. We can, however, try to answer your questions, unfortunately we do not have the resources to review and check your font packages for correct use of the OFL.
-
-4.4 Will you distribute my OFL font for me?
-No, although if the font is of sufficient quality and general interest we may include a link to it on our partial list of OFL fonts on the OFL web site. You may wish to consider other open font catalogs or hosting services, such as the Unifont Font Guide (http://unifont.org/fontguide), The League of Movable Type (http://theleagueofmovabletype.com), Kernest (http://kernest.com/) or the Open Font Library (http://openfontlibrary.org/), which despite the name has no direct relationship to the OFL or SIL. We do not endorse any particular catalog or hosting service - it is your responsibility to determine if the service is right for you.
-
-4.5 Why should I use the OFL for my fonts?
-- to meet needs for fonts that can be modified to support minority languages
-- to provide a legal and clear way for people to respect your work but still use it (and reduce piracy)
-- to involve others in your font project
-- to enable your fonts to be expanded with new weights and improved writing system/language support
-- to allow more technical font developers to add features to your design (such as OpenType and Graphite support)
-- to renew the life of an old font lying on your hard drive with no business model
-- to allow your font to be included in Libre Software operating systems like Ubuntu
-- to give your font world status and wide, unrestricted distribution
-- to educate students about quality typeface and font design
-- to expand your test base and get more useful feedback
-- to extend your reach to new markets when users see your metadata and go to your website
-- to get your font more easily into one of the webfont online services
-- to attract attention for your commercial fonts
-- to make money through webfont services
-- to make money by bundling fonts with applications
-- to make money adjusting and extending existing open fonts
-- to get a better chance that foundations/NGOs/charities/companies who commission fonts will pick you
-- to be part of a sharing design and development community
-- to give back and contribute to a growing body of font sources
-
-
-5 CHOOSING RESERVED FONT NAMES
-
-5.1 What are Reserved Font Names?
-These are font names, or portions of font names, that the author has chosen to reserve for use only with the Original Version of the font, or for Modified Version(s) created by the original author.
-
-5.2 Why can't I use the Reserved Font Names in my derivative font names? I'd like people to know where the design came from.
-The best way to acknowledge the source of the design is to thank the original authors and any other contributors in the files that are distributed with your revised font (although no acknowledgement is required). The FONTLOG is a natural place to do this. Reserved Font Names ensure that the only fonts that have the original names are the unmodified Original Versions. This allows designers to maintain artistic integrity while allowing collaboration to happen. It eliminates potential confusion and name conflicts. When choosing a name, be creative and avoid names that reuse almost all the same letters in the same order or sound like the original. It will help everyone if Original Versions and Modified Versions can easily be distinguished from one another and from other derivatives. Any substitution and matching mechanism is outside the scope of the license.
-
-5.3 What do you mean by "primary name as presented to the user"? Are you referring to the font menu name?
-Yes, this applies to the font menu name and other mechanisms that specify a font in a document. It would be fine, however, to keep a text reference to the original fonts in the description field, in your modified source file or in documentation provided alongside your derivative as long as no one could be confused that your modified source is the original. But you cannot use the Reserved Font Names in any way to identify the font to the user (unless the Copyright Holder(s) allow(s) it through a separate agreement). Users who install derivatives (Modified Versions) on their systems should not see any of the original Reserved Font Names in their font menus, for example. Again, this is to ensure that users are not confused and do not mistake one font for another and so expect features only another derivative or the Original Version can actually offer.
-
-5.4 Am I not allowed to use any part of the Reserved Font Names?
-You may not use individual words from the Reserved Font Names, but you would be allowed to use parts of words, as long as you do not use any word from the Reserved Font Names entirely. We do not recommend using parts of words because of potential confusion, but it is allowed. For example, if "Foobar" was a Reserved Font Name, you would be allowed to use "Foo" or "bar", although we would not recommend it. Such an unfortunate choice would confuse the users of your fonts as well as make it harder for other designers to contribute.
-
-5.5 So what should I, as an author, identify as Reserved Font Names?
-Original authors are encouraged to name their fonts using clear, distinct names, and only declare the unique parts of the name as Reserved Font Names. For example, the author of a font called "Foobar Sans" would declare "Foobar" as a Reserved Font Name, but not "Sans", as that is a common typographical term, and may be a useful word to use in a derivative font name. Reserved Font Names should also be single words. A font called "Flowing River" should have Reserved Font Names "Flowing" and "River", not "Flowing River". You also need to be very careful about reserving font names which are already linked to trademarks (whether registered or not) which you do not own.
-
-5.6 Do I, as an author, have to identify any Reserved Font Names?
-No, but we strongly encourage you to do so. This is to avoid confusion between your work and Modified Versions.
-
-5.7 Are any names (such as the main font name) reserved by default?
-No. That is a change to the license as of version 1.1. If you want any names to be Reserved Font Names, they must be specified after the copyright statement(s).
-
-5.8 Is there any situation in which I can use Reserved Font Names for a Modified Version?
-The Copyright Holder(s) can give certain trusted parties the right to use any of the Reserved Font Names through separate written agreements. For example, even if "Foobar" is a RFN, you could write up an agreement to give company "XYZ" the right to distribute a modified version with a name that includes "Foobar". This allows for freedom without confusion.
-
-5.9 Do font rebuilds require a name change? Do I have to change the name of the font when my packaging workflow includes a full rebuild from source?
-Yes, all rebuilds which change the font data and the smart code are Modified Versions and the requirements of the OFL apply: you need to respect what the Author(s) have chosen in terms of Reserved Font Names. However if a package (or installer) is simply a wrapper or a compressed structure around the final font - leaving them intact on the inside - then no name change is required. Please get in touch with the author(s) and copyright holder(s) to inquire about the presence of font sources beyond the final font file(s) and the recommended build path. That build path may very well be non-trivial and hard to reproduce accurately by the maintainer. If a full font build path is made available by the upstream author(s) please be aware that any regressions and changes you may introduce when doing a rebuild for packaging purposes is your responsibility as a package maintainer since you are effectively creating a separate branch. You should make it very clear to your users that your rebuilt version is not the canonical one from upstream.
-
-5.10 Can I add other Reserved Font Names when making a derivative font?
-Yes. List your additional Reserved Font Names after your additional copyright statement, as indicated with example placeholders at the top of the OFL.txt file. Be sure you do not remove any exiting RFNs but only add your own.
-
-
-6 ABOUT THE FONTLOG
-
-6.1 What is this FONTLOG thing exactly?
-It has three purposes: 1) to provide basic information on the font to users and other developers, 2) to document changes that have been made to the font or accompanying files, either by the original authors or others, and 3) to provide a place to acknowledge authors and other contributors. Please use it!
-
-6.2 Is the FONTLOG required?
-It is not a requirement of the license, but we strongly recommend you have one.
-
-6.3 Am I required to update the FONTLOG when making Modified Versions?
-No, but users, designers and other developers might get very frustrated with you if you don't. People need to know how derivative fonts differ from the original, and how to take advantage of the changes, or build on them. There are utilities that can help create and maintain a FONTLOG, such as the FONTLOG support in FontForge.
-
-6.4 What should the FONTLOG look like?
-It is typically a separate text file (FONTLOG.txt), but can take other formats. It commonly includes these four sections:
-
-- brief header describing the FONTLOG itself and name of the font family
-- Basic Font Information - description of the font family, purpose and breadth
-- ChangeLog - chronological listing of changes
-- Acknowledgements - list of authors and contributors with contact information
-
-It could also include other sections, such as: where to find documentation, how to make contributions, information on contributing organizations, source code details, and a short design guide. See Appendix A for an example FONTLOG.
-
-
-7 MAKING CONTRIBUTIONS TO OFL PROJECTS
-
-7.1 Can I contribute work to OFL projects?
-In many cases, yes. It is common for OFL fonts to be developed by a team of people who welcome contributions from the wider community. Contact the original authors for specific information on how to participate in their projects.
-
-7.2 Why should I contribute my changes back to the original authors?
-It would benefit many people if you contributed back in response to what you've received. Your contributions and improvements to the fonts and other components could be a tremendous help and would encourage others to contribute as well and 'give back'. You will then benefit from other people's contributions as well. Sometimes maintaining your own separate version takes more effort than merging back with the original. Be aware that any contributions, however, must be either your own original creation or work that you own, and you may be asked to affirm that clearly when you contribute.
-
-7.3 I've made some very nice improvements to the font. Will you consider adopting them and putting them into future Original Versions?
-Most authors would be very happy to receive such contributions. Keep in mind that it is unlikely that they would want to incorporate major changes that would require additional work on their end. Any contributions would likely need to be made for all the fonts in a family and match the overall design and style. Authors are encouraged to include a guide to the design with the fonts. It would also help to have contributions submitted as patches or clearly marked changes - the use of smart source revision control systems like subversion, svk, mercurial, git or bzr is a good idea. Please follow the recommendations given by the author(s) in terms of preferred source formats and configuration parameters for sending contributions. If this is not indicated in a FONTLOG or other documentation of the font, consider asking them directly. Examples of useful contributions are bug fixes, additional glyphs, stylistic alternates (and the smart font code to access them) or improved hinting. Keep in mind that some kinds of changes (esp. hinting) may be technically difficult to integrate.
-
-7.4 How can I financially support the development of OFL fonts?
-It is likely that most authors of OFL fonts would accept financial contributions - contact them for instructions on how to do this. Such contributions would support future development. You can also pay for others to enhance the fonts and contribute the results back to the original authors for inclusion in the Original Version.
-
-
-8 ABOUT THE LICENSE ITSELF
-
-8.1 I see that this is version 1.1 of the license. Will there be later changes?
-Version 1.1 is the first minor revision of the OFL. We are confident that version 1.1 will meet most needs, but are open to future improvements. Any revisions would be for future font releases, and previously existing licenses would remain in effect. No retroactive changes are possible, although the Copyright Holder(s) can re-release the font under a revised OFL. All versions will be available on our web site: http://scripts.sil.org/OFL.
-
-8.2 Does this license restrict the rights of the Copyright Holder(s)?
-No. The Copyright Holder(s) still retain(s) all the rights to their creation; they are only releasing a portion of it for use in a specific way. For example, the Copyright Holder(s) may choose to release a 'basic' version of their font under the OFL, but sell a restricted 'enhanced' version. Only the Copyright Holder(s) can do this.
-
-8.3 Is the OFL a contract or a license?
-The OFL is a license and not a contract and so does not require you to sign it to have legal validity. By using, modifying and redistributing components under the OFL you indicate that you accept the license.
-
-8.4 I really like the terms of the OFL, but want to change it a little. Am I allowed to take ideas and actual wording from the OFL and put them into my own custom license for distributing my fonts?
-We strongly recommend against creating your very own unique open licensing model. Using a modified or derivative license will likely cut you off - along with the font(s) under that license - from the community of designers using the OFL, potentially expose you and your users to legal liabilities, and possibly put your work and rights at risk. The OFL went though a community and legal review process that took years of effort, and that review is only applicable to an unmodified OFL. The text of the OFL has been written by SIL (with review and consultation from the community) and is copyright (c) 2005-2010 SIL International. You may re-use the ideas and wording (in part, not in whole) in another non-proprietary license provided that you call your license by another unambiguous name, that you do not use the preamble, that you do not mention SIL and that you clearly present your license as different from the OFL so as not to cause confusion by being too similar to the original. If you feel the OFL does not meet your needs for an open license, please contact us.
-
-8.5 Can I translate the license and the FAQ into other languages?
-SIL certainly recognises the need for people who are not familiar with English to be able to understand the OFL and its use. Making the license very clear and readable has been a key goal for the OFL, but we know that people understand their own language best.
-
-If you are an experienced translator, you are very welcome to translate the OFL and OFL-FAQ so that designers and users in your language community can understand the license better. But only the original English version of the license has legal value and has been approved by the community. Translations do not count as legal substitutes and should only serve as a way to explain the original license. SIL - as the author and steward of the license for the community at large - does not approve any translation of the OFL as legally valid because even small translation ambiguities could be abused and create problems.
-
-SIL gives permission to publish unofficial translations into other languages provided that they comply with the following guidelines:
-
-- Put the following disclaimer in both English and the target language stating clearly that the translation is unofficial:
-
-"This is an unofficial translation of the SIL Open Font License into <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.
-
-
-9 ABOUT SIL INTERNATIONAL
-
-9.1 Who is SIL International and what do they do?
-SIL serves language communities worldwide, building their capacity for sustainable language development, by means of research, translation, training and materials development. SIL makes its services available to all without regard to religious belief, political ideology, gender, race, or ethnic background. SIL's members and volunteers share a Christian commitment.
-
-9.2 What does this have to do with font licensing?
-The ability to read, write, type and publish in one's own language is one of the most critical needs for millions of people around the world. This requires fonts that are widely available and support lesser-known languages. SIL develops - and encourages others to develop - a complete stack of writing systems implementation components available under open licenses. This open stack includes input methods, smart fonts, smart rendering libraries and smart applications. There has been a need for a common open license that is specifically applicable to fonts and related software (a crucial component of this stack), so SIL developed the SIL Open Font License with the help of the Free/Libre and Open Source Software community.
-
-9.3 How can I contact SIL?
-Our main web site is: http://www.sil.org/
-Our site about complex scripts is: http://scripts.sil.org/
-Information about this license (and contact information) is at: http://scripts.sil.org/OFL
-
-
-APPENDIX A - FONTLOG EXAMPLE
-
-Here is an example of the recommended format for a FONTLOG, although other formats are allowed.
-
------
-FONTLOG for the GlobalFontFamily fonts
-
-This file provides detailed information on the GlobalFontFamily Font Software. This information should be distributed along with the GlobalFontFamily fonts and any derivative works.
-
-Basic Font Information
-
-GlobalFontFamily is a Unicode typeface family that supports all languages that use the Latin script and its variants, and could be expanded to support other scripts.
-
-NewWorldFontFamily is based on the GlobalFontFamily and also supports Greek, Hebrew, Cyrillic and Armenian.
-
-More specifically, this release supports the following Unicode ranges...
-This release contains...
-Documentation can be found at...
-To contribute to the project...
-
-ChangeLog
-
-1 August 2008 (Tom Parker) GlobalFontFamily version 1.2.1
-- Tweaked the smart font code (Branch merged with trunk version)
-- Provided improved build and debugging environment for smart behaviours
-
-7 February 2007 (Pat Johnson) NewWorldFontFamily Version 1.3
-- Added Greek and Cyrillic glyphs
-
-7 March 2006 (Fred Foobar) NewWorldFontFamily Version 1.2
-- Tweaked contextual behaviours
-
-1 Feb 2005 (Jane Doe) NewWorldFontFamily Version 1.1
-- Improved build script performance and verbosity
-- Extended the smart code documentation
-- Corrected minor typos in the documentation
-- Fixed position of combining inverted breve below (U+032F)
-- Added OpenType/Graphite smart code for Armenian
-- Added Armenian glyphs (U+0531 -> U+0587)
-- Released as "NewWorldFontFamily"
-
-1 Jan 2005 (Joe Smith) GlobalFontFamily Version 1.0
-- Initial release
-
-Acknowledgements
-
-If you make modifications be sure to add your name (N), email (E), web-address (if you have one) (W) and description (D). This list is in alphabetical order.
-
-N: Jane Doe
-E: jane(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 renowed educational institution with a strong design department...
------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xits/OFL.txt new/doc/fonts/xits/OFL.txt
--- old/doc/fonts/xits/OFL.txt 2010-07-17 01:55:19.000000000 +0200
+++ new/doc/fonts/xits/OFL.txt 2019-08-30 23:09:20.000000000 +0200
@@ -16,6 +16,12 @@
Portions copyright (c) 1990 by Elsevier, Inc.
+Portions copyright (c) 2014, 2015 by (URW)++ Design & Development.
+
+Portions copyright (c) 2009-2019 by Khaled Hosny.
+
+Portions copyright (c) 2019 by Daniel Benjamin Miller.
+
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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/xits/README.txt new/doc/fonts/xits/README.txt
--- old/doc/fonts/xits/README.txt 2018-10-02 23:38:14.000000000 +0200
+++ new/doc/fonts/xits/README.txt 2019-08-30 23:09:20.000000000 +0200
@@ -1,24 +1,22 @@
+[![Build Status](https://travis-ci.com/alif-type/xits.svg?branch=master)](https://tr…
+
The XITS font project
======================
XITS is a Times-like typeface for mathematical and scientific publishing, based
on [STIX fonts][1]. The main mission of XITS is to provide a version of STIX
-fonts enriched with the OpenType MATH extension, making it suitable for high
-quality mathematic typesetting with OpenType MATH capable layout systems, like
-MS Office 2007 and the new TeX engines XeTeX and LuaTeX.
-
-XITS font is free, open source font, under [Open Font License][2], version 1.1.
-
-The current version of XITS is based on version 1.1.0-beta1 of STIX fonts.
+fonts enhanced with the OpenType `MATH` table, making it suitable for high
+quality mathematic typesetting with OpenType math-capable layout systems, like
+Microsoft Office 2007+, XeTeX and LuaTeX.
-This is work in progress, feedback, bug reports and even patches are welcomed.
+XITS fonts are distributed under the [Open Font License][2], version 1.1.
Contributing
------------
The preferred way for modifying the fonts is by editing the SFD files under
`sources` directory in the [source repository][5], using [FontForge][3]. When
-submitting patches, please make sure they are as clean as possible, avoiding
+submitting patches, please run `make normalize` before committing and avoid
any unrelated or unnecessary changes.
To build the fonts from source you need GNU Make, [FontForge][3] Python module,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xits.doc.tlpobj new/tlpkg/tlpobj/xits.doc.tlpobj
--- old/tlpkg/tlpobj/xits.doc.tlpobj 2019-02-28 04:18:54.000000000 +0100
+++ new/tlpkg/tlpobj/xits.doc.tlpobj 2019-09-08 01:54:45.000000000 +0200
@@ -1,10 +1,9 @@
name xits.doc
category Package
-revision 48879
+revision 52046
shortdesc doc files of xits
relocated 1
-docfiles size=19
+docfiles size=6
RELOC/doc/fonts/xits/FONTLOG.txt
- RELOC/doc/fonts/xits/OFL-FAQ.txt
RELOC/doc/fonts/xits/OFL.txt
RELOC/doc/fonts/xits/README.txt
++++++ xits.tar.xz ++++++
Binary files old/fonts/opentype/public/xits/XITS-Bold.otf and new/fonts/opentype/public/xits/XITS-Bold.otf differ
Binary files old/fonts/opentype/public/xits/XITS-BoldItalic.otf and new/fonts/opentype/public/xits/XITS-BoldItalic.otf differ
Binary files old/fonts/opentype/public/xits/XITS-Italic.otf and new/fonts/opentype/public/xits/XITS-Italic.otf differ
Binary files old/fonts/opentype/public/xits/XITS-Regular.otf and new/fonts/opentype/public/xits/XITS-Regular.otf differ
Binary files old/fonts/opentype/public/xits/XITSMath-Bold.otf and new/fonts/opentype/public/xits/XITSMath-Bold.otf differ
Binary files old/fonts/opentype/public/xits/XITSMath-Regular.otf and new/fonts/opentype/public/xits/XITSMath-Regular.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xits.tlpobj new/tlpkg/tlpobj/xits.tlpobj
--- old/tlpkg/tlpobj/xits.tlpobj 2019-02-28 04:18:54.000000000 +0100
+++ new/tlpkg/tlpobj/xits.tlpobj 2019-09-08 01:54:45.000000000 +0200
@@ -1,6 +1,6 @@
name xits
category Package
-revision 48879
+revision 52046
shortdesc A Scientific Times-like font with support for mathematical typesetting
relocated 1
longdesc XITS is a Times-like font for scientific typesetting with
@@ -8,7 +8,7 @@
longdesc capable TeX engines, namely LuaTeX and XeTeX. For use with
longdesc LuaLaTeX or XeLaTeX, support is available from the fontspec and
longdesc unicode-math packages.
-runfiles size=350
+runfiles size=358
RELOC/fonts/opentype/public/xits/XITS-Bold.otf
RELOC/fonts/opentype/public/xits/XITS-BoldItalic.otf
RELOC/fonts/opentype/public/xits/XITS-Italic.otf
@@ -16,8 +16,11 @@
RELOC/fonts/opentype/public/xits/XITSMath-Bold.otf
RELOC/fonts/opentype/public/xits/XITSMath-Regular.otf
catalogue-also stix asana-math
+catalogue-contact-announce https://github.com/alif-type/xits/releases
+catalogue-contact-repository https://github.com/alif-type/xits
+catalogue-contact-support https://github.com/alif-type/xits/issues
catalogue-ctan /fonts/xits
-catalogue-date 2018-10-10 12:22:04 +0200
+catalogue-date 2019-09-07 18:36:14 +0200
catalogue-license ofl
catalogue-topics font font-serif font-maths font-symbol-maths font-otf
-catalogue-version 1.200.1
+catalogue-version 1.301
++++++ xltabular.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xltabular/Changes new/doc/latex/xltabular/Changes
--- old/doc/latex/xltabular/Changes 2018-12-16 22:52:40.000000000 +0100
+++ new/doc/latex/xltabular/Changes 2020-03-20 22:28:00.000000000 +0100
@@ -1,3 +1,4 @@
+2.0c 2020/03/20 - restore of original longtable more robust
2.0a 2018/12/16 - better hyperref support; example files
1.0a 2018/05/23 - restore original tabularx must not be statically
0.05 2017-10-26 - set \keepXColumns
Binary files old/doc/latex/xltabular/xltabular-doc.pdf and new/doc/latex/xltabular/xltabular-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xltabular.doc.tlpobj new/tlpkg/tlpobj/xltabular.doc.tlpobj
--- old/tlpkg/tlpobj/xltabular.doc.tlpobj 2019-02-28 04:18:55.000000000 +0100
+++ new/tlpkg/tlpobj/xltabular.doc.tlpobj 2020-03-20 23:59:04.000000000 +0100
@@ -1,6 +1,6 @@
name xltabular.doc
category Package
-revision 49939
+revision 54437
shortdesc doc files of xltabular
relocated 1
docfiles size=27
++++++ xltabular.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xltabular/xltabular.sty new/tex/latex/xltabular/xltabular.sty
--- old/tex/latex/xltabular/xltabular.sty 2019-02-04 22:37:28.000000000 +0100
+++ new/tex/latex/xltabular/xltabular.sty 2020-03-20 22:28:00.000000000 +0100
@@ -3,21 +3,18 @@
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
%% Either version 1.3 or, at your option, any later version.
%%
-% Copyright 2018 Herbert Voss <hvoss(a)tug.org>
-% Rolf Niepraschk <Rolf.Niepraschk(a)gmx.de>
+% Copyright 2018,... Herbert Voss <hvoss(a)tug.org>
+% Rolf Niepraschk <Rolf.Niepraschk(a)gmx.de>
%%
-\ProvidesPackage{xltabular}[2019/01/30 v0.2b `xltabular' package (hv,RN)]
+\ProvidesPackage{xltabular}[2020/03/20 v0.2c `xltabular' package (hv,RN)]
\RequirePackage{tabularx}
\let\XLT@i@tabularx=\tabularx
\let\XLT@i@endtabularx=\endtabularx
\let\XLT@i@TX@endtabularx=\TX@endtabularx
%
-\RequirePackage{ltablex}
-\keepXColumns% xltabular behaves like tabularx
-%
-\let\XLT@ii@tabularx=\tabularx
-\let\XLT@ii@TX@endtabularx=\TX@endtabularx
+\RequirePackage{longtable}
\let\XLT@longtable=\longtable
+\let\XLT@LT@caption=\LT@caption
\let\XLT@LT@start=\LT@start
\let\XLT@LT@array=\LT@array
\@ifundefined{scr@LT@array}{%
@@ -25,7 +22,12 @@
\@ifundefined{adl@LT@array}{}{\let\XLT@adl@LT@array=\adl@LT@array}
}
}{\let\XLT@scr@LT@array=\scr@LT@array}%
-
+%
+\RequirePackage{ltablex}
+\keepXColumns% xltabular behaves like tabularx
+%
+\let\XLT@ii@tabularx=\tabularx
+\let\XLT@ii@TX@endtabularx=\TX@endtabularx
%
% restore original tabularx
\renewenvironment{tabularx}%
@@ -64,11 +66,14 @@
}%
%
\providecommand*\LTcaptype{table}% support of package "caption"
+% restore original longtable
\def\longtable{%
\ifXLT@HypRef
% revert to the unpatched version when \caption is not used
- \global\let\LT@start=\XLT@LT@start
+ \global\let\LT@start=\XLT@LT@start%
\fi
+ \let\LT@array=\XLT@LT@array
+ \let\LT@caption=\XLT@LT@caption
\XLT@longtable
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xltabular.tlpobj new/tlpkg/tlpobj/xltabular.tlpobj
--- old/tlpkg/tlpobj/xltabular.tlpobj 2019-02-28 04:18:55.000000000 +0100
+++ new/tlpkg/tlpobj/xltabular.tlpobj 2020-03-20 23:59:04.000000000 +0100
@@ -1,6 +1,6 @@
name xltabular
category Package
-revision 49939
+revision 54437
shortdesc Longtable support with possible X-column specifier
relocated 1
longdesc This package loads package ltablex, but keeps the current
@@ -13,7 +13,5 @@
catalogue-contact-bugs https://github.com/rolfn/xltabular/issues
catalogue-contact-home https://github.com/rolfn/xltabular
catalogue-ctan /macros/latex/contrib/xltabular
-catalogue-date 2019-02-04 10:22:01 +0100
catalogue-license lppl1.3
catalogue-topics table table-long
-catalogue-version 0.2b
++++++ xmltex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xmltex.doc.tlpobj new/tlpkg/tlpobj/xmltex.doc.tlpobj
--- old/tlpkg/tlpobj/xmltex.doc.tlpobj 2019-02-28 04:18:55.000000000 +0100
+++ new/tlpkg/tlpobj/xmltex.doc.tlpobj 2020-03-24 02:04:32.000000000 +0100
@@ -1,6 +1,6 @@
name xmltex.doc
category Package
-revision 48634
+revision 54498
shortdesc doc files of xmltex
docfiles size=32
texmf-dist/doc/otherformats/xmltex/base/englishutf16.xml
++++++ xmltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xmltex.tlpobj new/tlpkg/tlpobj/xmltex.tlpobj
--- old/tlpkg/tlpobj/xmltex.tlpobj 2019-02-28 04:18:55.000000000 +0100
+++ new/tlpkg/tlpobj/xmltex.tlpobj 2020-03-24 02:04:32.000000000 +0100
@@ -1,6 +1,6 @@
name xmltex
category Package
-revision 48634
+revision 54498
shortdesc Support for parsing XML documents
longdesc The package provides an implementation of a parser for
longdesc documents matching the XML 1.0 and XML Namespace
@@ -16,14 +16,19 @@
depend xmltexconfig
depend babel
depend cm
-depend dehyph
depend hyphen-base
depend latex-fonts
-depend latexconfig
+depend l3backend
+depend l3kernel
+depend l3packages
depend tex-ini-files
+depend unicode-data
+depend dehyph
+depend hyph-utf8
+depend latexconfig
depend xmltex.ARCH
-execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="*xmltex.ini" fmttriggers=babel,cm,dehyph,hyphen-base,latex,latex-fonts,latexconfig,tex-ini-files,xmltexconfig
-execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="*pdfxmltex.ini" fmttriggers=babel,cm,dehyph,hyphen-base,latex,latex-fonts,latexconfig,tex-ini-files,xmltexconfig
+execute AddFormat name=xmltex engine=pdftex patterns=language.dat options="*xmltex.ini" fmttriggers=babel,cm,hyphen-base,latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data,dehyph,hyph-utf8,latex,latexconfig,tex-ini-files,xmltexconfig
+execute AddFormat name=pdfxmltex engine=pdftex patterns=language.dat options="*pdfxmltex.ini" fmttriggers=babel,cm,hyphen-base,latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data,dehyph,hyph-utf8,latex,latexconfig,tex-ini-files,xmltexconfig
runfiles size=24
texmf-dist/tex/xmltex/base/iso-8859-1.xmt
texmf-dist/tex/xmltex/base/iso-8859-2.xmt
@@ -37,7 +42,6 @@
texmf-dist/tex/xmltex/base/xmltex.tex
catalogue-contact-repository https://github.com/davidcarlisle/dpctex
catalogue-ctan /macros/xmltex/base
-catalogue-date 2018-04-05 06:13:24 +0200
catalogue-license lppl
catalogue-topics foreign-import
catalogue-version 0.8
++++++ xpatch.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xpatch/README new/doc/latex/xpatch/README
--- old/doc/latex/xpatch/README 2012-10-06 11:27:44.000000000 +0200
+++ new/doc/latex/xpatch/README 2020-03-26 22:29:18.000000000 +0100
@@ -1,14 +1,18 @@
The xpatch package generalizes the macro patching commands provided by
P. Lehmann's `etoolbox'.
-This is version 0.3 of the package
+This is version 0.3a of the package
+
+Changes from version 0.3
+o Changed deprecated function \token_get_replacement_spec:N
+ to \cs_replacement_spec:N
Changes from version 0.2
o Added \xpatch...format, \xpreto...format and \xappto...format macros
for patching internal biblatex macros defined \Declare...Format
(under kind request by Audrey Boruvka)
- Copyright 2012 Enrico Gregorio
+ Copyright 2012-2020 Enrico Gregorio
It may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3c of this
Binary files old/doc/latex/xpatch/xpatch.pdf and new/doc/latex/xpatch/xpatch.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xpatch.doc.tlpobj new/tlpkg/tlpobj/xpatch.doc.tlpobj
--- old/tlpkg/tlpobj/xpatch.doc.tlpobj 2019-02-28 04:18:56.000000000 +0100
+++ new/tlpkg/tlpobj/xpatch.doc.tlpobj 2020-03-26 23:29:45.000000000 +0100
@@ -1,8 +1,8 @@
name xpatch.doc
category Package
-revision 27897
+revision 54563
shortdesc doc files of xpatch
relocated 1
-docfiles size=112
+docfiles size=116
RELOC/doc/latex/xpatch/README
RELOC/doc/latex/xpatch/xpatch.pdf
++++++ xpatch.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xpatch/xpatch.sty new/tex/latex/xpatch/xpatch.sty
--- old/tex/latex/xpatch/xpatch.sty 2012-10-06 11:27:44.000000000 +0200
+++ new/tex/latex/xpatch/xpatch.sty 2020-03-26 22:29:18.000000000 +0100
@@ -9,7 +9,7 @@
%% Do not distribute this file without also distributing the
%% source files specified above.
%%
-%% File: xpatch.dtx (C) Copyright 2012 Enrico Gregorio
+%% File: xpatch.dtx (C) Copyright 2012-2020 Enrico Gregorio
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -24,7 +24,7 @@
%% The released version of this bundle is available from CTAN.
%%
\RequirePackage{expl3}
-\GetIdInfo$Id: xpatch.dtx 0.3 2012-10-02 12:00:00Z Enrico $
+\GetIdInfo$Id: xpatch.dtx 0.3a 2020-03-25 12:00:00Z Enrico $
{Extending etoolbox patching commands}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -53,7 +53,7 @@
\bool_set_false:N \l__xpatch_protect_bool
\tl_set:Nx \l__xpatch_name_tl { \cs_to_str:N #2 }
\tl_set:Nx \l__xpatch_repl_tl
- { \c__xpatch_bizarre_tl \token_get_replacement_spec:N #2 }
+ { \c__xpatch_bizarre_tl \cs_replacement_spec:N #2 }
\tl_if_in:NxT \l__xpatch_repl_tl
{
\c__xpatch_bizarre_tl
@@ -107,7 +107,7 @@
{
\tl_set:Nx \l__xpatch_repl_tl
{ \c__xpatch_bizarre_tl
- \exp_after:wN \token_get_replacement_spec:N
+ \exp_after:wN \cs_replacement_spec:N
\cs:w \l__xpatch_name_tl \cs_end: }
\tl_if_in:NxT \l__xpatch_repl_tl
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xpatch.tlpobj new/tlpkg/tlpobj/xpatch.tlpobj
--- old/tlpkg/tlpobj/xpatch.tlpobj 2019-02-28 04:18:56.000000000 +0100
+++ new/tlpkg/tlpobj/xpatch.tlpobj 2020-03-26 23:29:45.000000000 +0100
@@ -1,6 +1,6 @@
name xpatch
category Package
-revision 27897
+revision 54563
shortdesc Extending etoolbox patching commands
relocated 1
longdesc The package generalises the macro patching commands provided by
@@ -8,7 +8,6 @@
runfiles size=3
RELOC/tex/latex/xpatch/xpatch.sty
catalogue-ctan /macros/latex/contrib/xpatch
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
-catalogue-version 0.2
+catalogue-version 0.3
++++++ xsavebox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsavebox/ChangeLog new/doc/latex/xsavebox/ChangeLog
--- old/doc/latex/xsavebox/ChangeLog 2018-07-09 23:27:37.000000000 +0200
+++ new/doc/latex/xsavebox/ChangeLog 2020-03-05 01:53:15.000000000 +0100
@@ -1,3 +1,20 @@
+2020-03-04
+ * v0.16
+ * fix: dvisvgm-special `bbox' option `transform' added
+
+2019-11-12
+ * v0.15
+ * fix: output driver set-up
+
+2019-08-13
+ * v0.14
+ * fix: existing \theXXX macros, such as LaTeX counters, could accidentally
+ be overwritten
+
+2019-06-24
+ * v0.13
+ * fix: dvipdfmx driver option fixed to work with current expl3
+
2018-07-09
* v0.12
* fix: non-vanishing Re-run message
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsavebox/README new/doc/latex/xsavebox/README
--- old/doc/latex/xsavebox/README 2018-06-09 00:04:36.000000000 +0200
+++ new/doc/latex/xsavebox/README 2020-03-05 01:53:15.000000000 +0100
@@ -21,6 +21,7 @@
* pdfLaTeX, LuaLaTeX
* LaTeX --> dvips --> ps2pdf/Distiller
* (Xe)LaTeX --> (x)dvipdfmx
+ * LaTeX --> dvisvgm
The user commands are:
Binary files old/doc/latex/xsavebox/xsavebox.pdf and new/doc/latex/xsavebox/xsavebox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xsavebox.doc.tlpobj new/tlpkg/tlpobj/xsavebox.doc.tlpobj
--- old/tlpkg/tlpobj/xsavebox.doc.tlpobj 2019-02-28 04:18:59.000000000 +0100
+++ new/tlpkg/tlpobj/xsavebox.doc.tlpobj 2020-03-05 02:15:52.000000000 +0100
@@ -1,9 +1,9 @@
name xsavebox.doc
category Package
-revision 48171
+revision 54097
shortdesc doc files of xsavebox
relocated 1
-docfiles size=93
+docfiles size=92
RELOC/doc/latex/xsavebox/ChangeLog
RELOC/doc/latex/xsavebox/README
RELOC/doc/latex/xsavebox/xsavebox.pdf
++++++ xsavebox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xsavebox/xsavebox.sty new/tex/latex/xsavebox/xsavebox.sty
--- old/tex/latex/xsavebox/xsavebox.sty 2018-07-09 23:27:37.000000000 +0200
+++ new/tex/latex/xsavebox/xsavebox.sty 2020-03-05 01:53:15.000000000 +0100
@@ -28,8 +28,8 @@
% \xusebox{<name>}
% \the<name> %short form of \xusebox{<name>} for <name> composed of [a-zA-Z]
%
-% Supports all known engines and backends including
-% pdflatex, latex+dvips+ps2pdf, xelatex, latex+dvipdfmx, lualatex.
+% Supports all known engines and backends including pdflatex,
+% latex+dvips+ps2pdf, xelatex, latex+dvipdfmx, lualatex, latex+dvisvgm.
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -46,11 +46,10 @@
% The Current Maintainer of this work is A. Grahn.
\RequirePackage{xparse}
-\RequirePackage{pdfbase} %everything with `pbs_' prefix
\RequirePackage{l3keys2e}
-\def\g@xsb@version@tl{0.12}
-\def\g@xsb@date@tl{2018/07/09}
+\def\g@xsb@version@tl{0.16}
+\def\g@xsb@date@tl{2020/03/04}
\ProvidesExplPackage{xsavebox}{\g@xsb@date@tl}{\g@xsb@version@tl}
{saveboxes for repeating content without code replication}
@@ -60,10 +59,6 @@
Please~install~an~up~to~date~version~of~`#1'.\\
Loading~xsavebox~will~abort!
}
-\@ifpackagelater{pdfbase}{2017/03/23}{}{
- \msg_error:nnn{xsavebox}{support~outdated}{pdfbase.sty}
- \tex_endinput:D
-}
%re-run message
\msg_set:nnn{xsavebox}{rerun}{Rerun~to~get~internal~references~right!}
@@ -81,6 +76,7 @@
}
%package options
+\bool_new:N\g_xsb_dvisvgm_bool %`dvisvgm' driver option
\tl_gset:Nn\g_xsb_margin_tl{3pt}
\keys_define:nn{xsavebox}{
margin .code:n = {
@@ -88,20 +84,57 @@
\tl_gset:Nx\g_xsb_margin_tl{\dim_use:N\l_tmpa_dim}
},
+ xetex .code:n = {}, %dummy, we use engine test instead
+
+ dvipdfmx .choice:,
+ dvipdfmx / true .code:n = {
+ \bool_gset_false:N\g_xsb_dvisvgm_bool
+ \PassOptionsToPackage{dvipdfmx}{pdfbase}
+ },
+ dvipdfmx / false .code:n = {},
+ dvipdfmx .default:n = {true},
+
+ dvisvgm .choice:,
+ dvisvgm / true .code:n = {
+ \bool_gset_true:N\g_xsb_dvisvgm_bool
+ \PassOptionsToPackage{dvisvgm}{pdfbase}
+ },
+ dvisvgm / false .code:n = {\bool_gset_false:N\g_xsb_dvisvgm_bool},
+ dvisvgm .default:n = {true},
+
unknown .code:n = {
\msg_error:nnx{xsavebox}{unknown~package~option}{\l_keys_key_tl}
}
}
-
\ProcessKeysOptions{xsavebox}
+\sys_if_output_pdf:T{\bool_gset_false:N\g_xsb_dvisvgm_bool}
+
+\RequirePackage{pdfbase}
+\@ifpackagelater{pdfbase}{2017/03/23}{}{
+ \msg_error:nnn{xsavebox}{support~outdated}{pdfbase.sty}
+ \tex_endinput:D
+}
+\cs_gset_eq:NN\xsb_pdfxform:nnnnn\pbs_pdfxform:nnnnn
+\cs_gset_eq:NN\xsb_pdflastxform:\pbs_pdflastxform:
+\cs_gset_eq:NN\xsb_pdfrefxform:n\pbs_pdfrefxform:n
+
+\bool_if:NTF\g_xsb_dvisvgm_bool{
+ \tl_gset:Nn\g_xsb_margin_tl{0pt}
+ \cs_new_protected_nopar:Nn\xsb_updatebbox:nnn{
+ \special{dvisvgm:bbox~#1~#2~#3~transform}
+ }
+}{
+ \cs_new_protected_nopar:Nn\xsb_updatebbox:nnn{}
+}
+
\int_new:N\g_xsb_id_int
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% content insertion (referencing, actually)
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareDocumentCommand\xusebox{m}{
- \tl_if_exist:cF{the#1}{\msg_error:nnn{xsavebox}{save-box~undefined}{#1}}
+ \tl_if_exist:cF{xsb_name_#1}{\msg_error:nnn{xsavebox}{save-box~undefined}{#1}}
\tl_use:c{the#1}
}
\msg_set:nnnn{xsavebox}{save-box~undefined}{
@@ -114,6 +147,7 @@
% saving content
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\DeclareDocumentCommand\xsavebox{smO{\width}O{c}+m}{
+ \xsb_check_box_name:n{#2}
\group_begin:
\tl_set:Nn\l_xsb_content_grouped_tl{
\group_begin:
@@ -125,13 +159,9 @@
\xsb_beginLTR:
\IfBooleanTF{#1}{
%later colour injection possible (pdfTeX, LuaTeX)
- \hbox_set:Nn\l_xsb_raw_box{ %raw content
- \color@begingroup\l_xsb_content_grouped_tl\color@endgroup
- }
+ \hbox_set:Nn\l_xsb_raw_box{\l_xsb_content_grouped_tl} %raw content
\hbox_set:Nn\l_xsb_box{ %content re-aligned
- \makebox[#3][#4]{
- \color@begingroup\l_xsb_content_grouped_tl\color@endgroup
- }
+ \makebox[#3][#4]{\l_xsb_content_grouped_tl}
}
}{
%the LaTeX way (no colour injection)
@@ -140,13 +170,13 @@
}
%process one of \l_xsb_raw_box or \l_xsb_box
\dim_compare:nTF{\box_wd:N\l_xsb_raw_box>\box_wd:N\l_xsb_box}{
- \str_if_eq_x:nnTF{#4}{s}{
+ \str_if_eq:eeTF{#4}{s}{
%sqeezing content correctly
\IfBooleanTF{#1}{
%for colour injection
\hbox_set:Nn\l_xsb_box{
\makebox[\box_wd:N\l_xsb_raw_box][l]{
- \makebox[#3][s]{\color@begingroup#5\color@endgroup}
+ \makebox[#3][s]{#5}
}
}
}{
@@ -156,22 +186,18 @@
}
}
\xsb_process_box:nnnN{#2}{#3}{#4}\l_xsb_box
- }{
+ }{ % raw content
\IfBooleanTF{#1}{
- \hbox_set:Nn\l_xsb_raw_box{ %raw content
- \color@begingroup#5\color@endgroup
- }
+ \hbox_set:Nn\l_xsb_raw_box{#5}
}{
- \sbox\l_xsb_raw_box{#5} %raw content
+ \sbox\l_xsb_raw_box{#5}
}
\xsb_process_box:nnnN{#2}{#3}{#4}\l_xsb_raw_box
}
}{
\IfBooleanTF{#1}{
\hbox_set:Nn\l_xsb_box{ %content re-aligned
- \makebox[#3][#4]{
- \color@begingroup#5\color@endgroup
- }
+ \makebox[#3][#4]{#5}
}
}{
\savebox\l_xsb_box[#3][#4]{#5} %re-aligned
@@ -185,18 +211,34 @@
\DeclareDocumentCommand\xsbox{m+m}{\xsavebox{#1}{#2}}
\DeclareDocumentEnvironment{xlrbox}{m}{
+ \xsb_check_box_name:n{#1}
\xsb_xlrbox:
}{
\xsb_endxlrbox:n{#1}
}
\DeclareDocumentEnvironment{xlrbox*}{m}{
+ \xsb_check_box_name:n{#1}
\xsb_xlrbox_star:
}{
\xsb_endxlrbox_star:n{#1}
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\msg_set:nnn{xsavebox}{name~in~use}{
+ The~name~`#1'~is~already~in~use~\msg_line_context:.\\
+ Select~a~different~box~name.
+}
+\cs_new_protected_nopar:Nn\xsb_check_box_name:n{
+ \bool_if:nTF{
+ \cs_if_exist_p:c{the#1} && !\tl_if_exist_p:c{xsb_name_#1}
+ }{
+ \msg_error:nnx{xsavebox}{name~in~use}{#1}
+ }{
+ \tl_clear_new:c{xsb_name_#1}
+ }
+}
+
\cs_new_protected:Nn\xsb_xlrbox:{
\group_begin:
\xsb_push_props: %new, empty properties dict
@@ -208,7 +250,7 @@
\cs_new_protected_nopar:Nn\xsb_endxlrbox:n{
\unskip
\group_end:\hbox_set_end:
- \sbox\l_xsb_box{\hbox_unpack_clear:N\l_xsb_box}
+ \sbox\l_xsb_box{\hbox_unpack_drop:N\l_xsb_box}
\xsb_process_box:nnnN{#1}{\width}{c}\l_xsb_box
\xsb_endLTR:
\group_end:
@@ -218,13 +260,13 @@
\group_begin:
\xsb_push_props: %new, empty properties dict
\xsb_beginLTR:
- \hbox_set:Nw\l_xsb_box\color@begingroup
+ \hbox_set:Nw\l_xsb_box
\ignorespaces
}
\cs_new_protected_nopar:Nn\xsb_endxlrbox_star:n{
\unskip
- \color@endgroup\hbox_set_end:
+ \hbox_set_end:
\xsb_process_box:nnnN{#1}{\width}{c}\l_xsb_box
\xsb_endLTR:
\group_end:
@@ -245,7 +287,7 @@
%temporarily (for distilling) push the box bounds somewhat; glyphs tend to
%be bigger than their bounding boxes
\hbox_set_to_wd:Nnn#4{\width+\g_xsb_margin_tl+\g_xsb_margin_tl}{
- \hss\hbox_unpack_clear:N#4\hss
+ \hss\hbox_unpack_drop:N#4\hss
}
\box_set_ht:Nn#4{\height+\g_xsb_margin_tl}
\box_set_dp:Nn#4{\depth+\g_xsb_margin_tl}
@@ -260,7 +302,7 @@
\xsb_pop_props_to:N\l_tmpa_tl
%distill box to Form XObject, if used (ref'ed)
\bool_if:cT{c_\tl_use:c{xsb@\int_use:N\g_xsb_id_int}_bool}{
- \pbs_pdfxform:nnnnn{1}{0}{\l_tmpa_tl}{
+ \xsb_pdfxform:nnnnn{1}{0}{\l_tmpa_tl}{
\cs_if_exist_use:N\ocgbase_insert_oc:}{#4}
}
%for tracking box usage
@@ -275,18 +317,19 @@
\token_to_str:N\pbs@newkey{xsb@\int_use:N\g_xsb_id_int}{true}
}
\exp_not:N\tl_new:c{xsb_\int_use:N\g_xsb_id_int}
- }
+ }
\exp_not:N\bool_if:cF{c_\tl_use:c{xsb@\int_use:N\g_xsb_id_int}_bool}{
\exp_not:N\xsb_rerun_msg:
}
\exp_not:N\xsb_beginLTR:
+ \xsb_updatebbox:nnn{\l_xsb_new_wd_tl}{\l_xsb_ht_tl}{\l_xsb_dp_tl}
\exp_not:N\makebox[\l_xsb_new_wd_tl][#3]{
\exp_not:N\hbox_to_wd:nn{\l_xsb_wd_tl}{
\exp_not:N\vrule~width~\c_zero_dim~height~\l_xsb_ht_tl~
depth~\l_xsb_dp_tl
\exp_not:N\skip_horizontal:n{-\g_xsb_margin_tl}
\bool_if:cT{c_\tl_use:c{xsb@\int_use:N\g_xsb_id_int}_bool}{
- \exp_not:N\pbs_pdfrefxform:n{\pbs_pdflastxform:}
+ \exp_not:N\xsb_pdfrefxform:n{\xsb_pdflastxform:}
}
\hss
}
@@ -302,12 +345,12 @@
%environment for setting LTR typesetting direction with e-TeX based engines
\cs_new_protected:Nn\xsb_beginLTR:{
\cs_if_exist:NT\TeXXeTstate{
- \int_compare:nT{\TeXXeTstate>\c_zero}{\beginL}
+ \int_compare:nT{\TeXXeTstate>\c_zero_int}{\beginL}
}
}
\cs_new_protected:Nn\xsb_endLTR:{
\cs_if_exist:NT\TeXXeTstate{
- \int_compare:nT{\TeXXeTstate>\c_zero}{\endL}
+ \int_compare:nT{\TeXXeTstate>\c_zero_int}{\endL}
}
}
@@ -326,7 +369,7 @@
\cs_new_protected:Nn\xsb_pop_props_to:N{
\seq_gpop:NNT\g_xsb_props_seq\l_tmpa_tl{
\tl_trim_spaces:N\l_tmpa_tl
- \str_if_eq_x:nnF{\l_tmpa_tl}{}{\tl_set:Nx#1{/Properties<<\l_tmpa_tl>>}}
+ \str_if_eq:eeF{\l_tmpa_tl}{}{\tl_set:Nx#1{/Properties<<\l_tmpa_tl>>}}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xsavebox.tlpobj new/tlpkg/tlpobj/xsavebox.tlpobj
--- old/tlpkg/tlpobj/xsavebox.tlpobj 2019-02-28 04:19:00.000000000 +0100
+++ new/tlpkg/tlpobj/xsavebox.tlpobj 2020-03-05 02:15:52.000000000 +0100
@@ -1,6 +1,6 @@
name xsavebox
category Package
-revision 48171
+revision 54097
shortdesc Saveboxes for repeating content without code replication, based on PDF Form XObjects
relocated 1
longdesc The package defines commands for saving content that can be
@@ -17,7 +17,6 @@
RELOC/tex/latex/xsavebox/xsavebox.sty
catalogue-contact-repository https://gitlab.com/agrahn/xsavebox
catalogue-ctan /macros/latex/contrib/xsavebox
-catalogue-date 2018-07-09 17:37:27 +0200
catalogue-license lppl1.3
catalogue-topics boxing pdf-feat adobe-distiller
-catalogue-version 0.12
+catalogue-version 0.16
++++++ xsim.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/README new/doc/latex/xsim/README
--- old/doc/latex/xsim/README 2018-02-14 22:31:31.000000000 +0100
+++ new/doc/latex/xsim/README 2020-04-12 00:52:28.000000000 +0200
@@ -1,5 +1,6 @@
--------------------------------------------------------------------------
-XSIM 2018/02/12 v0.11
+XSIM 2020/04/04 v0.19b
+XSIMVERB 2019/12/29 v0.1a
eXercise Sheets IMproved
@@ -8,7 +9,7 @@
Web: https://github.com/cgnieder/xsim
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2017--2018 Clemens Niederberger
+Copyright 2017--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -25,6 +26,7 @@
The xsim package consists of the code files:
xsim.sty
xsimverb.sty
+ xsim.auxfile.code.tex
xsim.base.code.tex
xsim.blanks.code.tex
xsim.collections.code.tex
@@ -34,11 +36,11 @@
xsim.goals.code.tex
xsim.grades.code.tex
xsim.interface.code.tex
- xsim.layouts.code.tex
xsim.modules.code.tex
xsim.properties.code.tex
xsim.random.code.tex
xsim.solutions.code.tex
+ xsim.style.layouts.code.tex
xsim.tags.code.tex
xsim.templates.code.tex
xsim.translations.code.tex
@@ -63,8 +65,8 @@
xsim.grade-distribution.tex, xsim.grade-distribution.pdf
xsim.hints.tex, xsim.hints.pdf
xsim.listings.tex, xsim.listings.pdf
- xsim.multiplechoice.tex, xsim.multiplechoice.pdf
xsim.listofexercises.tex, xsim.listofexercises.pdf
+ xsim.multiplechoice.tex, xsim.multiplechoice.pdf
xsim.pointsums.tex, xsim.pointsums.pdf
xsim.randomexercises.tex, xsim.randomexercises.pdf
xsim.various.tex, xsim.various.pdf
@@ -82,8 +84,10 @@
xsim.texsx-370642.tex, xsim.texsx-370642.pdf
xsim.texsx-391530.tex, xsim.texsx-391530.pdf
xsim.texsx-395273.tex, xsim.texsx-395273.pdf
+ xsim.texsx-498299.tex, xsim.texsx-498299.pdf,
xsim.texwelt-6698.tex, xsim.texwelt-6698.pdf
xsim.texwelt-15093.tex, xsim.texwelt-15093.pdf
+ xsim.texwelt-23968.tex, xsim.texwelt-23968.pdf
xsim.golatex-16824.tex, xsim.golatex-16824.pdf
xsim.golatex-18844.tex, xsim.golatex-18844.pdf
--------------------------------------------------------------------------
Binary files old/doc/latex/xsim/examples/xsim.code-and-output.pdf and new/doc/latex/xsim/examples/xsim.code-and-output.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.code-and-output.tex new/doc/latex/xsim/examples/xsim.code-and-output.tex
--- old/doc/latex/xsim/examples/xsim.code-and-output.tex 2017-05-19 23:12:44.000000000 +0200
+++ new/doc/latex/xsim/examples/xsim.code-and-output.tex 2019-09-30 23:52:46.000000000 +0200
@@ -10,7 +10,7 @@
}
\makeatletter
-\NewDocumentEnvironment{example}{o}
+\NewDocumentEnvironment{example}{!o}
{%
\XSIMgobblechars{2}%
\XSIMsetfilebegin{\@percentchar\space file `\jobname.tmp'}%
@@ -25,7 +25,7 @@
\input{\jobname.tmp}
}
-\NewDocumentEnvironment{code}{o}
+\NewDocumentEnvironment{code}{!o}
{%
\XSIMgobblechars{2}%
\IfNoValueTF{#1}
@@ -46,7 +46,7 @@
\bigskip
-\begin{code}
+\begin{code}[]
blubber \LaTeX
\end{code}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.collections.tex new/doc/latex/xsim/examples/xsim.collections.tex
--- old/doc/latex/xsim/examples/xsim.collections.tex 2017-05-19 23:12:44.000000000 +0200
+++ new/doc/latex/xsim/examples/xsim.collections.tex 2020-03-17 22:32:40.000000000 +0100
@@ -5,7 +5,7 @@
\DeclareExerciseCollection{foo-medium}
\DeclareExerciseTagging{difficulty}
-\usepackage{filecontents,lipsum}
+\usepackage{lipsum}
\begin{filecontents*}{foo.tex}
\begin{exercise}[difficulty=easy,points=1]
foo one \lipsum[4]
Binary files old/doc/latex/xsim/examples/xsim.texsx-338165.pdf and new/doc/latex/xsim/examples/xsim.texsx-338165.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.texsx-338165.tex new/doc/latex/xsim/examples/xsim.texsx-338165.tex
--- old/doc/latex/xsim/examples/xsim.texsx-338165.tex 2017-05-19 23:12:44.000000000 +0200
+++ new/doc/latex/xsim/examples/xsim.texsx-338165.tex 2019-10-07 22:58:33.000000000 +0200
@@ -8,9 +8,7 @@
\usepackage{xsim}
\usepackage{tcolorbox}
\tcbuselibrary{breakable, skins}
-\settasks{
- counter-format = tsk.
-}
+\settasks{ label = \arabic*. }
\DeclareExerciseEnvironmentTemplate{boxed}
{%
Binary files old/doc/latex/xsim/examples/xsim.texsx-350028.pdf and new/doc/latex/xsim/examples/xsim.texsx-350028.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.texsx-350028.tex new/doc/latex/xsim/examples/xsim.texsx-350028.tex
--- old/doc/latex/xsim/examples/xsim.texsx-350028.tex 2017-05-19 23:12:44.000000000 +0200
+++ new/doc/latex/xsim/examples/xsim.texsx-350028.tex 2020-04-12 00:52:28.000000000 +0200
@@ -1,7 +1,6 @@
% http://tex.stackexchange.com/q/350028/
\documentclass{book}
-
-\usepackage{xsimverb}
+\usepackage[T1]{fontenc}
\usepackage{xsim}
\usepackage[most]{tcolorbox}
\tcbuselibrary{skins,breakable}
Binary files old/doc/latex/xsim/examples/xsim.texsx-498299.pdf and new/doc/latex/xsim/examples/xsim.texsx-498299.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.texsx-498299.tex new/doc/latex/xsim/examples/xsim.texsx-498299.tex
--- old/doc/latex/xsim/examples/xsim.texsx-498299.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/xsim/examples/xsim.texsx-498299.tex 2019-11-10 23:07:28.000000000 +0100
@@ -0,0 +1,75 @@
+\documentclass{article}
+\usepackage[no-files]{xsim}
+\usepackage{tasks}
+
+\DeclareExerciseEnvironmentTemplate{item}
+ {\item[\GetExerciseProperty{counter}]}
+ {}
+
+\DeclareExerciseProperty{answer}
+
+\newcommand*\answer[1]{%
+ \XSIMexpandcode{%
+ \SetExerciseProperty{answer}
+ { (\noexpand\textit{\alph{task}}) \unexpanded{#1}}}%
+ #1%
+}
+
+\newcommand*\getanswers{%
+ \def\betweenanswers{\def\betweenanswers{\hspace{2em}}}%
+ \ForEachUsedExerciseByID{%
+ \betweenanswers##3\ExercisePropertyGet{##1}{##2}{answer}%
+ }%
+}
+
+\xsimsetup{
+ exercise/template = item,
+ exercise/the-counter = \arabic{exercise}.
+}
+
+\NewTasksEnvironment[
+ label = (\textit{\alph*}) ,
+ label-width = 14pt
+]{choice}[\choice]
+
+\newenvironment{questions}
+ {\itemize}
+ {\enditemize}
+
+\begin{document}
+
+\section{Problems}
+\begin{questions}
+ \begin{exercise}
+ What is the product of $-2$ and $3$?
+ \begin{choice}(4)
+ \choice \answer{$-6$}
+ \choice $6$
+ \choice $5$
+ \choice $-5$
+ \end{choice}
+ \end{exercise}
+ \begin{exercise}
+ What is the sum of the sides of a polygon called?
+ \begin{choice}(2)
+ \choice Leg
+ \choice \answer{Perimeter}
+ \choice Area
+ \choice Volume
+ \end{choice}
+ \end{exercise}
+ \begin{exercise}
+ What is the sum of $-2$ and $-3$?
+ \begin{choice}(4)
+ \choice $-6$
+ \choice $6$
+ \choice $5$
+ \choice \answer{$-5$}
+ \end{choice}
+ \end{exercise}
+\end{questions}
+
+\section{Answers}
+\getanswers
+
+\end{document}
Binary files old/doc/latex/xsim/examples/xsim.texwelt-23968.pdf and new/doc/latex/xsim/examples/xsim.texwelt-23968.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/examples/xsim.texwelt-23968.tex new/doc/latex/xsim/examples/xsim.texwelt-23968.tex
--- old/doc/latex/xsim/examples/xsim.texwelt-23968.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/xsim/examples/xsim.texwelt-23968.tex 2020-04-12 00:52:28.000000000 +0200
@@ -0,0 +1,70 @@
+% http://texwelt.de/wissen/fragen/23968/
+\documentclass{article}
+\usepackage{xsim}
+
+% new property:
+\DeclareExerciseProperty{shortsolution}
+
+% new environment:
+\NewDocumentEnvironment{shortsolution}{+b}
+ {%
+ \edef\ExerciseType{\csname g_xsim_exercise_type_tl\endcsname}%
+ \edef\ExerciseID{\csname g_xsim_exercise_id_tl\endcsname}%
+ \SetExerciseProperty{shortsolution}{#1}%
+ }
+ {}
+
+% we'll use a description list for the list of short solutions:
+\newcommand\printshortsolutions{%
+ \begin{description}
+ \ForEachUsedExerciseByType{%
+ \def\ExerciseType{##1}%
+ \def\ExerciseID{##2}%
+ \GetExercisePropertyT{shortsolution}
+ {%
+ \item[Short Solution ##3]
+ ####1%
+ }%
+ }%
+ \end{description}
+}
+
+\begin{document}
+
+\section{Problems}
+% set shortsolution through option:
+\begin{exercise}[subtitle=Pythagoras]
+ This is the first problem.
+\end{exercise}
+\begin{shortsolution}
+ This is a shortsolution to the first problem.
+\end{shortsolution}
+\begin{solution}
+ This is the solution to the first problem.
+\end{solution}
+
+\begin{exercise}[subtitle=Another Problem]
+ This is the second problem.
+\end{exercise}
+\begin{solution}
+ This is the solution to the second problem.
+\end{solution}
+
+% set shortsolution with custom command:
+\begin{exercise}[subtitle=Yet Another Problem]
+ This is the third problem.
+\end{exercise}
+\begin{shortsolution}
+ This is a shortsolution to the third problem.
+\end{shortsolution}
+\begin{solution}
+ This is the solution to the third problem.
+\end{solution}
+
+\section{Shortsolutions}
+\printshortsolutions
+
+\section{Solutions}
+\printsolutions[headings=false]
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/xsim.history new/doc/latex/xsim/xsim.history
--- old/doc/latex/xsim/xsim.history 2018-02-14 22:31:31.000000000 +0100
+++ new/doc/latex/xsim/xsim.history 2020-04-12 00:52:28.000000000 +0200
@@ -7,7 +7,7 @@
Web: https://github.com/cgnieder/xsim
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2017--2018 Clemens Niederberger
+Copyright 2017--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -111,3 +111,48 @@
- introduce a \xsim_if_<tagging>_value:nTF for each tag
kind
- \ProvideExerciseTagging
+ v0.12 2019/09/30 - add parameter versions for the plural forms of exercise
+ and solution names
+ - bug fixes (issues 37, 39, 43, 47)
+ v0.13 2019/10/06 - experimental package option `no-files'
+ v0.14 2019/10/13 - new exercise parameters `exercise-heading' and
+ `solution-heading'
+ - new options `exercise/heading' and `solution/heading' as
+ interface for setting the new parameters
+ - new command \GetExerciseHeadingF for using the new
+ parameters in environment templates
+ - change the environment template `default' to use the new
+ \GetExerciseHeadingF and output a \par at the end
+ - make argument of \xsimsetup long
+ - new template `minimal'
+ - new option `load-style'
+ - new example `texwelt-23968' (long and short solutions)
+ v0.14a 2019/10/19 - fix \xsim_if_exercise_exist:nnTF to obey the `no-files'
+ option
+ v0.15 2019/11/02 - use own auxiliary file per default and add option
+ `use-aux'
+ v0.16 2019/11/10 - fix issue due to usage of own auxiliary file
+ - \XSIMatbegindocument and \XSIMatenddocument
+ - \xprintexercise, \xprintsolution, \xsimprint, \xsimxprint
+ 2019/12/29 - bugfix in `xsimverb'
+ v0.16a 2020/01/16 - adapt to renaming of string case changing functions
+ v0.17 2020/02/21 - prefer lazy boolean evaluation if possible
+ - remove spurious \par at the beginning of typeset
+ exercises
+ - add `blank' option, implements issue #31
+ - add `solution' property, implements issue #33
+ - fix issue #27
+ - implement issue #2
+ - don't allow package options to be set with \xsimsetup
+ v0.18 2020/02/23 - fix issue #56
+ - change \printexercise and \printsolution to accept a
+ clist of either ids or IDs (or mixed)
+ - new templates in the `layouts' style
+ v0.19 2020/03/16 - improve performance
+ - only set \ExerciseID and \ExerciseType locally to ensure
+ correct values when exercises (of different types) are
+ nested
+ - new load-time option `debug' - only for development
+ v0.19a 2020/03/19 - fix missing-variant-bug introduced with the last update
+ v0.19b 2020/04/04 - fix bug in new attribute mechanism which was a problem
+ when `no-files` has been used
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/xsim.ideas new/doc/latex/xsim/xsim.ideas
--- old/doc/latex/xsim/xsim.ideas 2018-02-14 22:31:31.000000000 +0100
+++ new/doc/latex/xsim/xsim.ideas 2020-02-24 15:31:15.000000000 +0100
@@ -7,7 +7,7 @@
Web: https://github.com/cgnieder/xsim
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2017--2018 Clemens Niederberger
+Copyright 2017--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
@@ -26,6 +26,4 @@
- a document class `xsim-exam' for creating exams
- a mechanism for providing variants of an exam
-- provide a switch: either write the environments to an external file
- or save it to an auxiliary file ? (not really sure about this one --
- probably not)
+
Binary files old/doc/latex/xsim/xsim_manual.pdf and new/doc/latex/xsim/xsim_manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xsim/xsim_manual.tex new/doc/latex/xsim/xsim_manual.tex
--- old/doc/latex/xsim/xsim_manual.tex 2018-02-14 22:31:31.000000000 +0100
+++ new/doc/latex/xsim/xsim_manual.tex 2020-04-12 00:52:28.000000000 +0200
@@ -1,8 +1,8 @@
-% !arara: pdflatex: { action: nonstopmode }
+% !arara: pdflatex: { interaction: nonstopmode }
% !arara: biber
-% !arara: pdflatex: { action: nonstopmode }
-% arara: pdflatex: { action: nonstopmode }
-% arara: pdflatex: { action: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
+% arara: pdflatex: { interaction: nonstopmode }
% ----------------------------------------------------------------------------
% the XSIM package
%
@@ -13,7 +13,7 @@
% Web: https://github.com/cgnieder/xsim
% E-Mail: contact(a)mychemistry.eu
% ----------------------------------------------------------------------------
-% Copyright 2017--2018 Clemens Niederberger
+% Copyright 2017--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -32,8 +32,7 @@
% ----------------------------------------------------------------------------
\documentclass{xsim-manual}
-\usepackage{filecontents}
-\begin{filecontents*}{\jobname.bib}
+\begin{filecontents*}[overwrite]{\jobname.bib}
@online{texsx:romannumeral,
author = {Bruno Le Floch} ,
title = {Cunning (La)TeX tricks} ,
@@ -44,7 +43,7 @@
title = {Questions tagged `exsheets'} ,
author = {various} ,
url = {http://tex.stackexchange.com/questions/tagged/exsheets} ,
- urldate = {2017-05-15}
+ urldate = {2020-02-21}
}
\end{filecontents*}
\addbibresource{\jobname.bib}
@@ -69,14 +68,27 @@
package. Be careful: if you're in the middle of an important project it
might be better to wait with the update until you've finished the project.
Every update might be breaking some things.
+
+ Please also be aware that \xsim\ is actively developed and many things may
+ still change. However, I will try my best to keep the interface stable.
+\end{bewareofthedog}
+
+I'm currently thinking to make the option \option{no-files} the default
+behavior of \xsim. There is a poll and discussion regarding this question on
+\xsim's github page if you like to give your opinion on this.
+
+\begin{bewareofthedog}
+ The whole collection mechanism is likely to change completely in the
+ not-so-far future (let's say sometime in the six months from April~2020 or
+ so).
\end{bewareofthedog}
-\section{Motivation and Background}
+\section{Motivation, Background}
It has been quite a while since I first published
\pkg{exsheets}~\cite{pkg:exsheets} in June 2012. Since then it has gained a
user base and a little bit of popularity as the number of questions on tex.sx
-shows (119~at the time of writing)~\cite{texsx:tagged/exsheets}. User
+shows (143~at the time of writing)~\cite{texsx:tagged/exsheets}. User
questions, bug reports and feature requests improved it over the time. It
still has a version number starting with a zero, though, which in my
versioning system means I still consider it experimental.
@@ -121,41 +133,56 @@
environment body files.
\opt{clear-aux}
If used every time the total number of exercise changes \xsim\ will write
- \emph{less} information to the auxfile on the next run and only if the
- number of exercises stays stable between compilations the needed
- information will be written to the auxfile. \emph{This needs more
+ \emph{less} information to the auxiliary file on the next run and only if
+ the number of exercises stays stable between compilations the needed
+ information will be written to the auxiliary file. \emph{This needs more
compilations until everything stabilizes but should reduce the
probability of possibly faulty exercises after changes to the document.}
The \option{final} option automatically disables this option. See also
sections~\vref{sec:how-exerc-envir} and~\vref{sec:resolve-getting}.
+ \opt{no-files}
+ \sinceversion{0.13}This option prevents \xsim\ from writing the exercises
+ and solutions to external files. This will keep your working folder
+ ``clean'' but will also prevent using verbatim material in exercises and
+ solutions and will possibly slow processing further down. \emph{This
+ option is considered experimental. Feedback is very welcome.}
+ \opt{use-aux}
+ \sinceversion{0.15}With this option enabled \xsim\ will use the regular
+ auxiliary file \cs*{jobname}\code{.aux} instead of its own auxiliary file
+ \cs*{jobname}\code{.xsim}.
+ \opt{blank}
+ \sinceversion{0.17}With this option enabled \xsim\ will not define the
+ default environments \env{exercise} and \env{solution}.
\end{options}
-Those options are used the usual way as package option
+Those options are load-time options and are used the usual way as package
+options:
\begin{sourcecode}
\usepackage[verbose]{xsim}
\end{sourcecode}
-or as global option
-\begin{sourcecode}
- \documentclass[verbose]{article}
-\end{sourcecode}
-or via the setup command:
+\begin{bewareofthedog}
+ Although those options technically belong to the \module{package} module
+ (see also section~\vref{sec:setting-options}) it is \emph{not} possible to
+ set them via \cs{xsimsetup}.
+\end{bewareofthedog}
+
+\subsection{Setting Options}\label{sec:setting-options}
+Apart from the package options already described in
+section~\vref{sec:package-options} \xsim\ has further options. All those
+options are set using the following command:
\begin{commands}
\command{xsimsetup}[\marg{options}]
Set up \xsim's package options and all other options described at
other places in the manual.
\end{commands}
-
-\subsection{Setting Options}
-Apart from the package options already described in
-section~\vref{sec:package-options} \xsim\ has further options. Those can be
-\enquote{toplevel} options or options belonging to a module.
+Options can be \enquote{toplevel} options or options belonging to a module:
\begin{options}
\keyval*{toplevel}{value}
A toplevel option.
\keyval*{sublevel}{value}\Module*{module}
A sublevel option belonging to the module \module*{module}
\end{options}
-Both kinds of options are set with \cs{xsimsetup}:
+Both kinds of options are set with the setup command:
\begin{sourcecode}
\xsimsetup{
toplevel = {value} ,
@@ -190,11 +217,11 @@
no \meta{true} argument.
\end{commands}
-
\section{Exercises and Solutions}
The two predefined environments for exercises and solutions are the following
-ones:
+ones\footnote{When you load \xsim\ with the \option{blank} those environments
+ will \emph{not} be defined!}:
\begin{environments}
\environment{exercise}[\oarg{\acsp*{prop}}]
Input and typeset an exercise. See section~\vref{sec:exercise-properties}
@@ -218,7 +245,7 @@
setup. This can be changed using the following option.
\begin{options}
\keybool{print}\Module{solution}\Default{false}
- Set if solutions are printed or or not.
+ Set if solutions are printed or not.
\end{options}
The option (belonging to the module \module*{solution}) can either be set
@@ -238,13 +265,13 @@
There is an completely analoguous option for the \env{exercise} environment:
\begin{options}
\keybool{print}\Module{exercise}\Default{true}
- Set if exercises are printed or or not.
+ Set if exercises are printed or not.
\end{options}
More details on those two environments can be found in
section~\vref{sec:using-printing}.
\section{How the Exercise Environments Work}\label{sec:how-exerc-envir}
-Both the exercise and the solution enviroments write the contents of their
+Both the exercise and the solution environments write the contents of their
bodies verbatim to external files following a certain naming structure:
\begin{itemize}
\item
@@ -252,7 +279,7 @@
\end{itemize}
The name starts with the name of the job (which is the name of the document
itself) followed by type and id of the corresponding exercise and then
-followed by the environment type. For example both enviroments from the first
+followed by the environment type. For example both environments from the first
example have been written to files named
\begin{itemize}
\item \verbcode+xsim_manual-exercise-1-exercise-body.tex+ and
@@ -284,50 +311,53 @@
document uses \keyis{path}{exercises}.
\keyval{file-extension}{string}\Default{\code{tex}}
\sinceversion{0.10}This option let's you choose the extension of the
- auxiliary files.
+ external files.
\end{options}
-Another thing to keep in mind: the environment in many ways works the same way
-as the \env{filecontents} environment. \emph{This also means that you
- \emph{cannot} have comments on the first line of the environments:}
+\begin{bewareofthedog}
+ Another thing to keep in mind: the environment in many ways works the same
+ way as the \env{filecontents} environment. \emph{This also means that you
+ \emph{cannot} have comments or \cs*{label}s or anything else on the first
+ line of the environments!}
+\end{bewareofthedog}
\begin{sourcecode}
\begin{exercise}[points=2] % this comment will cause trouble
Lorem ipsum
\end{exercise}
\end{sourcecode}
-\begin{bewareofthedog}
- \xsim\ writes a lot of stuff to the auxfile for re-using information on
- subsequent compilations. If you add exercises, change properties \etc\ it
- might happen that wrong information is staying in the auxfile and is wrongly
- used by \xsim. In such cases deleting the auxfile and doing a few fresh
- compilations may resolve your problems.
-
- Sometimes the \emph{existence of exercise or solution files from earlier
- compilations} may lead to wrong lists of exercises or solutions. In such
- cases it can be useful to delete all those files and doing a fresh
- compilation. It may be helpful to use a subfolder for those exernal files
- which will make deleting them a little bit easier. (Don't forget to both
- create the subfolder and set \option{path} accordingly then.)
+If\sinceversion{0.13} you don't like all the external files and the problems
+which come with them \emph{and} if you don't need any verbatim or similar
+material inside the exercises and solutions then you can use the following
+package option:
+\begin{options}
+ \opt{no-files}
+ This package option prevents \xsim\ from writing the exercises and
+ solutions to external files. This will keep your working folder ``clean''
+ but will also prevent using verbatim material in exercises and solutions
+ and will possibly slow processing further down. \emph{This option is
+ considered experimental. Feedback is very welcome.}
+\end{options}
- Using the \option{clear-aux} option might help to reduce erroneous exercises.
+\begin{bewareofthedog}
+ \xsimauxfileinfo
\end{bewareofthedog}
\begin{bewareofthedog}
- A lot of the lines \xsim\ writes to the auxfile and reads in a subsequent
- run look like this:
+ A lot of the lines \xsim\ writes to the auxiliary file and reads in a
+ subsequent run look like this:
\begin{sourcecode}
- \XSIM {points}{exercise-2=={4}|exercise-10=={2.5}|problem-11=={5}}
+ \XSIM{points}{exercise-2=={4}||exercise-10=={2.5}||problem-11=={5}}
\end{sourcecode}
As you can see different entries of the various properties of exercises are
- separated with a \code{|}. This means that you cannot use this symbol
- inside properties. This is why \xsim\ provides an option to change this
- marker.
+ separated with \code{||}. This means that you cannot use this symbol
+ combination inside properties. For this reason \xsim\ provides an option to
+ change the marker.
\end{bewareofthedog}
\begin{options}
- \keyval{split-aux-lists}{string}\Default{\code{|}}
+ \keyval{split-aux-lists}{string}\Default{\code{||}}
Set\sinceversion{0.11} the string that is used to separate the property
- entries in the auxfile.
+ entries in the auxiliary file.
\end{options}
\section{New Exercise Types}\label{sec:new-exercise-types}
@@ -351,15 +381,20 @@
There are \numberofexercises~exercises and \numberofproblems~problem in this
manual.
\end{example}
-\xsim's pre-defined environment pair has been defined as follows:
+\xsim's pre-defined environment pair\changedversion{0.14} has been defined as
+follows:
\begin{sourcecode}
\DeclareExerciseType{exercise}{
exercise-env = exercise ,
solution-env = solution ,
exercise-name = \XSIMtranslate{exercise} ,
+ exercises-name = \XSIMtranslate{exercises} ,
solution-name = \XSIMtranslate{solution} ,
+ solutions-name = \XSIMtranslate{solutions} ,
exercise-template = default ,
- solution-template = default
+ solution-template = default ,
+ exercise-heading = \subsection* ,
+ solution-heading = \subsection*
}
\end{sourcecode}
@@ -375,9 +410,17 @@
\paraval{exercise-name}{exercise name}
The name of the exercises of type \meta{type} -- used for typesetting.
\emph{This parameter is mandatory.}
+ \paraval{exercises-name}{exercises name}
+ The\sinceversion{0.12} plural name of the exercises of type \meta{type} --
+ used for typesetting. If this is not set explicitly an \code{s} is
+ appended to the singular name.
\paraval{solution-name}{solution name}
The name of the solutions of type \meta{type} -- used for typesetting.
\emph{This parameter is mandatory.}
+ \paraval{solutions-name}{solutions name}
+ The\sinceversion{0.12} plural name of the solutions of type \meta{type} --
+ used for typesetting. If this is not set explicitly an \code{s} is
+ appended to the singular name.
\paraval{exercise-template}{exercise template}
The template used for typesetting the exercises of type \meta{type}.
\emph{This parameter is mandatory.} See
@@ -407,13 +450,26 @@
An internal parameter that is used to keep track of the number of
exercises of a type. This parameter cannot be set or changed by the
user.
+ \paraval{exercise-heading}{exercise heading command}
+ The\sinceversion{0.14} command used for typesetting of the heading of
+ exercises of type \meta{type} -- used for typesetting with the command
+ \cs{GetExerciseHeadingF}.
+ \paraval{solution-heading}{solution heading command}
+ The\sinceversion{0.14} command used for typesetting of the heading of
+ solutions of type \meta{type} -- used for typesetting with the command
+ \cs{GetExerciseHeadingF}.
\end{parameters}
It is possible to change some of the parameters after an exercise type has
been defined. Those include \parameter{exercise-name},
\parameter{solution-name}, \parameter{exercise-template}, and
-\parameter{solution-template}:
+\parameter{solution-template}. It is also possible to define new parameters.
\begin{commands}
+ \command{DeclareExerciseParameter}[\sarg\marg{parameter}]
+ Declares the new parameter \meta{parameter}. The optional star declares a
+ fixed parameter which cannot be changed once it is set. \emph{You
+ probably will never need this command. Most tasks can be solved using
+ properties (see section~\vref{sec:exercise-properties}) instead.}
\command{SetExerciseParameter}[\marg{type}\marg{parameter}\marg{value}]
Usable to set a single parameter to a new value.
\command{SetExerciseParameters}[\marg{type}\marg{parameters}]
@@ -446,12 +502,12 @@
Holds the user id of an exercise if defined. Otherwise it is equal to
\property{id}.
\propval{counter}{text}
- Holds the counter value represenation of an exercise (\ie, what you
+ Holds the counter value representation of an exercise (\ie, what you
usually know as \cs*{the\meta{counter}}). \emph{Cannot be set by the
user}.
\propval{counter-value}{integer}
Holds the counter value of an exercise (\ie, what you usually know as
- \cs*{arabic}\marg{counter}). \emph{Cannot be set by the user}.
+ \cs*{the}\cs*{value}\marg{counter}). \emph{Cannot be set by the user}.
\propval{subtitle}{text}
Holds the subtitle of an exercise.
\propval{points}{number}
@@ -472,34 +528,48 @@
True if an exercise has been used at least once. For an existing exercise
this is only false for exercises that have been collected
(\cf~section~\vref{sec:collecting-exercises}).
+ \propbool{solution}
+ \sinceversion{0.17}Holds the solution boolean of an exercise. If this is
+ true then a solution has the same text\slash environment body as the
+ corresponding exercise. (This might be useful for multiple choice
+ questions for example.)
\propval{tags}{csv list of tags}
Holds the list of tags the exercise should be associated with.
\propval{topics}{csv list of topics}
Holds the list of topics the exercise should be associated with.
\propval{page}{text}
- Holds the page counter value represenation of an exercise (\ie, what you
- usually know as \cs*{thepage}).
+ Holds the page counter value representation of an exercise \\
+ (\ie, what you usually know as \cs*{thepage}).
\propval{page-value}{integer}
- Holds the page counter value of an exercise (\ie, what you usually know as
- \cs*{arabic}\Marg{page}).
+ Holds the page counter value of an exercise \\
+ (\ie, what you usually know as \cs*{the}\cs*{value}\Marg{page}).
\propval{section}{text}
- Holds the section counter value represenation of an exercise (\ie, what
- you usually know as \cs*{thesection}).
+ Holds the section counter value representation of an exercise \\
+ (\ie, what you usually know as \cs*{thesection}).
\propval{section-value}{integer}
- Holds the section counter value of an exercise (\ie, what you usually know
- as \cs*{arabic}\Marg{section}).
+ Holds the section counter value of an exercise \\
+ (\ie, what you usually know as \cs*{the}\cs*{value}\Marg{section}).
\propval{chapter}{text}
- Holds the chapter counter value represenation of an exercise (\ie, what
- you usually know as \cs*{thechapter}). \emph{Only if a command
- \cs*{chapter} \emph{and} a counter \code{chapter} exist.}
+ Holds the chapter counter value representation of an exercise \\
+ (\ie, what you usually know as \cs*{thechapter}). \\
+ \emph{Only if a command \cs*{chapter} \emph{and} a counter \code{chapter}
+ exist.}
\propval{chapter-value}{integer}
- Holds the chapter counter value of an exercise (\ie, what you usually know
- as \cs*{arabic}\Marg{chapter}). \emph{Only if a command \cs*{chapter}
- \emph{and} a counter \code{chapter} exist.}
+ Holds the chapter counter value of an exercise \\
+ (\ie, what you usually know as \cs*{the}\cs*{value}\Marg{chapter}). \\
+ \emph{Only if a command \cs*{chapter} \emph{and} a counter \code{chapter}
+ exist.}
\propval{sectioning}{section numbers}
Holds five brace groups which in turn hold the section numbers (integers)
of the exercise in the order
\marg{chapter}\marg{section}\marg{subsection}\marg{subsubsection}\marg{paragraph}.
+ \propval{exercise-body}{\TeX code}
+ When\sinceversion{0.13} the package option \option{no-files} is set this
+ property is defined and holds the environment body of an exercise.
+ \propval{solution-body}{\TeX code}
+ When\sinceversion{0.13} the package option \option{no-files} is set this
+ property is defined and holds the environment body of the corresponding
+ solution.
\end{properties}
Some of these \acsp*{prop} are fixed and cannot be set by the user. Those
@@ -545,13 +615,11 @@
This is better demonstrated with an example:
\begin{example}
\begin{exercise}
- \lipsum[4] % from package `lipsum'
\verb+\GetExerciseProperty{id}+: \GetExerciseProperty{id} \par
\verb+\GetExerciseAliasProperty{ID}+: \GetExerciseAliasProperty{ID} \par
\verb+\GetExerciseProperty{ID}+: \GetExerciseProperty{ID}
\end{exercise}
\begin{exercise}[ID=foo-bar]
- \lipsum[4]
\verb+\GetExerciseProperty{id}+: \GetExerciseProperty{id} \par
\verb+\GetExerciseAliasProperty{ID}+: \GetExerciseAliasProperty{ID} \par
\verb+\GetExerciseProperty{ID}+: \GetExerciseProperty{ID}
@@ -631,7 +699,7 @@
respectively. The starred version prints nothing. Defined in terms of
\cs{AddtoExerciseGoal} and \cs{AddtoExerciseGoalPrint}.
\command{points}[\marg{value}]
- Print \meta{value}followed by an appropriate translation of the words
+ Print \meta{value} followed by an appropriate translation of the words
\enquote{point} or \enquote{points}, respectively. Defined in terms of
\cs{ExerciseGoalValuePrint}.
\command{printbonus}[\marg{type}]
@@ -709,7 +777,7 @@
\begin{sourcecode}
\DeclareExerciseTagging{tags}
\DeclareExerciseTagging{topics}
- \xsimsetup{tags/ingore-untagged=false}
+ \xsimsetup{tags/ignore-untagged=false}
\end{sourcecode}
This means that these options are available:
\begin{options}
@@ -762,7 +830,7 @@
\end{itemize}
\begin{example}
- \begin{exercise}[print=false]
+ \begin{exercise}[print=false,ID=invisible]
This exercise will not be printed but the exercise counter will be
incremented nonetheless. Its solution will be printed in the list of
solutions.
@@ -818,6 +886,12 @@
\keyval{name}{name}\Module{solution}
An interface for \cs{SetExerciseParameter}\Marg{exercise}%
\Marg{solution-name}\marg{name}.
+ \keyval{heading}{heading command}\Module{exercise}
+ An\sinceversion{0.14} interface for \cs{SetExerciseParameter}%
+ \Marg{exercise}\Marg{exercise-heading}\marg{heading command}.
+ \keyval{heading}{heading command}\Module{solution}
+ An\sinceversion{0.14} interface for \cs{SetExerciseParameter}%
+ \Marg{exercise}\Marg{solution-heading}\marg{heading command}.
\keyval{pre-hook}{code}\Module{exercise}\Default
The code for the \emph{pre exercise hook} for exercises of the type
\enquote{exercise}.
@@ -851,16 +925,26 @@
If you know type and \property{id} of an exercise you can (re-)insert every
existing exercise, \ie, every exercise whose external file exists.
\begin{commands}
- \command{printexercise}[\marg{type}\marg{id}]
- Inserts the exercise of type \meta{type} with the \property{id}
- \meta{id}.
+ \command{printexercise}[\marg{type}\marg{csv of ids}]
+ \changedversion{0.17}Inserts the exercise or exercises of type
+ \meta{type} with the \property{id}s or \property{ID}s given in \meta{csv
+ of ids}.
+ \command{xprintexercise}[\marg{type}\marg{csv of ids}]
+ \sincechanged{0.16}{0.17}The same as \cs{printexercise} but expands
+ \meta{type} and the items of \meta{csv of ids} before it uses them.
\end{commands}
\begin{example}
- \printexercise{exercise}{5}
+ \printexercise{exercise}{invisible}
\end{example}
\section{Collecting Exercises}\label{sec:collecting-exercises}
+\begin{bewareofthedog}
+ The whole collection mechanism is likely to change completely in the
+ not-so-far future (let's say sometime in the six months from April~2020 or
+ so).
+\end{bewareofthedog}
+
\subsection{Background}
\xsim\ knows the concept of \enquote{exercise collections}. A collection of
exercises can be useful when you want to print a certain group of exercises
@@ -1078,6 +1162,9 @@
\command{printsolution}[\oarg{options}\marg{type}\marg{id}]
Prints the solution of the exercise of type \meta{type} with the
\property{id} \meta{id}.
+ \command{xprintsolution}[\marg{type}\marg{id}]
+ \sinceversion{0.16}The same as \cs{printsolution} but expands \meta{type}
+ and \meta{id} before it uses them.
\end{commands}
\begin{example}
@@ -1223,10 +1310,17 @@
information on style files\index{style file}).
\item[\code{margin}] A layout rather similar to the one by package
\pkg{exsheets}, see section~\ref{sec:margin-template}. Available through
- the style file \code{layouts} (see section~\vref{sec:style-files} for more
- information on style files\index{style file}).
+ the style file \code{layouts}.
+ \item[\code{minimal}] A\sinceversion{0.13} minimalistic layout, see
+ section~\ref{sec:minimal-template}. As the others inspired by an
+ \pkg{exsheets} layout. Available through the style file \code{layouts}.
+ \item[\code{inline}] A\sinceversion{0.18} minimalistic layout, the same as
+ \code{minimal} but doesn't add \cs*{par} at the beginning and end.
+ Available through the style file \code{layouts}.
+ \item[\code{centered}] A\sinceversion{0.18} layout with a centered heading.
+ Available through the style file \code{layouts}.
\end{description}
-
+
\collectexercises{layouts}
\begin{exercise}[subtitle=The Subtitle,points=2.5,ID=showlayout]
Lorem ipsum dolor sit amet, consectetuer adipiscing elit. Ut purus elit,
@@ -1355,6 +1449,11 @@
Retrieves the value of the parameter \parameter{exercise-name} for the
current exercise or of the parameter \parameter{solution-name} for the
current solution.
+ \expandable\command{GetExerciseHeadingF}[\marg{false}]
+ \sinceversion{0.14}Retrieves the value of the parameter
+ \parameter{exercise-heading} for the current exercise or of the parameter
+ \parameter{solution-heading} for the current solution. Inserts
+ \meta{false} if the corresponding parameter has not been set.
\expandable\command{ExerciseParameterGet}[\marg{type}\marg{parameter}]
Retrieves the value of the parameter \meta{parameter} for the exercise of type
\meta{type} with id \meta{id}.
@@ -1403,6 +1502,10 @@
Can be used to refer to the current exercise type.
\expandable\command{ExerciseID}
Can be used to refer to the current exercise id.
+ \expandable\command{ExerciseText}
+ Can be used inside solutions to retrieve the text of the corresponding
+ solution. This is propably seldom useful as in most use cases the
+ exercise property \property{solution} is the easier alternative.
\expandable\command{ExerciseCollection}
Can be used in certain templates to refer to the collection that is
currently inserted.
@@ -1443,7 +1546,7 @@
\item \code{\#5}: the \property{points} property of the exercise
\item \code{\#6}: the \property{bonus-points} property of the exercise
\end{itemize}
- \command{ForEachPrintedExerciseByID}
+ \command{ForEachPrintedExerciseByID}[\marg{code}]
Loops over each \emph{printed} exercise order by the exercise id. Inside
\meta{code} you can refer to several properties of the corresponding
exercise:
@@ -1455,7 +1558,7 @@
\item \code{\#5}: the \property{points} property of the exercise
\item \code{\#6}: the \property{bonus-points} property of the exercise
\end{itemize}
- \command{ForEachUsedExerciseByID}
+ \command{ForEachUsedExerciseByID}[\marg{code}]
Loops over each \emph{used} exercise order by the exercise id. Inside
\meta{code} you can refer to several properties of the corresponding
exercise:
@@ -1467,6 +1570,12 @@
\item \code{\#5}: the \property{points} property of the exercise
\item \code{\#6}: the \property{bonus-points} property of the exercise
\end{itemize}
+ \command{XSIMprint}[\Marg{exercise|solution}\marg{type}\marg{id}]
+ \sincechanged{0.16}{0.17}Inserts the either the exercise or the solution
+ of type \meta{type} with the \property{id} or \property{ID} \meta{id}.
+ \command{XSIMxprint}[\Marg{exercise|solution}\marg{type}\marg{id}]
+ The same as \cs{XSIMprint} but expands \meta{type} and \meta{id} before it
+ uses them.\sincechanged{0.16}{0.17}
\expandable\command{XSIMtranslate}[\marg{keyword}]
Delivers the translation of \meta{keyword} according to the current
document language (in the meaning of a \pkg{babel}~\cite{pkg:babel} or
@@ -1496,7 +1605,13 @@
\meta{code 2} is the same tokenlist.
\expandable\command{XSIMifblank\TF}[\marg{code}\marg{true}\marg{false}]
Checks if the full expansion\footref{fn:romannumeral} of \meta{code} is
- blank (\ie, if it is empty or only consists of spaces).
+ blank (\ie, if it is empty or only consists of spaces).
+ \command{XSIMatbegindocument}[\marg{code}]
+ \sinceversion{0.15a}Adds \meta{code} to \xsim's begin document hook.
+ Should be used inside style files instead of \cs*{AtBeginDocument}.
+ \command{XSIMatenddocument}[\marg{code}]
+ \sinceversion{0.15a}Adds \meta{code} to \xsim's end document hook.
+ Should be used inside style files instead of \cs*{AtEndDocument}.
\end{commands}
\subsection{Declaring Templates}
@@ -1536,9 +1651,70 @@
with the option \option{template} of module \module{grading-table}
The predefined templates are \enquote{\code{default}} and
-\enquote{\code{default}}, see sections~\vref{sec:table-templ-default}
+\enquote{\code{default*}}, see sections~\vref{sec:table-templ-default}
and~\vref{sec:table-templ-default*}.
+\subsection{Create and Use \xsim\ Style Files}\label{sec:style-files}
+\index{style file|(}
+
+\xsim\changedversion{0.11} offers you the possibility to create own
+\emph{style files}. Let's say you want to have a style called
+\code{math-exam}. Then you need to save all necessary definitions in a file
+called:
+\begin{center}
+ \code{xsim.style.math-exam.code.tex}
+\end{center}
+The first command in the file should be \cs{xsimstyle}\Marg{math-exam}. This
+file can now be loaded into your document using
+\cs{loadxsimstyle}\Marg{math-exam} or by using
+\cs{xsimsetup}\Marg{load-style=math-exam}:
+\begin{sourcecode}
+ \documentclass[DIV=18,parskip=half]{scrartcl}
+ \usepackage[T1]{fontenc}
+ \usepackage[utf8]{inputenc}
+
+ \usepackage[clear-aux]{xsim}
+ \loadxsimstyle{math-exam}
+
+ \title{Math Exam \#3}
+ \date{2017-03-28}
+\end{sourcecode}
+
+In this style file stuff like template and property definitions should
+happen. This is more or less a convenient way to
+\begin{itemize}
+ \item keep the preamble \enquote{clean} and
+ \item define re-usable styles without the need of copying the document
+ preamble to another document.
+\end{itemize}
+A style file is like a package or class file, \ie, \code{@} has category
+code~11 (letter).
+
+The formal description of the commands:
+\begin{commands}
+ \command{xsimstyle}[\sarg\marg{style name}]
+ The\changedversion{0.11} first command in a \xsim\ style file called
+ \code{xsim.style.\meta{style name}.code.tex} which defines the \xsim\
+ style \meta{style name}. The starred version activates expl3
+ syntax\footnote{Those users who want this will know what it means. If you
+ don't know what it means you will not need it.}.
+ \command{loadxsimstyle}[\marg{csv list of style names}]
+ Load one or more styles into the document.
+\end{commands}
+\begin{options}
+ \keyval{load-style}{csv list of style names}
+ Another\sinceversion{0.14} interface for \cs{loadxsimstyle}\marg{csv list
+ of style names}.
+\end{options}
+
+\begin{bewareofthedog}
+ At the moment this mechanism offers no advantages over creating a custom
+ package or simply \cs*{input}ing a file. Future versions might provide
+ additional features.
+\end{bewareofthedog}
+
+\index{style file|)}
+
\subsection{Examples}\label{sec:template-examples}
The repository of this package\footnote{GitHub:
@@ -1552,21 +1728,21 @@
\subsubsection{The \code{default} Exercise Template}\label{sec:exercise-templ-default}
-Below the definition of the \code{default} exercise template provided by
-\xsim\ is shown:
+Below the definition\changedversion{0.14} of the \code{default} exercise
+template provided by \xsim\ is shown:
\begin{sourcecode}
\DeclareExerciseEnvironmentTemplate{default}{%
- \subsection*
- {%
- \XSIMmixedcase{\GetExerciseName}\nobreakspace
- \GetExerciseProperty{counter}%
- \IfInsideSolutionF
- {%
- \GetExercisePropertyT{subtitle}
- { {\normalfont\itshape\PropertyValue}}%
- }%
- }
+ \GetExerciseHeadingF{\subsection*}%
+ {%
+ \XSIMmixedcase{\GetExerciseName}\nobreakspace
+ \GetExerciseProperty{counter}%
+ \IfInsideSolutionF
+ {%
+ \GetExercisePropertyT{subtitle}
+ { {\normalfont\itshape\PropertyValue}}%
+ }%
+ }
\GetExercisePropertyT{points}
{%
\marginpar
@@ -1578,7 +1754,7 @@
}%
}%
}
- {}
+ {\par}
\end{sourcecode}
\subsubsection{A New Exercise Type Using \pkg*{tcolorbox}}
@@ -1698,6 +1874,27 @@
{\endtrivlist}
\end{sourcecode}
+\subsubsection{A \code{minimal} Template}
+\label{sec:minimal-template}
+
+This shows the implementation of the \code{minimal} template:
+\begin{sourcecode}
+ \DeclareExerciseEnvironmentTemplate{minimal}
+ {%
+ \par
+ \textbf{\GetExerciseProperty{counter}}%
+ \IfInsideSolutionF{%
+ \GetExercisePropertyT{points}{%
+ \GetExercisePropertyT{bonus-points}{+\printgoal{\PropertyValue}}%
+ \,\IfExerciseGoalSingularTF{points}
+ {\XSIMtranslate{point}}
+ {\XSIMtranslate{points}}%
+ }%
+ }%
+ }
+ {\par}
+\end{sourcecode}
+
\subsubsection{The Headings Templates}\label{sec:headings-templates}
\xsim\ defines four heading templates which only differ by which text they
output:
@@ -1938,7 +2135,7 @@
\keyval{linespread}{decimal number}\Module{blank}\Default{\code{1}}
Set the linespread for the blank lines. This only has an effect if
\cs{blank} is used at the begin of a paragraph.
- \keyval{line-increment}{dim}\Module{blank}\Default{\code{1pt}}
+ \keyval{line-increment}{dim}\Module{blank}\Default{\code{0.001\cs*{linewidth}}}
The blank line is built in multiples of this value. If the value is too
large you may end up with uneven lines. If the value is too small you may
end up with a non-ending compilation. Experiment with values to find the
@@ -2009,25 +2206,12 @@
\subsection{\dots Resolve Getting Repeatedly Wrong Exercise Properties or
Wrong Exercise Lists?}\label{sec:resolve-getting}
-\xsim\ writes a lot of stuff to the auxfile for re-using information on
-subsequent compilations. If you add exercises, change properties \etc\ it
-might happen that wrong information is staying in the auxfile and is wrongly
-used by \xsim. In such cases deleting the auxfile and doing a few fresh
-compilations may resolve your problems.
-
-Sometimes the \emph{existence of exercise or solution files from earlier
- compilations} may lead to wrong lists of exercises or solutions. In such
-cases it can be useful to delete all those files and doing a fresh
-compilation. It may be helpful to use a subfolder for those exernal files
-which will make deleting them a little bit easier. (Don't forget to both
-create the subfolder and set \option{path} accordingly then.)
-
-Using the \option{clear-aux} option might help to reduce erroneous exercises.
+\xsimauxfileinfo
\subsection{\dots Resolve Strange Errors After Updating?}
-\xsim\ writes a lot of stuff to the auxfile. An update may well change how
-this is done so deleting the auxfile and doing a few fresh compilations may
-resolve your problems.
+\xsim\ writes a lot of stuff to the auxiliary file. An update may well change
+how this is done so deleting the auxiliary file and doing a few fresh
+compilations may resolve your problems.
\subsection{\code{! TeX capacity exceeded, sorry [text input levels=15].}
Why?}
@@ -2089,61 +2273,6 @@
\end{exercise}
\end{example}
-\subsection{\dots Create and Use \xsim\ Style Files?}\label{sec:style-files}
-\index{style file|(}
-
-\xsim\changedversion{0.11} offers you the possibility to create own
-\emph{style files}. Let's say you want to have a style called
-\code{math-exam}. Then you need to save all necessary definitions in a file
-called:
-\begin{center}
- \code{xsim.style.math-exam.code.tex}
-\end{center}
-The first command in the file should be \cs{xsimstyle}\Marg{math-exam}. This
-file can now be loaded into your document using
-\cs{loadxsimstyle}\Marg{math-exam}:
-\begin{sourcecode}
- \documentclass[DIV=18,parskip=half]{scrartcl}
- \usepackage[T1]{fontenc}
- \usepackage[utf8]{inputenc}
-
- \usepackage[clear-aux]{xsim}
- \loadxsimstyle{math-exam}
-
- \title{Math Exam \#3}
- \date{2017-03-28}
-\end{sourcecode}
-
-In this style file stuff like template and property definitions should
-happen. This is more or less a convenient way to
-\begin{itemize}
- \item keep the preamble \enquote{clean} and
- \item define re-usable styles without the need of copying the document
- preamble to another document.
-\end{itemize}
-A style file is like a package or class file, \ie, \code{@} has category
-code~11 (letter).
-
-The formal description of the commands:
-\begin{commands}
- \command{xsimstyle}[\sarg\marg{style name}]
- The\changedversion{0.11} first command in a \xsim\ style file called
- \code{xsim.style.\meta{style name}.code.tex} which defines the \xsim\
- style \meta{style name}. The starred version activates expl3
- syntax\footnote{Those users who want this will know what it means. If you
- don't know what it means you will not need it.}.
- \command{loadxsimstyle}[\marg{csv list of style names}]
- Load one or more styles into the document.
-\end{commands}
-
-\begin{bewareofthedog}
- At the moment this mechanism offers no advantages over creating a custom
- package or simply \cs*{input}ing a file. Future versions might provide
- additional features.
-\end{bewareofthedog}
-
-\index{style file|)}
-
\subsection{\dots Print All Solutions Grouped by Section?}
Here is an idea how to get a list of all solutions grouped by the section the
corresponding exercises are appearing in.
@@ -2177,10 +2306,11 @@
}
\section{The \pkg*{xsimverb} package}\label{sec:xsimverb-package}
-\xsim\ comes bundled with another package called \pkg{xsimverb}. This package
-loads a very small subset of \xsim\ which allows to create environments which
-write their contents verbatim to external files. It provides the following
-commands (which of course are also available in \xsim, too):
+\xsim\ comes bundled with another package called
+\pkg{xsimverb}\xsimverbversion. This package loads a very small subset of
+\xsim\ which allows to create environments that write their contents verbatim
+to external files. It provides the following commands (which of course are
+also available in \xsim, too):
\begin{commands}
\command{XSIMfilewritestart}[\sarg\marg{file name}]
@@ -2212,7 +2342,7 @@
value is~$0$.
\end{commands}
-An example of how to use those commands:
+The following code shows an example of how to use those commands:
\begin{sourcecode}
\documentclass{article}
\usepackage{xsimverb,listings}
@@ -2281,6 +2411,9 @@
kinds of layouts can be achieved as well as how to solve concrete problems
that have come up in different \LaTeX\ forums.
+Besides showing excerpts of the code and the resulting pdf the examples below
+also link to both the \code{tex} source the resulting pdf.
+
\listexamplefiles
\printbibliography
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xsim.doc.tlpobj new/tlpkg/tlpobj/xsim.doc.tlpobj
--- old/tlpkg/tlpobj/xsim.doc.tlpobj 2019-02-28 04:19:00.000000000 +0100
+++ new/tlpkg/tlpobj/xsim.doc.tlpobj 2020-04-12 01:55:58.000000000 +0200
@@ -1,9 +1,9 @@
name xsim.doc
category Package
-revision 46634
+revision 54681
shortdesc doc files of xsim
relocated 1
-docfiles size=748
+docfiles size=808
RELOC/doc/latex/xsim/README
RELOC/doc/latex/xsim/examples/xsim.blanks.pdf
RELOC/doc/latex/xsim/examples/xsim.blanks.tex
@@ -69,8 +69,12 @@
RELOC/doc/latex/xsim/examples/xsim.texsx-391530.tex
RELOC/doc/latex/xsim/examples/xsim.texsx-395273.pdf
RELOC/doc/latex/xsim/examples/xsim.texsx-395273.tex
+ RELOC/doc/latex/xsim/examples/xsim.texsx-498299.pdf
+ RELOC/doc/latex/xsim/examples/xsim.texsx-498299.tex
RELOC/doc/latex/xsim/examples/xsim.texwelt-15093.pdf
RELOC/doc/latex/xsim/examples/xsim.texwelt-15093.tex
+ RELOC/doc/latex/xsim/examples/xsim.texwelt-23968.pdf
+ RELOC/doc/latex/xsim/examples/xsim.texwelt-23968.tex
RELOC/doc/latex/xsim/examples/xsim.texwelt-6698.pdf
RELOC/doc/latex/xsim/examples/xsim.texwelt-6698.tex
RELOC/doc/latex/xsim/examples/xsim.various.pdf
++++++ xsim.tar.xz ++++++
++++ 3971 lines of diff (skipped)
++++++ xskak.doc.tar.xz ++++++
++++ 5252 lines of diff (skipped)
++++++ xskak.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xskak/xskak-keys.sty new/tex/latex/xskak/xskak-keys.sty
--- old/tex/latex/xskak/xskak-keys.sty 2015-01-02 22:29:30.000000000 +0100
+++ new/tex/latex/xskak/xskak-keys.sty 2019-06-23 22:59:18.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% xskak-src.dtx (with options: `xskak-keys')
+%% xskak.dtx (with options: `xskak-keys')
%%
%% xskak: a package to parse and print chess games
%% Copyright 2006-2015 Ulrike Fischer (chess(a)nililand.de)
@@ -16,8 +16,7 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{xskak-keys.sty}[2015/01/02 version v1.4 key definitions for xskak.sty]
-%%$Date: 2011/03/17 16:54:07 $$Version: 041ab49ae0e2 $
+\ProvidesFile{xskak-keys.sty}[2019/06/23 version v1.5 key definitions for xskak.sty]
%%%%%%%%%%%%%%%%%%%%%
%%%% Keys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xskak/xskak-nagdef.sty new/tex/latex/xskak/xskak-nagdef.sty
--- old/tex/latex/xskak/xskak-nagdef.sty 2015-01-02 22:29:30.000000000 +0100
+++ new/tex/latex/xskak/xskak-nagdef.sty 2019-06-23 22:59:18.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% xskak-src.dtx (with options: `xskak-nagdef')
+%% xskak.dtx (with options: `xskak-nagdef')
%%
%% xskak: a package to parse and print chess games
%% Copyright 2006-2015 Ulrike Fischer (chess(a)nililand.de)
@@ -16,8 +16,7 @@
%% License, or (at your option) any later version.
%%
%% For error reports see documentation.
-\ProvidesFile{xskak-nagdef.sty}[2015/01/02 version v1.4 nag definitions for xskak.sty]
-%%$Date: 2011/03/17 16:54:07 $$Version: 041ab49ae0e2 $
+\ProvidesFile{xskak-nagdef.sty}[2019/06/23 version v1.5 nag definitions for xskak.sty]
\expandafter\def\csname $1\endcsname{!}
\expandafter\def\csname $2\endcsname{?}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xskak/xskak.sty new/tex/latex/xskak/xskak.sty
--- old/tex/latex/xskak/xskak.sty 2015-01-02 22:29:30.000000000 +0100
+++ new/tex/latex/xskak/xskak.sty 2019-06-23 22:59:18.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% xskak-src.dtx (with options: `xskak')
+%% xskak.dtx (with options: `xskak')
%%
%% xskak: a package to parse and print chess games
%% Copyright 2006-2015 Ulrike Fischer (chess(a)nililand.de)
@@ -17,8 +17,7 @@
%%
%% For error reports see documentation.
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xskak}[2015/01/02 version v1.4 extended chess typesetting and parsing]
-%%$Date: 2015/01/02 13:51:58 $$Version: c80394b06dd1 $
+\ProvidesPackage{xskak}[2019/06/23 version v1.5 extended chess typesetting and parsing]
\newif\ifxskakpdfmatch
@@ -1211,6 +1210,7 @@
beforeNAG={}}
\newcommand\xskak@beforeNAG{}
+\newcommand\xskak@beforecomment{}
\newcommand\xskaknewstyleitem[2][]{%
\ifcsname xskak@styleitem@#2@beforeblack\endcsname
@@ -1311,6 +1311,7 @@
whiteopen=.,
blackopen=. -,
beforewhite=\space,
+ afterblack=\space,
beforeblack={,\space}]{styleA}
\xskaknewstyleitem[%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xskak.tlpobj new/tlpkg/tlpobj/xskak.tlpobj
--- old/tlpkg/tlpobj/xskak.tlpobj 2019-02-28 04:19:01.000000000 +0100
+++ new/tlpkg/tlpobj/xskak.tlpobj 2019-06-24 01:39:30.000000000 +0200
@@ -1,6 +1,6 @@
name xskak
category Package
-revision 35945
+revision 51432
shortdesc An extension to the skak package for chess typesetting
relocated 1
longdesc Xskak, as its prime function, saves information about a chess
@@ -12,8 +12,10 @@
RELOC/tex/latex/xskak/xskak-keys.sty
RELOC/tex/latex/xskak/xskak-nagdef.sty
RELOC/tex/latex/xskak/xskak.sty
+catalogue-contact-repository https://github.com/u-fischer/xskak
+catalogue-contact-support https://github.com/u-fischer/xskak/issues
catalogue-ctan /macros/latex/contrib/xskak
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-06-23 18:43:18 +0200
catalogue-license lppl
-catalogue-topics games
-catalogue-version 1.4
+catalogue-topics games etex
+catalogue-version 1.5
++++++ xurl.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xurl/Changes new/doc/latex/xurl/Changes
--- old/doc/latex/xurl/Changes 2018-12-24 00:04:34.000000000 +0100
+++ new/doc/latex/xurl/Changes 2020-01-24 22:47:36.000000000 +0100
@@ -1,3 +1,5 @@
+0.09 2020-01-24 - add missing \do\\
+0.08 2020-01-14 - define macro \useOriginalUrlSetting
0.07 2018-12-23 - move numbers into \UrlBreaks
0.06 2018-12-16 - define \UrlSpecials
0.05 2018-12-08 - added support for biblatex
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xurl/README.md new/doc/latex/xurl/README.md
--- old/doc/latex/xurl/README.md 2018-06-02 23:26:22.000000000 +0200
+++ new/doc/latex/xurl/README.md 2020-01-24 22:47:36.000000000 +0100
@@ -4,8 +4,8 @@
and = / . : * - ~ ' "
All arguments which are valid for url can be used.
-It will be passed to package url. xurl itself has no
-special optional argument. For more information read
+It will be passed to package url. xurl itself has only
+the optional argument "nobiblatex". For more information read
the documentation of package url.
This file is distributed under the terms of the LaTeX Project Public
Binary files old/doc/latex/xurl/xurl.pdf and new/doc/latex/xurl/xurl.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/xurl/xurl.tex new/doc/latex/xurl/xurl.tex
--- old/doc/latex/xurl/xurl.tex 2018-12-24 00:04:34.000000000 +0100
+++ new/doc/latex/xurl/xurl.tex 2020-01-14 22:52:18.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: xurl.tex 876 2018-12-23 10:26:11Z herbert $
+%% $Id: xurl.tex 1133 2020-01-14 12:10:03Z herbert $
%
\listfiles\setcounter{errorcontextlines}{100}
\RequirePackage{filecontents}
@@ -63,7 +63,14 @@
special optional argument. For more information read
the documentation of package url.
+\section{With the original setting from package url}
+The original behaviour of package \texttt{url} can be optained
+by using the macro \texttt{\textbackslash useOriginalUrlSetting}
+which should be used inside a group:
+
+\begingroup
+\useOriginalUrlSetting
\noindent
\frame{\begin{minipage}{0.5\linewidth}
\noindent
@@ -78,7 +85,31 @@
and another url: \url{https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url/10419?noredirect=1#comment1021887_10419}
\end{minipage}}
+\noindent
+\frame{\begin{minipage}{\dimexpr\linewidth-2\fboxrule}
+\noindent
+some text \url{iszv://dsf.tqsdatmdtdls.ctm/cudfsdvqfqll-ocd/bdcbcfqlf-lcclldh/cbsntwgqke-esbptb-vvylhy/zkhqnqidf-obedbacpf-lzlal-pxaccqa-gwki.lfof/}
+and another url: \url{koff://osb.ccdngagkkg.raa/qrkxzvi/dxfsiaa/xidf-lata-dgdqmhp-uoxdl-vst-vcsbhl-aisdsasih-skl-aezb-fhixvyy-qqlachd-achhfc-koe-xgfqp-iyplcu-1.696884}
+\end{minipage}}
+\endgroup
+
+
+\section{With the setting from package xurl}
+
+
+\noindent
+\frame{\begin{minipage}{0.5\linewidth}
+\noindent
+some text \url{very-long-url-very-long-url-very-long-url-very-long-url-very-long-url-}
+and another url: \url{https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url/10419?noredirect=1#comment1021887_10419}
+\end{minipage}}
+\noindent
+\frame{\begin{minipage}{0.75\linewidth}
+\noindent
+some text \url{very-long-url-very-long-url-very-long-url-very-long-url-very-long-url-}
+and another url: \url{https://tex.stackexchange.com/questions/3033/forcing-linebreaks-in-url/10419?noredirect=1#comment1021887_10419}
+\end{minipage}}
\noindent
\frame{\begin{minipage}{\dimexpr\linewidth-2\fboxrule}
@@ -109,6 +140,7 @@
\nocite{*}
+
\printbibliography[title={With urlbreaks}]
\setcounter{biburllcpenalty}{0}
@@ -117,6 +149,10 @@
\printbibliography[title={xurl with option nobiblatex}]
+
+
+
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xurl.doc.tlpobj new/tlpkg/tlpobj/xurl.doc.tlpobj
--- old/tlpkg/tlpobj/xurl.doc.tlpobj 2019-02-28 04:19:02.000000000 +0100
+++ new/tlpkg/tlpobj/xurl.doc.tlpobj 2020-01-25 01:55:37.000000000 +0100
@@ -1,9 +1,9 @@
name xurl.doc
category Package
-revision 49488
+revision 53538
shortdesc doc files of xurl
relocated 1
-docfiles size=14
+docfiles size=18
RELOC/doc/latex/xurl/Changes
RELOC/doc/latex/xurl/README.md
RELOC/doc/latex/xurl/xurl.pdf
++++++ xurl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/xurl/xurl.sty new/tex/latex/xurl/xurl.sty
--- old/tex/latex/xurl/xurl.sty 2018-12-24 00:04:34.000000000 +0100
+++ new/tex/latex/xurl/xurl.sty 2020-01-24 22:47:36.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: xurl.sty 876 2018-12-23 10:26:11Z herbert $
+%% $Id: xurl.sty 1137 2020-01-24 13:32:38Z herbert $
%%
%% This is file `xurl.sty',
%%
@@ -16,7 +16,7 @@
%% `xurl' is a package for extended URL breaks
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{xurl}[2018/12/23 v 0.07 modify URL breaks]
+\ProvidesPackage{xurl}[2020/01/24 v 0.09 modify URL breaks]
\newif\if@no@biblatex \@no@biblatexfalse
\DeclareOption{nobiblatex}{\@no@biblatextrue}
@@ -44,7 +44,7 @@
\do\m\do\n\do\o\do\p\do\q\do\r\do\s\do\t\do\u\do\v\do\w\do\x\do\y\do\z%
\do\A\do\B\do\C\do\D\do\E\do\F\do\G\do\H\do\I\do\J\do\K\do\L%
\do\M\do\N\do\O\do\P\do\Q\do\R\do\S\do\T\do\U\do\V\do\W\do\X\do\Y\do\Z%
- \do\*\do\-\do\~\do\'\do\"\do\-%
+ \do\*\do\-\do\~\do\'\do\"\do\-\do\\%
\do0\do1\do2\do3\do4\do5\do6\do7\do8\do9\do=\do/\do.\do:%
}
%
@@ -57,7 +57,12 @@
\Urlmuskip=0mu plus 1mu
%
-%
+\def\useOriginalUrlSetting{%
+\def\UrlBreaks{\do\.\do\@\do\\\do\/\do\!\do\_\do\|\do\;\do\>\do\]%
+ \do\)\do\,\do\?\do\&\do\'\do+\do\=\do\#}%
+\def\UrlSpecials{\do\ {\Url@space}\do\%{\Url@percent}\do\^^M{\Url@space}%
+ \Url@force@Tilde}% package option may force faked text-ascii-tilde
+}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/xurl.tlpobj new/tlpkg/tlpobj/xurl.tlpobj
--- old/tlpkg/tlpobj/xurl.tlpobj 2019-02-28 04:19:02.000000000 +0100
+++ new/tlpkg/tlpobj/xurl.tlpobj 2020-01-25 01:55:37.000000000 +0100
@@ -1,6 +1,6 @@
name xurl
category Package
-revision 49488
+revision 53538
shortdesc Allow URL breaks at any alphanumerical character
relocated 1
longdesc This package loads url by default and defines possible URL
@@ -11,7 +11,6 @@
runfiles size=2
RELOC/tex/latex/xurl/xurl.sty
catalogue-ctan /macros/latex/contrib/xurl
-catalogue-date 2018-12-23 12:25:27 +0100
catalogue-license lppl1.3
catalogue-topics verbatim
-catalogue-version 0.07
+catalogue-version 0.09
++++++ yathesis.doc.tar.xz ++++++
++++ 1751 lines of diff (skipped)
++++++ yathesis.tar.xz ++++++
++++ 1713 lines of diff (skipped)
++++++ yax.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yax.doc.tlpobj new/tlpkg/tlpobj/yax.doc.tlpobj
--- old/tlpkg/tlpobj/yax.doc.tlpobj 2019-02-28 04:19:11.000000000 +0100
+++ new/tlpkg/tlpobj/yax.doc.tlpobj 2020-03-04 23:55:57.000000000 +0100
@@ -1,6 +1,6 @@
name yax.doc
category Package
-revision 21183
+revision 54080
shortdesc doc files of yax
relocated 1
docfiles size=38
++++++ yax.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yax.tlpobj new/tlpkg/tlpobj/yax.tlpobj
--- old/tlpkg/tlpobj/yax.tlpobj 2019-02-28 04:19:11.000000000 +0100
+++ new/tlpkg/tlpobj/yax.tlpobj 2020-03-04 23:55:57.000000000 +0100
@@ -1,6 +1,6 @@
name yax
category Package
-revision 21183
+revision 54080
shortdesc Yet Another Key System
relocated 1
longdesc YaX is advertised as a key system, but it rather organizes
@@ -17,7 +17,6 @@
RELOC/tex/generic/yax/yax.sty
RELOC/tex/generic/yax/yax.tex
catalogue-ctan /macros/generic/yax
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics keyval
+catalogue-topics keyval etex
catalogue-version 1.03
++++++ yhmath.doc.tar.xz ++++++
Binary files old/doc/fonts/yhmath/yhmath.pdf and new/doc/fonts/yhmath/yhmath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yhmath.doc.tlpobj new/tlpkg/tlpobj/yhmath.doc.tlpobj
--- old/tlpkg/tlpobj/yhmath.doc.tlpobj 2019-02-28 04:19:12.000000000 +0100
+++ new/tlpkg/tlpobj/yhmath.doc.tlpobj 2020-03-18 01:57:15.000000000 +0100
@@ -1,9 +1,9 @@
name yhmath.doc
category Package
-revision 50127
+revision 54377
shortdesc doc files of yhmath
relocated 1
-docfiles size=84
+docfiles size=85
RELOC/doc/fonts/yhmath/LICENSE
RELOC/doc/fonts/yhmath/README
RELOC/doc/fonts/yhmath/yhcmex10.vpl
++++++ yhmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/yhmath/yhmath.sty new/tex/latex/yhmath/yhmath.sty
--- old/tex/latex/yhmath/yhmath.sty 2019-02-25 23:21:39.000000000 +0100
+++ new/tex/latex/yhmath/yhmath.sty 2020-03-17 22:31:23.000000000 +0100
@@ -7,11 +7,11 @@
%% yhmath.dtx (with options: `package')
%%
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
-\ProvidesPackage{yhmath}[2019/02/24 v1.5]
+\ProvidesPackage{yhmath}[2020/03/17 v1.6]
\RequirePackage{amsmath}
-\newcommand{\widering}[1]{\overset{\smash{\lower1.333ex\hbox{$%
-\displaystyle\ring{}$}}}{\wideparen{#1}}}
\newif\if@yh@full
+\newif\if@yh@nowidering
+\@yh@nowideringfalse
\DeclareOption{minimal}{%
\@yh@fullfalse%
}%
@@ -19,7 +19,7 @@
\@yh@fulltrue%
}%
\DeclareOption{nowidering}{%
- \let\widering\@undefined%
+ \@yh@nowideringtrue%
}
\ExecuteOptions{full}%
\ProcessOptions\relax
@@ -100,6 +100,10 @@
\DeclareMathDelimiter{\bracevert} % the vertical bar that extends braces
{\mathord}{yhlargesymbols}{"3E}{yhlargesymbols}{"3E}
\fi
+\if@yh@nowidering\else
+\newcommand{\widering}[1]{\overset{\smash{\lower1.333ex\hbox{$%
+\displaystyle\ring{}$}}}{\wideparen{#1}}}%
+\fi
\newenvironment{amatrix}{\left\langle\begin{matrix}}{\end{matrix}\right\rangle}
\def\adots{\mathinner{\mkern2mu\raise\p(a)\hbox{.}
\mkern2mu\raise4\p(a)\hbox{.}\mkern1mu
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/yhmath.tlpobj new/tlpkg/tlpobj/yhmath.tlpobj
--- old/tlpkg/tlpobj/yhmath.tlpobj 2019-02-28 04:19:12.000000000 +0100
+++ new/tlpkg/tlpobj/yhmath.tlpobj 2020-03-18 01:57:15.000000000 +0100
@@ -1,6 +1,6 @@
name yhmath
category Package
-revision 50127
+revision 54377
shortdesc Extended maths fonts for LaTeX
relocated 1
longdesc The yhmath bundle contains fonts (in Metafont and type 1
@@ -23,7 +23,6 @@
catalogue-contact-home https://github.com/TeX-Live/yhmath
catalogue-contact-repository https://github.com/TeX-Live/yhmath.git
catalogue-ctan /fonts/yhmath
-catalogue-date 2019-02-24 08:57:29 +0100
catalogue-license lppl1.3c
catalogue-topics font font-mf font-type1 font-symbol-maths
-catalogue-version 1.5
+catalogue-version 1.6
++++++ zebra-goodies.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zebra-goodies/README.md new/doc/latex/zebra-goodies/README.md
--- old/doc/latex/zebra-goodies/README.md 2017-12-07 00:56:22.000000000 +0100
+++ new/doc/latex/zebra-goodies/README.md 2019-07-04 23:14:35.000000000 +0200
@@ -1,23 +1,23 @@
# zebra-goodies
-A collection of handy macros for paper writing in my group. Do remove this
-package once the paper is finished.
-
-This is not intended for general cases. Use it at your own risk.
+A collection of handy macros for note taking, like `todo` and `comment`. This is
+not intended for general cases. Use it at your own risk.
## Options
-* `draft`: boolean option, whether to show the notes. Enabled by default. Example to disable it:
-
-```latex
-\usepackage[draft=false]{zebra-goodies}
-```
-
-* `microtype`: boolean option, whether to load package `microtype`. Enabled by default.
+- `draft`: boolean option, whether to show the notes. Enabled by default. Example to disable it:
+ ```latex
+ \usepackage[draft=false]{zebra-goodies}
+ % or use the complementary option "final"
+ \usepackage[final]{zebra-goodies}
+ ```
+- `microtype`: boolean option, whether to load package `microtype`. Enabled by default.
## Take Notes
-Add comments, todos, notes anything you like during revise in a colorful way. The package also summarizes the revise notes at the end of the document. Predefined commands are as follows:
+Add comments, todos, notes anything you like during revise in a colorful way.
+The package also summarizes the revise notes at the end of the document.
+Predefined commands are as follows:
```latex
\todo[<who>]{bla bla}
@@ -27,7 +27,9 @@
\placeholder[<who>]{bla bla}
```
-If any of them does not work, it is probaboly it has been defined by other packages. We will not override the definition, so you have to turn to its full version as follows:
+If any of them does not work, it is very likely that it has been defined by
+other packages. We will not override the definition, so you have to turn to its
+full version as follows:
```latex
\zebratodo[<who>]{bla bla}
@@ -41,9 +43,11 @@
```latex
% \zebranewnote{<note name>}{<xcolor color>}
-\zebranewnote{question}{red!80}
-\question{what's this?}
+\colorlet{mycyan}{cyan}
+\zebranewnote{question}{mycyan}
+
+\question[who]{what's this?}
```
## Use Colors
Binary files old/doc/latex/zebra-goodies/zebra-goodies.pdf and new/doc/latex/zebra-goodies/zebra-goodies.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zebra-goodies.doc.tlpobj new/tlpkg/tlpobj/zebra-goodies.doc.tlpobj
--- old/tlpkg/tlpobj/zebra-goodies.doc.tlpobj 2019-02-28 04:19:13.000000000 +0100
+++ new/tlpkg/tlpobj/zebra-goodies.doc.tlpobj 2019-07-05 01:53:51.000000000 +0200
@@ -1,7 +1,8 @@
name zebra-goodies.doc
category Package
-revision 46004
+revision 51554
shortdesc doc files of zebra-goodies
relocated 1
-docfiles size=1
+docfiles size=29
RELOC/doc/latex/zebra-goodies/README.md
+ RELOC/doc/latex/zebra-goodies/zebra-goodies.pdf
++++++ zebra-goodies.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zebra-goodies/zebra-goodies.sty new/tex/latex/zebra-goodies/zebra-goodies.sty
--- old/tex/latex/zebra-goodies/zebra-goodies.sty 2017-12-07 00:56:22.000000000 +0100
+++ new/tex/latex/zebra-goodies/zebra-goodies.sty 2019-07-04 23:14:35.000000000 +0200
@@ -1,44 +1,41 @@
-%% Copyright (C) 2017 by Ruini Xue <xueruini(a)gmail.com>
%%
-%% This file may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3a
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in:
+%% This is file `zebra-goodies.sty',
+%% generated with the docstrip utility.
%%
-%% http://www.latex-project.org/lppl.txt
+%% The original source files were:
%%
-%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2008/05/04 or later.
-\ProvidesPackage{zebra-goodies}[2017/12/6 0.3.0 LaTeX goodies for paper writing.]
+%% zebra-goodies.dtx (with options: `package')
+%% Copyright (C) 2016-2019, Ruini Xue <xueruini(a)gmail.com>
+%%
+%% It may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License (LPPL), either version 1.3c of
+%% this license or (at your option) any later version. The latest
+%% version of this license is in the file:
+%%
+%% http://www.latex-project.org/lppl.txt
+
+\ProvidesPackage{zebra-goodies}
+[2019/07/04 0.8.0 Easy Notes Taking]
\RequirePackage{kvoptions}
\SetupKeyvalOptions{
family=zebra,
prefix=zebr@,
setkeys=\kvsetkeys}
\DeclareBoolOption{draft}
+\DeclareComplementaryOption{final}{draft}
\DeclareBoolOption{microtype}
\setkeys{zebra}{draft,microtype}
\ProcessKeyvalOptions{zebra}
-
-% comment this if you do not need.
\ifzebr@microtype
\RequirePackage{microtype}
\fi
\RequirePackage{xcolor}
\RequirePackage{tikzpagenodes}
\RequirePackage{marginnote}
-\RequirePackage{manfnt}
-
-%%%%%%%%%%%%%%%%%%
-% zebra-note
-%%%%%%%%%%%%%%%%%%
-
-% From: http://tex.stackexchange.com/questions/247449/making-marginnote-to-appear-e…
-% I did a little edit.
+\@ifundefined{dbend}{\RequirePackage{manfnt}}{}
\newlength{\zebr@tempdima}
\newcount{\zebr@tikzpage}
-
\newcommand*{\zebr@marginnote}[1]{%
\begin{tikzpicture}[remember picture, overlay]%
\pgfextractx{\zebr@tempdima}{\pgfpointanchor{current page text area}{center}}%
@@ -50,42 +47,44 @@
\marginnote{#1}%
\endgroup% resets \reversemarginpar
}
-
\def\zebr@note{%
\ifzebr@draft\expandafter\zebr@note@\else\expandafter\@gobblefour\fi}
-
-% #1: note name
-% #2: color
-% #3: assignee
-% #4: note text
\newcommand{\zebr@note@}[4]{%
\zebr@marginnote{\textcolor{#2}{\dbend}}%
\expandafter\stepcounter{zebr@num@#1}%
- \textcolor{#2}{[\textbf{\MakeUppercase{#1}\textit{#3}:} #4]}}
-
+ \textcolor{#2}{[\colorbox[gray]{0.97}{%
+ \textcolor{#2!70!black}{%
+ \textsc{\MakeLowercase{\MakeUppercase#1}}
+ {\expandafter\csname thezebr@num@#1\endcsname}\texttt{#3}:}} #4]}}
\newcommand{\zebr@prepend}[2]{%
\ifx\relax#2\relax\relax\else#1#2\fi}
-
-\global\def\zebr@noteslist{}
+\def\zebr@noteslist{}
\def\zebranewnote#1#2{%
\g@addto@macro\zebr@noteslist{,#1}%
\expandafter\newcounter\expandafter{zebr@num@#1}
- \expandafter\newcommand\csname zebr@color@#1\endcsname{#2}
- \expandafter\newcommand\csname zebra#1\endcsname[2][]{% we suppose it is not defined yet
+ \expandafter\gdef\csname zebr@color@#1\endcsname{#2}
+ \expandafter\newcommand\csname zebra#1\endcsname[2][]{%
\zebr@note{#1}{#2}{\zebr@prepend{@}{##1}}{##2}}
- \@ifundefined{#1}{\expandafter\def\csname #1\endcsname{\csname zebra#1\endcsname}}{%
- \PackageWarning{zebra}{'\textbackslash{#1}' has been taken. Use '\textbackslash{zebra#1}' instead.}}}
-
+ \@ifundefined{#1}{%
+ \expandafter\def\csname #1\endcsname{\csname zebra#1\endcsname}}{%
+ \PackageWarning{zebra}{'\textbackslash{#1}' has been taken.
+ Use '\textbackslash{zebra#1}' instead.}}}
+\zebranewnote{todo}{purple}
+\zebranewnote{fixed}{teal}
+\zebranewnote{comment}{blue}
+\zebranewnote{note}{violet}
+\zebranewnote{placeholder}{gray}
\def\zebr@listnotes{%
\ifzebr@draft\zebr@listnotes@\fi}
-
\def\zebr@listnotes@{%
\def\temp@a{}
\edef\temp@noteslist{\expandafter\@gobble\zebr@noteslist}
\@for\temp@b:=\temp@noteslist\do{%
\expandafter\ifnum\expandafter\value\expandafter{zebr@num@\temp@b} > 0%
\def\temp@c{\expandafter\csname thezebr@num@\temp@b\endcsname}
- \edef\temp@d{\noexpand\textcolor{\expandafter\csname zebr@color@\temp@b\endcsname}{\temp@b} \noexpand & \temp@c\noexpand\\}
+ \edef\temp@d{\noexpand\textcolor{%
+ \expandafter\csname zebr@color@\temp@b\endcsname}{\temp@b}%
+ \noexpand & \temp@c\noexpand\\}
\expandafter\g@addto@macro\expandafter\temp@a\expandafter{\temp@d}%
\fi}
\ifx\temp@a\@empty\else%
@@ -99,27 +98,23 @@
\temp@a
\hline
\end{tabular}
- \par \medskip
- \textbf{Do fix all of them before submitting.}
\end{center}
\fi}
-
\AtEndDocument{\zebr@listnotes}
-
-\zebranewnote{todo}{purple}
-\zebranewnote{fixed}{teal}
-\zebranewnote{comment}{blue}
-\zebranewnote{note}{violet}
-\zebranewnote{placeholder}{gray}
-
-%%%%%%%%%%%%%%
-% zebra-color
-%%%%%%%%%%%%%%
\definecolor{zebrablue}{HTML}{4F81BD}
\definecolor{zebrared}{HTML}{C0504D}
\definecolor{zebragreen}{HTML}{9BBB00}
\definecolor{zebrapurple}{HTML}{9F4C7C}
\definecolor{zebrayellow}{HTML}{D9CD2E}
\definecolor{zebragreen2}{HTML}{00E000}
-
-\endinput
+%%
+%% This work is "maintained" (as per LPPL maintenance status) by
+%% Ruini Xue.
+%%
+%% This work consists of the file zebra-goodies.dtx
+%% and the derived files zebra-goodies.ins,
+%% zebra-goodies.pdf and
+%% zebra-goodies.sty.
+%%
+%%
+%% End of file `zebra-goodies.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zebra-goodies.tlpobj new/tlpkg/tlpobj/zebra-goodies.tlpobj
--- old/tlpkg/tlpobj/zebra-goodies.tlpobj 2019-02-28 04:19:13.000000000 +0100
+++ new/tlpkg/tlpobj/zebra-goodies.tlpobj 2019-07-05 01:53:51.000000000 +0200
@@ -1,6 +1,6 @@
name zebra-goodies
category Package
-revision 46004
+revision 51554
shortdesc A collection of handy macros for paper writing
relocated 1
longdesc This package offers a collection of macros to help in the
@@ -16,12 +16,10 @@
runfiles size=1
RELOC/tex/latex/zebra-goodies/zebra-goodies.sty
catalogue-contact-bugs https://github.com/xueruini/zebra-goodies/issues
-catalogue-contact-development https://github.com/xueruini
-catalogue-contact-home https://github.com/xueruini/zebra-goodies
catalogue-contact-repository https://github.com/xueruini/zebra-goodies
catalogue-contact-support https://github.com/xueruini/zebra-goodies/issues
catalogue-ctan /macros/latex/contrib/zebra-goodies
-catalogue-date 2017-12-06 09:55:03 +0100
+catalogue-date 2019-07-04 05:23:10 +0200
catalogue-license lppl1.3c
catalogue-topics notes editorial marginal
-catalogue-version 0.3.0
+catalogue-version 0.8.0
++++++ zhlineskip.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhlineskip/README.md new/doc/latex/zhlineskip/README.md
--- old/doc/latex/zhlineskip/README.md 2018-12-01 23:47:43.000000000 +0100
+++ new/doc/latex/zhlineskip/README.md 2019-05-16 23:03:18.000000000 +0200
@@ -2,15 +2,16 @@
==========
`zhlineskip` is a package for typesetting CJK documents. This package allows users
-to specify the two ratios between the leading and the font size of the body text
-and the footnote text. For Latin typesetting, these ratios usually range
+to specify two ratios: One between the leading and the font size of the body text
+and the other between those of the footnote text.
+For Latin typography, these ratios usually range
[from 1.2 to 1.45](https://practicaltypography.com/line-spacing.html),
-but they should be larger for CJK typesetting (usually from 1.5 to 1.67).
+but they should be larger for CJK typography (usually from 1.5 to 1.67).
-On the one hand, CJK text requires larger line spacing. On the other hand, math
-line spacing should follow Latin typesetting, since math often consists of only
-Latin letters and symbols. The `zhlineskip` package is capable of restoring the
-math leading to that of the Latin text.
+Although CJK text requires larger line spacing, maths formulae should follow
+the rules of Latin typography, since maths often consists of only Latin-based
+letters and symbols. The `zhlineskip` package is capable of restoring the
+maths leading to that of the Latin text.
Finally, it is possible to achieve the “Microsoft Word multiple line spacing”
style using `zhlineskip`.
@@ -25,7 +26,7 @@
Copyright and Licence
---------------------
- Copyright (C) 2018 by Ruixi Zhang <ruixizhang42(a)gmail.com>
+ Copyright (C) 2018, 2019 by Ruixi Zhang <ruixizhang42(a)gmail.com>
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3c
@@ -40,9 +41,9 @@
The Current Maintainer of this work is Ruixi Zhang.
This work consists of the files zhlineskip.sty,
- zhlineskip-man.tex,
+ zhlineskip.tex,
zhlineskip-test.tex,
Latinmetrics.pdf,
CJKmetrics.pdf,
README.md (this file)
- and the derived file zhlineskip-man.pdf.
\ No newline at end of file
+ and the derived file zhlineskip.pdf.
\ No newline at end of file
Binary files old/doc/latex/zhlineskip/zhlineskip-man.pdf and new/doc/latex/zhlineskip/zhlineskip-man.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhlineskip/zhlineskip-man.tex new/doc/latex/zhlineskip/zhlineskip-man.tex
--- old/doc/latex/zhlineskip/zhlineskip-man.tex 2018-12-01 23:47:43.000000000 +0100
+++ new/doc/latex/zhlineskip/zhlineskip-man.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,629 +0,0 @@
-% !TeX program = XeLaTeX
-% !TeX encoding = UTF-8 Unicode
-%
-% 为了得到最佳的排版结果,可以考虑安装免费的思源宋体、思源黑体与 Fandol 字库
-% - 思源字库可以前往
-% https://github.com/adobe-fonts/source-han-serif/tree/release
-% https://github.com/adobe-fonts/source-han-sans/tree/release
-% 下载,请安装 Language-specific OTFs 的简体中文版本
-% - Fandol 字库可以通过发行版 TeX Live 或 MiKTeX 安装
-%
-% 如果已经安装了思源、Fandol 字库,请在导言区启用 \SourceHanSCandFandoltrue
-%
-\documentclass[zihao=5,no-math,a4paper]{ctexart}
-\newif\ifSourceHanSCandFandol
-\SourceHanSCandFandolfalse
-% 如果已经安装了思源、Fandol 字库,请启用 \SourceHanSCandFandoltrue
-%\SourceHanSCandFandoltrue
-\frenchspacing
-\ctexset{
- section={
- name={第,节},
- aftername=\hskip\ccwd\relax,
- format=\Large\bfseries
- },
- subsection/aftername=\hskip\ccwd\relax,
- subsubsection/aftername=\hskip\ccwd\relax
-}
-\renewcommand\sectionmark[1]{%
- \markright{%
- \normalfont\sffamily
- \CTEXifname{\CTEXthesection\hskip\ccwd\relax}{}#1%
- }%
-}
-\usepackage{mathtools}
-\usepackage[math-style=ISO]{unicode-math}
-\ifSourceHanSCandFandol
- \setmainfont{TeX Gyre Pagella}[
- Scale=1.0534682080924855,
- WordSpace={0.8984910836762689,1.2030178326474623,0.6954732510288066},
- SmallCapsFeatures={LetterSpace=5}
- ]
- \setsansfont{TeX Gyre Heros}[
- Scale=1.0068587105624143,
- WordSpace={0.7863093721208319,1.4273812557583361,0.3589281163624958}
- ]
- \setmonofont{Source Han Sans SC}[
- BoldFont=Source Han Sans SC Bold,
- CharacterWidth=Half
- ]
- \setmathfont{TeX Gyre Pagella Math}[
- Scale=1.0534682080924855
- ]
- \setCJKmainfont{Source Han Serif SC Medium}[
- ItalicFont=FandolKai-Regular,
- ItalicFeatures={FakeBold=1},
- BoldFont=Source Han Serif SC Bold,
- BoldItalicFont=FandolKai-Regular,
- BoldItalicFeatures={FakeBold=3},
- CharacterWidth=Full
- ]
- \usepackage{etoolbox}
- \makeatletter
- \newcommand*\original@CJKsymbol{}
- \newcommand*\original@CJKpunctsymbol{}
- \let\original@CJKsymbol\CJKsymbol
- \let\original@CJKpunctsymbol\CJKpunctsymbol
- \newcommand*\raise@Fandol@CJK[1]{\raise0.08\ccwd\hbox{#1}}
- \appto\itshape{%
- \let\CJKsymbol\raise@Fandol@CJK
- \let\CJKpunctsymbol\raise@Fandol@CJK
- }
- \appto\upshape{%
- \let\CJKsymbol\original@CJKsymbol
- \let\CJKpunctsymbol\original@CJKpunctsymbol
- }
- \makeatother
- \setCJKsansfont{Source Han Sans SC}[
- BoldFont=Source Han Sans SC Bold,
- CharacterWidth=Full
- ]
- \setCJKmonofont{Source Han Sans SC}[
- BoldFont=Source Han Sans SC Bold,
- CharacterWidth=Full
- ]
-\else
- \setmainfont{TeX Gyre Pagella}[
- SmallCapsFeatures={LetterSpace=5}
- ]
- \setsansfont{TeX Gyre Heros}
- \setmathfont{TeX Gyre Pagella Math}
-\fi
-\usepackage{zhlineskip}
-\SetTextEnvironmentSinglespace{1.05}
-\SetMathEnvironmentSinglespace{1.05}
-\ifSourceHanSCandFandol
- \SetTextEnvironmentSinglespace{1.106}
- \SetMathEnvironmentSinglespace{1.106}
-\fi
-\usepackage{caption}
-\DeclareCaptionLabelSeparator{zhcolon}{~:}% U+FF1A, Fullwidth Colon
-\captionsetup{labelsep=zhcolon,format=hang}
-\usepackage{enumitem}
-\setlist{
- listparindent=\parindent,parsep=\parskip
-}
-\ifSourceHanSCandFandol
- \setlist[itemize,1]{
- itemsep=0pt,
- label=・,% U+30FB, Katakana Middle Dot
- leftmargin=\parindent,labelsep=0pt,labelwidth=0.5\parindent
- }
-\else
- \setlist[itemize,1]{
- itemsep=0pt,
- label=·,% U+00B7, Middle Dot
- leftmargin=\parindent,labelsep=0pt,labelwidth=0.5\parindent
- }
-\fi
-\setlist[description,1]{
- font=\mdseries,
- leftmargin=\parindent,labelsep=0.5\parindent
-}
-\usepackage{booktabs}
-\usepackage{hyperref}
-\hypersetup{
- colorlinks=true,
- pdfstartview={FitH},
- unicode=true,
- pdftitle={zhlineskip-man},
- pdfauthor={张瑞熹}
-}
-\usepackage[open,openlevel=-1,numbered]{bookmark}
-\usepackage[width=378bp]{geometry}
-
-\makeatletter
-\ifSourceHanSCandFandol
- \ExplSyntaxOn
- \xeCJK_new_class:n { PoZheHao }
- \__xeCJK_save_CJK_class:n { PoZheHao }
- \seq_map_inline:Nn \g__xeCJK_class_seq
- {
- \str_if_eq:nnF {#1} { PoZheHao }
- {
- \xeCJK_copy_inter_class_toks:nnnn { PoZheHao } {#1} { FullRight } {#1}
- \xeCJK_copy_inter_class_toks:nnnn {#1} { PoZheHao } {#1} { FullRight }
- }
- }
- \xeCJK_declare_char_class:nn { PoZheHao } { "2014 , "2015 }
- \ExplSyntaxOff
-\fi
-% From `doc.dtx'
-\ifx\l@nohyphenation\undefined
- \newlanguage\l@nohyphenation
-\fi
-\newcommand*\meta{}
-\DeclareRobustCommand\meta[1]{%
- \ensuremath\langle
- \ifmmode \expandafter \nfss@text \fi
- {%
- \meta@font@select
- \edef\meta@hyphen@restore
- {\hyphenchar\the\font\the\hyphenchar\font}%
- \hyphenchar\font\m@ne
- \language\l@nohyphenation
- #1\/%
- \meta@hyphen@restore
- }\ensuremath\rangle
-}
-\def\meta@font@select{\itshape}
-% From `ltxdoc.dtx'
-\newcommand*\cmd[1]{\cs{\expandafter\cmd@to@cs\string#1}}
-\def\cmd@to@cs#1#2{\char\number`#2\relax}
-\newcommand*\cs{}
-\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
-\newcommand\marg[1]{%
- {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
-\newcommand\oarg[1]{%
- {\ttfamily[}\meta{#1}{\ttfamily]}}
-\newcommand\parg[1]{%
- {\ttfamily(}\meta{#1}{\ttfamily)}}
-% My commands
-\newcommand\cls[1]{{\normalfont\ttfamily#1}}
-\newcommand\pkg[1]{{\normalfont\ttfamily#1}}
-\newcommand\opt[1]{{\normalfont\ttfamily#1}}
-\newcommand\env[1]{{\normalfont\ttfamily#1}}
-\newcommand*\packagedependency[1]{%
- \mbox{\pkg{#1}~宏包:}\ignorespaces
-}
-\newcommand*\keyvalueitem[3][2.5]{%
- \item[\opt{#2}\hskip0.5\ccwd\relax\rlap{\meta{#3}}\hskip#1\ccwd\relax]%
- \hskip\z@ \@plus 0.25\ccwd \@minus 0.25\ccwd
- \ignorespaces
-}
-\newcommand*\usercmditem[3][3]{%
- \item[\cmd{#2}\rlap{\marg{#3}}\hskip#1\ccwd\relax]%
- \hskip\z@ \@plus 0.25\ccwd \@minus 0.25\ccwd
- \ignorespaces
-}
-\newcommand*\defaultleadingratio[3]{%
- \opt{#1} & $#2$ & $#3$%
-}
-\newcommand*\fontandsinglespaceratio[2]{%
- #1 & $#2$%
-}
-\newenvironment{originalpmatrix}{\left(\env@matrix}{\endmatrix\right)}
-\newenvironment{originalcases}{\env(a)cases}{\endarray\right.}
-\newcommand*\myemail{ruixizhang42(a)gmail.com}
-\makeatother
-
-\title{\vspace*{-26bp}\pkg{zhlineskip} 宏包}
-\author{张瑞熹\thanks{\href{mailto:\myemail}{\nolinkurl{\myemail}}。}}
-\date{2018/11/30\hskip\ccwd\relax v1.0d}
-
-\begin{document}
-
-\maketitle
-
-\tableofcontents
-
-\section{简介}
-
-\pkg{zhlineskip} 宏包允许用户指定正文行距相比于正文字号的倍数(通常建议设置在
-$1.5$ 至 $1.67$ 之间),以及脚注行距相比于脚注字号的倍数。另一方面,由于数学公式
-主要是由西文字符构成的,\pkg{zhlineskip} 还能将数学公式的行距“恢复”成西文
-较为紧凑的行距(通常为西文字号的 $1.2$~倍),使得全文的视觉密度较为均匀。最后,
-本宏包还支持按照 Microsoft Word 进行“多倍行距”排版。
-
-\subsection{宏包依赖}
-
-本宏包是针对中日韩文的横排文档设计出来的,它依赖于下面这些宏包:
-\begin{itemize}
-\item \packagedependency{kvoptions}
-为用户提供载入本宏包的键值选项。
-\item \packagedependency{xintexpr~}
-实现精确的浮点运算,属于 \pkg{xint} 宏集的一个部分。
-\item \packagedependency{etoolbox~}
-处理脚注行距与数学行距时需要打补丁。
-\item \packagedependency{mathtools}
-只有在恢复数学行距为西文行距时,才会载入这个宏包。
-\end{itemize}
-请确保你的 \TeX\ 发行版里已经安装好了以上这些宏包的最新版本。
-
-\subsection{中西有别}
-
-在西文排版里,相邻两行\emph{基线}(baseline)之间的距离称为\emph{行距}(leading,
-发音为 led-ding)。这个词的词根是 lead,即\emph{铅}。早在铅字时代,每当工匠填满
-一行铅字之后要开始填下一行,都会在两行之间插入铅条,从而适当地扩大行距。因为西文的
-每个字母四周与其\emph{字框}(em-box,见图~\ref{fig:eng-font-size})之间有
-较大的空隙,所以不需要插入很高的铅条。一般来说,西文的行距为\emph{字号}(font
-size)的 $1.2$ 至 $1.45$~倍\footnote{参见
-\url{https://practicaltypography.com/line-spacing.html}。}。
-
-\begin{figure}[h]
-\centering
-\includegraphics{Latinmetrics}
-\caption[西文字体]{西文字体。绿色方框即为 em-box,它在纸上的实际边长就是西文字号。}
-\label{fig:eng-font-size}
-\end{figure}
-
-中文排版虽然没有基线的概念,但有非常相似的概念:\emph{底线}(ideographic baseline,
-见图~\ref{fig:chi-font-size})。中文里相邻两行底线之间的距离,与西文里行距的
-概念是一致的。另一概念是上一行底线和下一行\emph{顶线}之间的距离,即\emph{行间距}(line
-gap),这与西文里插入铅条的高度是一致的。由于汉字四周与其字框间的空隙较小,所以需要
-使用比西文更大的行间距。根据场合不同,行间距从字号的 $1/4$ 至 $1$~倍不等:以中文
-书刊为例,行间距一般为字号的 $1/2$ 至 $2/3$~倍\footnote{参见张胜涛、王忆波著
-《方正飞腾4.0实用培训教程》,第~6.1.1~节。},即行距约为字号的 $1.5$ 至 $1.67$~倍。
-
-\begin{figure}[h]
-\centering
-\includegraphics{CJKmetrics}
-\caption[中文字体]{中文字体。汉字字面几乎占满整个字框,字框的边长即为中文字号。}
-\label{fig:chi-font-size}
-\end{figure}
-
-在一般情况下,\CTeX\ 会默认用 \opt{linespread=1.3} 这个文档类选项将中文的
-行距设置为字号的 $1.56$~倍(基础行距是字号的 $1.2$~倍,而 $1.2 \times 1.3
-= 1.56$)。通过这种方法扩大全文的行距,自然会影响到文章里数学公式的行距。而数学
-公式主要是由西文字符构成的,把它们按照中文的行距进行排版,就会显得有些松散。
-图~\ref{fig:math-leading} 左边是 \CTeX\ 默认排版效果,文本、数学看似
-一紧、一松;右边是配合用 \pkg{zhlineskip} 的效果,视觉密度比较均匀。
-\pkg{zhlineskip} 宏包还允许用户调整数学行距的大小。
-
-\begin{figure}[h]
-\sbox0{%
-\begin{minipage}[t]{162pt}
-\fontsize{9}{10.8}\linespread{1.3}\selectfont
-\rule{0pt}{\ht\strutbox}\hskip2\ccwd\relax
-设 $\symbf{I}_2=\begin{psmallmatrix} 1&0\\0&1 \end{psmallmatrix}$.
-又设 $\symbf{A}=(a_{ij})_{m \times n}$ 为一个 $m$~行 $n$~列的实值矩阵, 即
-\[
-\symbf{A} = \begin{originalpmatrix}
-a_{11} & a_{12} & \dotsc & a_{1n} \\
-a_{21} & a_{22} & \dotsc & a_{2n} \\
-\vdots & \vdots & & \vdots \\
-a_{m1} & a_{m2} & \dotsc & a_{mn}
-\end{originalpmatrix},
-\]
-其中 $a_{ij} \in \mathbb{R}$, $i=1,\dotsc,m$, $j=1,\dotsc,n$.
-又因为
-\[
-\sum_{\substack{i=1\\i\neq j}}^m a_{ij} = \begin{originalcases}
-0, & j=1,\\
-1, & j>1,
-\end{originalcases}
-\]
-我们得到……\rule[-\dp\strutbox]{0pt}{\dp\strutbox}
-\end{minipage}%
-}%
-\centering
-\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}\quad
-\copy0\quad
-\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}\quad
-\begin{minipage}[t]{162pt}
-\fontsize{9}{10.8}\linespread{1.25}\selectfont
-\hskip2\ccwd\relax
-设 $\symbf{I}_2=\begin{psmallmatrix} 1&0\\0&1 \end{psmallmatrix}$.
-又设 $\symbf{A}=(a_{ij})_{m \times n}$ 为一个 $m$~行 $n$~列的实值矩阵, 即
-\[
-\symbf{A} = \begin{pmatrix}
-a_{11} & a_{12} & \dotsc & a_{1n} \\
-a_{21} & a_{22} & \dotsc & a_{2n} \\
-\vdots & \vdots & & \vdots \\
-a_{m1} & a_{m2} & \dotsc & a_{mn}
-\end{pmatrix},
-\]
-其中 $a_{ij} \in \mathbb{R}$, $i=1,\dotsc,m$, $j=1,\dotsc,n$.
-又因为
-\[
-\sum_{\substack{i=1\\i\neq j}}^m a_{ij} = \begin{cases}
-0, & j=1,\\
-1, & j>1,
-\end{cases}
-\]
-我们得到……
-\end{minipage}\quad
-\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}%
-\llap{\rule[\dimexpr-\dp0-0.5em\relax]{\dimexpr2\wd0+4em+1.2pt\relax}{0.4pt}}%
-\llap{\rule[\dimexpr\ht0+0.5em-0.4pt\relax]{\dimexpr2\wd0+4em+1.2pt\relax}{0.4pt}}
-\caption[数学行距对比]{数学行距对比。在左图中,大矩阵 \env{pmatrix} 与分类
- \env{cases} 两个环境受到影响,行距都被扩大了;但第一行文本里的小矩阵与末尾
- 公式里求和号的下角标却没有受到影响,行距仍然较为紧凑。在右图中,数学公式的行距
- 都是西文的行距,密度比较均匀,行间公式里的大括弧、大括号也不会特别突兀。}
-\label{fig:math-leading}
-\end{figure}
-
-综上所述,在进行中西文混排时,最好能够区分中文与西文的行距。在使用 \pkg{zhlineskip}
-时,就可以分开处理中文文本与数学公式的行距。用户甚至还能分别指定正文行距与脚注
-行距,实现灵活的排版。同时,\pkg{zhlineskip} 宏包能恢复各种“多行”数学环境
-(包括矩阵、分类、多行公式推导等等)的行距,使数学公式的行距符合西文行距的规范。
-
-最后,\pkg{zhlineskip} 宏包还支持用户在一定范围内按 Microsoft Word 的
-“多倍行距”进行排版\footnote{本宏包默认假定“被要求”用的字体是中易系列字体,
-这包括 Microsoft Word 里的“宋体”、“黑体”、“楷体”与“仿宋”。若改用其他字体,
-可能需要调整 \opt{MSWordSinglespaceRatio} 的值。
-参见第~\ref{sec:key-value}~节与第~\ref{sec:MS-Word}~节。}。
-用户可以指定“多倍行距”的“倍数”,但是这只保证用 \TeX\ 排出来的文本行距与用
-Microsoft Word 排的行距相同。硬要用 \TeX\ 模仿 Microsoft Word 是没有
-太大意义的。
-
-\section{功能介绍}
-
-首先,请避免使用“多倍行距”这个概念:Microsoft Word 中“单倍行距”的值严重依赖于
-字体(参见第~\ref{sec:MS-Word}~节)。在严格排版的时候,一般都会给定具体的字号
-与行距,例如字号 $12$~磅、行距 $22$~磅。对于一般的用户,指定目标行距相比字号的
-倍数即可——\pkg{zhlineskip} 宏包可以自动提取基础行距(即 \TeX\ 中的单倍行距)
-相比字号的倍数(详见表~\ref{tab:default-leading-ratio}),再通过用户指定的
-倍数来计算所需的行伸展因子。因此,不论是中日韩文还是西文的横排文档,都是可以使用
-本宏包的。本宏包的缺省设置更适合中日韩文文档。
-\begin{table}[h]
-\centering
-\caption[基础行距倍数]{\cls{ctexart} 与 \cls{article} 各个文档类选项
- 设置的基础行距倍数。}
-\label{tab:default-leading-ratio}
-\begin{tabular}{l l l}
-\toprule
-文档类选项 & 正文基础行距 & 脚注基础行距 \\
-\midrule
-\defaultleadingratio{zihao=5}{1.2}{1.2} \\
-\defaultleadingratio{zihao=-4}{1.2}{1.2} \\
-\defaultleadingratio{10pt}{12/10}{9.5/8} \\
-\defaultleadingratio{11pt}{13.6/10.95}{11/9} \\
-\defaultleadingratio{12pt}{14.5/12}{12/10} \\
-\bottomrule
-\end{tabular}
-\end{table}
-
-\subsection{载入宏包时的键值选项}
-\label{sec:key-value}
-
-载入 \pkg{zhlineskip} 宏包时可以设定六个基本的键值选项,它们分别是:
-\begin{description}
-\keyvalueitem{bodytextleadingratio}{real}
-指定正文目标行距相比于正文字号的倍数。以书刊为例,建议设置在~$1.5$ 至~$1.67$
-之间。缺省值是~\opt{1.5},即 $1/2$~的行间距。
-\keyvalueitem{footnoteleadingratio}{real}
-指定脚注目标行距相比于脚注字号的倍数,它可以比正文的倍数稍小一些,建议设置在正文
-倍数的 $98\%$ 至 $100\%$ 之间。缺省值是~\opt{1.48},即大约为正文倍数的~$98.67\%$。
-\keyvalueitem{restoremathleading}{bool}
-指定是否要将数学公式的行距恢复成西文基础行距。缺省值是~\opt{true},即恢复数学
-行距。该选项为真时,会自动载入 \pkg{mathtools} 宏包,此时还能利用
-\cmd{\SetMathEnvironmentSinglespace}\marg{real}
-命令\emph{微调}数学公式的基础行距。
-\keyvalueitem{UseMSWordMultipleLineSpacing}{bool}
-在排版论文时,如果被要求按照 Microsoft Word 来设置“多倍行距”,那么用户可以
-将该选项设置为~\opt{true},并通过设置 \opt{MSWordLineSpacingMultiple}
-指定“倍数”,这会忽略用户之前指定的正文行距与脚注行距倍数,但是与数学行距的设置
-独立。该选项的缺省值是~\opt{false}。
-\keyvalueitem{MSWordLineSpacingMultiple}{real}
-设置 Microsoft Word“多倍行距”的“倍数”,
-仅在 \opt{UseMSWordMultipleLineSpacing} 为真时生效。
-缺省值是~\opt{1.15},在不修改 \opt{MSWordSinglespaceRatio} 时,
-相当于设置了目标行距为字号的 $1.49140625$~倍,适用于中易字体
-(参见第~\ref{sec:MS-Word}~节)。
-\keyvalueitem{MSWordSinglespaceRatio}{real}
-设置 Microsoft Word 的“单倍行距”相比字号的倍数,
-仅在 \opt{UseMSWordMultipleLineSpacing} 为真时生效。
-缺省值是~\opt{1.296875},适用于中易字体(参见第~\ref{sec:MS-Word}~节)。
-若改用其他字体,则需调整该选项的值。
-\end{description}
-
-\subsection{载入宏包后的用户命令}
-
-\subsubsection{调整数学公式的行距}
-
-当键值选项 \opt{restoremathleading} 为~\opt{true} 时,数学公式的行距被
-恢复成字号的 $1.2$~倍。对于某些字面较大的数学字体(例如类似 Palatino 的字体),
-这个基础行距会显得过小。此时,用户可以通过如下命令微调数学行距:
-\begin{description}
-\usercmditem{\SetMathEnvironmentSinglespace}{real}
-如果数学字体来自 \pkg{newpxmath} 或是 TeX Gyre Pagella Math,那么
-数学行距在字号 $1.2$~倍的基础上再扩大 $1.05$~倍更加合适。此时,只需指定
-\verb|\SetMathEnvironmentSinglespace{1.05}| 即可。
-\end{description}
-本宏包恢复的多行数学环境包括:
-\begin{description}
-\raggedright
-\item[\LaTeX\ 环境]
-\env{array};
-\item[\pkg{amsmath} 宏包各环境]
-\env{matrix},
-\env{pmatrix},
-\env{bmatrix},
-\env{Bmatrix},
-\env{vmatrix},
-\env{Vmatrix},
-\env{cases},
-\env{aligned},
-\env{alignedat},
-\env{gathered},
-\env{gather},
-\env{gather*},
-\env{align},
-\env{align*},
-\env{flalign},
-\env{flalign*},
-\env{alignat},
-\env{alignat*},
-\env{xalignat},
-\env{xalignat*},
-\env{xxalignat},
-\env{multline},
-\env{multline*},
-\env{split};
-\item[\pkg{mathtools} 宏包各环境]
-\env{matrix*},
-\env{pmatrix*},
-\env{bmatrix*},
-\env{Bmatrix*},
-\env{vmatrix*},
-\env{Vmatrix*},
-\env{cases*},
-\env{dcases},
-\env{dcases*},
-\env{rcases},
-\env{rcases*},
-\env{drcases},
-\env{drcases*},
-\env{multlined},
-\env{lgathered},
-\env{rgathered}。
-\end{description}
-超出上述列表范围、用户自定义的\emph{数学}环境,可用如下命令恢复其行距:
-\begin{description}
-\usercmditem[6]{\RestoreMathEnvironmentLeading}{env name}
-使用范例:本宏包恢复数学环境 \env{array} 的行距,通过
-\verb|\RestoreMathEnvironmentLeading{array}| 实现。
-\end{description}
-
-\emph{注意,在 \opt{restoremathleading} 为~\opt{false} 时,
-\cmd{\SetMathEnvironmentSinglespace}
-与 \cmd{\RestoreMathEnvironmentLeading} 无效。}
-
-\subsubsection{调整西文文本的行距}
-
-与数学行距命令对应,本宏包还提供两个调整\emph{西文文本}行距的命令,用法类似。
-\begin{description}
-\usercmditem{\SetTextEnvironmentSinglespace}{real}
-如果西文字体来自 \pkg{newpxtext} 或是 TeX Gyre Pagella,那么可以指定
-\verb|\SetTextEnvironmentSinglespace{1.05}|。
-\usercmditem[6]{\RestoreTextEnvironmentLeading}{env name}
-使用范例:假设文中的表格仅含西文、数字,此时如果想要文本环境 \env{tabular} 的
-行距与西文行距一致,可通过
-\verb|\RestoreTextEnvironmentLeading{tabular}| 实现。
-\end{description}
-
-如果作者没有顾及到某些\emph{基本环境}(数学或文本),鼓励用户向 \pkg{zhlineskip} 的
-\href{https://github.com/CTeX-org/ctex-kit/issues}{GitHub 维护页}%
-提供相关信息。
-
-\subsection{使用范例}
-
-下面以 \CTeX\ 提供的 \cls{ctexart} 文档类为例,展示 \pkg{zhlineskip} 的
-使用方法。
-
-\subsubsection*{例:直接载入}
-
-\begin{verbatim}
- \documentclass{ctexart}
- \usepackage{zhlineskip}
- \begin{document}
- 正文测试。
- \end{document}
-\end{verbatim}
-
-\subsubsection*{例:设置正文行距为字号的 1.6~倍}
-
-\begin{verbatim}
- \documentclass{ctexart}
- \usepackage[
- bodytextleadingratio=1.6, % 设置正文行距倍数为 1.6
- footnoteleadingratio=1.57 % 设置脚注行距倍数为 1.57
- ]{zhlineskip} % 缺省数学行距倍数为 1.2
- \begin{document}
- 正文测试。
- \end{document}
-\end{verbatim}
-
-\subsubsection*{例:按照 Microsoft Word 设置“1.62~倍行距”}
-
-\begin{verbatim}
- \documentclass{ctexart}
- \usepackage[
- restoremathleading=false,
- UseMSWordMultipleLineSpacing,
- MSWordLineSpacingMultiple=1.62
- ]{zhlineskip}
- \begin{document}
- 按照 Microsoft Word 设置 1.62~倍行距。
- \end{document}
-\end{verbatim}
-
-\subsubsection*{例:中文正文里需要插入成段的西文}
-
-如果插入的西文是引用参考文献的段落,那么使用 \env{quote} 或 \env{quotation}
-环境就比较合适。此时,可以直接在引用环境内部使用 \cmd{\linespread}\marg{real}
-命令,建议将 \meta{real} 设置在正文行距倍数的 $0.7$~倍左右。例如,在载入
-\pkg{zhlineskip} 宏包后,正文行距为字号的 $1.5$~倍,那么
-\verb|\linespread{1.05}| 就比较合适($1.5 \times 0.7 = 1.05$)。
-\begin{verbatim}
- \documentclass{ctexart}
- \usepackage{zhlineskip}
- \begin{document}
- 下面引用一段出自英文文献的段落:
- \begin{quotation}
- \linespread{1.05}\selectfont % 此处数值为正文行距倍数的 0.7 倍左右
- A quotation from English literature.
- \end{quotation}
- \end{document}
-\end{verbatim}
-
-\subsection{Microsoft Word 中的“单倍行距”}
-\label{sec:MS-Word}
-
-Microsoft Word 中“单倍行距”的设置,其行距值相比字号的倍数严重依赖于字体,
-甚至还可能因为操作系统的不同而迥然不同。表~\ref{tab:word-line-height} 列出
-几种常见字体对应的单倍行距倍数。正是因为“单倍行距”本身随字体、操作系统而变化,
-所以请尽量避免使用“多倍行距”的概念!
-\begin{table}[h]
-\centering
-\caption[单倍行距倍数]{在 Microsoft Word 中设置“单倍行距”后,实际的行距
- 依赖于字体。}
-\label{tab:word-line-height}
-\begin{tabular}{l l}
-\toprule
-字体名称 & “单倍行距”除以字号的倍数 \\
-\midrule
-\fontandsinglespaceratio{Arial}{2355/2048=1.14990234375} \\
-\fontandsinglespaceratio{Times New Roman}{2355/2048=1.14990234375} \\
-\fontandsinglespaceratio{中易系列字体}{\phantom0332/256\phantom0=1.296875} \\
-\fontandsinglespaceratio{华文中宋(Windows)}{1479/1000=1.479} \\
-\fontandsinglespaceratio{微软雅黑 Light(Windows)}{3400/2048=1.66015625} \\
-\fontandsinglespaceratio{微软雅黑 Regular/Bold}{3513/2048=1.71533203125} \\
-\fontandsinglespaceratio{华文中宋(macOS)}{1723/1000=1.723} \\
-\fontandsinglespaceratio{微软雅黑 Light(macOS)}{3542/2048=1.7294921875} \\
-\fontandsinglespaceratio{苹方(macOS)}{1820/1000=1.82} \\
-\fontandsinglespaceratio{思源宋体~1.001}{1869/1000=1.869} \\
-\fontandsinglespaceratio{思源黑体~2.000}{1882/1000=1.882} \\
-\fontandsinglespaceratio{思源黑体~1.004}{1924/1000=1.924} \\
-\bottomrule
-\end{tabular}
-\end{table}
-
-\begin{thebibliography}{9}
-\bibitem{butterick2018linespacing}
-\textsc{Butterick, Matthew}.
-\newblock \textit{Butterick's Practical Typography\textup:
- Line spacing}.
-\newblock \url{https://practicaltypography.com/line-spacing.html},
- 访问日期: 2018/10/28.
-
-\bibitem{knuth1986tex}
-\textsc{Knuth, Donald Ervin}.
-\newblock \textit{The \TeX book}.
-\newblock Addison--Wesley, 1986.
-
-\bibitem{lunde2008cjkv}
-\textsc{Lunde, Ken}.
-\newblock \textit{CJKV Information Processing\textup:
- Chinese\textup, Japanese\textup, Korean \textup\&
- Vietnamese Computing} (2~ed.).
-\newblock O'Reilly Media, Inc., 2008.
-
-\bibitem{zhang2005fang}
-\textsc{张胜涛, 王忆波}.
-\newblock \textit{方正飞腾4.0实用培训教程}.
-\newblock 清华大学出版社, 2005.
-\end{thebibliography}
-
-\end{document}
\ No newline at end of file
Binary files old/doc/latex/zhlineskip/zhlineskip.pdf and new/doc/latex/zhlineskip/zhlineskip.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhlineskip/zhlineskip.tex new/doc/latex/zhlineskip/zhlineskip.tex
--- old/doc/latex/zhlineskip/zhlineskip.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/zhlineskip/zhlineskip.tex 2019-05-16 23:03:18.000000000 +0200
@@ -0,0 +1,733 @@
+% !TeX program = XeLaTeX
+% !TeX encoding = UTF-8 Unicode
+%
+% 为了得到最佳的排版结果,可以考虑安装免费的思源宋体、思源黑体与 M+ 字体
+% - 思源字库可以前往
+% https://github.com/adobe-fonts/source-han-serif/tree/release
+% https://github.com/adobe-fonts/source-han-sans/tree/release
+% 下载,请安装 Language-specific OTFs 的简体中文版本
+% - M+ 字体可以前往
+% https://osdn.net/projects/mplus-fonts/releases/
+% 下载
+%
+% 如果已经安装了思源、M+ 字体,请在导言区启用 \SourceHanSCandMplustrue
+%
+\documentclass[zihao=5,a4paper]{ctexart}
+\XeTeXgenerateactualtext=1 %
+\newif\ifSourceHanSCandMplus
+\SourceHanSCandMplusfalse
+% 如果已经安装了思源、M+ 字体,请启用 \SourceHanSCandMplustrue
+%\SourceHanSCandMplustrue
+\frenchspacing
+\ctexset{
+ section={
+ name={第,节},
+ aftername=\hskip\ccwd\relax,
+ format=\Large\bfseries
+ },
+ subsection/aftername=\hskip\ccwd\relax,
+ subsubsection/aftername=\hskip\ccwd\relax
+}
+\renewcommand\sectionmark[1]{%
+ \markright{%
+ \normalfont\sffamily
+ \CTEXifname{\CTEXthesection\hskip\ccwd\relax}{}#1%
+ }%
+}
+\usepackage{mathtools}
+\usepackage[math-style=ISO]{unicode-math}
+\ifSourceHanSCandMplus
+ \setmainfont{texgyrepagella}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ ItalicFont=*-italic,
+ BoldFont=*-bold,
+ BoldItalicFont=*-bolditalic,
+ Scale=1.05924855491329480,
+ SmallCapsFeatures={LetterSpace=5}
+ ]
+ \setsansfont{texgyreheros}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ ItalicFont=*-italic,
+ BoldFont=*-bold,
+ BoldItalicFont=*-bolditalic,
+ Scale=1.00685871056241427
+ ]
+ \setmonofont{mplus-1m-regular.ttf}[
+ BoldFont=mplus-1m-bold.ttf
+ ]
+ \setmathfont{texgyrepagella-math.otf}[
+ Scale=1.05924855491329480
+ ]
+ \setCJKmainfont{SourceHanSerifSC-Medium.otf}[
+ ItalicFont=SourceHanSerifSC-Heavy.otf,
+ BoldFont=SourceHanSerifSC-Bold.otf,
+ Language=Chinese Simplified
+ ]
+ \setCJKsansfont{SourceHanSansSC-Regular.otf}[
+ BoldFont=SourceHanSansSC-Bold.otf,
+ Language=Chinese Simplified
+ ]
+ \setCJKmonofont{SourceHanSansSC-Regular.otf}[
+ BoldFont=SourceHanSansSC-Bold.otf,
+ Language=Chinese Simplified
+ ]
+ \makeatletter
+ \def\setCJKecglue@nnn#1#2#3{%
+ \xeCJKsetup
+ { xCJKecglue = {\hskip #1em plus #2em minus #3em\relax} }%
+ }
+ \newcommand*\setCJKecglue{%
+ \ifnum\strcmp{\f@family}{\rmdefault}=0 %
+ \setCJKecglue(a)nnn{0.22203274215552524}
+ {0.11101637107776262}
+ {0.07401091405184175}%
+ \else
+ \ifnum\strcmp{\f@family}{\sfdefault}=0 %
+ \setCJKecglue(a)nnn{0.21859400544959128}
+ {0.10929700272479564}
+ {0.07286466848319709}%
+ \else
+ \setCJKecglue(a)nnn{0.25}
+ {0.125}
+ {0.08333333333333333}%
+ \fi
+ \fi
+ }
+ \makeatother
+ \usepackage{everysel}
+ \EverySelectfont{\setCJKecglue}
+\else
+ \setmainfont{texgyrepagella}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ ItalicFont=*-italic,
+ BoldFont=*-bold,
+ BoldItalicFont=*-bolditalic,
+ SmallCapsFeatures={LetterSpace=5}
+ ]
+ \setsansfont{texgyreheros}[
+ Extension=.otf,
+ UprightFont=*-regular,
+ ItalicFont=*-italic,
+ BoldFont=*-bold,
+ BoldItalicFont=*-bolditalic
+ ]
+ \setmathfont{texgyrepagella-math.otf}
+\fi
+\usepackage{zhlineskip}
+\SetTextEnvironmentSinglespace{1.05}
+\SetMathEnvironmentSinglespace{1.05}
+\ifSourceHanSCandMplus
+ \SetTextEnvironmentSinglespace{1.112}
+ \SetMathEnvironmentSinglespace{1.112}
+\fi
+\usepackage{caption}
+\DeclareCaptionLabelFormat{zhlabel}{\bothIfFirst{#1}{\nobreak\CJKecglue}#2\CJKecglue}
+\DeclareCaptionLabelSeparator{zhcolon}{\char"FF1A }% Fullwidth Colon
+\captionsetup{format=hang,labelformat=zhlabel,labelsep=zhcolon,font={small,sf}}
+\usepackage{enumitem}
+\setlist{
+ listparindent=\parindent,parsep=\parskip
+}
+\ifSourceHanSCandMplus
+ \setlist[itemize,1]{
+ itemsep=0pt,
+ label=\char"30FB,% Katakana Middle Dot
+ leftmargin=\parindent,labelsep=0pt,labelwidth=0.5\parindent
+ }
+\else
+ \setlist[itemize,1]{
+ itemsep=0pt,
+ label=\char"00B7,% Middle Dot
+ leftmargin=\parindent,labelsep=0pt,labelwidth=0.5\parindent
+ }
+\fi
+\setlist[description,1]{
+ font=\bfseries,
+ leftmargin=\parindent,labelsep=0.5\parindent
+}
+\usepackage{booktabs}
+\usepackage{hyperref}
+\hypersetup{
+ colorlinks=true,
+ pdfstartview={FitH},
+ unicode=true,
+ pdftitle={zhlineskip},
+ pdfauthor={Ruixi Zhang}
+}
+\usepackage[open,openlevel=-1,numbered]{bookmark}
+\usepackage[text={378bp,609bp},centering]{geometry}
+
+\makeatletter
+\ExplSyntaxOn
+\ifSourceHanSCandMplus
+ \xeCJK_new_class:n { PoZheHao }
+ \__xeCJK_save_CJK_class:n { PoZheHao }
+ \seq_map_inline:Nn \g__xeCJK_class_seq
+ {
+ \str_if_eq:nnF {#1} { PoZheHao }
+ {
+ \xeCJK_copy_inter_class_toks:nnnn { PoZheHao } {#1} { FullRight } {#1}
+ \xeCJK_copy_inter_class_toks:nnnn {#1} { PoZheHao } {#1} { FullRight }
+ }
+ }
+ \xeCJK_declare_char_class:nn { PoZheHao } { "2014 , "2015 }
+\fi
+\ExplSyntaxOff
+% From `doc.dtx'
+\ifx\l@nohyphenation\undefined
+ \newlanguage\l@nohyphenation
+\fi
+\newcommand*\meta{}
+\DeclareRobustCommand\meta[1]{%
+ \ensuremath\langle
+ \ifmmode \expandafter \nfss@text \fi
+ {%
+ \meta@font@select
+ \edef\meta@hyphen@restore
+ {\hyphenchar\the\font\the\hyphenchar\font}%
+ \hyphenchar\font\m@ne
+ \language\l@nohyphenation
+ #1\/%
+ \meta@hyphen@restore
+ }\ensuremath\rangle
+}
+\def\meta@font@select{\itshape}
+% From `ltxdoc.dtx'
+\newcommand*\cmd[1]{\cs{\expandafter\cmd@to@cs\string#1}}
+\def\cmd@to@cs#1#2{\char\number`#2\relax}
+\newcommand*\cs{}
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\newcommand\marg[1]{%
+ {\ttfamily\char`\{}\meta{#1}{\ttfamily\char`\}}}
+\newcommand\oarg[1]{%
+ {\ttfamily[}\meta{#1}{\ttfamily]}}
+\newcommand\parg[1]{%
+ {\ttfamily(}\meta{#1}{\ttfamily)}}
+% My commands
+\newcommand\cls[1]{{\ttfamily#1}}
+\newcommand\pkg[1]{{\ttfamily#1}}
+\newcommand\opt[1]{{\ttfamily#1}}
+\newcommand\env[1]{{\ttfamily#1}}
+\newcommand*\packagedependency[1]{%
+ \mbox{\pkg{#1}\CJKecglue 宏包:}\ignorespaces
+}
+\newcommand*\keyvalueitem[3][2.5]{%
+ \item[\opt{#2}\hskip0.5\ccwd\relax\rlap{\meta{#3}}\hskip#1\ccwd\relax]%
+ \hskip\z@ \@plus 0.25\ccwd \@minus 0.25\ccwd
+ \ignorespaces
+}
+\newcommand*\usercmditem[3][3]{%
+ \item[\cmd{#2}\rlap{\marg{#3}}\hskip#1\ccwd\relax]%
+ \hskip\z@ \@plus 0.25\ccwd \@minus 0.25\ccwd
+ \ignorespaces
+}
+\newcommand*\defaultleadingratio[3]{%
+ \opt{#1} & $#2$ & $#3$%
+}
+\newcommand*\fontandsinglespaceratio[2]{%
+ #1 & $#2$%
+}
+\newenvironment{originalpmatrix}{\left(\env@matrix}{\endmatrix\right)}
+\newenvironment{originalcases}{\env(a)cases}{\endarray\right.}
+\newcounter{example}
+\newcommand*\example{%
+ \refstepcounter{example}%
+ 例\nobreak\CJKecglue\theexample\CJKecglue\char"FF1A %
+}
+\newenvironment{english}
+ {\addvspace\medskipamount}
+ {\par\addvspace\medskipamount}
+\newcommand*\myemail{ruixizhang42(a)gmail.com}
+\makeatother
+
+\title{\vspace*{-26bp}\pkg{zhlineskip} 宏包}
+\author{张瑞熹\thanks{\href{mailto:\myemail}{\nolinkurl{\myemail}}。}}
+\date{2019/05/15\hskip\ccwd\relax v1.0e}
+
+\begin{document}
+
+\maketitle
+
+\tableofcontents
+
+\section{简介}
+
+\pkg{zhlineskip} 宏包允许用户指定正文行距相比于正文字号的倍数(通常建议设置在
+$1.5$ 至 $1.67$ 之间),以及脚注行距相比于脚注字号的倍数。另一方面,由于数学公式
+主要是由西文字符构成的,\pkg{zhlineskip} 还能将数学公式的行距“恢复”成西文
+较为紧凑的行距(通常为西文字号的 $1.2$\nobreak\CJKecglue 倍),使得全文的视觉
+密度较为均匀。最后,本宏包还支持按照 Microsoft Word 进行“多倍行距”排版。
+
+\subsection{宏包依赖}
+
+本宏包是针对中日韩文的横排文档设计出来的,它依赖于下面这些宏包:
+\begin{itemize}
+\item \packagedependency{kvoptions}
+为用户提供载入本宏包的键值选项。
+\item \packagedependency{xintexpr~}
+实现精确的浮点运算,属于\CJKecglue\pkg{xint} 宏集的一个部分。
+\item \packagedependency{etoolbox~}
+处理脚注行距与数学行距时需要打补丁。
+\item \packagedependency{mathtools}
+只有在恢复数学行距为西文行距时,才会载入这个宏包。
+\end{itemize}
+请确保你的 \TeX\ 发行版里已经安装好了以上这些宏包的最新版本。
+
+\subsection{中西有别}
+
+在西文排版里,相邻两行\emph{基线}(baseline)之间的距离称为\emph{行距}(leading,
+发音为 led-ding)。这个词的词根是 lead,即\emph{铅}。早在铅字时代,每当工匠填满
+一行铅字之后要开始填下一行,都会在两行之间插入铅条,从而适当地扩大行距。因为西文的
+每个字母四周与其\emph{字框}(em-box,见图\nobreak\CJKecglue\ref{fig:eng-font-size})之间有
+较大的空隙,所以不需要插入很高的铅条。一般来说,西文的行距为\emph{字号}(font
+size)的 $1.2$ 至 $1.45$\nobreak\CJKecglue 倍\footnote{参见
+\url{https://practicaltypography.com/line-spacing.html}。}。
+
+\begin{figure}[h]
+\centering
+\includegraphics{Latinmetrics}
+\caption[西文字体]{西文字体。绿色方框即为 em-box,它在纸上的实际边长就是西文字号。}
+\label{fig:eng-font-size}
+\end{figure}
+
+中文排版虽然没有基线的概念,但有非常相似的概念:\emph{底线}(ideographic baseline,
+见图\nobreak\CJKecglue\ref{fig:chi-font-size})。中文里相邻两行底线之间的距离,与西文里行距的
+概念是一致的。另一概念是上一行底线和下一行\emph{顶线}之间的距离,即\emph{行间距}(line
+gap),这与西文里插入铅条的高度是一致的。由于汉字四周与其字框间的空隙较小,所以需要
+使用比西文更大的行间距。根据场合不同,行间距从字号的 $1/4$ 至 $1$\nobreak\CJKecglue 倍不等:以中文
+书刊为例,行间距一般为字号的 $1/2$ 至 $2/3$\nobreak\CJKecglue 倍\footnote{参见张胜涛、王忆波著
+《方正飞腾4.0实用培训教程》,第\nobreak\CJKecglue6.1.1\nobreak\CJKecglue 节。},即行距约为字号的
+$1.5$ 至 $1.67$\nobreak\CJKecglue 倍。
+
+\begin{figure}[h]
+\centering
+\includegraphics{CJKmetrics}
+\caption[中文字体]{中文字体。汉字字面几乎占满整个字框,字框的边长即为中文字号。}
+\label{fig:chi-font-size}
+\end{figure}
+
+在一般情况下,\CTeX\ 会默认用\CJKecglue\opt{linespread=1.3} 这个文档类
+选项将中文的行距设置为字号的 $1.56$\nobreak\CJKecglue 倍(基础行距是字号的
+$1.2$\nobreak\CJKecglue 倍,而 $1.2 \times 1.3
+= 1.56$)。通过这种方法扩大全文的行距,自然会影响到文章里数学公式的行距。而数学
+公式主要是由西文字符构成的,把它们按照中文的行距进行排版,就会显得有些松散。
+图\nobreak\CJKecglue\ref{fig:math-leading}\CJKecglue 左边是 \CTeX\ 默认
+排版效果,文本、数学看似一紧、一松;右边是配合用\CJKecglue\pkg{zhlineskip} 的效果,
+视觉密度比较均匀。\pkg{zhlineskip} 宏包还允许用户调整数学行距的大小。
+
+\begin{figure}[h]
+\sbox0{%
+\begin{minipage}[t]{162pt}
+\fontsize{9}{10.8}\linespread{1.3}\selectfont
+\rule{0pt}{\ht\strutbox}\hskip2\ccwd\relax
+设 $\symbf{I}_2=\begin{psmallmatrix} 1&0\\0&1 \end{psmallmatrix}$.
+又设 $\symbf{A}=(a_{ij})_{m \times n}$ 为一个 $m$\nobreak\CJKecglue 行
+$n$\nobreak\CJKecglue 列的实值矩阵, 即
+\[
+\symbf{A} = \begin{originalpmatrix}
+a_{11} & a_{12} & \dotsc & a_{1n} \\
+a_{21} & a_{22} & \dotsc & a_{2n} \\
+\vdots & \vdots & & \vdots \\
+a_{m1} & a_{m2} & \dotsc & a_{mn}
+\end{originalpmatrix},
+\]
+其中 $a_{ij} \in \mathbb{R}$, $i=1,\dotsc,m$, $j=1,\dotsc,n$.
+又因为
+\[
+\sum_{\substack{i=1\\i\neq j}}^m a_{ij} = \begin{originalcases}
+0, & j=1,\\
+1, & j>1,
+\end{originalcases}
+\]
+我们得到……\rule[-\dp\strutbox]{0pt}{\dp\strutbox}
+\end{minipage}%
+}%
+\centering
+\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}\quad
+\copy0\quad
+\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}\quad
+\begin{minipage}[t]{162pt}
+\fontsize{9}{10.8}\linespread{1.25}\selectfont
+\hskip2\ccwd\relax
+设 $\symbf{I}_2=\begin{psmallmatrix} 1&0\\0&1 \end{psmallmatrix}$.
+又设 $\symbf{A}=(a_{ij})_{m \times n}$ 为一个 $m$\nobreak\CJKecglue 行
+$n$\nobreak\CJKecglue 列的实值矩阵, 即
+\[
+\symbf{A} = \begin{pmatrix}
+a_{11} & a_{12} & \dotsc & a_{1n} \\
+a_{21} & a_{22} & \dotsc & a_{2n} \\
+\vdots & \vdots & & \vdots \\
+a_{m1} & a_{m2} & \dotsc & a_{mn}
+\end{pmatrix},
+\]
+其中 $a_{ij} \in \mathbb{R}$, $i=1,\dotsc,m$, $j=1,\dotsc,n$.
+又因为
+\[
+\sum_{\substack{i=1\\i\neq j}}^m a_{ij} = \begin{cases}
+0, & j=1,\\
+1, & j>1,
+\end{cases}
+\]
+我们得到……
+\end{minipage}\quad
+\rule[\dimexpr-\dp0-0.5em\relax]{0.4pt}{\dimexpr\dp0+\ht0+1em\relax}%
+\llap{\rule[\dimexpr-\dp0-0.5em\relax]{\dimexpr2\wd0+4em+1.2pt\relax}{0.4pt}}%
+\llap{\rule[\dimexpr\ht0+0.5em-0.4pt\relax]{\dimexpr2\wd0+4em+1.2pt\relax}{0.4pt}}
+\caption[数学行距对比]{数学行距对比。在左图中,大矩阵\CJKecglue\env{pmatrix} 与
+ 分类\CJKecglue\env{cases} 两个环境受到影响,行距都被扩大了;但第一行文本里的小矩阵与末尾
+ 公式里求和号的下角标却没有受到影响,行距仍然较为紧凑。在右图中,数学公式的行距
+ 都是西文的行距,密度比较均匀,行间公式里的大括弧、大括号也不会特别突兀。}
+\label{fig:math-leading}
+\end{figure}
+
+综上所述,在进行中西文混排时,最好能够区分中文与西文的行距。在使用\CJKecglue\pkg{zhlineskip}
+时,就可以分开处理中文文本与数学公式的行距。用户甚至还能分别指定正文行距与脚注
+行距,实现灵活的排版。同时,\pkg{zhlineskip} 宏包能恢复各种“多行”数学环境
+(包括矩阵、分类、多行公式推导等等)的行距,使数学公式的行距符合西文行距的规范。
+
+最后,\pkg{zhlineskip} 宏包还支持用户在一定范围内按 Microsoft Word 的
+“多倍行距”进行排版\footnote{本宏包默认假定“被要求”用的字体是中易系列字体,
+这包括 Microsoft Word 里的“宋体”、“黑体”、“楷体”与“仿宋”。若改用其他字体,
+可能需要调整\CJKecglue\opt{MSWordSinglespaceRatio} 的值。
+参见第\nobreak\CJKecglue\ref{sec:key-value}\nobreak\CJKecglue 节
+与第\nobreak\CJKecglue\ref{sec:MS-Word}\nobreak\CJKecglue 节。}。
+用户可以指定“多倍行距”的“倍数”,但是这只保证用 \TeX\ 排出来的文本行距与用
+Microsoft Word 排的行距相同。硬要用 \TeX\ 模仿 Microsoft Word 是没有
+太大意义的。
+
+\section{功能介绍}
+
+首先,请避免使用“多倍行距”这个概念:Microsoft Word 中“单倍行距”的值严重依赖于
+字体(参见第\nobreak\CJKecglue\ref{sec:MS-Word}\nobreak\CJKecglue 节)。
+在严格排版的时候,一般都会给定具体的字号
+与行距,例如字号 $12$\nobreak\CJKecglue 磅、行距 $22$\nobreak\CJKecglue 磅。
+对于一般的用户,指定目标行距相比字号的倍\nobreak 数
+即可——\pkg{zhlineskip} 宏包可以自动提取基础行距(即 \TeX\ 中的单倍行距)
+相比字号的倍数(详见表\nobreak\CJKecglue\ref{tab:default-leading-ratio}),再通过用户指定的
+倍数来计算所需的行伸展因子。因此,不论是中日韩文还是西文的横排文档,都是可以使用
+本宏包的。本宏包的缺省设置更适合中日韩文文档。
+\begin{table}[h]
+\centering
+\caption[基础行距倍数]{\cls{ctexart} 与\CJKecglue\cls{article} 各个文档类选项
+ 设置的基础行距倍数。}
+\label{tab:default-leading-ratio}
+\begin{tabular}{l l l}
+\toprule
+文档类选项 & 正文基础行距 & 脚注基础行距 \\
+\midrule
+\defaultleadingratio{zihao=5}{1.2}{1.2} \\
+\defaultleadingratio{zihao=-4}{1.2}{1.2} \\
+\defaultleadingratio{10pt}{12/10}{9.5/8} \\
+\defaultleadingratio{11pt}{13.6/10.95}{11/9} \\
+\defaultleadingratio{12pt}{14.5/12}{12/10} \\
+\bottomrule
+\end{tabular}
+\end{table}
+
+\subsection{载入宏包时的键值选项}
+\label{sec:key-value}
+
+载入\CJKecglue\pkg{zhlineskip} 宏包时可以设定六个基本的键值选项,它们分别是:
+\begin{description}
+\keyvalueitem{bodytextleadingratio}{real}
+指定正文目标行距相比于正文字号的倍数。以书刊为例,建议设置在\nobreak\CJKecglue$1.5$
+至\nobreak\CJKecglue$1.67$ 之间。缺省值是\nobreak\CJKecglue\opt{1.5},
+即 $1/2$\nobreak\CJKecglue 的行间距。
+\keyvalueitem{footnoteleadingratio}{real}
+指定脚注目标行距相比于脚注字号的倍数,它可以比正文的倍数稍小一些,建议设置在正文
+倍数的 $98\%$ 至 $100\%$ 之间。缺省值是\nobreak\CJKecglue\opt{1.48},
+即为正文倍数的\nobreak\CJKecglue$98.67\%$ 左右。
+\keyvalueitem{restoremathleading}{bool}
+指定是否要将数学公式的行距恢复成西文基础行距。缺省值是\nobreak\CJKecglue\opt{true},
+即恢复数学行距。该选项为真时,会自动载入\CJKecglue\pkg{mathtools} 宏包,
+此时还能利用\CJKecglue\cmd{\SetMathEnvironmentSinglespace}\marg{real}
+命令\emph{微调}数学公式的基础行距。
+\keyvalueitem{UseMSWordMultipleLineSpacing}{bool}
+在排版论文时,如果被要求按照 Microsoft Word 来设置“多倍行距”,那么用户可以
+将该选项设置为\nobreak\CJKecglue\opt{true},并通过
+设置\CJKecglue\opt{MSWordLineSpacingMultiple}
+指定“倍数”,这会忽略用户之前指定的正文行距与脚注行距倍数,但是与数学行距的设置
+独立。该选项的缺省值是\nobreak\CJKecglue\opt{false}。
+\keyvalueitem{MSWordLineSpacingMultiple}{real}
+设置 Microsoft Word“多倍行距”的“倍数”,
+仅在\CJKecglue\opt{UseMSWordMultipleLineSpacing} 为真时生效。
+缺省值是\nobreak\CJKecglue\opt{1.15},
+在不修改\CJKecglue\opt{MSWordSinglespaceRatio} 时,
+相当于设置了目标行距为字号的 $1.49140625$\nobreak\CJKecglue 倍,适用于中易字体
+(参见第\nobreak\CJKecglue\ref{sec:MS-Word}\nobreak\CJKecglue 节)。
+\keyvalueitem{MSWordSinglespaceRatio}{real}
+设置 Microsoft Word 的“单倍行距”相比字号的倍数,
+仅在\CJKecglue\opt{UseMSWordMultipleLineSpacing} 为真时生效。
+缺省值是\nobreak\CJKecglue\opt{1.296875},适用于中易字体
+(参见第\nobreak\CJKecglue\ref{sec:MS-Word}\nobreak\CJKecglue 节)。
+若改用其他字体,则需调整该选项的值。
+\end{description}
+
+\subsection{载入宏包后的用户命令}
+
+\subsubsection{调整数学公式的行距}
+
+当键值选项\CJKecglue\opt{restoremathleading}
+为\nobreak\CJKecglue\opt{true} 时,数学公式的行距被
+恢复成字号的 $1.2$\nobreak\CJKecglue 倍。对于某些字面较大的数学字体
+(例如类似 Palatino 的字体),
+这个基础行距会显得过小。此时,用户可以通过如下命令微调数学行距:
+\begin{description}
+\usercmditem{\SetMathEnvironmentSinglespace}{real}
+如果数学字体来自\CJKecglue\pkg{newpxmath} 或是 TeX Gyre Pagella Math,
+那么数学行距在字号 $1.2$\nobreak\CJKecglue 倍的基础上再扩大
+$1.05$\nobreak\CJKecglue 倍更加合适。此时,只需指定
+\verb|\SetMathEnvironmentSinglespace{1.05}|\CJKecglue 即可。
+\end{description}
+本宏包恢复的多行数学环境包括:
+\begin{description}
+\raggedright
+\item[\LaTeX\ 环境]
+\env{array};
+\item[\pkg{amsmath} 宏包各环境]
+\env{matrix},
+\env{pmatrix},
+\env{bmatrix},
+\env{Bmatrix},
+\env{vmatrix},
+\env{Vmatrix},
+\env{cases},
+\env{aligned},
+\env{alignedat},
+\env{gathered},
+\env{gather},
+\env{gather*},
+\env{align},
+\env{align*},
+\env{flalign},
+\env{flalign*},
+\env{alignat},
+\env{alignat*},
+\env{xalignat},
+\env{xalignat*},
+\env{xxalignat},
+\env{multline},
+\env{multline*},
+\env{split};
+\item[\pkg{mathtools} 宏包各环境]
+\env{matrix*},
+\env{pmatrix*},
+\env{bmatrix*},
+\env{Bmatrix*},
+\env{vmatrix*},
+\env{Vmatrix*},
+\env{cases*},
+\env{dcases},
+\env{dcases*},
+\env{rcases},
+\env{rcases*},
+\env{drcases},
+\env{drcases*},
+\env{multlined},
+\env{lgathered},
+\env{rgathered}。
+\end{description}
+超出上述列表范围、用户自定义的\emph{数学}环境,可用如下命令恢复其行距:
+\begin{description}
+\usercmditem[6]{\RestoreMathEnvironmentLeading}{env name}
+例如本宏包恢复 \LaTeX\ 数学环境\CJKecglue\env{array} 的行距,是通过
+\verb|\RestoreMathEnvironmentLeading{array}|\CJKecglue 实现的。
+\meta{env name}\CJKecglue 可以是由若干环境名构成的逗号列表。
+\end{description}
+
+\emph{注意,在\CJKecglue\opt{restoremathleading}
+为\nobreak\CJKecglue\opt{false} 时,
+\cmd{\SetMathEnvironmentSinglespace}
+与\CJKecglue\cmd{\RestoreMathEnvironmentLeading} 无效。}
+
+\subsubsection{调整西文文本的行距}
+
+与数学行距命令对应,本宏包还提供两个调整\emph{西文文本}行距的命令,用法类似。
+\begin{description}
+\usercmditem{\SetTextEnvironmentSinglespace}{real}
+如果西文字体来自\CJKecglue\pkg{newpxtext} 或是 TeX Gyre Pagella,
+那么可以指定
+\verb|\SetTextEnvironmentSinglespace{1.05}|。
+\usercmditem[6]{\RestoreTextEnvironmentLeading}{env name}
+使用范例:假设文中的表格仅含西文、数字,此时如果想要文本环境\CJKecglue\env{tabular} 的
+行距与西文行距一致,可通过
+\verb|\RestoreTextEnvironmentLeading{tabular}|\CJKecglue 实现。
+亦可参见例\nobreak\CJKecglue\ref{example:english-block}。
+\meta{env name}\CJKecglue 可以是由若干环境名构成的逗号列表。
+\end{description}
+
+如果作者没有顾及到某些\emph{基本环境}(数学或文本),鼓励用户向\CJKecglue\pkg{zhlineskip} 的
+\href{https://github.com/CTeX-org/ctex-kit/issues}{GitHub 维护页}\CJKecglue
+提供相关信息。
+
+\subsection{使用范例}
+
+下面以 \CTeX\ 提供的\CJKecglue\cls{ctexart} 文档类为例,
+展示\CJKecglue\pkg{zhlineskip} 的使用方法。
+
+\subsubsection*{\example 直接载入}
+
+\begin{verbatim}
+ \documentclass{ctexart}
+ \usepackage{zhlineskip}
+ \begin{document}
+ 正文测试。
+ \end{document}
+\end{verbatim}
+
+\subsubsection*{\example 设置正文行距为字号的 1.6\nobreak\CJKecglue 倍}
+
+\begin{verbatim}
+ % 导言区
+ \usepackage[
+ bodytextleadingratio=1.6, % 设置正文行距倍数为 1.6
+ footnoteleadingratio=1.57 % 设置脚注行距倍数为 1.57
+ ]{zhlineskip} % 缺省数学行距倍数为 1.2
+\end{verbatim}
+
+\subsubsection*{\example 按照 Microsoft Word 设置“1.62\nobreak\CJKecglue 倍行距”}
+
+\begin{verbatim}
+ % 导言区
+ \usepackage[
+ restoremathleading=false, % 可选
+ UseMSWordMultipleLineSpacing, % 需设置为真
+ MSWordLineSpacingMultiple=1.62
+ ]{zhlineskip}
+\end{verbatim}
+
+\subsubsection*{\example\label{example:english-block}中文正文里需要插入成段的西文}
+
+如果需要插入成段的西文,最好的方法是先定义一个西文专用的环境。比如说可以在导言区
+定义如下这个环境:
+\begin{verbatim}
+ \newenvironment{english} % 新建“英文”段落环境
+ {\addvspace\medskipamount} % 段前间距,上文段落需结束
+ {\par\addvspace\medskipamount} % 段后间距
+\end{verbatim}
+注意要先用空行结束上文段落。这时,可以通过\CJKecglue\pkg{zhlineskip} 声明
+\begin{verbatim}
+ \RestoreTextEnvironmentLeading{english} % 恢复“英文”使用紧凑行距
+\end{verbatim}
+将“英文”段落的行距恢复成西文较为紧凑的行距。
+这样一来,正文(也许是中英交替的译文)就会有比较均匀的视觉密度,
+而不至于“中文很挤、英文很散”。
+
+\begin{center}
+\rule[\dimexpr-200.34pt-0.25em\relax]{0.4pt}{\dimexpr206.5pt+0.5em\relax}\quad
+\begin{minipage}[t]{161pt}
+\fontsize{7}{8.4}\linespread{1.25}\selectfont
+\begin{verbatim}
+\RestoreTextEnvironmentLeading{english}
+人人生而自由,在尊严和权利上一律平等。他们赋有
+理性和良心,并应以兄弟关系的精神相对待。
+
+\begin{english}
+All human beings are born free and equal in
+dignity and rights. They are endowed with
+reason and conscience and should act towards
+one another in a spirit of brotherhood.
+\end{english}
+
+人人有资格享有本宣言所载的一切权利和自由,不分
+种族、肤色、性别、语言……
+
+\begin{english}
+Everyone is entitled to all the rights and
+freedoms set forth in this Declaration,
+without distinction of any kind, such as
+race, colour, sex, language\dots
+\end{english}
+\end{verbatim}
+\end{minipage}\quad
+\rule[\dimexpr-200.34pt-0.25em\relax]{0.4pt}{\dimexpr206.5pt+0.5em\relax}\quad
+\begin{minipage}[t]{161pt}
+\fontsize{7}{8.4}\linespread{1.25}\selectfont
+\parindent2\ccwd\relax
+\RestoreTextEnvironmentLeading{english}
+人人生而自由,在尊严和权利上一律平等。他们赋有
+理性和良心,并应以兄弟关系的精神相对待。
+
+\begin{english}
+All human beings are born free and equal in
+dignity and rights. They are endowed with
+reason and conscience and should act towards
+one another in a spirit of brotherhood.
+\end{english}
+
+人人有资格享有本宣言所载的一切权利和自由\nobreak\makebox[\ccwd]{,}\allowbreak
+不分种族、肤色、性别、语言……
+
+\begin{english}
+Everyone is entitled to all the rights and
+freedoms set forth in this Declaration,
+without distinction of any kind, such as
+race, colour, sex, language\dots
+\end{english}
+\end{minipage}\quad
+\rule[\dimexpr-200.34pt-0.25em\relax]{0.4pt}{\dimexpr206.5pt+0.5em\relax}
+\end{center}
+
+\subsection{Microsoft Word 中的“单倍行距”}
+\label{sec:MS-Word}
+
+Microsoft Word 中“单倍行距”的设置,其行距值相比字号的倍数严重依赖于字体,
+甚至还可能因为操作系统的不同而迥然不同。
+表\nobreak\CJKecglue\ref{tab:word-line-height}\CJKecglue 列出
+几种常见字体对应的单倍行距倍数。正是因为“单倍行距”本身随字体、操作系统而变化,
+所以请尽量避免使用“多倍行距”的概念!
+\begin{table}[h]
+\centering
+\caption[单倍行距倍数]{在 Microsoft Word 中设置“单倍行距”后,实际的行距
+ 依赖于字体。}
+\label{tab:word-line-height}
+\begin{tabular}{l l}
+\toprule
+字体名称 & “单倍行距”除以字号的倍数 \\
+\midrule
+\fontandsinglespaceratio{Arial}{2355/2048=1.14990234375} \\
+\fontandsinglespaceratio{Times New Roman}{2355/2048=1.14990234375} \\
+\fontandsinglespaceratio{中易系列字体}{\phantom0332/256\phantom0=1.296875} \\
+\fontandsinglespaceratio{华文中宋(Windows)}{1479/1000=1.479} \\
+\fontandsinglespaceratio{微软雅黑 Light(Windows)}{3400/2048=1.66015625} \\
+\fontandsinglespaceratio{微软雅黑 Regular/Bold}{3513/2048=1.71533203125} \\
+\fontandsinglespaceratio{华文中宋(macOS)}{1723/1000=1.723} \\
+\fontandsinglespaceratio{微软雅黑 Light(macOS)}{3542/2048=1.7294921875} \\
+\fontandsinglespaceratio{苹方(macOS)}{1820/1000=1.82} \\
+\fontandsinglespaceratio{思源宋体\nobreak\CJKecglue1.001}{1869/1000=1.869} \\
+\fontandsinglespaceratio{思源黑体\nobreak\CJKecglue2.000}{1882/1000=1.882} \\
+\fontandsinglespaceratio{思源黑体\nobreak\CJKecglue1.004}{1924/1000=1.924} \\
+\bottomrule
+\end{tabular}
+\end{table}
+
+\begin{thebibliography}{9}
+\bibitem{butterick2018linespacing}
+\textsc{Butterick, Matthew}.
+\newblock \textit{Butterick's Practical Typography\textup:
+ Line spacing}.
+\newblock \url{https://practicaltypography.com/line-spacing.html},
+ 访问日期: 2018/10/28.
+
+\bibitem{knuth1986tex}
+\textsc{Knuth, Donald Ervin}.
+\newblock \textit{The \TeX book}.
+\newblock Addison--Wesley, 1986.
+
+\bibitem{lunde2008cjkv}
+\textsc{Lunde, Ken}.
+\newblock \textit{CJKV Information Processing\textup:
+ Chinese\textup, Japanese\textup, Korean \textup\&
+ Vietnamese Computing} (2~ed.).
+\newblock O'Reilly Media, Inc., 2008.
+
+\bibitem{zhang2005fang}
+\textsc{张胜涛 \& 王忆波}.
+\newblock \textbf{方正飞腾4.0实用培训教程}.
+\newblock 清华大学出版社, 2005.
+\end{thebibliography}
+
+\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhlineskip.doc.tlpobj new/tlpkg/tlpobj/zhlineskip.doc.tlpobj
--- old/tlpkg/tlpobj/zhlineskip.doc.tlpobj 2019-02-28 04:19:14.000000000 +0100
+++ new/tlpkg/tlpobj/zhlineskip.doc.tlpobj 2019-05-17 01:38:33.000000000 +0200
@@ -1,12 +1,12 @@
name zhlineskip.doc
category Package
-revision 49296
+revision 51142
shortdesc doc files of zhlineskip
relocated 1
-docfiles size=65
+docfiles size=80
RELOC/doc/latex/zhlineskip/CJKmetrics.pdf
RELOC/doc/latex/zhlineskip/Latinmetrics.pdf
RELOC/doc/latex/zhlineskip/README.md
- RELOC/doc/latex/zhlineskip/zhlineskip-man.pdf
- RELOC/doc/latex/zhlineskip/zhlineskip-man.tex
RELOC/doc/latex/zhlineskip/zhlineskip-test.tex
+ RELOC/doc/latex/zhlineskip/zhlineskip.pdf
+ RELOC/doc/latex/zhlineskip/zhlineskip.tex
++++++ zhlineskip.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhlineskip/zhlineskip.sty new/tex/latex/zhlineskip/zhlineskip.sty
--- old/tex/latex/zhlineskip/zhlineskip.sty 2018-12-01 23:47:43.000000000 +0100
+++ new/tex/latex/zhlineskip/zhlineskip.sty 2019-05-16 23:03:18.000000000 +0200
@@ -1,5 +1,5 @@
%
-% Copyright (C) 2018 by Ruixi Zhang <ruixizhang42(a)gmail.com>
+% Copyright (C) 2018, 2019 by Ruixi Zhang <ruixizhang42(a)gmail.com>
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3c
@@ -14,16 +14,16 @@
% The Current Maintainer of this work is Ruixi Zhang.
%
% This work consists of the files zhlineskip.sty,
-% zhlineskip-man.tex,
+% zhlineskip.tex,
% zhlineskip-test.tex,
% Latinmetrics.pdf,
% CJKmetrics.pdf,
% README.md
-% and the derived file zhlineskip-man.pdf.
+% and the derived file zhlineskip.pdf.
%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{zhlineskip}[%
- 2018/11/30 v1.0d Line spacing for CJK documents]
+ 2019/05/15 v1.0e Line spacing for CJK documents]
\RequirePackage{kvoptions}
\RequirePackage{xintexpr}
@@ -100,7 +100,9 @@
\ZhLS@targetfootleading/\ZhLS@defaultfootleading\relax\relax
}
-\linespread{\ZhLS@bodylinespread}\selectfont
+\AtBeginDocument{%
+ \linespread{\ZhLS@bodylinespread}\selectfont
+}
\patchcmd\@footnotetext
{\reset@font}
@@ -123,8 +125,8 @@
\def\ZhLS@textlinespread{#1}%
}
\SetTextEnvironmentSinglespace{1}
-\newcommand*\RestoreTextEnvironmentLeading{%
- \ZhLS@restoretextenvironmentleading
+\newcommand*\RestoreTextEnvironmentLeading[1]{%
+ \forcsvlist\ZhLS@restoretextenvironmentleading{#1}%
}
\def\ZhLS@restoretextenvironmentleading#1{%
\AtBeginEnvironment{#1}{%
@@ -138,8 +140,8 @@
\def\ZhLS@mathlinespread{#1}%
}
\SetMathEnvironmentSinglespace{1}
- \newcommand*\RestoreMathEnvironmentLeading{%
- \ZhLS@restoremathenvironmentleading
+ \newcommand*\RestoreMathEnvironmentLeading[1]{%
+ \forcsvlist\ZhLS@restoremathenvironmentleading{#1}%
}
\def\ZhLS@restoremathenvironmentleading#1{%
\AtBeginEnvironment{#1}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhlineskip.tlpobj new/tlpkg/tlpobj/zhlineskip.tlpobj
--- old/tlpkg/tlpobj/zhlineskip.tlpobj 2019-02-28 04:19:14.000000000 +0100
+++ new/tlpkg/tlpobj/zhlineskip.tlpobj 2019-05-17 01:38:33.000000000 +0200
@@ -1,6 +1,6 @@
name zhlineskip
category Package
-revision 49296
+revision 51142
shortdesc Line spacing for CJK documents
relocated 1
longdesc This package supports typesetting CJK documents. It allows
@@ -18,7 +18,7 @@
catalogue-contact-repository https://github.com/CTeX-org/ctex-kit
catalogue-contact-support https://github.com/CTeX-org/ctex-kit/issues
catalogue-ctan /language/chinese/zhlineskip
-catalogue-date 2018-12-01 06:25:43 +0100
+catalogue-date 2019-05-16 09:07:56 +0200
catalogue-license lppl1.3c
catalogue-topics chinese
-catalogue-version 1.0d
+catalogue-version 1.0e
++++++ zhlipsum.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhlipsum/README.md new/doc/latex/zhlipsum/README.md
--- old/doc/latex/zhlipsum/README.md 2018-04-08 22:06:41.000000000 +0200
+++ new/doc/latex/zhlipsum/README.md 2020-04-12 00:25:18.000000000 +0200
@@ -36,8 +36,8 @@
Contributing
------------
-[Issues](https://github.com/Stone-Zeng/zhlipsum/issues) and
-[pull requests](https://github.com/Stone-Zeng/zhlipsum/pulls)
+[Issues](https://github.com/stone-zeng/zhlipsum/issues) and
+[pull requests](https://github.com/stone-zeng/zhlipsum/pulls)
are always welcome.
License
@@ -50,4 +50,4 @@
-----
-Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>.
+Copyright (C) 2017–2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>.
Binary files old/doc/latex/zhlipsum/zhlipsum-en.pdf and new/doc/latex/zhlipsum/zhlipsum-en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zhlipsum/zhlipsum-en.tex new/doc/latex/zhlipsum/zhlipsum-en.tex
--- old/doc/latex/zhlipsum/zhlipsum-en.tex 2018-09-08 23:45:24.000000000 +0200
+++ new/doc/latex/zhlipsum/zhlipsum-en.tex 2020-04-12 00:25:18.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% zhlipsum.dtx
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -37,7 +37,8 @@
\PassOptionsToPackage{scheme=plain, linespread=1.1}{ctex}
\documentclass{ctxdoc}
\usepackage{multirow}
-\setCJKmonofont{FangSong}[ItalicFont=KaiTi]
+\setCJKmainfont{Source Han Serif SC}[ItalicFont=Kaiti SC]
+\setCJKmonofont{STFangsong}[ItalicFont=Kaiti SC]
\hypersetup{%
pdftitle={zhlipsum: Chinese dummy text},
pdfauthor={Xiangdong Zeng},
@@ -49,17 +50,15 @@
}
\pagestyle{headings}
% Use `!` for comment in `ctexexam`.
-\makeatletter
\catcode`!=\active
\RecustomVerbatimEnvironment{ctexexam}{Verbatim}{%
frame=single, framesep=10pt,
- gobble=2,
- label=\rule{0pt}{12pt}\textnormal{\bfseries Example \arabic{ctexexam}},
+ gobble=2,
+ label=\rule{0pt}{12pt}\textnormal{\bfseries Example \arabic{ctexexam}},
+ defineactive=\def!{\color{gray}\itshape\%},
listparameters=%
\setlength\topsep{\bigskipamount}%
- \refstepcounter{ctexexam}\ctexexamlabelref
- \appto\FV@EndList{\nointerlineskip},
- defineactive=\def!{\color{gray}\itshape\%}}
+ \refstepcounter{ctexexam}\ctexexamlabelref}
\preto\ctexexam{\catcode`!=\active}
\preto\endctexexam{\catcode`!=12}
\catcode`!=12
@@ -78,17 +77,6 @@
}
\group_end:
}
-% From l3doc, to make @@ -> <module> while @@@@ -> @@
-\cs_set_protected:Npn \__ctxdoc_replace_at_at_aux:Nn #1#2
- {
- \tl_replace_all:Nnn #1 { \token_to_str:N @ } { @ }
- \tl_replace_all:Nnn #1 { \token_to_str:N _ } { _ }
- \tl_replace_all:Nnn #1 { @ @ @ @ } { \token_to_str:N a a }
- \tl_replace_all:Nnn #1 { _ _ @ @ } { _ _ #2 }
- \tl_replace_all:Nnn #1 { _ @ @ } { _ _ #2 }
- \tl_replace_all:Nnn #1 { @ @ } { _ _ #2 }
- \tl_replace_all:Nnn #1 { \token_to_str:N a a } { @ @ }
- }
\ExplSyntaxOff
\makeatother
\RenewDocumentEnvironment{arguments}{}%
@@ -97,8 +85,8 @@
{\endenumerate}
\title{\textbf{The \pkg{zhlipsum} Package: Chinese Dummy Text}}
\author{Xiangdong Zeng}
-\date{2018/09/08 \quad v1.1.1%
- \thanks{\url{https://github.com/Stone-Zeng/zhlipsum}.}}
+\date{2020/04/10 \quad v1.2.0%
+ \thanks{\url{https://github.com/stone-zeng/zhlipsum}.}}
\begin{document}
@@ -140,7 +128,7 @@
bundle, the correspoding options are \opt{UTF8} and \opt{GBK},
while the options in \pkg{zhlipsum} are all in \emph{lowercase}.
-\begin{function}[updated=2018-04-08]{\zhlipsum}
+\begin{function}[updated=2020-04-08]{\zhlipsum}
\begin{syntax}
\cs{zhlipsum}\oarg{paragraph}\oarg{options}
\cs{zhlipsum*}\oarg{paragraph}\oarg{options}
@@ -150,7 +138,7 @@
between the arguments.
\end{function}
-By default, the \cs{zhlipsum} command will insert \tn{par} before,
+By default, the \cs{zhlipsum} command will insert \tn{par}
after and between dummy text paragraphs, while \cs{zhlipsum}|*|
will not give any extra processing. To change the default
behavior, you can use the \opt{before}, \opt{after} and
@@ -212,9 +200,9 @@
\begin{function}[added=2018-03-29]{before,after,inter}
\begin{syntax}
- name = \meta{content}
- after = \meta{content}
- inter = \meta{content}
+ before = \meta{content}
+ after = \meta{content}
+ inter = \meta{content}
\end{syntax}
Insert contents before, after or between dummy text paragraphs.
Note that the \tn{par} command inserted when using \cs{zhlipsum}
@@ -311,7 +299,7 @@
! Using `\newzhlipsum{big5}{許蓋功, 蓋功許, 功許蓋}' directly will
! lead to an error.
- ! Use <, >, + to replace {, } and \, and set the original {, } and \
+ ! Use <, >, + to replace {, } and \, then set the original {, } and \
! to be `other' category (i.e. catcode=12).
\begingroup
\catcode`\<=1
Binary files old/doc/latex/zhlipsum/zhlipsum.pdf and new/doc/latex/zhlipsum/zhlipsum.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhlipsum.doc.tlpobj new/tlpkg/tlpobj/zhlipsum.doc.tlpobj
--- old/tlpkg/tlpobj/zhlipsum.doc.tlpobj 2019-02-28 04:19:14.000000000 +0100
+++ new/tlpkg/tlpobj/zhlipsum.doc.tlpobj 2020-04-16 01:57:30.000000000 +0200
@@ -1,9 +1,9 @@
name zhlipsum.doc
category Package
-revision 48629
+revision 54758
shortdesc doc files of zhlipsum
relocated 1
-docfiles size=87
+docfiles size=105
RELOC/doc/latex/zhlipsum/README.md
RELOC/doc/latex/zhlipsum/zhlipsum-en.pdf
RELOC/doc/latex/zhlipsum/zhlipsum-en.tex
++++++ zhlipsum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhlipsum/zhlipsum-big5.def new/tex/latex/zhlipsum/zhlipsum-big5.def
--- old/tex/latex/zhlipsum/zhlipsum-big5.def 2018-09-08 23:45:24.000000000 +0200
+++ new/tex/latex/zhlipsum/zhlipsum-big5.def 2020-04-12 00:25:18.000000000 +0200
@@ -7,7 +7,7 @@
%% zhlipsum.dtx (with options: `text,big5')
%% zhlipsum-text.dtx (with options: `text,big5')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -35,7 +35,7 @@
%% zhlipsum-en.pdf,
%% and README.md.
%%
-\GetIdInfo $Id: zhlipsum.dtx 1.1.1 2018-09-08 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
+\GetIdInfo $Id: zhlipsum.dtx 1.2.0 2020-04-10 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
{Chinese dummy text with Big5 encoding (for zhlipsum)}
\ProvidesExplFile{\ExplFileName-big5.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhlipsum/zhlipsum-gbk.def new/tex/latex/zhlipsum/zhlipsum-gbk.def
--- old/tex/latex/zhlipsum/zhlipsum-gbk.def 2018-09-08 23:45:24.000000000 +0200
+++ new/tex/latex/zhlipsum/zhlipsum-gbk.def 2020-04-12 00:25:18.000000000 +0200
@@ -7,7 +7,7 @@
%% zhlipsum.dtx (with options: `text,gbk')
%% zhlipsum-text.dtx (with options: `text,gbk')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -35,7 +35,7 @@
%% zhlipsum-en.pdf,
%% and README.md.
%%
-\GetIdInfo $Id: zhlipsum.dtx 1.1.1 2018-09-08 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
+\GetIdInfo $Id: zhlipsum.dtx 1.2.0 2020-04-10 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
{Chinese dummy text with GBK encoding (for zhlipsum)}
\ProvidesExplFile{\ExplFileName-gbk.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhlipsum/zhlipsum-utf8.def new/tex/latex/zhlipsum/zhlipsum-utf8.def
--- old/tex/latex/zhlipsum/zhlipsum-utf8.def 2018-09-08 23:45:24.000000000 +0200
+++ new/tex/latex/zhlipsum/zhlipsum-utf8.def 2020-04-12 00:25:18.000000000 +0200
@@ -7,7 +7,7 @@
%% zhlipsum.dtx (with options: `text,utf8')
%% zhlipsum-text.dtx (with options: `text,utf8')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -35,7 +35,7 @@
%% zhlipsum-en.pdf,
%% and README.md.
%%
-\GetIdInfo $Id: zhlipsum.dtx 1.1.1 2018-09-08 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
+\GetIdInfo $Id: zhlipsum.dtx 1.2.0 2020-04-10 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
{Chinese dummy text with UTF-8 encoding (for zhlipsum)}
\ProvidesExplFile{\ExplFileName-utf8.def}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zhlipsum/zhlipsum.sty new/tex/latex/zhlipsum/zhlipsum.sty
--- old/tex/latex/zhlipsum/zhlipsum.sty 2018-09-08 23:45:24.000000000 +0200
+++ new/tex/latex/zhlipsum/zhlipsum.sty 2020-04-12 00:25:18.000000000 +0200
@@ -6,7 +6,7 @@
%%
%% zhlipsum.dtx (with options: `package')
%%
-%% Copyright (C) 2017, 2018 by Xiangdong Zeng <xdzeng96(a)gmail.com>
+%% Copyright (C) 2017--2020 by Xiangdong Zeng <xdzeng96(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -36,7 +36,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\GetIdInfo $Id: zhlipsum.dtx 1.1.1 2018-09-08 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
+\GetIdInfo $Id: zhlipsum.dtx 1.2.0 2020-04-10 12:00:00Z Xiangdong Zeng <xdzeng96(a)gmail.com> $
{Chinese dummy text}
\ProvidesExplPackage{\ExplFileName}
{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
@@ -56,100 +56,96 @@
\tl_new:N \l__zhlipsum_tmpa_tl
\seq_new:N \l__zhlipsum_tmpa_seq
\seq_new:N \l__zhlipsum_tmpb_seq
-\tl_new:N \g__zhlipsum_encoding_tl
+\str_new:N \l__zhlipsum_tmpa_str
\seq_new:N \g_zhlipsum_seq
-\seq_new:N \c_zhlipsum_simp_seq
-\seq_new:N \c_zhlipsum_trad_seq
-\seq_set_from_clist:Nn \c_zhlipsum_simp_seq { simp, zhufu, aspirin }
-\seq_set_from_clist:Nn \c_zhlipsum_trad_seq { trad, xiangyu, nanshanjing }
+\seq_const_from_clist:Nn \c_zhlipsum_simp_seq { simp, zhufu, aspirin }
+\seq_const_from_clist:Nn \c_zhlipsum_trad_seq { trad, xiangyu, nanshanjing }
\cs_generate_variant:Nn \file_input:n { x }
-\prg_generate_conditional_variant:Nnn \tl_if_eq:nn { Vn } { T, TF }
-\prg_new_protected_conditional:Npnn \__zhlipsum_if_unicode_engine: { T, F, TF }
+\prg_new_conditional:Npnn \__zhlipsum_if_unicode_engine: { T, F, TF }
{
\bool_lazy_any:nTF
{
- { \sys_if_engine_xetex_p: }
- { \sys_if_engine_luatex_p: }
- { \sys_if_engine_uptex_p: }
+ \sys_if_engine_xetex_p:
+ \sys_if_engine_luatex_p:
+ \sys_if_engine_uptex_p:
}
- { \prg_return_true: }
- { \prg_return_false: }
+ { \prg_return_true: } { \prg_return_false: }
}
-\prg_new_protected_conditional:Npnn \__zhlipsum_if_encoding:n #1 { T, F, TF }
+\prg_new_conditional:Npnn \__zhlipsum_if_encoding:n #1 { T, F, TF }
{
- \tl_if_eq:VnTF \g__zhlipsum_encoding_tl {#1}
+ \str_if_eq:VnTF \g__zhlipsum_encoding_str {#1}
{ \prg_return_true: } { \prg_return_false: }
}
+\prg_generate_conditional_variant:Nnn \__zhlipsum_if_encoding:n { V } { T, F, TF }
+\str_new:N \g__zhlipsum_encoding_str
\cs_new:Npn \__zhlipsum_msg_new:nn { \msg_new:nnn { zhlipsum } }
\cs_new:Npn \__zhlipsum_error:n { \msg_error:nn { zhlipsum } }
\cs_new:Npn \__zhlipsum_error:nn { \msg_error:nnn { zhlipsum } }
+\cs_new:Npn \__zhlipsum_warning:n { \msg_warning:nn { zhlipsum } }
\cs_new:Npn \__zhlipsum_warning:nn { \msg_warning:nnn { zhlipsum } }
\cs_new:Npn \__zhlipsum_warning:nnn { \msg_warning:nnnn { zhlipsum } }
\cs_new:Npn \__zhlipsum_warning:nxxx { \msg_warning:nnxxx { zhlipsum } }
\cs_new:Npn \__zhlipsum_info:nn { \msg_info:nnn { zhlipsum } }
-\cs_new_eq:NN \__zhlipsum_par: \tex_par:D
\keys_define:nn { zhlipsum / option }
{
encoding .choices:nn =
{ utf8, gbk, big5 }
- {
- \tl_gset_eq:NN \g__zhlipsum_encoding_tl \l_keys_choice_tl
- \__zhlipsum_if_unicode_engine:T
- {
- \__zhlipsum_if_encoding:nF { utf8 }
- {
- \tl_gset:Nn \g__zhlipsum_encoding_tl { utf8 }
- \__zhlipsum_warning:nn { unicode-engine } {#1}
- }
- }
- \__zhlipsum_if_ctex_valid_encoding:F
- { \__zhlipsum_error:nn { ctex-invalid-encoding } {#1} }
- },
+ { \str_gset:Nn \g__zhlipsum_encoding_str {#1} },
encoding / unknown .code:n =
{ \__zhlipsum_error:nn { invalid-encoding } {#1} },
encoding .value_required:n = true,
unknown .code:n = { \__zhlipsum_error:n { unknown-option } }
}
-\__zhlipsum_msg_new:nn { unicode-engine }
+\__zhlipsum_msg_new:nn { invalid-encoding }
{
- You~ are~ now~ using~ Unicode~ engine~ \c_sys_engine_str. \\
- Encoding~ "#1"~ is~ invalid.~ Changed~ into~ "utf8".
+ Encoding~"#1"~is~invalid. \\
+ Available~encodings~are~"utf8",~"gbk"~and~"big5".
}
-\__zhlipsum_msg_new:nn { ctex-invalid-encoding }
+\__zhlipsum_msg_new:nn { unknown-option }
+ { Package~option~'\l_keys_key_tl'~is~unknown. }
+\cs_new_protected:Npn \__zhlipsum_check_unicode_engine_encoding:
{
- Package~ option~ "encoding=#1"~ is~ in~ conflict~ with~ ctex's~
- option~ "\tl_use:N \l__ctex_encoding_tl".\\\\
- Please~ check~ the~ package~ options.
+ \__zhlipsum_if_unicode_engine:T
+ {
+ \str_if_empty:NF \g__zhlipsum_encoding_str
+ {
+ \__zhlipsum_if_encoding:nF { utf8 }
+ { \__zhlipsum_warning:n { unicode-engine } }
+ }
+ \str_gset:Nn \g__zhlipsum_encoding_str { utf8 }
+ }
}
-\__zhlipsum_msg_new:nn { invalid-encoding }
+\__zhlipsum_msg_new:nn { unicode-engine }
{
- Encoding~ "#1"~ is~ invalid. \\
- Available~ encodings~ are~ "utf8",~ "gbk"~ and~ "big5".
+ You~are~now~using~Unicode~engine~\c_sys_engine_str\c_space_tl~so~
+ encoding~"\g__zhlipsum_encoding_str"~is~invalid. \\
+ Changed~into~"utf8".
}
-\__zhlipsum_msg_new:nn { unknown-option }
- { Package~ option~ "\l_keys_key_tl"~ is~ unknown. }
-\prg_new_protected_conditional:Npnn \__zhlipsum_if_ctex_valid_encoding: { F }
+\cs_new_protected:Npn \__zhlipsum_check_ctex_encoding:
{
- \tl_if_exist:NTF \l__ctex_encoding_tl
+ \tl_if_exist:NT \l__ctex_encoding_tl
{
- \tl_set:Nx \l__zhlipsum_tmpa_tl
+ \str_set:Nx \l__zhlipsum_tmpa_str
{ \str_lower_case:f { \l__ctex_encoding_tl } }
- \str_if_eq:NNTF \g__zhlipsum_encoding_tl \l__zhlipsum_tmpa_tl
- { \prg_return_true: } { \prg_return_false: }
+ \str_if_empty:NF \g__zhlipsum_encoding_str
+ {
+ \__zhlipsum_if_encoding:VF \l__zhlipsum_tmpa_str
+ { \__zhlipsum_warning:n { ctex-encoding-conflict } }
+ }
+ \str_gset_eq:NN \g__zhlipsum_encoding_str \l__zhlipsum_tmpa_str
}
- { \prg_return_true: }
}
-\tl_if_exist:NTF \l__ctex_encoding_tl
+\__zhlipsum_msg_new:nn { ctex-encoding-conflict }
{
- \tl_if_eq:VnTF \l__ctex_encoding_tl { UTF8 }
- { \tl_gset:Nn \g__zhlipsum_encoding_tl { utf8 } }
- {
- \tl_if_eq:VnT \l__ctex_encoding_tl { GBK }
- { \tl_gset:Nn \g__zhlipsum_encoding_tl { gbk } }
- }
+ Package~option~"encoding=\g__zhlipsum_encoding_str"~is~in~conflict~with~
+ ctex's~option~"\l__ctex_encoding_tl". \\
+ Changed~into~"encoding=\l__zhlipsum_tmpa_str".
}
- { \tl_gset:Nn \g__zhlipsum_encoding_tl { utf8 } }
\ProcessKeysOptions { zhlipsum / option }
+\__zhlipsum_check_unicode_engine_encoding:
+\__zhlipsum_check_ctex_encoding:
+\str_if_empty:NT \g__zhlipsum_encoding_str
+ { \str_gset:Nn \g__zhlipsum_encoding_str { utf8 } }
\tl_new:N \l__zhlipsum_name_tl
\tl_new:N \l__zhlipsum_before_tl
\tl_new:N \l__zhlipsum_after_tl
@@ -193,14 +189,14 @@
\group_begin:
\IfBooleanF {#1}
{
- \tl_set:Nn \l__zhlipsum_before_tl { \__zhlipsum_par: }
- \tl_set:Nn \l__zhlipsum_after_tl { \__zhlipsum_par: }
- \tl_set:Nn \l__zhlipsum_inter_tl { \__zhlipsum_par: }
+ \tl_set:Nn \l__zhlipsum_before_tl { }
+ \tl_set:Nn \l__zhlipsum_after_tl { \par }
+ \tl_set:Nn \l__zhlipsum_inter_tl { \par }
}
\IfValueTF {#3}
{
\keys_set:nn { zhlipsum } {#3}
- \zhlipsum_use:Vn \l__zhlipsum_name_tl {#2}
+ \__zhlipsum:n {#2}
}
{
\IfValueTF {#2}
@@ -208,19 +204,18 @@
\__zhlipsum_if_key_value_list:nTF {#2}
{
\keys_set:nn { zhlipsum } {#2}
- \zhlipsum_use:Vn \l__zhlipsum_name_tl { 1 - 3 }
+ \__zhlipsum:n { 1 - 3 }
}
- { \zhlipsum_use:Vn \l__zhlipsum_name_tl {#2} }
+ { \__zhlipsum:n {#2} }
}
- { \zhlipsum_use:Vn \l__zhlipsum_name_tl { 1 - 3 } }
+ { \__zhlipsum:n { 1 - 3 } }
}
\group_end:
}
-\prg_new_protected_conditional:Npnn \__zhlipsum_if_key_value_list:n #1 { TF }
- {
- \tl_if_in:nnTF {#1} { = }
- { \prg_return_true: } { \prg_return_false: }
- }
+\cs_new_protected:Npn \__zhlipsum:n #1
+ { \exp_args:No \zhlipsum_use:nn { \l__zhlipsum_name_tl } {#1} }
+\cs_new_protected:Npn \__zhlipsum_if_key_value_list:nTF #1
+ { \tl_if_in:nnTF {#1} {=} }
\seq_new:N \l__zhlipsum_par_num_seq
\cs_new_protected:Npn \zhlipsum_use:nn #1#2
{
@@ -229,57 +224,47 @@
\zhlipsum_if_exist:nTF {#1}
{
\__zhlipsum_parse_par:nn {#1} {#2}
- \seq_pop_right:NN \l__zhlipsum_par_num_seq \l__zhlipsum_tmpa_tl
- \tl_use:N \l__zhlipsum_before_tl
- \seq_map_inline:Nn \l__zhlipsum_par_num_seq
+ \seq_if_empty:NF \l__zhlipsum_par_num_seq
{
- \__zhlipsum_use:nn {#1} {##1}
- \tl_use:N \l__zhlipsum_inter_tl
+ \seq_pop_right:NN \l__zhlipsum_par_num_seq \l__zhlipsum_tmpa_tl
+ \l__zhlipsum_before_tl
+ \seq_map_inline:Nn \l__zhlipsum_par_num_seq
+ {
+ \__zhlipsum_use:nn {#1} {##1}
+ \l__zhlipsum_inter_tl
+ }
+ \__zhlipsum_use:nn {#1} { \l__zhlipsum_tmpa_tl }
+ \l__zhlipsum_after_tl
}
- \__zhlipsum_use:nn {#1} { \tl_use:N \l__zhlipsum_tmpa_tl }
- \tl_use:N \l__zhlipsum_after_tl
}
{ \__zhlipsum_error:nn { invalid-name } {#1} }
}
{ \__zhlipsum_error:n { CJK-invalid-encoding } }
}
-\cs_generate_variant:Nn \zhlipsum_use:nn { Vn }
\__zhlipsum_msg_new:nn { invalid-name }
{
- Name~ "#1"~ is~ unknown. \\\\
+ Name~ "#1"~ is~ unknown. \\
Please~ use~ the~ pre-defined~ Chinese~ dummy~ texts~ or~
declare~ new~ one.
}
\__zhlipsum_msg_new:nn { CJK-invalid-encoding }
{
- The~ current~ CJK~ environment~ uses~ "\tl_use:N \CJK@@@enc"~
- encoding,\\
+ The~ current~ CJK~ environment~ uses~ "\CJK@@@enc"~ encoding,~
but~ zhlipsum~ package~ has~ been~ loaded~ with~ the~ option~
- "encoding=\tl_use:N \g__zhlipsum_encoding_tl".\\\\
+ "encoding=\g__zhlipsum_encoding_str". \\
Please~ check~ the~ package~ options.
}
\prg_new_protected_conditional:Npnn \__zhlipsum_if_cjk_valid_encoding: { TF }
{
\tl_if_exist:NTF \CJK@@@enc
{
- \tl_set:Nx \l__zhlipsum_tmpa_tl { \str_lower_case:f { \CJK@@@enc } }
- \str_if_eq:NNTF \g__zhlipsum_encoding_tl \l__zhlipsum_tmpa_tl
- { \prg_return_true: }
+ \exp_args:NV \str_case:nn \g__zhlipsum_encoding_str
{
- \__zhlipsum_if_encoding:nTF { gbk }
- {
- \str_if_eq:VnTF \l__zhlipsum_tmpa_tl { gb }
- { \prg_return_true: } { \prg_return_false: }
- }
- {
- \__zhlipsum_if_encoding:nTF { big5 }
- {
- \str_if_eq:VnTF \l__zhlipsum_tmpa_tl { bg5 }
- { \prg_return_true: } { \prg_return_false: }
- }
- { \prg_return_false: }
- }
+ { utf8 } { \str_if_eq:VnTF \CJK@@@enc { UTF8 } }
+ { gbk } { \str_if_in:NnTF \CJK@@@enc { GB } }
+ { big5 } { \str_if_eq:VnTF \CJK@@@enc { Bg5 } }
}
+ { \prg_return_true: } { \prg_return_false: }
}
{ \prg_return_true: }
}
@@ -408,7 +393,7 @@
\tl_const:cn
{ c__zhlipsum_ #1 @ \int_use:c { g__zhlipsum_ #1 _int } _tl } {#2}
}
-\file_input:x { zhlipsum- \g__zhlipsum_encoding_tl .def }
+\file_input:x { zhlipsum- \g__zhlipsum_encoding_str .def }
\endinput
%%
%% End of file `zhlipsum.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zhlipsum.tlpobj new/tlpkg/tlpobj/zhlipsum.tlpobj
--- old/tlpkg/tlpobj/zhlipsum.tlpobj 2019-02-28 04:19:14.000000000 +0100
+++ new/tlpkg/tlpobj/zhlipsum.tlpobj 2020-04-16 01:57:30.000000000 +0200
@@ -1,6 +1,6 @@
name zhlipsum
category Package
-revision 48629
+revision 54758
shortdesc Chinese dummy text
relocated 1
longdesc This package provides an interface to dummy text in Chinese
@@ -12,10 +12,9 @@
RELOC/tex/latex/zhlipsum/zhlipsum-utf8.def
RELOC/tex/latex/zhlipsum/zhlipsum.sty
catalogue-also lipsum
-catalogue-contact-bugs https://github.com/Stone-Zeng/zhlipsum/issues
-catalogue-contact-repository https://github.com/Stone-Zeng/zhlipsum
+catalogue-contact-bugs https://github.com/stone-zeng/zhlipsum/issues
+catalogue-contact-repository https://github.com/stone-zeng/zhlipsum
catalogue-ctan /macros/latex/contrib/zhlipsum
-catalogue-date 2018-09-08 18:58:53 +0200
catalogue-license lppl1.3c
catalogue-topics dummy-gen chinese latex3 macro-supp
-catalogue-version 1.1.1
+catalogue-version 1.2.0
++++++ zlmtt.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/zlmtt/README new/doc/fonts/zlmtt/README
--- old/doc/fonts/zlmtt/README 2014-07-01 00:33:16.000000000 +0200
+++ new/doc/fonts/zlmtt/README 2019-06-12 22:08:41.000000000 +0200
@@ -4,7 +4,10 @@
http://www.ctan.org/license/lppl1.3
for the details of that license.
-Current version: 1.01
+Current version: 1.02
+
+Changes in version 1.02
+Modified the definitions of \proptt and \monott to take into account the font weight specified in the preamble. (Thanks, Frank Mittelbach.)
Changes in version 1.01
Added macro \lctt to access light-condensed weight.
Binary files old/doc/fonts/zlmtt/zlmtt-doc.pdf and new/doc/fonts/zlmtt/zlmtt-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/zlmtt/zlmtt-doc.tex new/doc/fonts/zlmtt/zlmtt-doc.tex
--- old/doc/fonts/zlmtt/zlmtt-doc.tex 2014-07-01 00:33:16.000000000 +0200
+++ new/doc/fonts/zlmtt/zlmtt-doc.tex 2019-06-12 22:08:41.000000000 +0200
@@ -42,7 +42,7 @@
\newpage
The options you may use in loading this package are:
\begin{itemize}
-\item {\tt scaled=1.05} will load the fonts scaled to $1.05$ times natural size. This is useful with Roman fonts having an x-height greater than Computer Modern.
+\item {\tt scaled=1.05} (or {\tt scale=1.05}) will load the fonts scaled to $1.05$ times natural size. This is useful with Roman fonts having an x-height greater than Computer Modern.
\item
{\tt proportional} (or just {\tt p}) loads the proportionally spaced version of the fonts. (By default, typewriter text is {\tt monospaced}.)
\item The defaults for \verb|\mdseries| and \verb|\bfseries|, which determine the series used to render medium and bold, are ({\tt m}) and ({\tt b}). You may change these defaults without affecting the settings for Roman and Sans Serif fonts as follows:
@@ -55,10 +55,12 @@
{\tt med} (or just {\tt m}) makes \verb|\bfseries| render using ({\tt m}).
\end{itemize}
\end{itemize}
-Note that the weight options depend on the {\tt mweights} package which was introduced only in July $2013$ and may require an update to your \TeX\ distribution.
+Note that the weight options depend on the {\tt mweights} package which was introduced in July $2013$.
The package defines two macros, \verb|\proptt| and \verb|\monott| that allow you to use proportional typewriter mode or monospace typewriter mode whether or not you selected the {\tt proportional} option. This document uses {\tt monospace} mode, but I can write \verb|\proptt{proportional spacing}| and get \proptt{proportional spacing}, or \verb|\textit{\proptt{proportionally spaced slanted}}| to get \textit{\proptt{proportionally spaced slanted}}. The macro \verb|\lctt| prints its argument in light-condensed weight, monospaced mode, and uses a slanted font if italic shape is in force. E.g., \verb|\lctt{light condensed}| produces \lctt{light condensed}, and \verb|\textit{\lctt{light condensed italic}}| produces \textit{\lctt{light condensed italic}}.
+As of version {\tt 1.02}, \verb|\proptt| and \verb|\monott| do not switch to medium weight if in your preamble you specified that regular means light.
+
This package supports all the encodings supported by the {\tt lmodern} package.
{\bf Examples}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zlmtt.doc.tlpobj new/tlpkg/tlpobj/zlmtt.doc.tlpobj
--- old/tlpkg/tlpobj/zlmtt.doc.tlpobj 2019-02-28 04:19:20.000000000 +0100
+++ new/tlpkg/tlpobj/zlmtt.doc.tlpobj 2019-06-13 01:38:41.000000000 +0200
@@ -1,9 +1,9 @@
name zlmtt.doc
category Package
-revision 34485
+revision 51368
shortdesc doc files of zlmtt
relocated 1
-docfiles size=18
+docfiles size=16
RELOC/doc/fonts/zlmtt/README
RELOC/doc/fonts/zlmtt/zlmtt-doc.pdf
RELOC/doc/fonts/zlmtt/zlmtt-doc.tex
++++++ zlmtt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zlmtt/zlmtt.sty new/tex/latex/zlmtt/zlmtt.sty
--- old/tex/latex/zlmtt/zlmtt.sty 2014-07-01 00:33:16.000000000 +0200
+++ new/tex/latex/zlmtt/zlmtt.sty 2019-06-12 22:08:41.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesPackage{zlmtt}[2014/06/28 v1.01 Alternate support package for Latin Modern TypeWriter]
+\ProvidesPackage{zlmtt}[2019/06/11 v1.02 Alternate support package for Latin Modern TypeWriter]
% Load after every package that (re)defines \ttdefault.
\renewcommand{\ttdefault}{zlmtt}
\newif\if@zlmtt@mw
@@ -23,9 +23,12 @@
}
\def\zlmtt@scale{1}
\DeclareOptionX{scaled}{\def\zlmtt@scale{#1}}
+\DeclareOptionX{scale}{\def\zlmtt@scale{#1}}
\ProcessOptionsX\relax
-\newcommand{\proptt}[1]{{\fontfamily{zlmvtt}\selectfont #1}}
-\newcommand{\monott}[1]{{\fontfamily{zlmtt}\selectfont #1}}
+%\newcommand{\proptt}[1]{{\fontfamily{zlmvtt}\selectfont #1}}
+%\newcommand{\monott}[1]{{\fontfamily{zlmtt}\selectfont #1}}
+\newcommand{\monott}[1]{{\def\ttdefault{zlmtt}\texttt{#1}}} % 2019-06-11
+\newcommand{\proptt}[1]{{\def\ttdefault{zlmvtt}\texttt{#1}}} % ditto
\newcommand{\lctt}[1]{{\fontfamily{zlmtt}\fontseries{lc}\selectfont #1}}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zlmtt.tlpobj new/tlpkg/tlpobj/zlmtt.tlpobj
--- old/tlpkg/tlpobj/zlmtt.tlpobj 2019-02-28 04:19:20.000000000 +0100
+++ new/tlpkg/tlpobj/zlmtt.tlpobj 2019-06-13 01:38:41.000000000 +0200
@@ -1,6 +1,6 @@
name zlmtt
category Package
-revision 34485
+revision 51368
shortdesc Use Latin Modern Typewriter fonts
relocated 1
longdesc The package allows selection of Latin Modern Typewriter fonts
@@ -27,7 +27,7 @@
RELOC/tex/latex/zlmtt/ts1zlmvtt.fd
RELOC/tex/latex/zlmtt/zlmtt.sty
catalogue-ctan /fonts/zlmtt
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-06-12 05:18:42 +0200
catalogue-license lppl1.3
catalogue-topics font-supp
-catalogue-version 1.01
+catalogue-version 1.02
++++++ zwpagelayout.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zwpagelayout/README new/doc/latex/zwpagelayout/README
--- old/doc/latex/zwpagelayout/README 2013-01-16 00:01:45.000000000 +0100
+++ new/doc/latex/zwpagelayout/README 2020-02-28 23:32:29.000000000 +0100
@@ -1,5 +1,5 @@
=============================================================================
-Package: zwpagelayout Version 1.4c 13 Janyary 2013
+Package: zwpagelayout Version 1.4d 28 February 2020
=============================================================================
This package was developed as a typographers toolbox offering the most
@@ -10,12 +10,24 @@
Partial PDF/X conformance is implemented and black overprint is enabled
in pdfTeX, dvips, as well as (x)dvipdfm(x) drivers, i.e in XeLaTeX.
-Version 1.4c is a bug fix, the PDF boxes now properly work in the
-(x)dvipdfm(x) family of drivers.
+Version 1.4d is a bug fix:
+* PDF/X-1a identification corrected.
+* Package iftex loaded instead of ifpdf and ifxetex.
+* Lualatex compatibility supported
Version 1.4 implements black overprint for (x)dvipdfm(x) family of drivers,
i.e. it now works also with XeLaTeX.
+
+Installation:
+
+1. put zwpagelayout.sty to the directory where latex expects packages,
+ preferably texmf-dist/tex/latex/zwpagelayout
+
+2. put all remaining files to a directory where texdoc looks for
+ documentation, preferably texmf-dist/doc/zwpagelayout
+
+
The license of the package is LPPL.
Author: Z. Wagner, http://icebearsoft.euweb.cz
Binary files old/doc/latex/zwpagelayout/adjustfoot.pdf and new/doc/latex/zwpagelayout/adjustfoot.pdf differ
Binary files old/doc/latex/zwpagelayout/adjusthead.pdf and new/doc/latex/zwpagelayout/adjusthead.pdf differ
Binary files old/doc/latex/zwpagelayout/coversample.pdf and new/doc/latex/zwpagelayout/coversample.pdf differ
Binary files old/doc/latex/zwpagelayout/zwpagelayout.pdf and new/doc/latex/zwpagelayout/zwpagelayout.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zwpagelayout/zwpagelayout.tex new/doc/latex/zwpagelayout/zwpagelayout.tex
--- old/doc/latex/zwpagelayout/zwpagelayout.tex 2013-01-16 00:01:45.000000000 +0100
+++ new/doc/latex/zwpagelayout/zwpagelayout.tex 2020-02-28 23:32:29.000000000 +0100
@@ -1,4 +1,4 @@
-%% $Id: zwpagelayout.tex 454 2013-01-13 18:30:27Z zw $
+%% $Id: zwpagelayout.tex 548 2020-02-28 13:27:51Z zw $
\input utf8-t1 % encTeX required
\documentclass[11pt]{article}
\usepackage{zwgetfdate}
@@ -118,11 +118,20 @@
to be switched off and just add the crop marks provided the paper dimensions are correctly
supplied. The details will be explained later when describing the package options.
+\section{Installation}\label{installation}
+The package consists of a single file, \texttt{zwpagelayout.sty}. Put it to a directory where
+\LaTeX\ expects packages, preferably \texttt{texmf-dist/tex/latex/zwpagelayout}. All remaining
+files belong to the documentation, put them to a directory where documentation (including
+documentation sources) is expected by \pkg{texdoc} or a similar program, preferably
+\texttt{texmf-dist/doc/zwpagelayout}.
+
\section{Package dependence}
As written in the introduction, the goal was to implement as much within this single package in
order to reduce the risk of clashes. Yet a few packages may be loaded. The package needs to know
-what engine is being used. For this purpose the \pkg{ifxetex} and \pkg{ifpdf} packages are used. If
-any of these packages is not found, it is assumed that the corresponding engine is not available.
+what engine is being used. For this purpose the \pkg{iftex} package\footnote{Up to version 1.4c
+both \pkg{ifxetex} and \pkg{ifpdf} were used. Nowadays both these packages are deprecated and load
+\pkg{iftex}. The package would fail with a critical error if they were used.} is used. If
+the package is not found, it is assumed that the engines are not available.
No error is reported. The color support requires the \pkg{color} package. It is loaded only if the
color support is requested. The algorithm for deciding when the package is needed will be described
in detail in section~\ref{color}.
@@ -1262,6 +1271,15 @@
specify the date in the \cmd{usepackage} or \cmd{RequirePackage} command if you rely on a specific
feature not available in the old version of the package.
+\subsection{Version 1.4d, 2020/02/07}
+\begin{itemize}
+\item Bug fix, packages \pkg{ifpdf} and \pkg{ifxetex} replaced with \pkg{iftex}.
+\item Bug fix, identification of PDF/X-1a corrected.
+\item Feature request, luatex85 loaded in order to support Lua\LaTeX\ compatibility.
+\item Modification, distribution file flattened as required by CTAN, see
+section~\ref{installation}.
+\end{itemize}
+
\subsection{Version 1.4c, 2013/01/13}
Bug fix, the PDF boxes are properly set even in the (x)dvipdfm(x) family of drivers, i.\,e.\@ in
\XeLaTeX.
@@ -1346,7 +1364,7 @@
\section{License}
The package can be used and distributed according to the \LaTeX\ Project Public License version~1.3 or later the
-text of which can be found at the \texttt{License.txt} file in the \texttt{doc} directory or at
+text of which can be found at the \texttt{License.txt} file or at
\url{http://www.latex-project.org/lppl.txt}
\section{Trade marks}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwpagelayout.doc.tlpobj new/tlpkg/tlpobj/zwpagelayout.doc.tlpobj
--- old/tlpkg/tlpobj/zwpagelayout.doc.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zwpagelayout.doc.tlpobj 2020-02-29 02:00:24.000000000 +0100
@@ -1,9 +1,9 @@
name zwpagelayout.doc
category Package
-revision 28846
+revision 53965
shortdesc doc files of zwpagelayout
relocated 1
-docfiles size=204
+docfiles size=205
RELOC/doc/latex/zwpagelayout/License.txt
RELOC/doc/latex/zwpagelayout/LoremIpsumDolor.tex
RELOC/doc/latex/zwpagelayout/README
++++++ zwpagelayout.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zwpagelayout/zwpagelayout.sty new/tex/latex/zwpagelayout/zwpagelayout.sty
--- old/tex/latex/zwpagelayout/zwpagelayout.sty 2013-01-16 00:01:45.000000000 +0100
+++ new/tex/latex/zwpagelayout/zwpagelayout.sty 2020-02-28 23:32:29.000000000 +0100
@@ -1,7 +1,7 @@
-\ProvidesPackage{zwpagelayout}[2013/01/13 ZW Page Layout]
-\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 453 2013-01-13 17:12:17Z zw $\@gobble}
+\ProvidesPackage{zwpagelayout}[2020/02/28 ZW Page Layout]
+\PackageInfo{zwpagelayout}{$Id: zwpagelayout.sty 547 2020-02-28 13:17:43Z zw $\@gobble}
-%% Copyright 2008--2013 Z. Wagner, http://icebearsoft.euweb.cz
+%% Copyright 2008--2020 Z. Wagner, http://icebearsoft.euweb.cz
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,8 @@
% adjustfoot.tex, adjustfoot.pdf, adjusthead.tex, adjusthead.pdf,
% coversample.tex, coversample.pdf, LoremIpsumDolor.tex.
-\(a)ifpackageloaded{ifpdf}{}{\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}}{\newif\ifpdf}}
-\(a)ifpackageloaded{ifxetex}{}{\IfFileExists{ifxetex.sty}{\RequirePackage{ifxetex}}{\newif\ifxetex}}
+\@ifpackageloaded{iftex}{}{\IfFileExists{iftex.sty}{\RequirePackage{iftex}}{\newif\ifpdf\newif\ifxetex\newif\ifluatex}}
+\ifluatex\RequirePackage{luatex85}\fi
\RequirePackage{kvoptions}[2010/02/22]
\SetupKeyvalOptions{family=zwpl,prefix=zwpl@}
@@ -342,7 +342,7 @@
\ifcat$\zwpl@pdfminorversion$ \else \ZWifdriver{pdftex}{\pdfminorversion3 \relax}\fi
\def\zwpl@pdfxinfo{}
\ifzwpl@pdfx
- \def\zwpl@pdfxinfo{ /GTS_PDFXVersion (PDF/X-1:2001) /GTS_PDFXConformance (PDFX-1a:2001)}
+ \def\zwpl@pdfxinfo{ /GTS_PDFXVersion (PDF/X-1a:2001) /GTS_PDFXConformance (PDFX-1a:2001)}
\ifcat$\zwpl@ICCfile$ \else
\ifcase\zwpl@Driver
\or
@@ -401,7 +401,7 @@
/S/GTS_PDFX
/OutputCondition (\zwpl@OutputCondition)
/OutputConditionIdentifier (\zwpl@OutputConditionIdentifier)
- /RegistryName (http://www/color.org)\zwpl@profile
+ /RegistryName (http://www.color.org)\zwpl@profile
>> ]}
\ifcase\zwpl@Driver
\or
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zwpagelayout.tlpobj new/tlpkg/tlpobj/zwpagelayout.tlpobj
--- old/tlpkg/tlpobj/zwpagelayout.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zwpagelayout.tlpobj 2020-02-29 02:00:24.000000000 +0100
@@ -1,6 +1,6 @@
name zwpagelayout
category Package
-revision 28846
+revision 53965
shortdesc Page layout and crop-marks
relocated 1
longdesc This package was developed as a typographers' toolbox offering
@@ -14,7 +14,6 @@
catalogue-also geometry crop
catalogue-contact-home http://icebearsoft.euweb.cz/tex/
catalogue-ctan /macros/latex/contrib/zwpagelayout
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl
catalogue-topics geometry production
catalogue-version 1.4d
++++++ zxjafont.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjafont/LICENSE new/doc/latex/zxjafont/LICENSE
--- old/doc/latex/zxjafont/LICENSE 2018-05-05 00:10:36.000000000 +0200
+++ new/doc/latex/zxjafont/LICENSE 2020-01-12 22:39:47.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjafont/README-ja.md new/doc/latex/zxjafont/README-ja.md
--- old/doc/latex/zxjafont/README-ja.md 2018-05-05 00:10:36.000000000 +0200
+++ new/doc/latex/zxjafont/README-ja.md 2020-02-24 15:23:17.000000000 +0100
@@ -36,6 +36,30 @@
更新履歴
--------
+ * Version 1.2 〈2020/02/24〉
+ - オプション追加:`expert`。
+ - luatexja-preset との互換のためのオプションを追加。
+ - Moga 系プリセットの仕様を調整。
+ * Version 1.1b 〈2020/02/22〉
+ - luatexja-preset との互換のためのオプションを追加。
+ * Version 1.1a 〈2020/02/15〉
+ - NFSS 改修に対する調整。
+ * Version 1.1 〈2020/02/08〉
+ - 和文処理モードでも `prop` が使えるようにした。
+ * Version 1.0 〈2020/02/02〉
+ - 3 ウェイトのサポート。`(no)threeweight` オプション追加。
+ - xeCJK 読込時も和文処理モードに切り替える。
+ - オプション追加:`(no)ignorejatype`。
+ * Version 0.7 〈2020/01/18〉
+ - オプション追加:`(no)bold`、`nojisshape`。
+ - オプション別名:`(no)deluxe`。
+ - バグ修正。
+ * Version 0.6 〈2020/01/12〉
+ - プリセット追加:`haranoaji` (thanks:doraTeX 氏)。
+ - `hiragino` を `hiragino-pro` の別名とする。
+ * Version 0.5 〈2019/06/29〉
+ - 非推奨のプリセットを廃止した。
+ - 他パッケージとの互換のため、オプションやプリセットの別名を追加。
* Version 0.4 〈2018/05/04〉
- プリセット追加:`yu-win10`、`sourcehan(-jp)`、`noto(-jp)`、`ume`。
- オプション追加:`90jis`、`jis2004`。
@@ -49,4 +73,4 @@
--------------------
Takayuki YATO (aka. "ZR")
-http://zrbabbler.sp.land.to/
+https://github.com/zr-tex8r
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjafont/README.md new/doc/latex/zxjafont/README.md
--- old/doc/latex/zxjafont/README.md 2018-05-05 00:10:36.000000000 +0200
+++ new/doc/latex/zxjafont/README.md 2020-02-24 15:23:17.000000000 +0100
@@ -12,8 +12,10 @@
### SYSTEM REQUIREMENTS
- - TeX format: XeLaTeX.
- - Prerequisite packages: fontspec.
+ * TeX format: LaTeX.
+ * TeX engine: XeTeX.
+ * Prerequisite packages:
+ - fontspec
### INSTALLATION
@@ -27,11 +29,43 @@
This package is distributed under the MIT License.
+
+zxjafont Package ー main
+------------------------
+
+Please refer to the manual `zxjafont.pdf` (in Japanese) for detail.
+
+
Revision History
----------------
+ * Version 1.2 〈2020/02/24〉
+ - New option: `expert`.
+ - More options for compatibility with luatexja-preset.
+ - Adjustment of presets involving Moga Fonts.
+ * Version 1.1b 〈2020/02/22〉
+ - More options for compatibility with luatexja-preset.
+ * Version 1.1a 〈2020/02/15〉
+ - Adjustment for the revision of NFSS.
+ * Version 1.1 〈2020/02/08〉
+ - Now `prop` is available even in Japanese-font mode.
+ * Version 1.0 〈2020/02/02〉
+ - Now multiweight presets offer three weights per family. New
+ option `(no)threeweight` is added.
+ - Now use of xeCJK activates the Japanese-font mode.
+ - New option: `(no)ignorejatype`.
+ * Version 0.7 〈2020/01/18〉
+ - New options: `(no)bold`, `nojisshape`.
+ - New option aliases: `(no)deluxe`.
+ - Bug fix.
+ * Version 0.6 〈2020/01/12〉
+ - New preset: `haranoaji` (thanks: doraTeX).
+ - `hiragino` is made an alias for `hiragino-pro`.
+ * Version 0.5 〈2019/06/29〉
+ - More aliases are provided.
+ - The deprecated presets are abolished.
* Version 0.4 〈2018/05/04〉
- - New preets: `yu-win10`, `sourcehan(-jp)`, `noto(-jp)`, `ume`.
+ - New presets: `yu-win10`, `sourcehan(-jp)`, `noto(-jp)`, `ume`.
- New options: `90jis`, `jis2004`.
- The use of deprecated presets is warned.
* Version 0.3 〈2015/05/08〉
@@ -43,4 +77,4 @@
--------------------
Takayuki YATO (aka. "ZR")
-http://zrbabbler.sp.land.to/
+https://github.com/zr-tex8r
Binary files old/doc/latex/zxjafont/zxjafont.pdf and new/doc/latex/zxjafont/zxjafont.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjafont/zxjafont.tex new/doc/latex/zxjafont/zxjafont.tex
--- old/doc/latex/zxjafont/zxjafont.tex 2018-05-05 00:10:36.000000000 +0200
+++ new/doc/latex/zxjafont/zxjafont.tex 2020-02-24 15:23:17.000000000 +0100
@@ -12,12 +12,14 @@
\bxtexlogoimport{*}
\usepackage{shortvrb}
\MakeShortVerb{\|}
-\newcommand{\PkgVersion}{0.4}
-\newcommand{\PkgDate}{2018/05/04}
+\newcommand{\PkgVersion}{1.2}
+\newcommand{\PkgDate}{2020/02/24}
\newcommand{\Pkg}[1]{\textsf{#1}}
\newcommand{\Meta}[1]{$\langle$\mbox{}#1\mbox{}$\rangle$}
\newcommand{\Note}{\par\noindent ※}
\newcommand{\Means}{:\ }
+\newcommand{\JEmph}{\textgt}
+\newcommand{\JSl}{\mbox{/}\linebreak[0]}
%-----------------------------------------------------------
\begin{document}
\title{\Pkg{zxjafont} パッケージ(v\PkgVersion)}
@@ -28,25 +30,25 @@
%===========================================================
\section{概要}
-{\XeLaTeX} + fontspec でのフォントファミリ名を直接指定する方式は
+{\XeLaTeX}+\Pkg{fontspec}でのフォントファミリ名を直接指定する方式は
「好きなフォントを指定する」という点では、
{\pLaTeX}\>よりも格段に使い易いが、
-日本語を扱うためには必ず何らかの設定を行う必要があり、
+日本語を扱うためには必ず何らかのフォント設定を行う必要があり、
これが煩わしく感じられる場合もある。
-本パッケージでは、{\pLaTeX}\>において
-一般的に行われている設定を予め用意しておいて、
+本パッケージでは、日本語\>{\LaTeX}\>において
+一般的に行われている日本語用フォント設定を予め用意しておいて、
簡単に呼び出せるようにしている。
-\paragraph{前提フォーマット}
-{\XeLaTeX}。
-
-\paragraph{依存パッケージ}
+\paragraph{前提環境}\mbox{}
\begin{itemize}
-\item \Pkg{fontspec}パッケージ
+\item フォーマット\Means {\LaTeX}
+\item エンジン\Means {\XeTeX}
+\item 依存パッケージ\Means \Pkg{fontspec}パッケージ
\end{itemize}
%===========================================================
\section{使い方}
+\label{sec:Usage}
以下のようにパッケージを読み込むだけである。
(ユーザ命令・環境はない。)
@@ -59,25 +61,31 @@
\Meta{サブ設定}と\Meta{他オプション}は任意個数指定可能である。
もし\Pkg{fontspec}が未読込の場合は自動的に読み込む。
{\XeLaTeX}\>には和文と欧文の元来の区別がないので、
-このパッケージで指定するフォントが全ての文字に通用する。
-ただし、\Pkg{zxjatype}パッケージでは和文と欧文を区別するので、
-それと併用の場合は和文のみにフォント設定が適用される。
+このパッケージで指定するフォントが全ての文字に通用される。
+ただし、\Pkg{xeCJK}パッケージや\Pkg{zxjatype}パッケージの
+日本語処理機能を利用する場合には和文と欧文が区別されるようになり、
+この場合は\JEmph{和文のみ}にフォント設定が適用される。
%-------------------
-\subsection{メイン設定}
+\subsection{メイン設定オプション}
+\label{ssec:Main-Option}
-総称ファミリの設定
-(\Pkg{fontspec}の |\setmainfont|、|\setsansfont|、|\setmonofont|)
+{\LaTeX}\>の総称ファミリに関するプリセット設定、すなわち、
+\Pkg{fontspec}の\>|\setmainfont|\JSl|\setsansfont|\JSl|\setmonofont|\>%
+(\Pkg{xeCJK}\JSl\Pkg{zxjatype}併用時は\>%
+|\setCJKmainfont|\JSl|\setCJKsansfont|\JSl|\setCJKmonofont|)
を行うもの。
-\Note 「メイン設定」は\Pkg{pxchfon}パッケージにおける
-「プリセット設定」をそのまま
-(ただし明朝・ゴシック2ウェイトに縮減して)
+\Note メイン設定のプリセットは\Pkg{pxchfon}パッケージにおける
+プリセットをそのまま
引き継いでいる。
-設定内容の詳細については、\Pkg{pxchfon}の説明書を
-参照してほしい。
+設定内容の詳細については、
+\JEmph{\Pkg{pxchfon}の説明書を参照してほしい}。
+
+\Note 1.0版より、\Pkg{pxchfon}パッケージの多ウェイト設定について
+明朝・ゴシックの3ウェイトが全てサポートされるようになった。
-\paragraph{単ウェイト用の設定}
+\paragraph{単ウェイト用プリセット}
明朝・ゴシック各々1ウェイトのみを用いる設定。
セリフ(|\rmfamily|)に明朝、
サンセリフ(|\sffamily|)と等幅(|\ttfamily|)にゴシックを割り当てる。
@@ -93,14 +101,35 @@
\item |ipaex|\Means
IPAexフォント。
\end{itemize}
-\Note {\XeTeX}\>は「フォント非埋込のPDF生成」に対応していない。
+\Note {\XeTeX}\>は「フォント非埋込のPDF生成」に対応していないので、
+|noembed| プリセットは存在しない。
+
+例えば、|ms|\>プリセットは以下の\Pkg{fontspec}の設定を行う:
+\begin{quote}\small\begin{verbatim}
+\setmainfont{MS-Mincho}[BoldFont=MS-Gothic]
+\setsansfont{MS-Gothic}[BoldFont=MS-Gothic]
+\setmonofont{MS-Gothic}[BoldFont=MS-Gothic]
+\end{verbatim}\end{quote}
+\Note \Pkg{xeCJK}\JSl\Pkg{zxjatype}読込時は和文用フォントの
+設定(|\setCJKmainfont|\>等)に置き換わり、またこの場合は
+和文スケール設定(|Scale|\>オプションキー)が追加される。
+これは以降で紹介する例についても同様である。
+
+\paragraph{多ウェイト用プリセット}
+セリフ(|\rmfamily|)に明朝、
+サンセリフ(|\sffamily|)と等幅(|\ttfamily|)にゴシックを割り当て、
+各々について中字(|\mdseries|)と太字(|\bfseries|)のフォントを
+\Pkg{pxchfon}のプリセットと同様に個別に設定する。
+
+さらに、|threeweight|\>オプションが有効の場合は、
+{p\LaTeX}\>の\Pkg{japanese-otf}で\>|deluxe|\>オプションを指定したときと
+同様に、「明朝の細字(|\rmfamily\ltseries|)」と
+「ゴシックの極太(|\sffamily\ebseries|)」が指定できるようになり、
+明朝とゴシックの各々について3ウェイトのフォントが
+\Pkg{pxchfon}のプリセットと同様に個別に設定される。
+\Note |threeweight|\>オプションは通常は既定で有効になっている
+(詳細は\>\ref{ssec:Other-Option}\>節を参照)。
-\paragraph{多ウェイト用の設定}
-明朝・ゴシック各々2ウェイトを用いる設定
-\footnote{\Pkg{fontspec}では3ウェイト以上の設定ができない。)}。
-セリフに明朝、サンセリフと等幅にゴシックを割り当て、
-各々について通常(|\mdseries|)と太字(|\bfseries|)
-を個別に設定する。
\begin{itemize}
\item |ms-hg|\Means
MSフォント + HGフォント。
@@ -110,17 +139,28 @@
\item |ipaex-hg|\Means
IPAexフォント + HGフォント。
\item |moga|\Means
- Mogaフォント(2004JIS字形)。
- \Note MogaEx系統が用いられる。
+ Mogaフォント(MogaEx;2004JIS字形)。
+ \Note \Pkg{pxchfon}の\>|moga-mobo-ex|(|jis2004|\>有効)と同じで、
+ MogaEx系統が用いられる。
\item |moga-90|\Means
- Mogaフォント(90/2000JIS字形)。
- \Note MogaEx90系統が用いられる。
+ Mogaフォント(MogaEx;90\JSl 2000JIS字形)。
+ \Note \Pkg{pxchfon}の\>|moga-mobo-ex|(|jis2004|\>無効)と同じで、
+ MogaEx90系統が用いられる。
+\item |mogaN-90|\Means
+ Mogaフォント(Moga;90\JSl 2000JIS字形)。
+ \Note \Pkg{pxchfon}の\>|moga-mobo|(|jis2004|\>無効)と同じで、
+ Moga90系統が用いられる。
+ \Note |moga|\JSl|moga-90|\JSl|mogaN-90|\>の各プリセットは、%
+ |jis2004|\JSl|jis90|\>オプションが併用された場合にはそれに応じて
+ 適切な字形をもつフォントの方に切り替える。
+\item |ume|\Means
+ 梅フォント。
\item |kozuka-pro|\Means
小塚フォント(Pro版)。
\item |kozuka-pr6|\Means
小塚フォント(Pr6版)。
\item |kozuka-pr6n|\Means
- 小塚フォント(Pr6n版)。
+ 小塚フォント(Pr6N版)。
\item |hiragino-pro|\Means
ヒラギノフォント基本6書体セット(Pro/Std版)。
\item |hiragino-pron|\Means
@@ -134,56 +174,130 @@
\item |yu-win10|\Means
游書体(Windows~10搭載版)。%TODO
\item |yu-osx|\Means
- 游書体(Mac OS X搭載版)。
+ 游書体(macOS搭載版)。
\item |sourcehan|\Means
Source Han Serif(源ノ明朝)+ Source Han Sans(源ノ角ゴシック)、
- 非サブセット版%TODO
- \footnote{つまり、地域別サブセットOTF版以外のもの。
- 後掲の |noto| も同じ。}。
+ 非サブセット版。%TODO
+ \Note つまり地域別サブセットOTF版以外のもの。
+ フォント名での指定であるため、%
+ \Pkg{pxchfon}の\>|sourcehan|\>と\>|sourcehan-otc|\>の両方と
+ 等価である。
+\item |sourcehan-jp|\Means
+ Source Han Serif + Source Han Sans、
+ 日本用地域別サブセット版。
\item |noto|\Means
Noto Serif CJK + Noto Sans CJK、
非サブセット版。
+ \Note |sourcehan|\>と同様の補足事項が当てはまる。
+ \Pkg{pxchfon}の\>|noto|\>と\>|noto-otc|\>の両方と等価。
+\item |noto-jp|\Means
+ Noto Serif JP + Noto Sans JP、
+ 日本用地域別サブセット版。
+\item |haranoaji|\Means
+ 原ノ味フォント。
+\end{itemize}
+
+例えば\>|haranoaji|\>プリセットについて説明すると、%
+|threeweight|\>が有効の場合は以下の設定
+(3ウェイト)が行われる%
+\footnote{実際には、状況に応じてフォント名の代わりにファイル名
+(\texttt{*.otf})での指定に切り替わる。}
+:
+\begin{quote}\small\begin{verbatim}
+\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Bold,
+ FontFace={l}{n}{HaranoAjiMincho-Light}]
+\setsansfont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold,
+ FontFace={eb}{n}{HaranoAjiGothic-Heavy}]
+\setmonofont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold,
+ FontFace={eb}{n}{HaranoAjiGothic-Heavy}]
+\end{verbatim}\end{quote}
+
+|threeweight|\>が無効の場合は以下の設定
+(中字・太字のみの2ウェイト)が行われる:
+\begin{quote}\small\begin{verbatim}
+\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiMincho-Bold]
+\setsansfont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold]
+\setmonofont{HaranoAjiGothic-Regular}[BoldFont=HaranoAjiGothic-Bold]
+\end{verbatim}\end{quote}
+
+|oneweight|\>オプション指定時は以下の設定
+(1ウェイトのみ)が行われる:
+\begin{quote}\small\begin{verbatim}
+\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiGothic-Medium]
+\setsansfont{HaranoAjiGothic-Medium}[BoldFont=HaranoAjiGothic-Medium]
+\setmonofont{HaranoAjiGothic-Medium}[BoldFont=HaranoAjiGothic-Medium]
+\end{verbatim}\end{quote}
+\Note 先の例と異なり明朝の太字がゴシックとなり、
+かつゴシックとして“|HaranoAjiGothic-Medium|”%
+(\Pkg{pxchfon}プリセットにおいて\>|\setgothicfont|\>に
+割り当てられているフォント)が使われることに注意。
+
+そして\>|bold|\>オプション指定時は以下の設定が行われる:
+\begin{quote}\small\begin{verbatim}
+\setmainfont{HaranoAjiMincho-Regular}[BoldFont=HaranoAjiGothic-Bold]
+\setsansfont{HaranoAjiGothic-Bold}[BoldFont=HaranoAjiGothic-Bold]
+\setmonofont{HaranoAjiGothic-Bold}[BoldFont=HaranoAjiGothic-Bold]
+\end{verbatim}\end{quote}
+
+\paragraph{特殊なプリセット}
+\mbox{}
+
+\begin{itemize}
+\item |nopreset|\Means
+ メイン設定を何も行わない。
+ \Note フォントの設定は自分で行うが、それでも何らかの理由で
+ \Pkg{zxjafont}パッケージを読み込みたいという場合に
+ 用いることが想定されている。
\end{itemize}
-\paragraph{ptex-fontmaps互換のオプション}
-
-\Pkg{ptex-fontmaps}のプリセット名を別名として用意した。
+\paragraph{他パッケージとの互換用のプリセット}
+\mbox{}
\begin{itemize}
\item |kozuka|\Means
- |kozuka-pro| の別名。%TODO
+ |kozuka-pro| の別名。
+ (\Pkg{ptex-fontmaps}でのプリセット名。)
\item |morisawa|\Means
- |morisawa-pro| の別名。%TODO
+ |morisawa-pro| の別名。
+ (\Pkg{ptex-fontmaps}でのプリセット名。)
+\item |moga-mobo|\Means
+ |mogaN-90| の別名。
+ (\Pkg{ptex-fontmaps}でのプリセット名。)
+\item |moga-mobo-ex|\Means
+ |moga-90| の別名。
+ (\Pkg{ptex-fontmaps}でのプリセット名。)
+ \Note 1.2版より、Moga系プリセットが\>|jis90|\JSl|jis2004|\>での
+ 字体指定に従うようになったため、
+ 他のパッケージの動作との互換がより高い動作に変更された。
+ 現在は既定で90JIS字形になることに注意。
+\item |noto-otf|\Means
+ |noto| の別名。
+ (\Pkg{luatexja-preset}でのプリセット名。)
+\item |hiragino|\Means
+ |hiragino-pro| の別名。
+ (\Pkg{ptex-fontmaps}でのプリセット名。)
+ \Note 0.6版で追加。
+ 0.4版以前では |hiragino| が別の設定を指していたが、
+ これは0.5版で廃止された。
\end{itemize}
-\Note なお、|hiragino-pro| と同義の\Pkg{ptex-fontmaps}の
-プリセット名は |hiragino| であるが、本パッケージの |hiragino| は
-旧版の非推奨の設定であり |hiragino-pro| とは異なる。
+\paragraph{廃止されたプリセット}
-\paragraph{旧版の設定}
+0.2a版以前で用意されていた次のプリセット設定は、
+0.5版において廃止された。
+現在は指定するとエラーが発生する。
-v0.2a版以前で用意されていたメイン設定で、現在では非推奨である。
+\Note ただし |hiragino| については現在では |hiragino-pro| の別名と
+解釈される。
-\Note これらは{\TeX} Live 2019のリリース時を目途にして
-\strong{廃止予定}である。
-
-\begin{itemize}
-\item |kozuka4|\Means
- 小塚フォント(Pro版)の単ウェイト使用。
-\item |kozuka6|\Means
- 小塚フォント(Pr6版)の単ウェイト使用。
-\item |kozuka6n|\Means
- 小塚フォント(Pr6n版)の単ウェイト使用。
-\item |hiragino|\Means
- ヒラギノフォント(Pro版)の単ウェイト使用。
-\item |ms-dx|\Means |ms-hg| の別名。
-\item |ipa-dx|\Means |ipa-hg| の別名。
-\item |hiragino-dx|\Means |hiragino-pro| の別名。
-\item |moga-mobo|\Means |moga| の別名。※\Pkg{pxchfon}互換用。
-\end{itemize}
+\begin{quote}
+|kozuka4|、|kozuka6|、|kozuka6n|、|hiragino|、
+|ms-dx|、|ipa-dx|、|hiragino-dx|
+\end{quote}
%-------------------
-\subsection{サブ設定}
+\subsection{サブ設定のオプション}
+\label{ssec:Sub-Option}
\Pkg{fontspec}では使用するフォントを |\newfontfamily| 命令で
増やすことができる。
@@ -218,9 +332,9 @@
\end{itemize}
\item |mobo-90|\Means
-Moboフォント(90/2000JIS字形)を使う設定。
+Moboフォント(90\JSl 2000JIS字形)を使う設定。
\begin{itemize}
-\item |\mobofamily|\Means Moboフォント(90/2000JIS字形)
+\item |\mobofamily|\Means Moboフォント(90\JSl 2000JIS字形)
\end{itemize}
\item |maruberi|\Means
@@ -229,49 +343,104 @@
\item |\mmgfamily|\Means モトヤLマルベリ3等幅
\end{itemize}
\end{itemize}
-\Note \Pkg{fontspec}では取り扱うフォントのウェイトを通常(|\mdseries|)
-と太字(|\bfseries|)の2つに制限している。
-多くのOSでの扱いに合わせているようである。
%-------------------
\subsection{その他のオプション}
+\label{ssec:Other-Option}
\begin{itemize}
\item |oneweight|\Means
-複数ウェイト用のメイン設定を単ウェイトとして用いる。
-\Note \Pkg{pxchfon}の説明書において |\setminchofont|
-と |\setgothicfont| で設定されているウェイトのフォント
-が用いられる。
+多ウェイト用のプリセットを単ウェイトとして用いる。
+\Note \Pkg{pxchfon}のマニュアルのプリセットの記述に
+おいて\>|\setminchofont|\>と\>|\setgothicfont|\>で設定されている
+ウェイトのフォントが用いられる。
+\item |nooneweight|(既定)\Means
+|oneweight|\>の否定。
+
+\item |threeweight|(既定)\Means
+多ウェイト用プリセットを使う場合に3ウェイトを利用できるようにする。
+\item |nothreeweight|\Means
+|threeweight|\>の否定。
+多ウェイト用プリセットは2ウェイトのみ使える。
+\Note |(no)threeweight|\>は1.0版で追加された。
+\Note 既定は\>|threeweight|\>であるが、使用中の\Pkg{fontspec}の版が
+古くて追加ウェイトに対応できない場合は\>|nothreeweight|\>が既定になる。
+
+\item |bold|\Means
+|oneweight|\>と同じく多ウェイト用プリセットを単ウェイトとして用いるが、
+この際のゴシック体のフォントとして太字ウェイトに相当するものを用いる。
+\Note \Pkg{pxchfon}のプリセットでの\>|\setminchofont|\>%
+と\>|\setboldgothicfont|\>のフォントが用いられる。
+\Note \Pkg{luatexja-preset}とは異なり、|bold|\>の指定自体が
+単ウェイト設定を強制する。
+|bold|\>と\>|oneweight|\>を同時に指定した場合は\>|bold|\>が優先する。
+\item |nobold|(既定)\Means
+|bold|\>の否定。
\item |prop|\Means
プロポーショナル幅のフォントを用いる。
-例えば、「IPA明朝」の代わりに「IPA P明朝」、
+例えば「IPA明朝」の代わりに「IPA P明朝」、
「HGS行書体」の代わりに「HGP行書体」を指定する。
既定で用いるのは等幅のフォントだが、
「欧文のみプロポーショナル」の変種(HGフォントの場合「HGS~」名称のもの)
-がある場合はそれを優先させている。
-\Note \Pkg{zxjatype}を用いる場合は、
-和文は等幅フォントを用いることが前提なので、
-このオプションは指定できない(エラーになる)。
+がある場合はそれを優先させる。
+\Note 1.1版より、\Pkg{xeCJK}\JSl\Pkg{zxjatype}併用時でも\>|prop|\>が
+指定できるようになった。
+\item |noprop|(既定)\Means
+|prop|\>の否定。
+(和文が)等幅のフォントを用いる。
\item |scale=|\Meta{実数}\Means
-スケール値(\Pkg{fontspec}の |Scale| 属性の値)。
+和文スケール値(\Pkg{fontspec}の |Scale| 属性の値)。
既定値は、\Pkg{BXjscls}の文書クラスおよび
\Pkg{zxjatype}パッケージで指定されている場合はその値、
なければ1となる。
-\item |90jis|\Means
+\item |jis90|\JSl|90jis|\Means
90JIS字形(2000JIS字形)の使用を指定する。
-
-\item |jis2004|\Means
+\item |jis2004|\JSl|2004jis|\Means
2004JIS字形の使用を指定する。
+\item |nojisshape|(既定)\Means
+特定のJIS字形の使用の指定を行わない。
+
+\item |expert|\Means
+横組専用仮名字形を(可能であれば)利用する。
+\Note \Pkg{luatexja-preset}の\>|expert|\>とは異なり、
+ルビ用字形は未サポート。
+
+\item |ignorejatype|\Means
+たとえ\Pkg{xeCJK}\JSl\Pkg{zxjatype}が読み込まれていたとしても
+それらを無視して、「和文欧文の区別がない」前提の動作を行う。
+\Note この場合「プリセットで指定した日本語フォントが\JEmph{欧文のみ}に
+適用される」という奇妙な動作になる。
+有用性はほぼないと思われるが念のため用意している。
+\item |noignorejatype|(既定)\Means
+|ignorejatype|\>の否定。
+\Note |(no)ignorejatype|\>は1.0版で追加された。
\item |feature={|\Meta{属性リスト}|}|\Means
-このパッケージで指定されるフォント全体に通用する
+このパッケージで指定されるフォント全てに通用する
\Pkg{fontspec}の属性の指定。
+既定値は空。
\end{itemize}
+\paragraph{他パッケージとの互換用のオプション}
+\Pkg{luatexja-preset}との互換のためのもの。
+
+\begin{itemize}
+\item |deluxe|\JSl|nodeluxe|\Means
+ それぞれ |nooneweight|\JSl|oneweight| の別名。
+\item |match|\JSl|fontspec|\Means
+ これらの機能は“常に有効”と考えられるため、黙って無視される。
+\item |nfssonly|\Means
+ 非サポートのため警告が出て無視される。
+\item |noembed|\Means
+ \ref{ssec:Main-Option}で述べた通り、非埋込の設定はサポートできない
+ ので、警告が出た上で、|nopreset|\>プリセットが指定されたものと
+ 見なされる。
+\end{itemize}
+
%===========================================================
\end{document}
%% EOF
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafont.doc.tlpobj new/tlpkg/tlpobj/zxjafont.doc.tlpobj
--- old/tlpkg/tlpobj/zxjafont.doc.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zxjafont.doc.tlpobj 2020-02-25 01:54:57.000000000 +0100
@@ -1,9 +1,9 @@
name zxjafont.doc
category Package
-revision 47613
+revision 53884
shortdesc doc files of zxjafont
relocated 1
-docfiles size=41
+docfiles size=51
RELOC/doc/latex/zxjafont/LICENSE
RELOC/doc/latex/zxjafont/README-ja.md
RELOC/doc/latex/zxjafont/README.md
++++++ zxjafont.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zxjafont/zxjafont.sty new/tex/latex/zxjafont/zxjafont.sty
--- old/tex/latex/zxjafont/zxjafont.sty 2018-05-05 00:10:36.000000000 +0200
+++ new/tex/latex/zxjafont/zxjafont.sty 2020-02-24 15:23:17.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'zxjafont.sty'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,54 +10,109 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjafont}[2018/05/03 v0.4-pre]
+\ProvidesPackage{zxjafont}[2020/02/24 v1.2]
\def\zxjf@pkgname{zxjafont}
%% preparation
\RequirePackage{ifxetex}\RequireXeTeX
\providecommand{\bxDebug}[1]{}
+%%<+> \zxjafontFeature
+% The default features for fonts declared by this package.
+% (Used if defined.)
+
%--------------------------------------- general
%% packages
\RequirePackage{fontspec}
\RequirePackage{keyval}
-\RequirePackage{etoolbox}
+\RequirePackage{etoolbox}[2011/01/03]% v2.1
%% errors
\def\zxjf@err@ivval#1#2{%
\PackageError\zxjf@pkgname
{Invalid value '#2' for option #1}\@ehc}
+%% switch 'fontspec@mw'
+\newif\ifzxjf@fontspec@mw
+\@ifpackagelater{fontspec}{2014/06/01}{\zxjf@fontspec@mwtrue}{}% v2.4
+
+%% \zxjf@cond\ifXXX...\fi{<true>}{<false>}
+\@gobbletwo\if\if \def\zxjf@cond#1\fi{%
+ #1\expandafter\@firstoftwo\else\expandafter\@secondoftwo\fi}
+
+%% \zxjf@with@cs\CS{<csname>}
+\def\zxjf@with@cs#1#2{%
+ \expandafter#1\csname#2\endcsname}
+
+%% \zxjf@onlypreamble@def\CS
+\def\zxjf@onlypreamble@def#1{%
+ \@onlypreamble#1\def#1}
+%% \zxjf@onlypreamble@let\CS
+\def\zxjf@onlypreamble@let#1{%
+ \@onlypreamble#1\let#1}
+
+%% \if\zxjf@isvalid{<csname>}...\fi
+\def\zxjf@isvalid#1{%
+ \ifcsvoid{#1}{F}{T}T}
+
+%% \zxjf@if@font@exists
+\ifdefined\IfFontExistsTF
+ \let\zxjf@if@font@exists\IfFontExistsTF
+\else % fallback
+ \def\zxjf@if@font@exists#1{\@firstoftwo}
+\fi
+
%--------------------------------------- handle options
+%% errors
+\zxjf@onlypreamble@def\zxjf@warn@niopt#1{%
+ \PackageWarningNoLine\zxjf@pkgname
+ {Option '#1' is not implemented}}
+
%% constants
\chardef\zxjf@cjkshape@@none=0
\chardef\zxjf@cjkshape@@xc=1 % 90jis
\chardef\zxjf@cjkshape@@mmiv=2 % jis2004
+\chardef\zxjf@jatype@@none=0
+\chardef\zxjf@jatype@@xeCJK=1
+\chardef\zxjf@jatype@@zxjatype=2
%% variables
\let\zxjf@main@preset\relax
\let\zxjf@sub@preset\@empty
\newif\ifzxjf@prop
\newif\ifzxjf@oneweight
+\newif\ifzxjf@threeweight
+\newif\ifzxjf@bold
\let\zxjf@cjkshape\zxjf@cjkshape@@none
\let\zxjf@scale\relax
-\let\zxjf@feat\@empty
-\newif\ifzxjf@zxjatype
+\let\zxjf@feature\@empty
+\let\zxjf@jatype\zxjf@jatype@@none
+\newif\ifzxjf@ignore@jatype
+\newif\ifzxjf@expert
+
+%% default for 'threeweight'
+\ifzxjf@fontspec@mw
+ \zxjf@threeweighttrue
+\fi
-%% \zxjf@main@preset
-\def\zxjf@all@main@preset{%
+%% \zxjf@all@main@preset
+\zxjf@onlypreamble@def\zxjf@all@main@preset{%
+ nopreset,noembed,%
+ %(uniweight)
ms,ipa,ipaex,%
- ms-hg,ipa-hg,ipaex-hg,moga,moga-90,ume,%
+ %(multiweight)
+ ms-hg,ipa-hg,ipaex-hg,moga,moga-90,mogaN-90,ume,%
kozuka-pro,kozuka-pr6,kozuka-pr6n,hiragino-pro,hiragino-pron,%
morisawa-pro,morisawa-pr6n,yu-win,yu-win10,yu-osx,%
- sourcehan,sourcehan-jp,noto,noto-jp,%
- kozuka4,kozuka6,kozuka6n,hiragino,%
- ms-dx,ipa-dx,hiragino-dx,moga-mobo}
+ sourcehan,sourcehan-jp,noto,noto-jp,haranoaji,%
+ moga-mobo,moga-mobo-ex,%
+ %(alias)
+ kozuka,morisawa,moga-mobo-ex,noto-otf,hiragino}
-%% \zxjf@main@sub@preset
-\def\zxjf@all@sub@preset{%
+%% \zxjf@all@sub@preset
+\zxjf@onlypreamble@def\zxjf@all@sub@preset{%
hg,hiraginomg-pro,hiraginomg-pron,mobo,mobo-90,maruberi,%
hiraginomg}
@@ -65,32 +120,60 @@
\def\zxjf@do#1{\DeclareOption{#1}{\def\zxjf@main@preset{#1}}}
\@for\zxjf@x:=\zxjf@all@main@preset\do{%
\expandafter\zxjf@do\expandafter{\zxjf@x}}
-\def\zxjf@do#1{\DeclareOption{#1}{\zxjf@add@sub@preset{#1}}}
+\def\zxjf@do#1{\DeclareOption{#1}{\appto\zxjf@sub@preset{#1,}}}
\@for\zxjf@x:=\zxjf@all@sub@preset\do{%
\expandafter\zxjf@do\expandafter{\zxjf@x}}
-\def\zxjf@add@sub@preset#1{%
- \edef\zxjf@sub@preset{\zxjf@sub@preset#1,}}
% 'prop'
\DeclareOption{prop}{\zxjf@proptrue}
+\DeclareOption{noprop}{\zxjf@propfalse}
% 'oneweight'
\DeclareOption{oneweight}{\zxjf@oneweighttrue}
+\DeclareOption{nooneweight}{\zxjf@oneweightfalse}
+\DeclareOption{nodeluxe}{\zxjf@oneweighttrue}
+\DeclareOption{deluxe}{\zxjf@oneweightfalse}
+% 'threeweight'
+\DeclareOption{threeweight}{\zxjf@threeweighttrue}
+\DeclareOption{nothreeweight}{\zxjf@threeweightfalse}
+% 'bold'
+\DeclareOption{bold}{\zxjf@boldtrue}
+\DeclareOption{nobold}{\zxjf@boldfalse}
% '90jis'/'jis2004'
+\DeclareOption{jis90}{\let\zxjf@cjkshape\zxjf@cjkshape@@xc}
\DeclareOption{90jis}{\let\zxjf@cjkshape\zxjf@cjkshape@@xc}
\DeclareOption{jis2004}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv}
+\DeclareOption{2004jis}{\let\zxjf@cjkshape\zxjf@cjkshape@@mmiv}
+\DeclareOption{nojisshape}{\let\zxjf@cjkshape\zxjf@cjkshape@@none}
+% 'ignorejatype'
+\DeclareOption{ignorejatype}{\zxjf@ignore@jatypetrue}
+\DeclareOption{noignorejatype}{\zxjf@ignore@jatypefalse}
+% 'expert'
+\DeclareOption{expert}{\zxjf@experttrue}
+% dummy options for compatibility with luatexja-preset
+\DeclareOption{match}{}% xeCJK always work as 'match' is on
+\DeclareOption{fontspec}{}% always on
+\DeclareOption{nfssonly}{\zxjf@warn@niopt{nfssonly}}
+
+% abolished presets
+\zxjf@onlypreamble@def\zxjf@err@abpre#1{%
+ \PackageError\zxjf@pkgname
+ {The old preset '#1' is *abolished*}{\@ehc}}
+\@for\zxjf@x:={%
+ kozuka4,kozuka6,kozuka6n,ms-dx,ipa-dx,hiragino-dx%
+}\do{\DeclareOption{\zxjf@x}{\zxjf@err@abpre{\CurrentOption}}}
%% options using keyval
-\DeclareOption*{\def\zxjf@nxt{\setkeys{zxjf}}%
- \expandafter\zxjf@nxt\expandafter{\CurrentOption}}
+\DeclareOption*{\def\zxjf@do{\setkeys{zxjf}}%
+ \expandafter\zxjf@do\expandafter{\CurrentOption}}
% 'scale=<real>'
\define@key{zxjf}{scale}{\def\zxjf@scale{#1}}
% 'feature=<text>'
-\define@key{zxjf}{feature}{\def\zxjf@feat{#1}}
+\define@key{zxjf}{feature}{\def\zxjf@feature{#1}}
%% dispatch
-\let\@org@use@ption\@use@ption
-\def\@use@ption{\csname ds@\CurrentOption \endcsname}
+\zxjf@onlypreamble@let\zxjf@org@use@ption\@use@ption
+\def\@use@ption{\csname ds@\CurrentOption \endcsname}% FIXME
\ProcessOptions*
-\let\@use@ption\@org@use@ption
+\let\@use@ption\zxjf@org@use@ption
%% preset must be given
\ifx\zxjf@main@preset\relax
@@ -100,29 +183,37 @@
\space\space\zxjf@all@main@preset}
\expandafter\endinput\fi\relax
-%% detect bxjatype
-\@ifpackageloaded{zxjatype}{\zxjf@zxjatypetrue}{}
-\AtBeginDocument{%
- \unless\ifzxjf@zxjatype
- \@ifpackageloaded{zxjatype}{%
- \PackageError\zxjf@pkgname
- {zxjatype must be loaded before me}\@ehc
- }{}%
- \fi}
-\ifzxjf@zxjatype\ifzxjf@prop
+%% detect zxjatype/xeCJK
+\unless\ifzxjf@ignore@jatype
+ \@ifpackageloaded{xeCJK}{\let\zxjf@jatype\zxjf@jatype@@xeCJK}{}
+ \@ifpackageloaded{zxjatype}{\let\zxjf@jatype\zxjf@jatype@@zxjatype}{}
+ \ifnum\zxjf@jatype=\zxjf@jatype@@none
+ \AtBeginDocument{%
+ \@ifpackageloaded{xeCJK}{%
+ \PackageError\zxjf@pkgname
+ {zxjatype/xeCJK must be loaded before zxjafont}\@ehc
+ }{}%
+ }
+ \fi
+\fi
+
+%% check for 'threeweight'
+\unless\ifzxjf@fontspec@mw\ifzxjf@threeweight
\PackageError\zxjf@pkgname
- {Option 'prop' cannot be used with zxjatype}\@ehc
- \zxjf@propfalse
+ {Option 'threeweight' cannot be used, bebause\MessageBreak
+ your 'fontspec' is too old}
+ {\@ehc}
+ \zxjf@threeweightfalse
\fi\fi
%% decide scale factor
\ifx\zxjf@scale\relax
- % If zxjatype is used, try \JaFontScale, \zxjt@scale,
+ % If zxjatype is used, try \zxjatypeJaScale, \zxjt@scale,
% and \__zxjt_scale_tl.
- \ifzxjf@zxjatype
- \ifdefined\JaFontScale \let\zxjf@scale\JaFontScale
- \else\ifdefined\zxjt@scale \let\zxjf@scale\zxjt@scale
- \else\ifcsname __zxjt_scale_tl\endcsname
+ \ifnum\zxjf@jatype=\zxjf@jatype@@zxjatype
+ \ifdefined\zxjatypeJaScale \let\zxjf@scale\zxjatypeJaScale
+ \else\if\zxjf@isvalid{zxjt@scale}\let\zxjf@scale\zxjt@scale
+ \else\if\zxjf@isvalid{__zxjt_scale_tl}%
\letcs\zxjf@scale{__zxjt_scale_tl}
\fi\fi\fi
\fi
@@ -137,253 +228,285 @@
\fi
\fi
-%% resolve CJKshape
-\edef\zxjf@feat{%
+%% \zxjf@whole@feature
+% All fontspec options including scale.
+\edef\zxjf@whole@feature{%
+ Scale=\zxjf@scale
+ % CJKShape
\ifcase\zxjf@cjkshape % none
- \or CJKShape=JIS1990,% 90jis
- \or CJKShape=JIS2004,% jis2004
+ \or ,CJKShape=JIS1990% 90jis
+ \or ,CJKShape=JIS2004% jis2004
\fi
- \zxjf@feat}
-
-%% \zxjf@xfeat
-% All fontspec options including scale.
-\edef\zxjf@xfeat{Scale=\zxjf@scale,\zxjf@feat}
-\bxDebug{zxjafont>>scale=\zxjf@scale/feat={\zxjf@feat}/%
+ \ifzxjf@expert
+ ,Style=HorizontalKana%
+ \fi
+ \ifdefined\zxjafontFeature
+ ,\expandonce\zxjafontFeature
+ \fi
+ \unless\ifx\zxjf@feature\@empty
+ ,\expandonce\zxjf@feature
+ \fi}
+\bxDebug{zxjafont>>scale=\zxjf@scale/feat={\zxjf@whole@feature}/%
preset=\zxjf@main@preset/\zxjf@sub@preset}
%--------------------------------------- font setup helpers
+%% \zxjf@font@set
+\zxjf@onlypreamble@def\zxjf@font@set#1#2{%
+ \noexpand#1[\expandonce\zxjf@whole@feature,#2]}
+%% \zxjf@newfamily@gen\CSnewjafamily
+\@onlypreamble\zxjf@newfamily@gen\edef\zxjf@newfamily@gen{%
+ \noexpand\zxjf@newfamily@gen@a
+ {\expandonce\zxjf@feature}{\expandonce\zxjf@whole@feature}}
+\zxjf@onlypreamble@def\zxjf@newfamily@gen@a#1#2#3{%
+ \def\zxjf@newfamily##1##2##3{%
+ \csedef{##1family}{%
+ \expandonce{\csname a##1family\endcsname}\noexpand\CJKfamily{##1}}%
+ \zxjf@with@cs\newfontfamily{a##1family}[#1,##2]{##3}%
+ #3{##1}[#2,##2]{##3}}}
+
%% \zxjf@setmainfont{<attributes>}{<fam_name>}, etc.
-\ifzxjf@zxjatype
-\def\zxjf@setmainfont#1{\setjamainfont[\zxjf@xfeat,#1]}
-\def\zxjf@setsansfont#1{\setjasansfont[\zxjf@xfeat,#1]}
-\def\zxjf@setmonofont#1{\setjamonofont[\zxjf@xfeat,#1]}
-\def\zxjf@newfamily#1#2#3{%
- \csedef{#1family}{%
- \expandonce{\csname a#1family\endcsname}\noexpand\CJKfamily{#1}}%
- \expandafter\newfontfamily\csname a#1family\endcsname[\zxjf@feat,#2]{#3}%
- \setjafamilyfont{#1}[\zxjf@xfeat,#2]{#3}}
+\ifnum\zxjf@jatype=\zxjf@jatype@@xeCJK
+\edef\zxjf@setmainfont#1{\zxjf@font@set\setCJKmainfont{#1}}
+\edef\zxjf@setsansfont#1{\zxjf@font@set\setCJKsansfont{#1}}
+\edef\zxjf@setmonofont#1{\zxjf@font@set\setCJKmonofont{#1}}
+\zxjf@newfamily@gen{\setCJKfamilyfont}
+\else\ifnum\zxjf@jatype=\zxjf@jatype@@zxjatype
+\edef\zxjf@setmainfont#1{\zxjf@font@set\setjamainfont{#1}}
+\edef\zxjf@setsansfont#1{\zxjf@font@set\setjasansfont{#1}}
+\edef\zxjf@setmonofont#1{\zxjf@font@set\setjamonofont{#1}}
+\zxjf@newfamily@gen{\setjafamilyfont}
\else
-\def\zxjf@setmainfont#1{\setmainfont[\zxjf@xfeat,#1]}
-\def\zxjf@setsansfont#1{\setsansfont[\zxjf@xfeat,#1]}
-\def\zxjf@setmonofont#1{\setmonofont[\zxjf@xfeat,#1]}
-\def\zxjf@newfamily#1#2{%
- \expandafter\newfontfamily\csname #1family\endcsname[\zxjf@xfeat,#2]}
-\fi
+\edef\zxjf@setmainfont#1{\zxjf@font@set\setmainfont{#1}}
+\edef\zxjf@setsansfont#1{\zxjf@font@set\setsansfont{#1}}
+\edef\zxjf@setmonofont#1{\zxjf@font@set\setmonofont{#1}}
+\edef\zxjf@newfamily#1#2{%
+ \unexpanded{\zxjf@with@cs\newfontfamily}{#1family}%
+ [\expandonce\zxjf@whole@feature,#2]}
+\fi\fi
%--------------------------------------- preset japanese font mappings
%% \zxjf@declare@preset{<name>}{<text>}, etc.
-\def\zxjf@declare@preset#1{%
- \expandafter\zxjf@decl@preset@a\csname zxjf@the@preset@#1\endcsname}
-\def\zxjf@decl@preset@a#1{\@onlypreamble#1\def#1}
+\zxjf@onlypreamble@def\zxjf@declare@preset#1{%
+ \zxjf@with@cs\zxjf@onlypreamble@def{zxjf@the@preset@#1}}
\zxjf@declare@preset{}{}
-\@onlypreamble\zxjf@uniweight
-\def\zxjf@uniweight#1#2{%
- \zxjf@uniweight@opt{#1}{#2}{}}
-\@onlypreamble\zxjf@uniweight@opt
-\def\zxjf@uniweight@opt#1#2#3{%
+\ifzxjf@fontspec@mw %TODO: temporary fix
+\zxjf@onlypreamble@def\zxjf@uniweight#1#2#3{%
+ \zxjf@setmainfont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#1}%
+ \zxjf@setsansfont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#2}%
+ \zxjf@setmonofont{#3,FontFace={bx}{n}{#2},BoldFont=#2}{#2}}
+\zxjf@onlypreamble@def\zxjf@multiweight#1#2#3#4#5#6#7#8{%
+ \ifzxjf@bold
+ \zxjf@setmainfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#2}%
+ \zxjf@setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#5}%
+ \zxjf@setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#5}%
+ \else\ifzxjf@oneweight
+ \zxjf@setmainfont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#2}%
+ \zxjf@setsansfont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#7}%
+ \zxjf@setmonofont{#8,FontFace={bx}{n}{#7},BoldFont=#7}{#7}%
+ \else\ifzxjf@threeweight
+ \zxjf@setmainfont{#8,FontFace={bx}{n}{#3},BoldFont=#3,
+ FontFace={l}{n}{#1}}{#2}%
+ \zxjf@setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
+ \zxjf@setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
+ \else
+ \zxjf@setmainfont{#8,FontFace={bx}{n}{#3},BoldFont=#3}{#2}%
+ \zxjf@setsansfont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#4}%
+ \zxjf@setmonofont{#8,FontFace={bx}{n}{#5},BoldFont=#5}{#4}%
+ \fi\fi\fi}
+\else
+\zxjf@onlypreamble@def\zxjf@uniweight#1#2#3{%
\zxjf@setmainfont{#3,BoldFont=#2}{#1}%
- \zxjf@setsansfont{#3}{#2}%
- \zxjf@setmonofont{#3}{#2}}
-\@onlypreamble\zxjf@multiweight
-\def\zxjf@multiweight#1#2#3#4#5{%
- \zxjf@multiweight@opt{#1}{#2}{#3}{#4}{#5}{}}
-\@onlypreamble\zxjf@multiweight@opt
-\def\zxjf@multiweight@opt#1#2#3#4#5#6{%
- \ifzxjf@oneweight
- \zxjf@setmainfont{#6,BoldFont=#5}{#1}%
- \zxjf@setsansfont{#6}{#5}%
- \zxjf@setmonofont{#6}{#5}%
+ \zxjf@setsansfont{#3,BoldFont=#2}{#2}%
+ \zxjf@setmonofont{#3,BoldFont=#2}{#2}}
+\zxjf@onlypreamble@def\zxjf@multiweight#1#2#3#4#5#6#7#8{%
+ \ifzxjf@bold
+ \zxjf@setmainfont{#8,BoldFont=#5}{#2}%
+ \zxjf@setsansfont{#8,BoldFont=#5}{#5}%
+ \zxjf@setmonofont{#8,BoldFont=#5}{#5}%
+ \else\ifzxjf@oneweight
+ \zxjf@setmainfont{#8,BoldFont=#7}{#2}%
+ \zxjf@setsansfont{#8,BoldFont=#7}{#7}%
+ \zxjf@setmonofont{#8,BoldFont=#7}{#7}%
+ \else\ifzxjf@threeweight
+ \zxjf@setmainfont{#8,BoldFont=#3,
+ FontFace={l}{n}{#1}}{#2}%
+ \zxjf@setsansfont{#8,BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
+ \zxjf@setmonofont{#8,BoldFont=#5,
+ FontFace={eb}{n}{#6}}{#4}%
\else
- \zxjf@setmainfont{#6,BoldFont=#2}{#1}%
- \zxjf@setsansfont{#6,BoldFont=#4}{#3}%
- \zxjf@setmonofont{#6,BoldFont=#4}{#3}%
- \fi}
+ \zxjf@setmainfont{#8,BoldFont=#3}{#2}%
+ \zxjf@setsansfont{#8,BoldFont=#5}{#4}%
+ \zxjf@setmonofont{#8,BoldFont=#5}{#4}%
+ \fi\fi\fi}
+\fi
%% \zxjf@declare@preset@with@prop{<name>}{<text>}
-\def\zxjf@declare@preset@with@prop#1#2{%
+\zxjf@onlypreamble@def\zxjf@declare@preset@with@prop#1#2{%
\zxjf@declare@preset{#1}{#2{RawFeature=-palt;-kern}}%
- \zxjf@declare@preset{#1/prop}{#2{RawFeature=+palt;+Wkern}}}
+ \zxjf@declare@preset{#1/prop}{#2{RawFeature=+palt;+kern}}}
%% \zxjf@declare@preset@alias{<name1>}{<name2>}
-\def\zxjf@declare@preset@alias#1#2{%
+\zxjf@onlypreamble@def\zxjf@declare@preset@alias#1#2{%
+ \zxjf@with@cs\@onlypreamble{zxjf@the@preset@#1}%
\csletcs{zxjf@the@preset@#1}{zxjf@the@preset@#2}}
%% \zxjf@declare@preset@alias@with@prop{<name1>}{<name2>}
-\def\zxjf@declare@preset@alias@with@prop#1#2{%
+\zxjf@onlypreamble@def\zxjf@declare@preset@alias@with@prop#1#2{%
\zxjf@declare@preset@alias{#1}{#2}%
\zxjf@declare@preset@alias{#1/prop}{#2/prop}}
+%% \zxjf@declare@preproc{<name>}{<text>}
+\zxjf@onlypreamble@def\zxjf@declare@preproc#1{%
+ \zxjf@with@cs\zxjf@onlypreamble@def{zxjf@the@preproc@#1}}
+%% \zxjf@declare@preproc@alias{<name1>}{<name2>}
+\zxjf@onlypreamble@def\zxjf@declare@preproc@alias#1#2{%
+ \zxjf@with@cs\@onlypreamble{zxjf@the@preproc@#1}%
+ \csletcs{zxjf@the@preproc@#1}{zxjf@the@preproc@#2}}
+
%% \zxjf@use@preset{<name>}
-\def\zxjf@use@preset#1{%
- \undef\zxjf@nxt
- \ifzxjf@prop \letcs\zxjf@nxt{zxjf@the@preset@#1/prop}\fi
- \unless\ifdefined\zxjf@nxt \letcs\zxjf@nxt{zxjf@the@preset@#1}\fi
- \zxjf@nxt}
+\zxjf@onlypreamble@def\zxjf@use@preset#1{%
+ \csuse{zxjf@the@preproc@#1}%
+ \undef\zxjf@do
+ \ifzxjf@prop \letcs\zxjf@do{zxjf@the@preset@#1/prop}\fi
+ \unless\ifdefined\zxjf@do \letcs\zxjf@do{zxjf@the@preset@#1}\fi
+ \zxjf@do}
%% definitions of main preset mappings
+\zxjf@declare@preset{nopreset}{}
+\zxjf@declare@preset{noembed}{%
+ \PackageWarningNoLine\zxjf@pkgname
+ {Preset 'noembed' is not supported, because\MessageBreak
+ XeTeX does not support non-embedded fonts,\MessageBreak
+ fallback to preset 'nopreset'}}
\zxjf@declare@preset{ms}{%
- \zxjf@uniweight{MS-Mincho}{MS-Gothic}}
+ \zxjf@uniweight{MS-Mincho}{MS-Gothic}{}}
\zxjf@declare@preset{ms/prop}{%
- \zxjf@uniweight{MS-PMincho}{MS-PGothic}}
+ \zxjf@uniweight{MS-PMincho}{MS-PGothic}{}}
\zxjf@declare@preset{ms-hg}{%
- \zxjf@multiweight{MS-Mincho}{HGMinchoE}%
- {HGGothicM}{HGGothicE}{MS-Gothic}}
+ \zxjf@multiweight{MS-Mincho}{MS-Mincho}{HGMinchoE}%
+ {HGGothicM}{HGGothicE}{hgrsgu.ttc}{MS-Gothic}{}}
\zxjf@declare@preset{ms-hg/prop}{%
- \zxjf@multiweight{MS-PMincho}{HGPMinchoE}%
- {HGPGothicM}{HGGothicE}{MS-PGothic}}
+ \zxjf@multiweight{MS-PMincho}{MS-PMincho}{HGPMinchoE}%
+ {HGPGothicM}{HGGothicE}{hgrsgu.ttc}{MS-PGothic}{}}
\zxjf@declare@preset{ipa}{%
- \zxjf@uniweight{IPAMincho}{IPAGothic}}
+ \zxjf@uniweight{IPAMincho}{IPAGothic}{}}
\zxjf@declare@preset{ipa/prop}{%
- \zxjf@uniweight{IPAPMincho}{IPAPGothic}}
+ \zxjf@uniweight{IPAPMincho}{IPAPGothic}{}}
\zxjf@declare@preset{ipa-hg}{%
- \zxjf@multiweight{IPAMincho}{HGMinchoE}%
- {HGGothicM}{HGGothicE}{IPAGothic}}
+ \zxjf@multiweight{IPAMincho}{IPAMincho}{HGMinchoE}%
+ {HGGothicM}{HGGothicE}{hgrsgu.ttc}{IPAGothic}{}}
\zxjf@declare@preset{ipa-hg/prop}{%
- \zxjf@multiweight{IPAPMincho}{HGPMinchoE}%
- {HGPGothicM}{HGGothicE}{IPAPGothic}}
+ \zxjf@multiweight{IPAPMincho}{IPAPMincho}{HGPMinchoE}%
+ {HGPGothicM}{HGGothicE}{hgrsgu.ttc}{IPAPGothic}{}}
\zxjf@declare@preset{ipaex}{%
- \zxjf@uniweight{IPAexMincho}{IPAexGothic}}
+ \zxjf@uniweight{\zxjf@Fa}{\zxjf@Fb}{}}
+\zxjf@declare@preproc{ipaex}{%
+ \zxjf@if@font@exists{ipaexm.ttf}%
+ {\def\zxjf@Fa{ipaexm.ttf}\def\zxjf@Fb{ipaexg.ttf}}%
+ {\def\zxjf@Fa{IPAexMincho}\def\zxjf@Fb{IPAexGothic}}}
\zxjf@declare@preset{ipaex-hg}{%
- \zxjf@multiweight{IPAexMincho}{HGSMinchoE}%
- {HGSGothicM}{HGSGothicE}{IPAexGothic}}
+ \zxjf@multiweight{\zxjf@Fa}{\zxjf@Fa}{HGSMinchoE}%
+ {HGSGothicM}{HGSGothicE}{hgrsgu.ttc}{\zxjf@Fb}{}}
+\zxjf@declare@preproc@alias{ipaex-hg}{ipaex}
\zxjf@declare@preset{moga}{%
- \zxjf@multiweight{MogaExMincho}{MogaExMincho Bold}%
- {MogaExGothic}{MogaExGothic Bold}{MogaExGothic}}
-\zxjf@declare@preset{moga-90}{%
- \zxjf@multiweight{MogaEx90Mincho}{MogaEx90Mincho Bold}%
- {MogaEx90Gothic}{MogaEx90Gothic Bold}{MogaEx90Gothic}}
+ \zxjf@multiweight{MogaEx\zxjf@Fa Mincho}{MogaEx\zxjf@Fa Mincho}%
+ {MogaEx\zxjf@Fa Mincho Bold}{MogaEx\zxjf@Fa Gothic}%
+ {MogaEx\zxjf@Fa Gothic Bold}{MogaEx\zxjf@Fa Gothic Bold}%
+ {MogaEx\zxjf@Fa Gothic}{}}
+\zxjf@declare@preset@alias{moga-90}{moga}
+\zxjf@declare@preset{mogaN-90}{%
+ \zxjf@multiweight{Moga\zxjf@Fa Mincho}{Moga\zxjf@Fa Mincho}%
+ {Moga\zxjf@Fa Mincho Bold}{Moga\zxjf@Fa Gothic}%
+ {Moga\zxjf@Fa Gothic Bold}{Moga\zxjf@Fa Gothic Bold}%
+ {Moga\zxjf@Fa Gothic}{}}
+\zxjf@declare@preproc{moga}{%
+ \edef\zxjf@Fa{\ifcase\zxjf@cjkshape \or 90\or \fi}}
+\zxjf@declare@preproc{moga-90}{%
+ \edef\zxjf@Fa{\ifcase\zxjf@cjkshape 90\or 90\or \fi}}
+\zxjf@declare@preproc@alias{mogaN-90}{moga-90}
\zxjf@declare@preset{ume}{%
- \zxjf@multiweight{Ume Mincho}{Ume Mincho}%
- {Ume Gothic}{Ume Gothic O5}{Ume Gothic O5}}
-\zxjf@declare@preset{kozuka-pro}{%
- \zxjf@multiweight@opt{KozMinPro-Regular}{KozMinPro-Bold}%
- {KozGoPro-Regular}{KozGoPro-Bold}%
- {KozGoPro-Medium}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka-pro/prop}{%
- \zxjf@multiweight@opt{KozMinPro-Regular}{KozMinPro-Bold}%
- {KozGoPro-Regular}{KozGoPro-Bold}%
- {KozGoPro-Medium}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka-pr6}{%
- \zxjf@multiweight@opt{KozMinProVI-Regular}{KozMinProVI-Bold}%
- {KozGoProVI-Regular}{KozGoProVI-Bold}%
- {KozGoProVI-Medium}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka-pr6/prop}{%
- \zxjf@multiweight@opt{KozMinProVI-Regular}{KozMinProVI-Bold}%
- {KozGoProVI-Regular}{KozGoProVI-Bold}%
- {KozGoProVI-Medium}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka-pr6n}{%
- \zxjf@multiweight@opt{KozMinPr6N-Regular}{KozMinPr6N-Bold}%
- {KozGoPr6N-Regular}{KozGoPr6N-Bold}%
- {KozGoPr6N-Medium}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka-pr6n/prop}{%
- \zxjf@multiweight@opt{KozMinPr6N-Regular}{KozMinPr6N-Bold}%
- {KozGoPr6N-Regular}{KozGoPr6N-Bold}%
- {KozGoPr6N-Medium}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{hiragino-pro}{%
- \zxjf@multiweight@opt{Hiragino Mincho Pro W3}{Hiragino Mincho Pro W6}%
- {Hiragino Kaku Gothic Pro W3}{Hiragino Kaku Gothic Pro W6}%
- {Hiragino Kaku Gothic Pro W6}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{hiragino-pro/prop}{%
- \zxjf@multiweight@opt{Hiragino Mincho Pro W3}{Hiragino Mincho Pro W6}%
- {Hiragino Kaku Gothic Pro W3}{Hiragino Kaku Gothic Pro W6}%
- {Hiragino Kaku Gothic Pro W6}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{hiragino-pron}{%
- \zxjf@multiweight@opt{Hiragino Mincho ProN W3}{Hiragino Mincho ProN W6}%
- {Hiragino Kaku Gothic ProN W3}{Hiragino Kaku Gothic ProN W6}%
- {Hiragino Kaku Gothic ProN W6}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{hiragino-pron/prop}{%
- \zxjf@multiweight@opt{Hiragino Mincho ProN W3}{Hiragino Mincho ProN W6}%
- {Hiragino Kaku Gothic ProN W3}{Hiragino Kaku Gothic ProN W6}%
- {Hiragino Kaku Gothic ProN W6}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{morisawa-pro}{%
- \zxjf@multiweight@opt{A-OTF-RyuminPro-Light.otf}{A-OTF-FutoMinA101Pro-Bold.otf}%
- {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-FutoGoB101Pro-Bold.otf}%
- {A-OTF-GothicBBBPro-Medium.otf}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{morisawa-pro/prop}{%
- \zxjf@multiweight@opt{A-OTF-RyuminPro-Light.otf}{A-OTF-FutoMinA101Pro-Bold.otf}%
- {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-FutoGoB101Pro-Bold.otf}%
- {A-OTF-GothicBBBPro-Medium.otf}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{morisawa-pr6n}{%
- \zxjf@multiweight@opt{A-OTF-RyuminPr6N-Light.otf}{A-OTF-FutoMinA101Pr6N-Bold.otf}%
- {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-FutoGoB101Pr6N-Bold.otf}%
- {A-OTF-GothicBBBPr6N-Medium.otf}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{morisawa-pr6n/prop}{%
- \zxjf@multiweight@opt{A-OTF-RyuminPr6N-Light.otf}{A-OTF-FutoMinA101Pr6N-Bold.otf}%
- {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-FutoGoB101Pr6N-Bold.otf}%
- {A-OTF-GothicBBBPr6N-Medium.otf}{RawFeature=+palt;+kern}}
-\zxjf@declare@preset{yu-win}{%
- \zxjf@multiweight@opt{YuMincho-Regular}{YuMincho-Demibold}%
- {YuGothic-Regular}{YuGothic-Bold}%
- {YuGothic-Regular}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{yu-win/prop}{%
- \zxjf@multiweight@opt{YuMincho-Regular}{YuMincho-Demibold}%
- {YuGothic-Regular}{YuGothic-Bold}%
- {YuGothic-Regular}{RawFeature=+palt;+kern}}
+ \zxjf@multiweight{Ume Mincho}{Ume Mincho}{Ume Mincho}%
+ {Ume Gothic}{Ume Gothic O5}{Ume Gothic O5}{Ume Gothic O5}{}}
+\zxjf@declare@preset@with@prop{kozuka-pro}{%
+ \zxjf@multiweight{KozMinPro-Light}{KozMinPro-Regular}{KozMinPro-Bold}%
+ {KozGoPro-Regular}{KozGoPro-Bold}{KozGoPro-Heavy}%
+ {KozGoPro-Medium}}
+\zxjf@declare@preset@with@prop{kozuka-pr6}{%
+ \zxjf@multiweight{KozMinProVI-Light}{KozMinProVI-Regular}{KozMinProVI-Bold}%
+ {KozGoProVI-Regular}{KozGoProVI-Bold}{KozGoProVI-Heavy}%
+ {KozGoProVI-Medium}}
+\zxjf@declare@preset@with@prop{kozuka-pr6n}{%
+ \zxjf@multiweight{KozMinPr6N-Light}{KozMinPr6N-Regular}{KozMinPr6N-Bold}%
+ {KozGoPr6N-Regular}{KozGoPr6N-Bold}{KozGoPr6N-Heavy}%
+ {KozGoPr6N-Medium}}
+\zxjf@declare@preset@with@prop{hiragino-pro}{%
+ \zxjf@multiweight{Hiragino Mincho Pro W2}{Hiragino Mincho Pro W3}{Hiragino Mincho Pro W6}%
+ {Hiragino Kaku Gothic Pro W3}{Hiragino Kaku Gothic Pro W6}{Hiragino Kaku Gothic Std W8}%
+ {Hiragino Kaku Gothic Pro W6}}
+\zxjf@declare@preset@with@prop{hiragino-pron}{%
+ \zxjf@multiweight{Hiragino Mincho ProN W2}{Hiragino Mincho ProN W3}{Hiragino Mincho ProN W6}%
+ {Hiragino Kaku Gothic ProN W3}{Hiragino Kaku Gothic ProN W6}{Hiragino Kaku Gothic StdN W8}%
+ {Hiragino Kaku Gothic ProN W6}}
+\zxjf@declare@preset@with@prop{morisawa-pro}{%
+ \zxjf(a)multiweight{A-OTF-RyuminPro-Light.otf}{A-OTF-RyuminPro-Light.otf}{A-OTF-FutoMinA101Pro-Bold.otf}%
+ {A-OTF-GothicBBBPro-Medium.otf}{A-OTF-FutoGoB101Pro-Bold.otf}{A-OTF-MidashiGoPro-MB31.otf}%
+ {A-OTF-GothicBBBPro-Medium.otf}}
+\zxjf@declare@preset@with@prop{morisawa-pr6n}{%
+ \zxjf(a)multiweight{A-OTF-RyuminPr6N-Light.otf}{A-OTF-RyuminPr6N-Light.otf}{A-OTF-FutoMinA101Pr6N-Bold.otf}%
+ {A-OTF-GothicBBBPr6N-Medium.otf}{A-OTF-FutoGoB101Pr6N-Bold.otf}{A-OTF-MidashiGoPr6N-MB31.otf}%
+ {A-OTF-GothicBBBPr6N-Medium.otf}}
+\zxjf@declare@preset@with@prop{yu-win}{%
+ \zxjf@multiweight{YuMincho-Light}{YuMincho-Regular}{YuMincho-Demibold}%
+ {YuGothic-Regular}{YuGothic-Bold}{YuGothic-Bold}%
+ {YuGothic-Regular}}
\zxjf@declare@preset@with@prop{yu-win10}{%
- \zxjf@multiweight@opt{YuMincho-Regular}{YuMincho-Demibold}%
- {YuGothic-Regular}{YuGothic-Bold}%
+ \zxjf@multiweight{YuMincho-Light}{YuMincho-Regular}{YuMincho-Demibold}%
+ {YuGothic-Regular}{YuGothic-Bold}{YuGothic-Bold}%
+ {YuGothic-Medium}}
+\zxjf@declare@preset@with@prop{yu-osx}{%
+ \zxjf@multiweight{YuMincho-Medium}{YuMincho-Medium}{YuMincho-Demibold}%
+ {YuGothic-Medium}{YuGothic-Bold}{YuGothic-Bold}%
{YuGothic-Medium}}
-\zxjf@declare@preset{yu-osx}{%
- \zxjf@multiweight@opt{YuMincho-Medium}{YuMincho-Demibold}%
- {YuGothic-Medium}{YuGothic-Bold}%
- {YuGothic-Medium}{RawFeature=-palt;-kern}}
-\zxjf@declare@preset{yu-osx/prop}{%
- \zxjf@multiweight@opt{YuMincho-Medium}{YuMincho-Demibold}%
- {YuGothic-Medium}{YuGothic-Bold}%
- {YuGothic-Medium}{RawFeature=+palt;+kern}}
\zxjf@declare@preset@with@prop{sourcehan}{%
- \zxjf@multiweight@opt{SourceHanSerif-Regular}{SourceHanSerif-Bold}%
- {SourceHanSans-Regular}{SourceHanSans-Bold}%
+ \zxjf@multiweight{SourceHanSerif-Light}{SourceHanSerif-Regular}{SourceHanSerif-Bold}%
+ {SourceHanSans-Regular}{SourceHanSans-Bold}{SourceHanSans-Heavy}%
{SourceHanSans-Medium}}
\zxjf@declare@preset@with@prop{sourcehan-jp}{%
- \zxjf@multiweight@opt{SourceHanSerifJP-Regular}{SourceHanSerifJP-Bold}%
- {SourceHanSansJP-Regular}{SourceHanSansJP-Bold}%
+ \zxjf@multiweight{SourceHanSerifJP-Light}{SourceHanSerifJP-Regular}{SourceHanSerifJP-Bold}%
+ {SourceHanSansJP-Regular}{SourceHanSansJP-Bold}{SourceHanSansJP-Heavy}%
{SourceHanSansJP-Medium}}
\zxjf@declare@preset@with@prop{noto}{%
- \zxjf@multiweight@opt{NotoSerifCJKjp-Regular}{NotoSerifCJKjp-Bold}%
- {NotoSansCJKjp-Regular}{NotoSansCJKjp-Bold}%
+ \zxjf@multiweight{NotoSerifCJKjp-Light}{NotoSerifCJKjp-Regular}{NotoSerifCJKjp-Bold}%
+ {NotoSansCJKjp-Regular}{NotoSansCJKjp-Bold}{NotoSansCJKjp-Black}%
{NotoSansCJKjp-Medium}}
\zxjf@declare@preset@with@prop{noto-jp}{%
- \zxjf@multiweight@opt{NotoSerifJP-Regular}{NotoSerifJP-Bold}%
- {NotoSansJP-Regular}{NotoSansJP-Bold}%
+ \zxjf@multiweight{NotoSerifJP-Light}{NotoSerifJP-Regular}{NotoSerifJP-Bold}%
+ {NotoSansJP-Regular}{NotoSansJP-Bold}{NotoSansJP-Black}%
{NotoSansJP-Medium}}
-%(obsolete)
-\zxjf@declare@preset{kozuka4}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
- {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka4/prop}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pro}{Kozuka Gothic Pro}%
- {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka6}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
- {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka6/prop}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pro-VI}{Kozuka Gothic Pro-VI}%
- {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{kozuka6n}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6N}%
- {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{kozuka6n/prop}{%
- \zxjf@uniweight@opt{Kozuka Mincho Pr6N}{Kozuka Gothic Pr6N}%
- {RawFeature=+palt;+kern}}
-\zxjf@declare@preset{hiragino}{%
- \zxjf@uniweight@opt{Hiragino Mincho Pro W3}{Hiragino Kaku Gothic Pro W6}%
- {RawFeature=-palt;-kern}}
-\zxjf@declare@preset{hiragino/prop}{%
- \zxjf@uniweight@opt{Hiragino Mincho Pro W3}{Hiragino Kaku Gothic Pro W6}%
- {RawFeature=+palt;+kern}}
+\zxjf@declare@preset@with@prop{haranoaji}{%
+ \zxjf@multiweight{HaranoAjiMincho-Light\zxjf@Fa}{HaranoAjiMincho-Regular\zxjf@Fa}{HaranoAjiMincho-Bold\zxjf@Fa}%
+ {HaranoAjiGothic-Regular\zxjf@Fa}{HaranoAjiGothic-Bold\zxjf@Fa}{HaranoAjiGothic-Heavy\zxjf@Fa}%
+ {HaranoAjiGothic-Medium\zxjf@Fa}}
+\zxjf@declare@preproc{haranoaji}{%
+ \zxjf@if@font@exists{HaranoAjiMincho-Regular.otf}%
+ {\def\zxjf@Fa{.otf}}{\let\zxjf@Fa\@empty}}
%(alias)
\zxjf@declare@preset@alias@with@prop{kozuka}{kozuka-pro}
\zxjf@declare@preset@alias@with@prop{morisawa}{morisawa-pro}
-\zxjf@declare@preset@alias{moga-mobo}{moga}
-%(alias-obsolete)
-\zxjf@declare@preset@alias{ms-dx}{ms-hg}
-\zxjf@declare@preset@alias{ms-dx/prop}{ms-hg/prop}
-\zxjf@declare@preset@alias{ipa-dx}{ipa-hg}
-\zxjf@declare@preset@alias{ipa-dx/prop}{ipa-hg/prop}
-\zxjf@declare@preset@alias{hiragino-dx}{hiragino-pro}
-\zxjf@declare@preset@alias{hiragino-dx/prop}{hiragino-pro/prop}
-
+\zxjf@declare@preset@alias{moga-mobo-ex}{moga-90}
+\zxjf@declare@preproc@alias{moga-mobo-ex}{moga-90}
+\zxjf@declare@preset@alias{moga-mobo}{mogaN-90}
+\zxjf@declare@preproc@alias{moga-mobo}{mogaN-90}
+\zxjf@declare@preset@alias@with@prop{noto-otf}{noto}
+\zxjf@declare@preset@alias@with@prop{hiragino}{hiragino-pro}
+
+%% \zxjf@declare@sub@preset@nf@with@prop{<name>}{<fam>}{<font>}
+\zxjf@onlypreamble@def\zxjf@declare@sub@preset@nf@with@prop#1#2#3{%
+ \zxjf@declare@preset{#1}{\zxjf@newfamily{#2}{RawFeature=-palt;-kern}{#3}}%
+ \zxjf@declare@preset{#1/prop}{\zxjf@newfamily{#2}{RawFeature=+palt;+kern}{#3}}}
%% definitions of sub preset mappings
\zxjf@declare@preset{hg}{%
\zxjf@newfamily{hgmc}{BoldFont=HGSMinchoE}{HGSMinchoB}%
@@ -407,40 +530,42 @@
\zxjf@newfamily{hggs}{}{HGPGyoshotai}%
\zxjf@newfamily{hgpp}{}{HGPSoeiKakupoptai}%
}
-\zxjf@declare@preset{hiraginomg-pro}{%
- \zxjf@newfamily{hmg}{RawFeature=-palt;-kern}{Hiragino Maru Gothic Pro W4}}
-\zxjf@declare@preset{hiraginomg-pro/prop}{%
- \zxjf@newfamily{hmg}{RawFeature=+palt;+kern}{Hiragino Maru Gothic Pro W4}}
-\zxjf@declare@preset{hiraginomg-pron}{%
- \zxjf@newfamily{hmg}{RawFeature=-palt;-kern}{Hiragino Maru Gothic ProN W4}}
-\zxjf@declare@preset{hiraginomg-pron/prop}{%
- \zxjf@newfamily{hmg}{RawFeature=+palt;+kern}{Hiragino Maru Gothic ProN W4}}
-\zxjf@declare@preset@alias{hiraginomg}{hiraginomg-pro}
-\zxjf@declare@preset@alias{hiraginomg/prop}{hiraginomg-pro/prop}
+\zxjf@declare@sub@preset@nf@with@prop{hiraginomg-pro}%
+ {hmg}{Hiragino Maru Gothic Pro W4}
+\zxjf@declare@sub@preset@nf@with@prop{hiraginomg-pron}%
+ {hmg}{Hiragino Maru Gothic ProN W4}
+\zxjf@declare@preset@alias@with@prop{hiraginomg}{hiraginomg-pro}
\zxjf@declare@preset{mobo}{%
- \zxjf@newfamily{mobo}{Bold=MoboExGothic Bold}{MoboExGothic}}
+ \zxjf@newfamily{mobo}{BoldFont=MoboExGothic Bold}{MoboExGothic}}
\zxjf@declare@preset{mobo-90}{%
- \zxjf@newfamily{mobo}{Bold=MoboEx90Gothic Bold}{MoboEx90Gothic}}
+ \zxjf@newfamily{mobo}{BoldFont=MoboEx90Gothic Bold}{MoboEx90Gothic}}
\zxjf@declare@preset{maruberi}{%
\zxjf@newfamily{mmg}{}{MotoyaLMaru}}
-%% warn for deprecated presets
-\@for\zxjf@x:={%
- kozuka4,kozuka6,kozuka6n,hiragino,ms-dx,ipa-dx,hiragino-dx%
-}\do{%
- \ifx\zxjf@x\zxjf@main@preset
- \PackageWarningNoLine\zxjf@pkgname
- {Old preset '\zxjf@x' is deprecated\MessageBreak
- (see the manual for detail)}%
- \fi}
-
%% ... and invokes the specified one!
\zxjf@use@preset{\zxjf@main@preset}
\@for\zxjf@x:=\zxjf@sub@preset\do{\zxjf@use@preset\zxjf@x}
%--------------------------------------- and some extras
+\ifzxjf@threeweight
+ %%<*> \ltdefault/\ltseries
+ \providecommand*\ltdefault{l}
+ \DeclareRobustCommand\ltseries{%
+ \not@math@alphabet\ltseries\relax
+ % \fontseries{\ltdefault} fails on New NFSS
+ % unless alphabetic font also has 'l' series.
+ \edef\f@series{\ltdefault}\selectfont
+ }
+ %%<*> \ebdefault/\ebseries
+ \providecommand*\ebdefault{eb}
+ \DeclareRobustCommand\ebseries{%
+ \not@math@alphabet\ebseries\relax
+ \edef\f@series{\ebdefault}\selectfont
+ }
+\fi
+
%%<*> \useeasyjapanesesettings
\newcommand*\useeasyjapanesesettings{%
\XeTeXlinebreaklocale "ja"\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjafont.tlpobj new/tlpkg/tlpobj/zxjafont.tlpobj
--- old/tlpkg/tlpobj/zxjafont.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zxjafont.tlpobj 2020-02-25 01:54:57.000000000 +0100
@@ -1,12 +1,11 @@
name zxjafont
category Package
-revision 47613
+revision 53884
shortdesc Set up Japanese font families for XeLaTeX
relocated 1
-runfiles size=5
+runfiles size=6
RELOC/tex/latex/zxjafont/zxjafont.sty
catalogue-ctan /language/japanese/zxjafont
-catalogue-date 2018-05-04 16:10:09 +0200
catalogue-license mit
catalogue-topics japanese font-supp xetex
-catalogue-version 0.4
+catalogue-version 1.2
++++++ zxjatype.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjatype/LICENSE new/doc/latex/zxjatype/LICENSE
--- old/doc/latex/zxjatype/LICENSE 2018-05-03 23:03:15.000000000 +0200
+++ new/doc/latex/zxjatype/LICENSE 2020-01-23 18:53:22.000000000 +0100
@@ -1,6 +1,6 @@
The MIT License
-Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjatype/README-ja.md new/doc/latex/zxjatype/README-ja.md
--- old/doc/latex/zxjatype/README-ja.md 2018-05-03 23:03:15.000000000 +0200
+++ new/doc/latex/zxjatype/README-ja.md 2020-01-23 18:53:22.000000000 +0100
@@ -23,22 +23,122 @@
zxjatype パッケージ ― 本体
---------------------------
-まだ解説が書けておりません…。基本的な機能の説明については以下の Web
-ページで行っていますのでそちらを参照してください。
+基本的な機能の説明については以下の Web ページでも行っているのでそちらも
+参照してほしい。
* [ZXjatype パッケージ]
(http://zrbabbler.sp.land.to/zxjatype.html)
+### パッケージ読込
+
+xeCJK と一緒に読み込む場合:
+
+ \usepackage[<オプション>...,<xeCJKのオプション>...]{zxjatype}
+
+xeCJK と別個に読み込む場合:
+
+ \usepackage[<xeCJKのオプション>...]{xeCJK}
+ \usepackage[<オプション>...]{zxjatype}
+
+有効なオプションは以下の通り:
+
+ * `default`:(既定)パッケージ読込直後に日本語用の設定への切替を行う。 (`\zxjapanesestyle` を実行する。)
+ * `nodefault`: `default` の否定。 xeCJK の初期設定が保持される。
+ * `CJKchecksingle`:(既定)xeCJK の文字ウィドウ抑制機能を有効にする。
+ (`CheckSingle=true` を設定する。)
+ * `noCJKchecksingle`: `CJKchecksingle` の否定。xeCJK の初期設定の通り
+ で文字ウィドウ抑制機能が無効になる。
+ * `adjustcharclass`:(既定)日本語の組版規則に合わせて xeCJK の文字
+ クラス設定を変更する。
+ * `noadjustcharclass`: `adjustcharclass` の否定。 xeCJK の文字クラス
+ 設定を変更しない。
+ * `kanakinsoku`: 小書き仮名を行頭禁則の対象にする。具体的には、これら
+ の文字の文字クラスを「閉じ括弧類」に変更する。
+ ※この扱いには副作用があって、直後に約物がある場合の空きが不正になる
+ (約物が並んでいると解釈されるため)。
+ * `nokanakinsoku`:(既定)小書き仮名を行頭禁則の対象にしない。具体的
+ にはこれらの文字の文字クラスを「通常 CJK 文字」に変更する。
+ ※`kanakinsoku`・`nokanakinsoku` の何れの場合も xeCJK の設定に変更を
+ 加えることに注意。変更したくない場合は `noadjustcharclass` にする。
+ * `useinhibitglue`: pTeX と互換の `\inhibitglue` 命令を定義する。
+ ※ただし現状の実装は不完全で問題があることが判っている。
+ * `nouseinhibitglue`:(既定) `useinhibitglue` の否定。`\inhibitglue`
+ は定義されない。
+ * `prefercjk`: 一部の記号類の文字クラスを「非 CJK 文字」(欧文扱い)
+ から「通常 CJK 文字」(和文扱い)に変更する。
+ ※和文扱いの範囲が LuaTeX-ja の初期状態とほぼ同じになる。
+ * `noprefercjk`:(既定)`prefercjk` の否定。
+
+### 機能
+
+xeCJK の CJK フォントファミリ設定において、`\setjafontscale` で設定された
+和文スケール値が `Scale` の値として設定される。以下の命令が対象となる。
+
+ - `\setCJKmainfont`
+ - `\setCJKsansfont`
+ - `\setCJKmonofont`
+ - `\setCJKfamilyfont`
+
+zxjatype の独自の命令。
+
+ * `\setjafontscale{<実数>}`: 和文スケール値を設定する。
+ ※空の引数も可能で、この場合は和文スケール値設定が抑止される。
+ * `\>`: 明示的に和欧文間空白を出力する。
+ ※数式モード中では LaTeX カーネルの定義が維持される。
+ ※他のパッケージで再定義が行われている場合は定義されない。
+ * `\inhibitglue`: その箇所で和文文字間に自動的に入る空白を抑制する。
+ ※`useinhibitglue` オプション指定時にのみ定義される。
+ * `\<`: `\inhibitglue` と同義。
+ ※他のパッケージで再定義が行われている場合は定義されない。
+ * `\textrawen{<テキスト>}`: 和文処理を無効化し、引数のテキストを欧文
+ フォントで出力する。
+ * `rawentext` 環境: `\textrawen` の環境版。
+ * `\textrawja{<テキスト>}`: 和文処理を無効化し、引数のテキストを和文
+ フォントで出力する。
+ * `rawjatext` 環境: `\textrawja` の環境版。
+ * `\zxjapanesestyle`: 日本語用の設定に切り替える。
+ ※この命令はユーザによる再定義が可能。
+ * `\zxusejapaneseparameter`: 和欧文間空白と和文間空白を日本語組版に
+ 適した値にする。
+ * `\zxuseoriginalparameter`: 和欧文間空白と和文間空白を xeCJK の初期
+ 設定に戻す。
+
+なお、`\zxjapanesestyle` の初期値は以下のとおりである:
+
+ \xeCJKsetup{
+ AllowBreakBetweenPuncts = true,
+ PunctStyle = fullwidth,
+ }%
+ \zxusejapaneseparameters
+
+### 旧版との互換のための命令
+
+ * `\setjamainfont`: xeCJK の `\setCJKmainfont` と同義。
+ * `\setjasansfont`: xeCJK の `\setCJKsansfont` と同義。
+ * `\setjamonofont`: xeCJK の `\setCJKmonofont` と同義。
+ * `\setjafamilyfont`: xeCJK の `\setCJKfamilyfont` と同義。
+ * `\jafamily`: xeCJK の `\CJKfamily` と同義。
+
+### 参考:0.6 版で廃止された機能
+
+ * `\(no)jafamilyinverbatim` 命令
+
更新履歴
--------
+ * Version 0.7 ‹2020/01/22›
+ - xeCJK 2.x 版の使用を非推奨(将来廃止予定)とする。
+ - `(no)prefercjk` オプションを新設。
+ - 和文スケール値を `\zxjatypeJaScale` に格納する。
+ - バグ修正。
+
* Version 0.6c ‹2018/05/03›
- バグ修正。
* Version 0.6b ‹2017/08/03›
- - (試験的) `(no)useinhibitglue` オプション。
- - (試験的) `(no)kanakinsoku` オプション。
+ - `(no)useinhibitglue` オプション。
+ - `(no)kanakinsoku` オプション。
* Version 0.6a ‹2017/08/02›
- バグ修正。
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/zxjatype/README.md new/doc/latex/zxjatype/README.md
--- old/doc/latex/zxjatype/README.md 2018-05-03 23:03:15.000000000 +0200
+++ new/doc/latex/zxjatype/README.md 2020-01-23 18:53:22.000000000 +0100
@@ -44,6 +44,7 @@
Revision History
----------------
+ * Version 0.7 ‹2020/01/22›
* Version 0.6c ‹2018/05/03›
* Version 0.6b ‹2017/08/03›
* Version 0.6a ‹2017/08/02›
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjatype.doc.tlpobj new/tlpkg/tlpobj/zxjatype.doc.tlpobj
--- old/tlpkg/tlpobj/zxjatype.doc.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zxjatype.doc.tlpobj 2020-01-24 01:57:35.000000000 +0100
@@ -1,9 +1,9 @@
name zxjatype.doc
category Package
-revision 47597
+revision 53500
shortdesc doc files of zxjatype
relocated 1
-docfiles size=48
+docfiles size=50
RELOC/doc/latex/zxjatype/LICENSE
RELOC/doc/latex/zxjatype/README-ja.md
RELOC/doc/latex/zxjatype/README.md
++++++ zxjatype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/zxjatype/zxjatype.sty new/tex/latex/zxjatype/zxjatype.sty
--- old/tex/latex/zxjatype/zxjatype.sty 2018-05-03 23:03:15.000000000 +0200
+++ new/tex/latex/zxjatype/zxjatype.sty 2020-01-23 18:53:22.000000000 +0100
@@ -1,7 +1,7 @@
%%
%% This is file 'zxjatype.sty'.
%%
-%% Copyright (c) 2018 Takayuki YATO (aka. "ZR")
+%% Copyright (c) 2009-2020 Takayuki YATO (aka. "ZR")
%% GitHub: https://github.com/zr-tex8r
%% Twitter: @zr_tex8r
%%
@@ -10,11 +10,12 @@
%% package declaration
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{zxjatype}[2018/05/03 v0.6c ZX Japanese typeset]
+\ProvidesPackage{zxjatype}[2020/01/22 v0.7 ZX Japanese typeset]
\RequirePackage{ifxetex}\RequireXeTeX
%% code guards
\edef\zxjt@restore@codes{%
+ \catcode33=\the\catcode33%
\catcode34=\the\catcode34%
\catcode39=\the\catcode39%
\catcode43=\the\catcode43%
@@ -24,11 +25,13 @@
\catcode58=\the\catcode58%
\catcode60=\the\catcode60%
\catcode62=\the\catcode62%
- \catcode63=\the\catcode63%
\catcode94=\the\catcode94%
\catcode96=\the\catcode96%
+ \catcode124=\the\catcode124%
+ \catcode126=\the\catcode126%
\endlinechar=\the\endlinechar%
\relax}
+\catcode33=12 % <!>
\catcode34=12 % <">
\catcode39=12 % <'>
\catcode43=12 % <+>
@@ -38,9 +41,10 @@
\catcode58=12 % <:>
\catcode60=12 % <<>
\catcode62=12 % <>>
-\catcode63=12 % <?>
\catcode94=7 % <^>
\catcode96=12 % <`>
+\catcode124=12 % <|>
+\catcode126=13 % <~>
\AtEndOfPackage{%
\zxjt@restore@codes
\let\zxjt@restore@codes\@undefined
@@ -49,7 +53,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% BOOTSTRAP CODE
-%
+%
%% definitions
\def\zxjt@pkgname{zxjatype}
@@ -58,7 +62,8 @@
\newif\ifzxjt@adjustcharclass
\newif\ifzxjt@kanakinsoku
\newif\ifzxjt@useinhibitglue
-\providecommand*\bxDebug{\@gobble}
+\newif\ifzxjt@prefercjk
+\providecommand\bxDebug[1]{}
%% process options
\DeclareOption{default}{\zxjt@defaulttrue}
@@ -76,6 +81,8 @@
\DeclareOption{nokanakinsoku}{\zxjt@kanakinsokufalse}
\DeclareOption{useinhibitglue}{\zxjt@useinhibitgluetrue}
\DeclareOption{nouseinhibitglue}{\zxjt@useinhibitgluefalse}
+\DeclareOption{prefercjk}{\zxjt@prefercjktrue}
+\DeclareOption{noprefercjk}{\zxjt@prefercjkfalse}
%
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{xeCJK}}
\ExecuteOptions{default,CJKchecksingle,adjustcharclass}
@@ -90,6 +97,10 @@
\let\zxjt@go@to@main\@empty
}{%
\bxDebug{xeCJK v2.x found.}%
+ \PackageWarningNoLine\zxjt@pkgname
+ {!!!!!!!! IMPORTANT !!!!!!!!\MessageBreak
+ Support for xeCJK v2.x will be *dropped*\MessageBreak
+ in the near future}
\long\def\zxjt@go@to@main#1\zxjt@begin@old@code{}%
}
@@ -130,6 +141,11 @@
\ifzxjt@useinhibitglue
\bool_set_true:N \l__zxjt_useinhibitglue_bool
\fi
+%% \l__zxjt_prefercjk_bool
+\bool_new:N \l__zxjt_prefercjk_bool
+\ifzxjt@prefercjk
+ \bool_set_true:N \l__zxjt_prefercjk_bool
+\fi
%%-------------------------------------- error messages
@@ -150,8 +166,8 @@
}
\__zxjt_msg_new:nn { jafamilyinverbatim-disabled }
{
- \token_to_str:N \(no)jafamilyinverbatim \c_space_tl
- ~is~disabled~in~this~version.
+ \token_to_str:N \( no)jafamilyinverbatim~
+ is~disabled~in~this~version.
}
\__zxjt_msg_new:nn { CJKfam-failed }
{
@@ -181,9 +197,9 @@
% (A mere \scan_stop: suffices?)
\cs_new:Nn \__zxjt_boundary:
{
- \ifhmode
+ \if_mode_horizontal:
\hbox:n {}
- \fi
+ \fi:
}
%% \__zxjt_leavevmode:
@@ -259,7 +275,7 @@
\AtBeginDocument
{
\cs_set_eq:NN \__zxjt_after_decl_CJKfam:n \__zxjt_after_decl_CJKfam_db:n
- \seq_remove_duplicates:N \g__zxjt_CJKfam_seq
+ \seq_gremove_duplicates:N \g__zxjt_CJKfam_seq
\seq_map_function:NN \g__zxjt_CJKfam_seq \__zxjt_after_decl_CJKfam:n
\seq_gclear:N \g__zxjt_CJKfam_seq
}
@@ -332,7 +348,7 @@
\bxDebug { family( #1 )~<=~ \g__zxjt_onefam_info_tl }
\tl_if_empty:NF \g__zxjt_onefam_info_tl
{
- \prop_put:NnV \g__zxjt_CJKfam_prop { #1 } \g__zxjt_onefam_info_tl
+ \prop_gput:NnV \g__zxjt_CJKfam_prop { #1 } \g__zxjt_onefam_info_tl
}
}
@@ -360,6 +376,8 @@
% The encoding used for CJK-families.
\tl_new:N \g__zxjt_encoding_tl
\tl_gset:Nn \g__zxjt_encoding_tl { EU1 }
+\cs_if_exist:NT \g_fontspec_encoding_tl
+ { \tl_set_eq:NN \g__zxjt_encoding_tl \g_fontspec_encoding_tl }
%% \__zxjt_use_CJKfam:
% Switches the NFSS family to the family corresponding to the current CJK-
@@ -501,6 +519,7 @@
"30E7, "30EE, "30F5, "30F6, "30FC, "31F0, "31F1, "31F2, "31F3, "31F4,
"31F5, "31F6, "31F7, "31F8, "31F9, "31FA, "31FB, "31FC, "31FD, "31FE,
"31FF, "309D, "309E, "30FD, "30FE,
+ "1B150, "1B151, "1B152, "1B164, "1B165, "1B166, "1B167,
}
\xeCJKDeclareCharClass { FullRight }
{
@@ -518,6 +537,36 @@
\xeCJKsetup { LongPunct+ = { ^^^^2015 } }
}
+\bool_if:NT \l__zxjt_prefercjk_bool
+ {
+ \clist_map_inline:nn
+ {
+ "2002, "2010, "2011, "2016, "201A, "201E, "2020, "2021,
+ "2022, "2030, "2032, "2033, "2039, "203A, "203B, "203C,
+ "203E, "203F, "2042, "2044, "2047, "2048, "2049, "2051
+ }
+ { \XeTeXcharclass #1 = \c__zxjt_CJK_class_int }
+ \clist_map_inline:nn
+ {
+ { "2070, "243F },
+ { "2460, "27BF },
+ { "2900, "29FF },
+ { "2B00, "2BFF },
+ { "FE50, "FE6F },
+ { "1F100, "1F1DF }
+ }
+ {
+ \clist_set:Nn \l_tmpa_clist {#1}
+ \int_step_inline:nnn
+ { \clist_item:Nn \l_tmpa_clist { 1 } }
+ { \clist_item:Nn \l_tmpa_clist { 2 } }
+ {
+ \int_compare:nNnF { \XeTeXcharclass ##1 } = { \c__zxjt_CJK_class_int }
+ { \XeTeXcharclass ##1 = \c__zxjt_CJK_class_int }
+ }
+ }
+ }
+
%%-------------------------------------- public commands
%%<*> \setjamainfont / \setjasansfont / \setjamonofont
@@ -571,23 +620,29 @@
}
}
-%% \__zxjt_scale_tl
+%% \l__zxjt_scale_tl
% The scale value to be applied to CJK fonts.
-\tl_new:N \__zxjt_scale_tl
+\tl_new:N \l__zxjt_scale_tl
%% \l__zxjt_scale_spec_tl
\tl_new:N \l__zxjt_scale_spec_tl
+%%<+> \zxjatypeJaScale
+% The scale value to be applied to CJK fonts.
+% (Same as \l__zxjt_scale_tl, but developer-level public.)
+
%%<*> \setjafontscale{<real>}
-%% Sets the value of \__zxjt_scale_tl, which defaults to 1.
+%% Sets the value of \l__zxjt_scale_tl, which defaults to 1.
\NewDocumentCommand \setjafontscale { m }
{
% NB: the argument is not expanded
- \tl_set:Nn \__zxjt_scale_tl { #1 }
- \tl_if_blank:VTF \__zxjt_scale_tl
+ \tl_set:Nn \l__zxjt_scale_tl { #1 }
+ \tl_set_eq:NN \zxjatypeJaScale \l__zxjt_scale_tl
+ \tl_set_eq:cN { __zxjt_scale_tl } \l__zxjt_scale_tl
+ \tl_if_blank:VTF \l__zxjt_scale_tl
{ \tl_clear:N \l__zxjt_scale_spec_tl }
- {
+ {
\tl_set:Nn \l__zxjt_scale_spec_tl
- { Scale = \__zxjt_scale_tl , }
+ { Scale = \l__zxjt_scale_tl , }
}
}
@@ -616,11 +671,11 @@
{
\cs_set:Npn \>
{
- \ifmmode
+ \if_mode_math:
\mskip \medmuskip
- \else
+ \else:
\CJKecglue \scan_stop:
- \fi
+ \fi:
}
}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/zxjatype.tlpobj new/tlpkg/tlpobj/zxjatype.tlpobj
--- old/tlpkg/tlpobj/zxjatype.tlpobj 2019-02-28 04:19:21.000000000 +0100
+++ new/tlpkg/tlpobj/zxjatype.tlpobj 2020-01-24 01:57:35.000000000 +0100
@@ -1,12 +1,11 @@
name zxjatype
category Package
-revision 47597
+revision 53500
shortdesc Standard conforming typesetting of Japanese, for XeLaTeX
relocated 1
runfiles size=8
RELOC/tex/latex/zxjatype/zxjatype.sty
catalogue-ctan /language/japanese/zxjatype
-catalogue-date 2018-05-03 14:56:59 +0200
catalogue-license mit
catalogue-topics std-conform japanese xetex
-catalogue-version 0.6c
+catalogue-version 0.7
1
0
Hello community,
here is the log from the commit of package texlive-specs-y for openSUSE:Factory checked in at 2020-05-29 21:19:39
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-y (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-y.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-y"
Fri May 29 21:19:39 2020 rev:40 rq:806935 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-y/texlive-specs-y.changes 2019-11-07 23:12:38.676279665 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-y.new.3606/texlive-specs-y.changes 2020-05-29 21:34:31.930141771 +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:
----
updmap-map_roboto.dif
wasy2-ps.doc.tar.xz
wasy2-ps.tar.xz
New:
----
unam-thesis.doc.tar.xz
unam-thesis.tar.xz
unicode-alphabets.doc.tar.xz
unicode-alphabets.tar.xz
unifith.doc.tar.xz
unifith.tar.xz
uniquecounter.doc.tar.xz
uniquecounter.tar.xz
unizgklasa.doc.tar.xz
unizgklasa.tar.xz
verifica.doc.tar.xz
verifica.tar.xz
vtable.doc.tar.xz
vtable.tar.xz
wasy-type1.doc.tar.xz
wasy-type1.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-y.spec ++++++
++++ 11307 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-y/texlive-specs-y.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-y.new.3606/texlive-specs-y.spec
++++++ ucsmonograph.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucsmonograph/README.md new/doc/latex/ucsmonograph/README.md
--- old/doc/latex/ucsmonograph/README.md 2018-11-23 22:43:08.000000000 +0100
+++ new/doc/latex/ucsmonograph/README.md 2019-11-08 22:41:32.000000000 +0100
@@ -114,11 +114,19 @@
* Paragraph first line indent.
v1.2.0 (2018-11-22, Henrique Baron):
-* Added macros `\areadoconhecimento`, `\avaliadori`, `\avaliadorii`, `\avaliadorext` and `\incluirimagem*`;
+* Added macros `\areadoconhecimento`, `\avaliadori`, `\avaliadorii`, `\avaliadorext` and `\incluirimagem`;
* Layout changes in the content generated by the `\imprimircapa`, `\imprimirfolhaderosto` and `\imprimirfolhadeaprovacao` macros;
* The `\imprimirfolhadeaprovacao` macro now takes only one mandatory argument;
* Package `\icomma` automatically included;
-* Page vertical layout improved with `\raggedbottom` instead of `\flushbottom`.
+
+v1.2.1 (Henrique Baron):
+* Compatibility fix due to an update of the package `enumerate`;
+
+v1.3.0 (2019-11-07, Henrique Baron):
+* Improvements on the `epigrafe` environment;
+* Fix on the `\imprimirfolhaderosto` macro;
+* Multi-language support for the `resumo` environment and the `\palavraschave` macro;
+* Created macro `\imprimirpalavraschave`.
# ucsmonograph - Português (BR)
Esta é uma classe LaTeX para formatação de trabalhos acadêmicos segundo o Guia para Elaboração de Trabalhos Acadêmicos da Universidade de Caxias do Sul.
Binary files old/doc/latex/ucsmonograph/ucsmonograph.pdf and new/doc/latex/ucsmonograph/ucsmonograph.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucsmonograph.doc.tlpobj new/tlpkg/tlpobj/ucsmonograph.doc.tlpobj
--- old/tlpkg/tlpobj/ucsmonograph.doc.tlpobj 2019-02-28 04:10:37.000000000 +0100
+++ new/tlpkg/tlpobj/ucsmonograph.doc.tlpobj 2019-11-09 01:55:14.000000000 +0100
@@ -1,8 +1,8 @@
name ucsmonograph.doc
category Package
-revision 49389
+revision 52698
shortdesc doc files of ucsmonograph
relocated 1
-docfiles size=104
+docfiles size=107
RELOC/doc/latex/ucsmonograph/README.md
RELOC/doc/latex/ucsmonograph/ucsmonograph.pdf
++++++ ucsmonograph.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ucsmonograph/ucsmonograph.cls new/tex/latex/ucsmonograph/ucsmonograph.cls
--- old/tex/latex/ucsmonograph/ucsmonograph.cls 2018-12-11 23:24:26.000000000 +0100
+++ new/tex/latex/ucsmonograph/ucsmonograph.cls 2019-11-08 22:41:32.000000000 +0100
@@ -31,7 +31,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{ucsmonograph}
-[2018/12/10 v1.2.1 Padrao de monografias da UCS]
+[2019/11/07 v1.3.0 Padrao de monografias da UCS]
\RequirePackage{ifthen}
@@ -142,6 +142,17 @@
\setabbreviationstyle[foreignabbreviation]{long-short-user}%
}{}
+\newcommand{\palavraschavename}{Palavras-chave:}
+\addto\captionsenglish{
+ \renewcommand\palavraschavename{Keywords:}
+}
+\addto\captionsgerman{
+ \renewcommand\palavraschavename{Stichw\"orter:}
+}
+\addto\captionsspanish{
+ \renewcommand\palavraschavename{Palabras-llave:}
+}
+
\newcommand{\quadroname}{Quadro}
\newcommand{\listquadroname}{Lista de quadros}
@@ -260,6 +271,14 @@
\end{capa}%
}
+\renewenvironment{folhaderosto}[1]{\clearpage\PRIVATEbookmarkthis{#1}}{\cleardoublepage}
+\renewenvironment{folhaderosto*}[1]{\clearpage\PRIVATEbookmarkthis{#1}}{\newpage}
+
+\renewcommand{\imprimirfolhaderosto}[1][\folhaderostoname]{%
+\@ifstar{\imprimirfolhaderostostar#1}{%
+\imprimirfolhaderostonostar#1}
+}
+
\renewcommand{\folhaderostocontent}{%
\bfseries\centering%
\expandafter\uppercase\expandafter{\theauthor}%
@@ -315,6 +334,53 @@
\@oldenddedicatoria%
}
+\let\@oldepigrafe\epigrafe
+\let\@oldendepigrafe\endepigrafe
+\def\epigrafe{%
+\@oldepigrafe %
+\vspace*{\fill}%
+\hspace{0.5\textwidth}%
+\begin{minipage}[b]{.45\textwidth}%
+\SingleSpacing\itshape\raggedleft%
+}
+\def\endepigrafe{%
+\end{minipage}%
+\@oldendepigrafe
+}
+
+\renewcommand\abstractnamefont\chaptitlefont
+\newboolean{@abstractotherlanguage}
+\setboolean{@abstractotherlanguage}{false}
+\DeclareRobustCommand\resumo{\@ifnextchar[{\@@resumo}{\@resumo}}
+\def\@resumo{%
+\let\@oldabstractname\abstractname
+\PRIVATEbookmarkthis{\abstractname}
+\def\abstractname{\MakeUppercase{\@oldabstractname}}
+\begin{abstract}
+\SingleSpacing
+}
+\def\@@resumo[#1]{%
+\begin{otherlanguage}{#1}
+\setboolean{@abstractotherlanguage}{true}
+\let\@oldabstractname\abstractname
+\PRIVATEbookmarkthis{\abstractname}
+\def\abstractname{\MakeUppercase{\@oldabstractname}}
+\begin{abstract}
+\SingleSpacing
+}
+\def\endresumo{%
+\vspace{\onelineskip}\par
+\imprimirpalavraschave
+\end{abstract}
+\PRIVATEclearpageifneeded
+\ifthenelse{\boolean{@abstractotherlanguage}}{\end{otherlanguage}}{}
+\setboolean{@abstractotherlanguage}{false}
+\def\abstractname\@oldabstractname
+}
+
+\newcommand\imprimirpalavraschave{%
+\textbf{\palavraschavename}\ \@palavraschavecontent}
+
\let\@oldtitulo\titulo
\renewcommand{\titulo}[1]{%
\@oldtitulo{#1}
@@ -394,13 +460,19 @@
\let\@oldforeignlanguage\foreignlanguage
\renewcommand{\foreignlanguage}[2]{\@oldforeignlanguage{#1}{\emph{#2}}}
-\newcommand{\@palavraschave}{}
-\newcommand{\palavraschave}[1]{%
-\renewcommand{\@palavraschave}{#1}
+\newcommand{\@palavraschavecontent}{}
+\DeclareRobustCommand\palavraschave{\@ifnextchar[{\@@palavraschave}{\@palavraschave}}
+\def\@palavraschave#1{%
+\renewcommand\@palavraschavecontent{#1}
\hypersetup{%
pdfkeywords={#1}
}
}
+\def\@@palavraschave[#1]#2{
+\expandafter\addto\csname captions#1\endcsname{
+\renewcommand\@palavraschavecontent{#2}
+}
+}
\newcommand\@areadoconhecimento{}
\newcommand\areadoconhecimento[1]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucsmonograph.tlpobj new/tlpkg/tlpobj/ucsmonograph.tlpobj
--- old/tlpkg/tlpobj/ucsmonograph.tlpobj 2019-02-28 04:10:37.000000000 +0100
+++ new/tlpkg/tlpobj/ucsmonograph.tlpobj 2019-11-09 01:55:14.000000000 +0100
@@ -1,6 +1,6 @@
name ucsmonograph
category Package
-revision 49389
+revision 52698
shortdesc Typesetting academic documents from the University of Caxias do Sul
relocated 1
longdesc This is a LaTeX class for typesetting academic documents
@@ -14,7 +14,7 @@
catalogue-contact-repository https://github.com/HenriqueBaron/ucsmonograph
catalogue-contact-support https://tex.stackexchange.com/users/153467/henrique-baron
catalogue-ctan /macros/latex/contrib/ucsmonograph
-catalogue-date 2018-12-11 07:40:11 +0100
+catalogue-date 2019-11-08 11:06:51 +0100
catalogue-license lppl1.3c
catalogue-topics class dissertation portuguese-br
-catalogue-version 1.2.1
+catalogue-version 1.3.0
++++++ udesoftec.doc.tar.xz ++++++
Binary files old/doc/latex/udesoftec/udesoftec-doc.pdf and new/doc/latex/udesoftec/udesoftec-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/udesoftec.doc.tlpobj new/tlpkg/tlpobj/udesoftec.doc.tlpobj
--- old/tlpkg/tlpobj/udesoftec.doc.tlpobj 2019-02-28 04:10:37.000000000 +0100
+++ new/tlpkg/tlpobj/udesoftec.doc.tlpobj 2020-03-10 01:48:40.000000000 +0100
@@ -1,7 +1,7 @@
name udesoftec.doc
category Package
-revision 47164
+revision 54215
shortdesc doc files of udesoftec
relocated 1
-docfiles size=119
+docfiles size=118
RELOC/doc/latex/udesoftec/udesoftec-doc.pdf
++++++ udesoftec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/udesoftec/udesoftec.bst new/bibtex/bst/udesoftec/udesoftec.bst
--- old/bibtex/bst/udesoftec/udesoftec.bst 2018-03-28 23:08:29.000000000 +0200
+++ new/bibtex/bst/udesoftec/udesoftec.bst 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec.bst
%% Copyright 2014-2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.7.0 udesoftec
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/udesoftec/udesoftec-bibcommon.sty new/tex/latex/udesoftec/udesoftec-bibcommon.sty
--- old/tex/latex/udesoftec/udesoftec-bibcommon.sty 2018-03-28 23:08:29.000000000 +0200
+++ new/tex/latex/udesoftec/udesoftec-bibcommon.sty 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec-biblatex.sty
%% Copyright 2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.7.0 udesoftec
%
% This work may be distributed and/or modified under the
@@ -40,7 +40,7 @@
% http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{udesoftec-bibcommon}[2018/03/28 v1.6.2 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]%
+\ProvidesPackage{udesoftec-bibcommon}[2020/03/09 v1.6.6 udesoftec-bibcommon.sty udesoftec bibstyle configuration commons]%
\newif\ifprimaryDocumentLanguageGerman
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/udesoftec/udesoftec-biblatex.sty new/tex/latex/udesoftec/udesoftec-biblatex.sty
--- old/tex/latex/udesoftec/udesoftec-biblatex.sty 2018-03-28 23:08:29.000000000 +0200
+++ new/tex/latex/udesoftec/udesoftec-biblatex.sty 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec-biblatex.sty
%% Copyright 2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.7.0 udesoftec
%
% This work may be distributed and/or modified under the
@@ -40,7 +40,7 @@
% http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{udesoftec-biblatex}[2018/03/28 v1.6.2 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]%
+\ProvidesPackage{udesoftec-biblatex}[2020/03/09 v1.6.6 udesoftec-biblatex.sty udesoftec bibstyle configuration for biblatex]%
%
% \newif\ifprimaryDocumentLanguageGerman
@@ -337,11 +337,7 @@
\newunit}}
\defbibheading{udesoftec}[\bibname]{%
- \renewcommand*{\chapterformatsimple}{}
- \let\chapterformat\chapterformatsimple%
- \chapter{#1}%
- \addcontentsline{toc}{chapter}{#1}%
- \let\chapterformat\defaultchapterformat%
+ \addchap{#1}
}
\renewbibmacro*{author}{%
\ifboolexpr{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/udesoftec/udesoftec-bst.sty new/tex/latex/udesoftec/udesoftec-bst.sty
--- old/tex/latex/udesoftec/udesoftec-bst.sty 2018-03-28 23:08:29.000000000 +0200
+++ new/tex/latex/udesoftec/udesoftec-bst.sty 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec-bst.sty
%% Copyright 2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.7.0 udesoftec
%
% This work may be distributed and/or modified under the
@@ -40,7 +40,7 @@
% http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{udesoftec-bst}[2018/03/28 v1.6.2 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]%
+\ProvidesPackage{udesoftec-bst}[2020/03/09 v1.6.6 udesoftec-bst.sty udesoftec bibstyle configuration for bibtex]%
\newif\ifprimaryDocumentLanguageGerman
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/udesoftec/udesoftec-extra.sty new/tex/latex/udesoftec/udesoftec-extra.sty
--- old/tex/latex/udesoftec/udesoftec-extra.sty 2018-03-28 23:08:29.000000000 +0200
+++ new/tex/latex/udesoftec/udesoftec-extra.sty 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec-extra.sty
%% Copyright 2013-2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.6.6 udesoftec
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -38,6 +38,6 @@
% and
% http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesPackage{udesoftec-extra}[2018/03/28 v1.6.2 udesoftec-extra.sty additions which are currently optional and may break former behaviour]%
+\ProvidesPackage{udesoftec-extra}[2020/03/09 v1.6.6 udesoftec-extra.sty additions which are currently optional and may break former behaviour]%
%%%%%%%%%%%%%%%%%%%%%%%%%
% empty - everything from 1.4.x is merged into main files
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/udesoftec/udesoftec.cls new/tex/latex/udesoftec/udesoftec.cls
--- old/tex/latex/udesoftec/udesoftec.cls 2018-03-28 23:08:29.000000000 +0200
+++ new/tex/latex/udesoftec/udesoftec.cls 2020-03-09 22:13:37.000000000 +0100
@@ -1,7 +1,7 @@
% !Mode:: "TeX:UTF-8"
%% udesoftec.cls
%% Copyright 2013-2015 J. Peter M. Schuler
-%% 2018/03/28 v1.6.2 udesoftec
+%% 2020/03/09 v1.7.0 udesoftec
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,11 +39,11 @@
% http://mirrors.ctan.org/macros/latex/contrib/udesoftec/udesoftec-doc.pdf
\NeedsTeXFormat{LaTeX2e}%
-\ProvidesClass{udesoftec}[2018/03/28 v1.6.2 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]%
+\ProvidesClass{udesoftec}[2020/03/09 v1.6.6 udesoftec.cls Thesis class and bibstyle for UDE SOFTEC]%
% class is based on KOMA-script http://www.ctan.org/pkg/koma-script
-\LoadClass{scrbook}
-\KOMAoptions{
+\LoadClass{scrbook}
+\KOMAoptions{%
twoside=true,
headings=openright, % same as documentclassoption openany/openright
numbers=noenddot, % section numbering without dot
@@ -52,7 +52,7 @@
listof=totoc,
headlines=1.5 % the size of the header in lines (1.5 because of pagemark and sepline); 1.25 is default; 1 would be appropriate if only text and no sepline)
}
-%%%% nag %%%%%%%%%%%%%
+%%%% nag %%%%%%%%%%%%%
% purpose: identifies deprecated code and suggests better pckgs
% source: http://www.ctan.org/pkg/nag
\RequirePackage[l2tabu, orthodox]{nag}
@@ -128,7 +128,7 @@
%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%
%%% all default values and the options
-\fallBackToBibtextrue
+\fallBackToBibtextrue
\documentIsFinalfalse
\documentIsProposalfalse
\documentOmitLOTfalse
@@ -142,17 +142,17 @@
\documentOmitTodosfalse
\documentOmitAfalse
\documentOmitAenfalse
-\documentOmitCCtrue
+\documentOmitCCtrue
\documentHasShortAtrue
\documentUsedTodosfalse
\templateUseColorfulLinkstrue
\templateUseSansSerifFonttrue
-\templateUseBookLayoutfalse
+\templateUseBookLayoutfalse
\templateVawifalse
\templateVawiEssenfalse
\templateVawiBambergfalse
\templateAddChapterToFigureNumberingfalse
-\templateUseCustomMaketitletrue
+\templateUseCustomMaketitletrue
\primaryDocumentLanguageGermantrue
%%%%%%%%%%%%%%%%%%%%%%
@@ -160,7 +160,7 @@
%%%%%%%%%%%%%%%%%%%%%%
%%%%%%%%%%%%%%%%%%%%%%
% Document options
-\DeclareOption{mwe}{
+\DeclareOption{mwe}{%
\documentOmitLOTtrue
\documentOmitSDtrue
\documentOmitLOFtrue
@@ -173,7 +173,7 @@
}
\DeclareOption{draft} {\documentIsFinalfalse}
\DeclareOption{final} {\documentIsFinaltrue}
-\DeclareOption{proposal}{
+\DeclareOption{proposal}{%
\documentIsProposaltrue
\documentOmitLOTtrue
\documentOmitSDtrue
@@ -197,11 +197,11 @@
\else%
\fi%
\def\udesoftec@bblengine{BibTeX}
-\DeclareOption{bibtex} {
+\DeclareOption{bibtex} {%
\fallBackToBibtextrue
\def\udesoftec@bblengine{BibTeX}
}
-\DeclareOption{biber} {
+\DeclareOption{biber} {%
\fallBackToBibtexfalse
\def\udesoftec@bblengine{BibLaTeX/Biber}
}
@@ -219,21 +219,21 @@
\DeclareOption{omit-aen} {\documentOmitAentrue}
\DeclareOption{confidential}{\documentOmitCCfalse}
-\DeclareOption{printlayout}{
+\DeclareOption{printlayout}{%
\templateUseColorfulLinksfalse
\templateUseSansSerifFontfalse
\templateUseBookLayouttrue
}
-\DeclareOption{screenlayout}{
+\DeclareOption{screenlayout}{%
\templateUseColorfulLinkstrue
\templateUseSansSerifFonttrue
\templateUseBookLayoutfalse
}
-\DeclareOption{vawiessen}{
+\DeclareOption{vawiessen}{%
\templateVawitrue
\templateVawiEssentrue
}
-\DeclareOption{vawibamberg}{
+\DeclareOption{vawibamberg}{%
\templateVawitrue
\templateVawiBambergtrue
}
@@ -244,6 +244,7 @@
%%%%%%%%%%%%%%%%%%%%%%
%Process all document options
\ProcessOptions\relax
+
% document title page and configuration commands
\newcommand{\city}[1]{\def\udesoftec@city{#1}}
\newcommand{\typeofdoc}[1]{\def\udesoftec@typeofdoc{#1}}
@@ -252,12 +253,12 @@
\newcommand{\academicfield}[1]{\def\udesoftec@academicfield{#1}}
\newcommand{\institution}[1]{\def\udesoftec@institution{#1}}
\newcommand{\semester}[1]{\def\udesoftec@semester{#1}}
-\newcommand{\entitle}[1]{\def\udesoftec@entitle{#1}}
-\newcommand{\confidentialitySource}[1]{\def\udesoftec@confidentialitySource{#1}}
-\newcommand{\confidSource}[1]{\def\udesoftec@confidentialitySource{#1}}
-\newcommand{\authorbox}[1]{\def\udesoftec@authorbox{#1}}
-\newcommand{\abstract}[1]{\def\udesoftec@abstract{#1}}
-\newcommand{\abstractEn}[1]{\def\udesoftec@abstracten{#1}}
+\newcommand{\entitle}[1]{\def\udesoftec@entitle{#1}}
+\newcommand{\confidentialitySource}[1]{\def\udesoftec@confidentialitySource{#1}}
+\newcommand{\confidSource}[1]{\def\udesoftec@confidentialitySource{#1}}
+\newcommand{\authorbox}[1]{\def\udesoftec@authorbox{#1}}
+\newcommand{\abstract}[1]{\def\udesoftec@abstract{#1}}
+\newcommand{\abstractEn}[1]{\def\udesoftec@abstracten{#1}}
@@ -269,13 +270,13 @@
\labelRespectConfidentiality{(Sperrvermerk beachten)}
\academicfield{Wirtschaftsinformatik}
\institution{Vorgelegt der Fakult\"at f\"ur Wirtschaftswissenschaften der\par Universit\"at Duisburg-Essen}
-\semester{\udesoftec@academicfield -- Sommersemester 2016}
-\entitle{Englischer Titel der Arbeit}
+\semester{\udesoftec@academicfield -- Sommersemester 2016}
+\entitle{Englischer Titel der Arbeit}
\confidentialitySource{Name der Firma, die auf die Vertraulichkeitserkl\"arung besteht}
\date{Dokumentversion: \today \linebreak Templateversion:
\udesoftecversion{} (with \udesoftec@bblengine)}
-\authorbox{
+\authorbox{%
\begin{tabularx}{.7\linewidth}{ll}
von:&Max Mustermann\\
&Musterstrasse 123\\
@@ -286,7 +287,7 @@
\\
Betreuer:&Dipl.-Wirt.-Inf Some Body\\
\\
-\end{tabularx}
+\end{tabularx}
}
\ifprimaryDocumentLanguageGerman
@@ -303,7 +304,7 @@
\confidentialitySource{Name of Company which wants the statutory declaration}
\date{Document version: \today \linebreak Template version:
\udesoftecversion{} (with \udesoftec@bblengine)}
- \authorbox{
+ \authorbox{%
\begin{tabularx}{.7\linewidth}{ll}
Author:&Max Mustermann\\
&Musterstrasse 123\\
@@ -314,9 +315,10 @@
\\
Supervisor:&Dipl.-Wirt.-Inf Some Body\\
\\
- \end{tabularx}
+ \end{tabularx}
}
\fi
+
\usepackage{libertine}
%% special set font before fontenc!
\fontfamily{LinuxLibertineT-TLF}
@@ -333,10 +335,10 @@
\setkomafont{caption}{\normalfont\normalcolor\scriptsize}
%%%% microtype %%%%%%
-% purpose: character protrusion (also known as margin kerning) and font expansion
+% purpose: character protrusion (also known as margin kerning) and font expansion
% purpose-de: optischen Randausgleich verwenden. Beispiele siehe Paket-Doku
% source: http://www.ctan.org/pkg/microtype
-\usepackage{microtype}
+\usepackage{microtype}
%%%%%%%%%%%%%%%%%%%%%%
\ifprimaryDocumentLanguageGerman
@@ -351,7 +353,7 @@
-%%%% l18n %%%%%%%%%%%%%
+%%%% l18n %%%%%%%%%%%%%
% purpose: localization and utf-8 config
% babel has primary language last
\usepackage[utf8]{inputenc}
@@ -360,6 +362,7 @@
\usepackage{hyphenat} % helps with \nohyphens command, which allows to remove hypens from quotes.
%%%%%%%%%%%%%%%%%%%%%%
+
%%%% xcolor %%%%%%%%%%
% purpose: define some color names
\usepackage[svgnames]{xcolor}
@@ -420,14 +423,14 @@
\colorlet{allchaptercolor}{black}
-
+
\colorlet{listingBackground}{white!50!UDEbeige}
\colorlet{documentTitle}{black}
-\colorlet{parExample}{UDEbrightblue}
+\colorlet{parExample}{UDEbrightblue}
-\colorlet{chapter}{allchaptercolor} % for all chapters, toc etc
-\colorlet{section}{allchaptercolor} % for all chapters, toc etc
-\colorlet{subsection}{allchaptercolor} % for all chapters, toc etc
+\colorlet{chapter}{allchaptercolor} % for all chapters, toc etc
+\colorlet{section}{allchaptercolor} % for all chapters, toc etc
+\colorlet{subsection}{allchaptercolor} % for all chapters, toc etc
\colorlet{ChapterHeadingBigChapterNumber}{allchaptercolor} % for the special chapter title page design
\colorlet{ChapterHeadingSmallChapterNumer}{allchaptercolor} % for the special chapter title page design
@@ -467,12 +470,12 @@
\abstractEn{}
\fi
-\newcommand{\printabstract}{%
+\newcommand{\printabstract}{%
\chapter*{\labelabstracttitle}%
\label{sec:abstract}
\pdfbookmark[0]{\labelabstracttitle}{sec:abstract}%
\udesoftec@abstract
-
+
\iflanguage{ngerman}{%
% German theses should have German and English abstract
\ifdocumentOmitAen
@@ -493,10 +496,10 @@
}
\newcaptionname{ngerman}{\labelconfidentialityclausetitle}{Sperrvermerk}
-\newcaptionname{british}{\labelconfidentialityclausetitle}{Confidentially Clause}
+\newcaptionname{british}{\labelconfidentialityclausetitle}{Confidentiality Clause}
\def\udesoftec@defaultconfidentialityclause{Die vorliegende \udesoftec@typeofdoc ~enth\"alt vertrauliche Informationen der \emph{\udesoftec@confidentialitySource}, die der Geheimhaltung unterliegen. Ver\"offentlichungen oder Vervielf\"altigungen der \udesoftec@typeofdoc ~-- auch nur auszugsweise -- sind ohne ausdr\"uckliche Genehmigung der \emph{\udesoftec@confidentialitySource} nicht gestattet. Die \udesoftec@typeofdoc ~ist nur den Mitarbeitern des betreuenden Lehrstuhls sowie den Mitgliedern des Pr\"ufungsausschusses zug\"anglich zu machen.\par{} Dieser Sperrvermerk gilt f\"ur die n\"achsten 2 Jahre. Die sich aus diesem Sperrvermerk ergebenden Einschr\"ankungen entfallen nach Ablauf dieses Zeitraums.\par{}}
\def\udesoftec@defaultconfidentialityclauseen{This \udesoftec@typeofdoc ~contains confidential data of \emph{\udesoftec@confidentialitySource}. Any publication or duplication of this \udesoftec@typeofdoc ~-- even in part -- is prohibited, excluding cases with explicit permission by \emph{\udesoftec@confidentialitySource}. The \udesoftec@typeofdoc ~is to be made accessible only to the staff of the research group supervising it and the board of examiners.\par{} This confidentially clause is valid for the next 2 years. Any limitations resulting from this confidentially clause do not apply after this period.\par{}}
-
+
% there should always be an additional German cc in English theses
\newcommand{\confidentialityclause}{%
\iflanguage{british}{%
@@ -504,41 +507,42 @@
\chapter*{\labelconfidentialityclausetitle} % English heading
\udesoftec@defaultconfidentialityclauseen % English text
\selectlanguage{ngerman} % prepare German
- \chapterWithoutPageBreak{\labelconfidentialityclausetitle} % German heading
+ \chapterWithoutPageBreak{\labelconfidentialityclausetitle} % German heading
\udesoftec@defaultconfidentialityclause % German text
\selectlanguage{british} % switching back to English
- }{
+ }{%
\cleardoublepage
\chapter*{\labelconfidentialityclausetitle}
\udesoftec@defaultconfidentialityclause
}
}
-
+
\newcaptionname{ngerman}{\labelstatutorydeclarationheading}{Eidesstattliche Versicherung}
\newcaptionname{british}{\labelstatutorydeclarationheading}{Statutory Declaration}
-\def\udesoftec@defaultstatutorydeclaration{Ich versichere an Eides statt durch meine Unterschrift, dass ich die vorstehende Arbeit selbst\"andig und ohne fremde Hilfe angefertigt und alle Stellen, die ich w\"ortlich oder ann\"ahrend w\"ortlich aus Ver\"offentlichungen entnommen habe, als solche kenntlich gemacht habe, mich auch keiner anderen als der angegebenen Literatur oder sonstiger Hilfsmittel bedient habe. Die Arbeit hat in dieser oder \"ahnlicher Form noch keiner anderen Pr\"ufungsbeh\"orde vorgelegen.\par{} \vspace*{40pt}\parbox{4cm}{\udesoftec@city, \today\hrule\strut \footnotesize Ort, Datum} \hfill\parbox{7cm}{\textcolor{white}{Hier wurde im Original unterschrieben}\hrule\strut \footnotesize Unterschrift} \hfill}
+\def\udesoftec@defaultstatutorydeclaration{Ich versichere an Eides statt durch meine Unterschrift, dass ich die vorstehende Arbeit selbst\"andig und ohne fremde Hilfe angefertigt und alle Stellen, die ich w\"ortlich oder ann\"ahernd w\"ortlich aus Ver\"offentlichungen entnommen habe, als solche kenntlich gemacht habe, mich auch keiner anderen als der angegebenen Literatur oder sonstiger Hilfsmittel bedient habe. Die Arbeit hat in dieser oder \"ahnlicher Form noch keiner anderen Pr\"ufungsbeh\"orde vorgelegen.\par{} \vspace*{40pt}\parbox{4cm}{\udesoftec@city, \today\hrule\strut \footnotesize Ort, Datum} \hfill\parbox{7cm}{\textcolor{white}{Hier wurde im Original unterschrieben}\hrule\strut \footnotesize Unterschrift} \hfill}
\def\udesoftec@defaultstatutorydeclarationenprefix{The statutory declaration needs to be in German, so the following excerpt is in German:}
-\newcommand{\statutorydeclaration}{
- \iflanguage{british}{
+\newcommand{\statutorydeclaration}{%
+ \iflanguage{british}{%
\cleardoublepage
\chapter*{\labelstatutorydeclarationheading}
\udesoftec@defaultstatutorydeclarationenprefix
- \selectlanguage{ngerman}
+ \selectlanguage{ngerman}
\chapterWithoutPageBreak{\labelstatutorydeclarationheading}
\udesoftec@defaultstatutorydeclaration
- \selectlanguage{british}
- }{
+ \selectlanguage{british}
+ }{%
\cleardoublepage
\chapter*{\labelstatutorydeclarationheading}
\udesoftec@defaultstatutorydeclaration
-
+
}
}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% http://www.golatex.de/nummerierung-der-fussnoten-durchgehend-im-gesamten-do…
% change counters for figures, footnotes, etc
-\usepackage{chngcntr}
+\usepackage{chngcntr}
\counterwithout{footnote}{chapter} % count footnotes for whole document, not per chapter
@@ -582,6 +586,7 @@
\usepackage{multicol}
+
%%%%%%%%%%%%%%%%%%%%%%
% title page background
% default
@@ -610,7 +615,7 @@
\renewcommand{\maketitle}{}
\else
\usepackage{wallpaper}
- \newcommand{\udesoftecmaketitle} {
+ \newcommand{\udesoftecmaketitle} {%
\newgeometry{bottom=1cm, inner=0cm,outer=0cm,top=4cm}
\begin{titlepage}
\begin{center}
@@ -623,10 +628,10 @@
\vspace*{20pt}
{\color{documentTitle}\Huge\textbf{\@title}\par}
\vspace*{20pt}
- {\color{documentTitle}\huge\textbf{\@subtitle}\par}
- \vspace*{20pt}
+ {\color{documentTitle}\huge\textbf{\@subtitle}\par}
+ \vspace*{20pt}
{\color{documentTitle}\large\textbf{\udesoftec@entitle}\par}
- \vspace*{50pt}
+ \vspace*{50pt}
\large\udesoftec@institution
\end{center}
\end{minipage}
@@ -634,26 +639,26 @@
\begin{minipage}{.7\linewidth}
\begin{center}
\ifdocumentOmitCC
- \else
+ \else
\udesoftec@labelRespectConfidentiality\par
- \fi
+ \fi
\vspace*{20pt}\Large\@date
\end{center}
\vspace*{30pt}
\end{minipage}
\udesoftec@authorbox\par
\begin{minipage}{.7\linewidth}
- \begin{center}
+ \begin{center}
\vspace*{40pt}
- \large\udesoftec@semester\par
+ \large\udesoftec@semester\par
\end{center}
\end{minipage}%
\end{center}%
\end{titlepage}%
\restoregeometry
}
-
- \newcommand{\udesoftecvawibambergmaketitle}{
+
+ \newcommand{\udesoftecvawibambergmaketitle}{%
\newgeometry{bottom=1cm, left=2cm,right=1cm,top=4cm}
\begin{titlepage}
\begin{center}
@@ -661,22 +666,22 @@
\vspace*{0pt}
\begin{minipage}[30em]{.7\linewidth}
\begin{center}
- {\color{documentTitle}\Huge\textbf{\@title}\par}
- \vspace*{20pt}
- {\color{documentTitle}\huge\textbf{\@subtitle}\par}
- \vspace*{20pt}
+ {\color{documentTitle}\Huge\textbf{\@title}\par}
+ \vspace*{20pt}
+ {\color{documentTitle}\huge\textbf{\@subtitle}\par}
+ \vspace*{20pt}
{\color{documentTitle}\large\textbf{\udesoftec@entitle}\par}
\vspace*{50pt}
\hrule
\vspace*{20pt}
- \Large\textbf{\udesoftec@typeofdoc}\par
+ \Large\textbf{\udesoftec@typeofdoc}\par
\large\udesoftec@institution\par
\vspace*{20pt}
\hrule
\vspace*{20pt}
\end{center}
\end{minipage}
- \vfill
+ \vfill
\begin{minipage}{.7\linewidth}
\begin{center}
\ifdocumentOmitCC
@@ -699,13 +704,13 @@
\end{titlepage}%
\restoregeometry
}
-
+
\renewcommand{\maketitle}{\udesoftecmaketitle}
\iftemplateVawiBamberg
\renewcommand{\maketitle}{\udesoftecvawibambergmaketitle}
\fi
\let\oldmaketitle\maketitle
- \renewcommand{\maketitle}{
+ \renewcommand{\maketitle}{%
\let\oldhbadness\hbadness
\let\oldvbadness\vbadness
\hbadness=10000
@@ -715,6 +720,7 @@
\let\vbadness\oldvbadness
}
\fi
+
%%%% chapterdesign %%%
\addtokomafont{chapter}{\color{chapter}}
\addtokomafont{sectioning}{\color{section}}
@@ -724,7 +730,7 @@
\subparagraph{#1}\hspace{0cm}\\%
}
% Chapter-Numbering for 4 levels, i.e. PART B Chapter 5.7.3.1; in order to have unnumbered headings use \paragraph{}
-\setcounter{secnumdepth}{3}
+\setcounter{secnumdepth}{3}
\setcounter{tocdepth}{3}
@@ -735,12 +741,12 @@
% source: https://groups.google.com/forum/#!msg/de.comp.text.tex/rVcjvNQI6IA/N-NsfyQz…
\let\defaultchapterformat\chapterformat
\newcommand{\udesoftec@chapterformat}{%
- \begingroup%
+ \begingroup%
\setlength{\unitlength}{1mm}%
\begin{picture}(20,40)(-2,8)%
\setlength{\fboxsep}{0pt}%
\put(20,15){\color{ChapterHeadingSeperatorLine}\line(1,0){\dimexpr\textwidth-20\unitlength\relax\@gobble}}%
- \put(-6,4.0){
+ \put(-6,4.0){%
\makebox(20,20)[r]{%
\fontsize{19\unitlength}{23\unitlength}\selectfont\color{ChapterHeadingBigChapterNumber}\thechapter
}%
@@ -766,6 +772,7 @@
\let\clearpage\par%
\let\appendix\par%
\fi
+
\renewcommand{\headfont}{\normalfont\small\color{HeadmarkText}} % header text should be small
\renewcommand{\pnumfont}{\normalfont\small\color{PagemarkText}} % pagenumber is in header and should be small too
@@ -795,7 +802,7 @@
\classdebug{using headline for booklayout}
\automark[section]{chapter}
- \defpagestyle{chapter}{
+ \defpagestyle{chapter}{%
(0pt,0pt)
{\pagemarkBox{\pagemark}{l}\hfill}
{\hfill\pagemarkBox{\pagemark}{r}}
@@ -811,7 +818,7 @@
\rohead[]{\pagemarkBox{\pagemark}{r}}
\classdebug{using headline for screenlayout}
\automark[chapter]{chapter}
- \defpagestyle{chapter}{
+ \defpagestyle{chapter}{%
(0pt,0pt)
{\hfill\pagemarkBox{\pagemark}{r}}
{\hfill\pagemarkBox{\pagemark}{r}}
@@ -826,10 +833,10 @@
%%%%%%%%%%%%%%%%%%%%%%
%%%% custom pagemark %%%%%%%%%%%%%%%%%%%%%%%
-\newcommand{\pagemarkBox}[2] {
+\newcommand{\pagemarkBox}[2] {%
% the picture has height 0 to change clipping behavior, else the clipping box might be higher than the text line
- \begin{picture}(50,0)
- \put(-.55,-5.05) {
+ \begin{picture}(50,0)
+ \put(-.55,-5.05) {%
\put(-2.8,.3){%these relate box to text
\color{PagemarkBackground}\rule{56.7pt}{16pt}}%
\put(5,1){%these relate box to text
@@ -850,14 +857,14 @@
% to adjust for regular printing (e.g. use in a folder), see below "geometry"
\usepackage[includehead=false,includefoot=false]{geometry}
\iftemplateUseBookLayout
- \KOMAoptions{twoside=true}
- \KOMAoptions{BCOR=12mm,DIV=10} % for helvetica
+ \KOMAoptions{twoside=true}
+ \KOMAoptions{BCOR=12mm,DIV=10} % for helvetica
\else
\KOMAoptions{twoside=false}
- \KOMAoptions{BCOR=0mm,DIV=10} % for helvetica
+ \KOMAoptions{BCOR=0mm,DIV=10} % for helvetica
\fi
-\renewcommand*\chapterheadstartvskip{}
+\renewcommand*\chapterheadstartvskip{}
\iffallBackToBibtex
\else
@@ -875,14 +882,15 @@
\renewcommand*{\marginfont}[1]{\scriptsize#1}
-\providecommand{\marginalText}[2][]{
+\providecommand{\marginalText}[2][]{%
\message{LaTeX Warning: \noexpand\marginalText is deprecated, use \noexpand\marginnote on input line \the\inputlineno }
\marginnote[#1]{#2}
}
-\providecommand{\marginline}[2][]{
+\providecommand{\marginline}[2][]{%
\message{LaTeX Warning: \noexpand\marginline is deprecated, use \noexpand\marginnote on input line \the\inputlineno }
\marginnote[#1]{#2}
}
+
%%%%%%%%%%%%%%%%
% allow footnotes in minipage
% from http://stackoverflow.com/questions/3126082/store-a-text-string-in-latex-and…
@@ -891,16 +899,17 @@
\stepcounter{footnotesinthisminipage}\addtocounter{footnotesinthisminipage}{-1} % initialize counter to avoid errors
\newcommand{\footnoteNumberInMinipage}{\stepcounter{footnotesinthisminipage}\stepcounter{footnote}\footnotemark[\value{footnote}]}
\newcommand{\footnoteTextAfterMinipage}[1]{%
-\addtocounter{footnotesinthisminipage}{-1}%decrease
+\addtocounter{footnotesinthisminipage}{-1}%decrease
\addtocounter{footnote}{-\value{footnotesinthisminipage}}%set footnote counter backwards for the number of footnotes
\footnotetext[\value{footnote}]{#1}%output footnotetext
\addtocounter{footnote}{\value{footnotesinthisminipage}}%reset footnote counter to real value
}%
\newcommand{\footnoteCmdForInsideMinipage}[1]{%
-\ClassError{udesoftec}{Warning: \protect\footnote\space in minipages not implemented, use \protect\footnoteNumberInMinipage and \protect\footnoteTextAfterMinipage instead}%
+\ClassError{udesoftec}{Warning: \protect\footnote\space{}in minipages not implemented, use \protect\footnoteNumberInMinipage and \protect\footnoteTextAfterMinipage instead}%
%\footnoteNumberInMinipage
%\let\executeThisAfterEndOfMinipage aloa
}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%
% have quote boxes with big quotation marks
% big quotation marks based on, reduced code and used mdframed
@@ -978,9 +987,9 @@
}{\end{mdframed}}
\newcommand{\parExample}[2][!]{%
-\ifx!#1{
+\ifx!#1{%
\parExampleWithHeading{Beispiel:}{#2}
-}\else{
+}\else{%
\parExampleWithHeading{Beispiel für #1:}{#2}
}\fi
}
@@ -1037,14 +1046,15 @@
\providecommand{\todoinline}[1]{\inlinetodo{#1}}
\let\defaultListoftodos\listoftodos
- \renewcommand{\listoftodos}{
+ \renewcommand{\listoftodos}{%
\defaultListoftodos
}
-
+
\ifdocumentUsedTodos
\listoftodos
\fi
\fi
+
%%%% hyperref %%%%%%%%
%% special: hyperref needs to be loaded last! (exception hycap)
%% purpose: make internal and external links working and colored
@@ -1079,7 +1089,7 @@
\makeglossaries
\newglossarystyle{myAcronymStyle}{%
% put the glossary in the itemize environment:
-\renewenvironment{theglossary}{\begin{description}[leftmargin=1.5cm,style=sameline]}{\end{description}}%
+\renewenvironment{theglossary}{\begin{description}[leftmargin=2.5cm,style=sameline]}{\end{description}}%
% have nothing after \begin{theglossary}:
\renewcommand*{\glossaryheader}{}%
% have nothing between glossary groups:
@@ -1111,11 +1121,7 @@
\else
\usepackage{udesoftec-biblatex}
\AtEndDocument{%
- \let\defaultchaptermarkformat\chaptermarkformat%
- \renewcommand*{\chaptermarksimple}{}
- \let\chaptermarkformat\chaptermarksimple%
\printbibliography[heading=udesoftec]%
- \let\chaptermarkformat\defaultchaptermarkformat%
}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/udesoftec.tlpobj new/tlpkg/tlpobj/udesoftec.tlpobj
--- old/tlpkg/tlpobj/udesoftec.tlpobj 2019-02-28 04:10:37.000000000 +0100
+++ new/tlpkg/tlpobj/udesoftec.tlpobj 2020-03-10 01:48:40.000000000 +0100
@@ -1,6 +1,6 @@
name udesoftec
category Package
-revision 47164
+revision 54215
shortdesc Thesis class for the University of Duisburg-Essen
relocated 1
longdesc The class is designed for typesetting theses in the Research
@@ -20,7 +20,6 @@
RELOC/tex/latex/udesoftec/udesoftec.cls
catalogue-contact-bugs https://github.com/jpmschuler/SOFTEC-Templates/issues
catalogue-ctan /macros/latex/contrib/udesoftec
-catalogue-date 2018-03-28 12:21:25 +0200
catalogue-license lppl1.3
catalogue-topics dissertation bus-study class
-catalogue-version 1.6.2
+catalogue-version 1.6.6
++++++ ulem.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ulem/README new/doc/generic/ulem/README
--- old/doc/generic/ulem/README 2011-03-27 00:36:08.000000000 +0100
+++ new/doc/generic/ulem/README 2020-01-10 22:42:03.000000000 +0100
@@ -5,7 +5,7 @@
A declaration of \normalem (or the \usepackage option "normalem") restores
the normal \em and \emph behavior.
- Copyright 1989-2011 by Donald Arseneau (Vancouver, Canada; asnd(a)triumf.ca)
+ Copyright 1989-2019 by Donald Arseneau (Vancouver, Canada; asnd(a)triumf.ca)
This software may be freely transmitted, reproduced, or modified for any
purpose provided that this copyright notice is left intact.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/ulem/ulem.ltx new/doc/generic/ulem/ulem.ltx
--- old/doc/generic/ulem/ulem.ltx 2011-03-27 00:36:08.000000000 +0100
+++ new/doc/generic/ulem/ulem.ltx 2020-01-10 22:42:03.000000000 +0100
@@ -2,9 +2,9 @@
% ulem.ltx Manual for ulem.sty
%
%
-% Copyright (c) 1989-2011 by Donald Arseneau
+% Copyright (c) 1989-2019 by Donald Arseneau
%
-% Version date 2011/03/18
+% Version date 2019/11/18
%
\documentclass[12pt]{ltxdoc}
\addtolength{\textwidth}{1cm}
@@ -15,7 +15,7 @@
\hyphenation{normalem uwforbf ulforem}
\title{The ulem package:\\ underlining for emphasis}
\author{Donald Arseneau\\ asnd(a)triumf.ca}
-\date{2011/03/18}
+\date{2019/11/18}
\begin{document}
\maketitle
@@ -46,7 +46,7 @@
\begin{footnotesize}
-\noindent The ulem package is Copyright \copyright\ 1989--2011 by
+\noindent The ulem package is Copyright \copyright\ 1989--2019 by
Donald Arseneau (Vancouver, Canada).\\
The package (ulem.sty) and this documentation (ulem.ltx, ulem.pdf) may be
freely transmitted, reproduced, or modified for any purpose provided that the
@@ -104,9 +104,8 @@
You can define your own styles of overprinting or underlining by using
the \cs{markoverwith} command in the definition of your new command.
-The definition should be something like:\\[3pt]
-\indent
- \cs{newcommand}\cs{cmd}|{|\cs{bgroup} \cs{markoverwith}|{|\meta{something}|}|\cs{ULon}|}|\\[3pt]
+The definition should be something like:\\[6pt]
+ \cs{newcommand}\cs{cmd}|{|\cs{bgroup} \meta{settings}\cs{markoverwith}|{|\meta{something}|}|\cs{ULon}|}|\\[8pt]
The `\meta{something}' can be as simple as a single character, or as complex as
you can keep track of; it will likely contain some repositioning commands, perhaps
\cs{raisebox}.
@@ -127,26 +126,27 @@
by issuing a proper \cs{useunder} declaration:\\[3pt]
\cs{useunder}|{|\meta{underlinecommand}|}{|\meta{fontdeclaration}|}{|\meta{fontcommand}|}|\\[3pt]
e.g., |\useunder{\uuline}{\bfseries}{\textbf}| gives a double underline
-instead of bold face in \LaTeX.
+instead of bold face in \LaTeX\ (but note the problem explained next).
The commands \cs{normalem} and \cs{ULforem} respectively disable and enable
underlining for \cs{em}/\cs{emph}, and so do the \cs{usepackage}
options [normalem] and [ULforem]. There is also the \cs{usepackage}
-option [UWforbf] to replace boldface with a wavey underline. These features
-use the \cs{useunder} command internally. UWforbf does handle bold in
-math mode, in a limited way, but it doesn't work in section titles,
-unfortunately, because the titles are not delimited by explicit braces when
-printed by the \cs{section} command. Currently under UWforbf the \cs{bfseries}
+option [UWforbf] to replace boldface from \cs{textbf} with a wavey underline.
+These features use the \cs{useunder} command internally.
+UWforbf specifically employs
+\cs{useunder}|{|\cs{uwave}|}|\allowbreak|{|\cs{bf}|}|\allowbreak|{|\cs{textbf}|}|,
+so the \cs{bfseries}
command still produces bold face, but \cs{bf} makes an
-under-wave\footnote{%% no verbatim in footnotes
+under-wave (if \cs{bf} is defined at all). That is
+because section title formatting typically uses \cs{bfseries} not delimited by
+braces, which would give errors for \cs{uwave}.\footnote{%% no verbatim in footnotes
To get under-waved section titles (in ordinary \LaTeX\ classes) you could define:\\
\texttt{\string\renewcommand\string\@seccntformat[1]\string{\string\uwave
\string{\string\csname\ the\#1\string\endcsname\string}\string\hskip 1em\string}}\\
and later specify
\texttt{\string\section[...]\string{\string\uwave\string{...\string}\string}}.
But you don't want to enter that swamp.}
-(if |\bf| is defined at all).
-In plain \TeX\ there is |\bf| but no \cs{textbf} so you could say |\useunder{\UWave}{\bf}{}|.
+In plain \TeX\ there is \cs{bf} but no \cs{textbf} so you could say |\useunder{\uwave}{\bf}{}|.
Some commands, such as |\\| and \cs{hskip} are given special treatment to
work within uline, but others are not. Support for others can sometimes
@@ -157,7 +157,7 @@
should include the test `|\ifx\ \LA@space|'. For example, support for
\cs{marginpar} is added through the hook mechanism.
-All the underlining commands are robust (self-protecting) in \LaTeX.
+All the underlining commands are robust in \LaTeX.
\section{Complications}
Binary files old/doc/generic/ulem/ulem.pdf and new/doc/generic/ulem/ulem.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ulem.doc.tlpobj new/tlpkg/tlpobj/ulem.doc.tlpobj
--- old/tlpkg/tlpobj/ulem.doc.tlpobj 2019-02-28 04:10:44.000000000 +0100
+++ new/tlpkg/tlpobj/ulem.doc.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,9 +1,9 @@
name ulem.doc
category Package
-revision 26785
+revision 53365
shortdesc doc files of ulem
relocated 1
-docfiles size=31
+docfiles size=45
RELOC/doc/generic/ulem/README
RELOC/doc/generic/ulem/ulem.ltx
RELOC/doc/generic/ulem/ulem.pdf
++++++ ulem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/ulem/ulem.sty new/tex/generic/ulem/ulem.sty
--- old/tex/generic/ulem/ulem.sty 2012-06-02 00:07:01.000000000 +0200
+++ new/tex/generic/ulem/ulem.sty 2020-01-10 22:42:03.000000000 +0100
@@ -1,5 +1,5 @@
%
-% U L E M . S T Y [2012-05-18]
+% U L E M . S T Y [2019-11-18]
%
% The ulem package provides various types of underlining that can stretch
% between words and be broken across lines in LaTeX or plain TeX.
@@ -21,7 +21,7 @@
%
% {\em phasized\/} | In LaTeX, by default, these are underlined; use
% \emph{asized} | \normalem or [normalem] to restore italics
-% \useunder{\uwave}{\bfseries}{\textbf}
+% \useunder{\uwave}{\bf}{\textbf}
% use wavy underline in place of bold face
% Use \markoverwith for defining new types of underlining.
%
@@ -40,20 +40,23 @@
\chardef\ULthickness\catcode\string`\@ % hold catcode temporarily
\catcode\string`\@=11
-\def\uline{\relax \ifmmode\expandafter\underline
+% \UL@protected = \protected, if available, else \relax
+
+\begingroup
+\global\expandafter\let\expandafter\UL@protected\csname protected\endcsname
+\endgroup
+
+\UL@protected\def\uline{\relax \ifmmode\expandafter\underline
\else \bgroup\expandafter\ULset\fi}
\newbox\UL@box
\newbox\UL@hyphenbox
\newskip\UL@skip
\newtoks\UL@hook
-
-\newdimen\UL@height
-
+\newdimen\UL@height \UL@height=\maxdimen % flags being unused
\newcount\UL@pe
-\let\LA@space\ \let\LA@hskip\hskip
-\def\UL@end *{\relax\relax}% something harmless unlikely to be found elsewhere
+\UL@protected\def\UL@end *{\relax\relax}% something harmless but unique
% For regular underlines, set the depth based on the font, or retain
% the preset value, then start underlining.
@@ -74,7 +77,7 @@
\def\ULon{\ifmmode \expandafter\UL@onmath\else \expandafter\UL@on\fi}
% \UL@on sets the engine of underline running, and tells it
-% where to stop.
+% where to stop. #1 = the relevant text.
\long\def\UL@on#1{\leavevmode\UL@ender \let\UL@on\UL@onin
\everymath{\UL@hrest}\everyvbox{\UL@hrest}\let\hskip\UL@hskip
\let\\\UL@cr \let\-\UL@dischyp \let\newline\UL@newline \let\ \UL@space
@@ -84,9 +87,11 @@
\UL@word\@empty#1\xdef\UL@spfactor{\the\spacefactor} \UL@end * }
% This is what \ULon does when it appears nested in an inner place.
-\def\UL@onin#1{\leavevmode\UL@ender % when nested, do multiple underlining
- \UL@height\ULthickness \advance\ULdepth\thr@@\UL@height
- \advance\UL@height-\ULdepth \setbox\UL@box\hbox{{#1}}%
+\long\def\UL@onin#1{\leavevmode\UL@ender % when nested, do multiple underlining
+ \ifdim\ULdepth=\maxdimen\else
+ \UL@height\ULthickness \advance\ULdepth\thr@@\UL@height \advance\UL@height-\ULdepth
+ \fi
+ \setbox\UL@box\hbox{{#1}}%
\let\UL@start\relax\UL@putbox\egroup}
% \UL@putbox is disabled in inner mode, so re-enable it by changing \UL@start
% \UL@hrest is implicit due to \everyhbox. Double braces for \hbox are in
@@ -103,7 +108,7 @@
% must expand to nothing outside the ifs for syntactical spaces to work.
% the \expandafters get rid of the \@empty inserted at the beg. of word
-\def\UL@word#1 {\expandafter\UL@start#1 %
+\long\def\UL@word#1 {\expandafter\UL@start#1 %
\expandafter\ifx\expandafter\UL@end#1\egroup\egroup
\unskip \unskip \unskip % remove extra leader at end
\spacefactor\UL@spfactor \let\UL@word\egroup
@@ -134,9 +139,10 @@
% behaves properly.
\def\UL@putbox{\ifx\UL@start\@empty \else % not inner
- \vrule\@width\z@ \LA@penalty\@M
- {\UL@skip\wd\UL@box \UL@leaders \kern-\UL@skip}%
- \box\UL@box \fi}
+ \vrule\@width\z@ \LA@penalty\@M
+ {\UL@skip\wd\UL@box \UL@leaders \kern-\UL@skip}%
+ \box\UL@box
+ \fi}
% With interword leaders, give some overlap to avoid gaps caused by
% round-off errors in the printing program. Needs \unskip \unskip \unskip
@@ -152,7 +158,8 @@
% restore some things for inside math or \mbox
\def\UL@hrest{\let\ \LA@space \let\-\@empty \let\penalty\LA@penalty}
-\def\UL@space{\LA@space \global\UL@skip\lastskip \unskip \UL@reskip}% \
+\let\LA@space\ %
+\UL@protected\def\UL@space{\LA@space \global\UL@skip\lastskip \unskip \UL@reskip}%
% Hyphenation is done by explicit \discretionary. The overlapping melds
% with the running overlap because it *is* part of the running overlap:
@@ -160,14 +167,14 @@
% then overlapped by leaders. The discretionary may occupy this space
% if a break occurs; otherwise the next syllable gets doubly-overlapped
% (in registration) for a distance of the hyphen's width.
-\def\UL@dischyp{\global\setbox\UL@hyphenbox\hbox
+\UL@protected\def\UL@dischyp{\global\setbox\UL@hyphenbox\hbox
{\ifnum \hyphenchar\font<\z@ \string-\else \char\hyphenchar\font \fi}%
\kern\wd\UL@hyphenbox \LA@penalty\@M
\UL@stop \kern-\wd\UL@hyphenbox
\discretionary{\box\UL@hyphenbox}{}{}\UL@start}
\let\LA@penalty\penalty
-\def\UL@penalty{\relax\ifhmode \afterassignment\UL@@penalty\count@
+\UL@protected\def\UL@penalty{\relax\ifhmode \afterassignment\UL@@penalty\count@
\else\LA@penalty\fi}
\def\UL@@penalty{\LA@penalty \ifnum\count@=\z@
\@ne \else \count@ \fi % zero penalty => no penalty, so use 1 instead.
@@ -181,7 +188,8 @@
% when they're used, but saves processing in \UL@hrest called by \everymath
% \everyvbox and \everyhbox.
-\def\UL@hskip{\ifx\ \LA@space \LA@hskip \else
+\let\LA@hskip\hskip
+\UL@protected\def\UL@hskip{\ifx\ \LA@space \LA@hskip \else
\afterassignment\UL@reskip \global\UL@skip \fi}
\def\UL@reskip{\UL@stop \UL@leaders \UL@start}
@@ -190,13 +198,13 @@
% and so the \hfil is not underlined! \\ and \newline do nothing if inside
% inner braces.
-\def\UL@cr{\unskip \ifx\ \LA@space \let\UL@vad\@gobble
+\UL@protected\def\UL@cr{\unskip \ifx\ \LA@space \let\UL@vad\@gobble
\else \UL@stop \unskip\unskip\unskip \let\UL@vad\vadjust \fi
\@ifstar{\UL@vad{\LA@penalty\@M}\UL@cra}\UL@cra}
\def\UL@cra{\@ifnextchar[\UL@crb\UL@newline}
\def\UL@crb[#1]{\UL@vad{\vskip#1}\UL@newline}
-\def\UL@newline{\ifx\UL@start\@empty % (\UL@cr may have \UL@stop-ed already)
+\UL@protected\def\UL@newline{\ifx\UL@start\@empty % (\UL@cr may have \UL@stop-ed already)
\unskip \ifx\ \LA@space \else \UL@stop \unskip\unskip\unskip \fi\fi
\LA@hskip \z@\@plus.0001fil\LA@penalty -\@M \UL@start}
@@ -213,7 +221,8 @@
\newbox\ULC@box
\let\ULleaders\leaders
-\def\markoverwith#1{\setbox\ULC@box\hbox{{#1}}\UL@pixel.5\wd\ULC@box
+\UL@protected\def\markoverwith#1{\leavevmode
+ \setbox\ULC@box\hbox{{#1}}\UL@pixel.5\wd\ULC@box
\ifmmode \setbox\ULC@box\hbox{\raise1.4ex\box\ULC@box}%
\dp\ULC@box-1.4ex\ht\ULC@box\z@ \def\UL@leadtype{\cleaders\copy\ULC@box}%
\else
@@ -226,36 +235,44 @@
% For drawing a wavey underline instead of a straight one the command
% is \uwave (under-wave) which uses the wiggle from 6-pt lasy font:
-\def\uwave{\bgroup \markoverwith{\lower3.5\p@\hbox{\sixly \char58}}\ULon}
-\font\sixly=lasy6 % does not re-load if already loaded, so no memory problem.
+\UL@protected\def\uwave{\leavevmode \bgroup
+ \ifdim \ULdepth=\maxdimen \ULdepth 3.5\p@
+ \else \advance\ULdepth2\p@
+ \fi \markoverwith{\lower\ULdepth\hbox{\sixly \char58}}\ULon}
+\font\sixly=lasy6 % does not re-load if already loaded, so no memory drain.
% To draw a double underline under text, use \uuline{text}
-\def\uuline{\bgroup \UL@setULdepth
+\UL@protected\def\uuline{\leavevmode \bgroup
+ \UL@setULdepth
+ \ifx\UL@on\UL@onin \advance\ULdepth2.8\p@\fi
\markoverwith{\lower\ULdepth\hbox
- {\kern-.03em\vbox{\hrule width.2em\kern1.2\p(a)\hrule}\kern-.03em}}%
+ {\kern-.03em\vbox{\hrule width.2em\kern1\p(a)\hrule}\kern-.03em}}%
\ULon}
% To draw a line through text instead of under it (strike out) do
% `under'-line with negative depth. Note that this one uses a real
% line, not characters, so there is no \markoverwith.
-\def\sout{\bgroup \ULdepth=-.55ex \ULset}
+\UL@protected\def\sout{\leavevmode \bgroup \ULdepth=-.55ex \ULset}
% To mark //// over text instead of underlining (x-out)
%
-\def\xout{\bgroup \markoverwith{\hbox to.35em{\hss/\hss}}\ULon}
+\UL@protected\def\xout{\leavevmode \bgroup
+ \markoverwith{\hbox to.35em{\hss/\hss}}\ULon}
-\def\dotuline{\bgroup
+\UL@protected\def\dotuline{\leavevmode \bgroup
\UL@setULdepth
+ \ifx\UL@on\UL@onin \advance\ULdepth2\p@\fi
\markoverwith{\begingroup
- \advance\ULdepth0.08ex
- \lower\ULdepth\hbox{\kern.1em .\kern.04em}%
+ %\advance\ULdepth0.08ex
+ \lower\ULdepth\hbox{\kern.06em .\kern.04em}%
\endgroup}%
\ULon}
-\def\dashuline{\bgroup
+\UL@protected\def\dashuline{\leavevmode \bgroup
\UL@setULdepth
+ \ifx\UL@on\UL@onin \advance\ULdepth2\p@\fi
\markoverwith{\kern.13em
\vtop{\kern\ULdepth \hrule width .3em}%
\kern.13em}\ULon}
@@ -266,13 +283,14 @@
% e.g.: \useunder{\uuline}{\bfseries}{\textbf}
% \useunder{\uwave}{\bf}{}
-\def\useunder#1#2#3{\relax
+\UL@protected\def\useunder#1#2#3{\relax
\ifx\relax#2\relax\else % declaration command given
- \def#2{\def\@tempa{#1}\global\let\UL@ender\UL@swender
+ \UL@protected\def#2{\def\@tempa{#1}\global\let\UL@ender\UL@swender
\expandafter\@tempa\expandafter{\ifnum\z@=\string`}\fi}%
- \MakeRobust{#2}\fi
+ \fi
\ifx\relax#3\relax\else % argumentative command
- \def#3{#1}\MakeRobust{#3}\fi}
+ \UL@protected\def#3{#1}%
+ \fi}
\expandafter\ifx \csname @ifundefined\endcsname \relax
@@ -282,23 +300,13 @@
\def\@width{width}
\def\@empty{}
\long\def\@gobble#1{}
- \def\MakeRobust#1{}
+ \long\def\@firstoftwo#1#2{#1}%
+ \long\def\@secondoftwo#1#2{#2}%
% Do non-outer \newif with no visible \if's or \fi's when skipping
\csname newif\expandafter\endcsname \csname if@ignore\endcsname
\else
- \def\MakeRobust#1{\expandafter\let
- \csname \expandafter\@gobble\string#1 \endcsname= #1%
- \edef#1{\noexpand\protect \expandafter\noexpand
- \csname\expandafter\@gobble\string#1 \endcsname}
- }
- \MakeRobust\uline
- \MakeRobust\uuline
- \MakeRobust\uwave
- \MakeRobust\sout
- \MakeRobust\xout
-
\let\LA@em\em \let\LA@emph\emph
\expandafter\let\expandafter\LA@Pem \csname em \endcsname
\expandafter\let\expandafter\LA@Pemph \csname emph \endcsname
@@ -313,17 +321,19 @@
% Process LaTeX \package options; plain TeX skips this section
\expandafter\ifx\csname ProvidesPackage\endcsname \relax \else
- \ProvidesPackage{ulem}[2012/05/18]
+ \ProvidesPackage{ulem}[2019/11/18]
\DeclareOption{normalem}{\normalem}
\DeclareOption{ULforem}{\ULforem}
\DeclareOption{normalbf}{}
\DeclareOption{UWforbf}{\useunder{\uwave}{\bf}{\textbf}}
\ProcessOptions
%
- \AtBeginDocument{\let\UL@marginpar\marginpar}%
- \newcommand\UL@marpar[2][\gDefault@pt]{\gdef\gDefault@pt{#2}%
+ \newcommand\UL@marpar[2][\ULmp@opt@arg]{\gdef\ULmp@opt@arg{#2}%
\ifx\ \LA@space \@latexerr{Marginpar lost}%
- \else \UL@stop \UL@marginpar[#1]{#2}\UL@start \fi}
+ \else \UL@stop \LA@marginpar[#1]{#2}\UL@start \fi}
+%
+ \AtBeginDocument{\let\LA@marginpar\marginpar}%
+%
\addto@hook\UL@hook{\let\marginpar\UL@marpar}
\fi
@@ -336,174 +346,6 @@
\endinput
-%====================== BEGIN INSTRUCTIONS ===========================
-These plain text instructions may disappear soon. The primary instructions
-are in ulem.ltx (ulem.pdf, ulem.dvi).
-
-ULEM is a package for LaTeX or plain TeX which provides various types of
-underlining that can stretch between words and be broken across lines.
-In LaTeX this style replaces italics with underlining in emphasized text
-given by \em or \emph -- but only if the text is delimited by braces. A
-declaration \normalem (or the \usepackage option [normalem]) restores the
-normal \em behavior. For underlining in plain TeX, \input ulem.sty, and
-use the \uline command.
-
-Unlike regular underlining, ulem allows line breaks, and even primitive
-hyphenation, within the underlined text; but it is far from perfect. It is
-most suitable for simple text like {\em \LaTeX: A document preparation
-system\/} that may need to be underlined in a manuscript submitted for
-publication. Again, ulem will only replace \em and \emph when the text is
-delimited by explicit braces.
-
-The thickness of the underline rule is given by \ULthickness; use
-\renewcommand or \def (not \setlength) to change it. The depth of the
-underline is controlled by the length \ULdepth. The default value is a
-special flag which lets the current font control the depth. You can set
-a particular value to \ULdepth (using \setlength) to force a particular
-depth, either locally for a special purpose, or for the document as a
-whole. See the definition of \sout.
-
-Every word is typeset in an underlined box, so automatic hyphenation is
-normally disabled, but explicit discretionary hyphens (\-) will still be
-obeyed. Several text-formatting commands are specially supported within
-the underlining: \-, \ , ~, \\, \newline, \linebreak, \nolinebreak,
-\penalty, \hskip, \hspace, \hfil, \hfill, \hss. Displayed math and \par
-are deliberately not supported to aid in the detection of runaway arguments
-(missing braces). The special commands do have a problem: they end a
-group so any local assignments are lost.
-
-The underlines continue between words, and stretch just like ordinary
-spaces do. Since spaces delimit words, there may be some difficulty
-with syntactical spaces (e.g. "2.3 pt"). Some effort is made to handle
-such cases, but sometimes (such as \let\x= y) the space is interpreted
-incorrectly. You can usually solve the problem by enclosing the offending
-command in braces or in a macro (\newcommand\xeqy{\let\x= y}), but...
-
-One important incompatibility with braces and macro replacement:
-ALL THE TEXT IN BRACES OR COMING FROM A MACRO IS TYPESET IN A BOX.
-That is, braces will suppress stretching and linebreaks in the text they
-enclose. Moreover, the specially-taken-care-of commands \-, \\, \newline
-and \linebreak are usually ignored if they appear inside extra braces.
-They operate only when the braces delimit a command parameter without
-introducing a level of grouping. (Even though braces delimiting command
-parameters do not normally imply grouping, many commands will add their
-own grouping.) Thus, you should try to limit inner braces to short bits of
-text or for delimiting parameters to commands. For emergency repairs, see
-the "Marat/Sade" example below. Syntactical spaces inside braces never
-cause a problem, nor do spaces in math mode.
-
-Text produced by expansion of a command (macro) is boxed too, but \\, \
-and \- still work properly in the expansion text:
- \newcommand\iff{if and only if} {\em \iff}
-does not allow any stretching or linebreaking between words, but
- \newcommand\iff{if\ and\ only\ if} {\em \iff}
-allows stretching and linebreaking. There is a problem though: the
-\ between words closes a group and any local assignments will be lost,
-in particular, font changes and color changes.
-
-This loss of local assignments will break some other standard commands,
-(e.g., \cite) which produce multiple `words' using local assignments.
-The way to protect such commands is to bury them in an \mbox:
- {\em every\-one agrees~\mbox{\cite{you,me}}.}
-
-Nested \em commands produce multiple underlining, but heed the warnings
-about braces above. To get italics without underlining, use \it. Nesting
-of other types of underline is also possible, but the `underlines' may
-overlap.
-
-HERE IS A SIMPLE EXAMPLE.
-
-\noindent 'Twas {\em brillig\/} and the {\em slithy~toves\/}
-did {\em gyre\/} and {\em gim\-ble\/} in the {\em wabe,\\[2pt] }
-All {\em mim\-sey\/} were the {\em boro\-goves\/} and
-the {\em mome raths outgrabe}.
-
-HERE IS A DIFFICULT EXAMPLE.
-
-\usepackage{ulem}
-\setlength\textwidth{3.3in}
-\begin{document}
-% \large
-No, I did {\em not} act in the movie {\em \emph{The} % <<<<<<< Nested
-\emph{Persecu}\-\emph{tion} \emph{and} \emph{Assassination} \emph{of}
-\emph{Jean-Paul} \emph{Marat}, as per\-formed by the Inmates
-of the Asylum of Charenton under the Direc\-tion of the
-Marquis de~Sade!} But I {\em did} see it.
-\end{document}
-
-In the nested emphasis, \emph had to be given for each word separately
-so the spaces between could stretch and break into lines. Even the
-discretionary hyphen (\-) in `Persecution' had to be outside the braces,
-but the hyphen in `Direction' was just fine because it was not in nested
-braces. The same applies to other special commands like \ and ~. Also,
-the spaces are printed with only a single underline because they are
-outside the nested \emph commands. This example really illustrates that
-ulem does not handle nested emphasis very well! Nevertheless, it is fine
-for simple things.
-
-Underlining can also be done according to \uline{this text}. To use this
-type of underlining, but have \em still produce italics, put the command
-\normalem in the preamble of the document or load ulem with
-\usepackage[normalem]{ulem}.
-
-Some variations on underlining are provided, including a wavey underline
-(\uwave{under-wave}), double underlines (\uuline{two lines under this}),
-dashed (\dashuline{dashes underneath}) or dotted (\dotuline{dots below})
-underlines,
-a line through text rather than under it (\sout{strike out}), and text
-crossed-out with /////// (\xout{cross out, X out}). You can define your
-own styles following the examples provided. The definition should be
-something like:
-
-\newcommand\command{\bgroup \markoverwith{something}\ULon}
-
-The "something" can be as simple as a single character, or as complex as
-you can keep track of.
-
-The various underlining commands are essentially textual, and will not
-work quite the same in math mode. But since some font commands, like \bf,
-serve both for text and math, math mode is handled (in an approximate way).
-The performance in math mode is somewhat different from in text: there will
-be no line breaks or stretching in the underlined text, and the vertical
-positioning may not be right. The results should be best for \uline,
-\uwave, \uuline, and any other truly UNDER-line you define.
-
-Any type of underlining can be substituted for any font-selection command
-by issuing a proper \useunder declaration:
-
-\useunder{\underlinecommand}{\fontdeclaration}{\fontcommand}
-
-e.g., \useunder{\uuline}{\bfseries}{\textbf} gives a double underline
-instead of bold face in LaTeX. The commands \normalem and \ULforem switch
-underlining for \em off and on, respectively, and so do the \usepackage
-options [normalem] and [ULforem]. There is also the \usepackage style
-option [UWforbf] to replace boldface with a wavey underline.
-
-UWforbf does handle \bf in math mode, but it doesn't work in section titles,
-unfortunately, because the titles are not delimited by explicit braces when
-printed by the \section command. For the present version, the \bfseries
-command still produces bold face, but \bf makes an under-wave. To get under-
-waved section titles you can do
-
-\renewcommand\@seccntformat[1]{\uwave{\csname the#1\endcsname}\hskip 1em}
-
-and later specify \section[...]{\uwave{...}}.
-
-In plain TeX there is no \textbf so you should use \useunder{\UWave}{\bf}{}.
-You can even skip a step and define the underline or overprint with \useunder:
-\useunder{\bgroup\markoverwith{!}\ULon}{\sf}{}
-
-Some commands, such as \\ and \hskip are given special treatment, but
-others (like \marginpar) are not. Support for others can be added by
-assigning special meanings in the token register \UL@hook. (In LaTeX do
-\addto@hook\UL@hook{\let\command\ULversion}.) The UL versions of commands
-should be modelled on \UL@hskip or \UL@cr, and should include the test
-"\ifx\ \LA@space". For example, support for "\marginpar" is added through
-the hook mechanism.
-
-All the underlining commands are robust in LaTeX.
-
-%====================== END INSTRUCTIONS ===========================
% Previous bug-finders: Esther Hu (\hfill in plain); Lones Smith (\tt\-);
% Steve Anderson (\ooalign accents); Thanassi Protopapas ( { in tables).
@@ -523,6 +365,8 @@
% 2010: Include \dotuline and \dashuline, typeset documentation, add \UL@setULdepth
% 2011: Change \dimen@ to \UL@height
% 2012: Removed \let\par garbage
+% 2017: Remove \makerobust
+% 2019: Handle \ULdepth better. Some tweaks.
%
% Send problem reports to asnd(a)triumf.ca
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ulem.tlpobj new/tlpkg/tlpobj/ulem.tlpobj
--- old/tlpkg/tlpobj/ulem.tlpobj 2019-02-28 04:10:45.000000000 +0100
+++ new/tlpkg/tlpobj/ulem.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name ulem
category Package
-revision 26785
+revision 53365
shortdesc Package for underlining
relocated 1
longdesc The package provides an \ul (underline) command which will
@@ -10,10 +10,9 @@
longdesc offers double and wavy underlining, and striking out (line
longdesc through words) and crossing out (/// over words). The package
longdesc works with both Plain TeX and LaTeX.
-runfiles size=6
+runfiles size=4
RELOC/tex/generic/ulem/ulem.sty
catalogue-also underlin-gen soul
catalogue-ctan /macros/latex/contrib/ulem
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics underline emphasis
++++++ ulthese.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ulthese/README.md new/doc/latex/ulthese/README.md
--- old/doc/latex/ulthese/README.md 2018-10-02 03:07:14.000000000 +0200
+++ new/doc/latex/ulthese/README.md 2019-11-29 22:56:43.000000000 +0100
@@ -18,7 +18,7 @@
## Version
-5.1 (2018-09-30)
+5.3 (2019-11-29)
## Author
@@ -35,9 +35,15 @@
Le paquetage **ulthese** fournit la classe du même nom permettant de
composer des thèses et des mémoires immédiatement conformes aux règles
générales de présentation matérielle de la Faculté des études
-supérieures et postdoctorales (FESP) de
-l'[Université Laval](https://www.ulaval.ca). La classe est
-compatible avec LaTeX et XeLaTeX.
+supérieures et postdoctorales (FESP) de l'[Université
+Laval](https://www.ulaval.ca).
+
+La classe permet également de produire les types de documents suivants
+selon les mêmes règles de présentation que les thèses et mémoires:
+examen de doctorat, essai de maîtrise, projet de recherche, rapport de
+stage.
+
+La classe est compatible avec LaTeX et XeLaTeX.
## Contenu du paquetage
@@ -55,7 +61,7 @@
latex ulthese.ins
-depuis une invite de commande. On peut aussi ouvrir le fichier
+depuis une ligne de commande. On peut aussi ouvrir le fichier
`ulthese.ins` dans son éditeur LaTeX et lancer la compilation avec
LaTeX, pdfTeX, pdfLaTeX ou XeLaTeX depuis celui-ci.
Binary files old/doc/latex/ulthese/ulthese.pdf and new/doc/latex/ulthese/ulthese.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ulthese.doc.tlpobj new/tlpkg/tlpobj/ulthese.doc.tlpobj
--- old/tlpkg/tlpobj/ulthese.doc.tlpobj 2019-02-28 04:10:45.000000000 +0100
+++ new/tlpkg/tlpobj/ulthese.doc.tlpobj 2019-11-30 01:56:54.000000000 +0100
@@ -1,9 +1,9 @@
name ulthese.doc
category Package
-revision 48802
+revision 52972
shortdesc doc files of ulthese
relocated 1
-docfiles size=85
+docfiles size=87
RELOC/doc/latex/ulthese/README.md
RELOC/doc/latex/ulthese/abstract.tex
RELOC/doc/latex/ulthese/annexe.tex
++++++ ulthese.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ulthese/ulthese.cls new/tex/latex/ulthese/ulthese.cls
--- old/tex/latex/ulthese/ulthese.cls 2018-10-02 03:07:14.000000000 +0200
+++ new/tex/latex/ulthese/ulthese.cls 2019-11-29 22:56:43.000000000 +0100
@@ -30,7 +30,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2009/09/24]
\ProvidesClass{ulthese}%
- [2018/09/30 v5.1 Universite Laval thesis and memoir class]
+ [2019/11/29 v5.3 Universite Laval thesis and memoir class]
\RequirePackage{ifxetex}
\newif\ifUL@babel \UL@babeltrue % charger babel?
\newif\ifUL@natbib \UL@natbibtrue % charger natbib?
@@ -41,6 +41,8 @@
\newif\ifUL@iscotutelle \UL@iscotutellefalse % thèse en cotutelle?
\newif\ifUL@isexam \UL@isexamfalse % examen de doctorat?
\newif\ifUL@isessay \UL@isessayfalse % essai de maîtrise?
+\newif\ifUL@isresearch \UL@isresearchfalse % projet de recherche?
+\newif\ifUL@isworkterm \UL@isworktermfalse % rapport de stage?
\newif\ifUL@hassubtitle \UL@hassubtitlefalse % document a un sous-titre?
\newif\ifUL@hastitlepage \UL@hastitlepagefalse % page titre utilisée?
\DeclareOption{nonatbib}{\UL@natbibfalse}
@@ -198,13 +200,25 @@
\else
\UL@isessaytrue
\fi}
+\DeclareOption{projet}{%
+ \UL@isresearchtrue
+ \renewcommand*{\UL@typenum}{0}
+ \def\UL@degree{\mbox{}}}
+\DeclareOption{stage}{%
+ \UL@isworktermtrue
+ \renewcommand*{\UL@typenum}{0}
+ \def\UL@degree{\mbox{}}}
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
\ExecuteOptions{11pt,letterpaper}
\ProcessOptions\relax
\ifx\UL@typenum\empty
- \ClassError{ulthese}{%
- No thesis type specified}
- {Declare the thesis type as a class option.}
+ \ifUL@isresearch\else
+ \ifUL@isworkterm\else
+ \ClassError{ulthese}{%
+ No thesis type specified}
+ {Declare the thesis type as a class option.}
+ \fi
+ \fi
\fi
\LoadClass[oneside]{memoir}
\ifxetex
@@ -345,6 +359,12 @@
\ifUL@isessay
\renewcommand*{\UL@typeofdoc}{Essai}
\fi
+\ifUL@isresearch
+ \renewcommand*{\UL@typeofdoc}{Projet de recherche}
+\fi
+\ifUL@isworkterm
+ \renewcommand*{\UL@typeofdoc}{Rapport de stage}
+\fi
\newcommand{\UL@docid}{%
{\UL@fontprogram\UL@typeofdoc\par
\ifnum\UL@typenum=2 \UL@program\par \fi}}
@@ -352,7 +372,12 @@
\ifcase\UL@typenum\relax% 0 standard
\vspace{96pt}
{\UL@fontprogram\UL@program}\par
- \UL@degree\par
+ \ifnum\ifUL@isresearch 1\else\ifUL@isworkterm 1\else 0\fi\fi
+ =1 %
+ \vspace{\baselineskip}
+ \else
+ \UL@degree
+ \fi\par
\vspace{112pt}
Qu\'ebec, Canada\par
\or% 1 multifacultaire
@@ -417,7 +442,7 @@
\addtolength{\UL@authorspacing}{-\baselineskip}
\fi}
\newcommand{\frontispice}{{%
- \ifUL@isexam\else\ifUL@isessay\else
+ \ifUL@isexam\else\ifUL@isworkterm\else
\clearpage
\pagestyle{empty}
\SingleSpacing\setlength{\parskip}{0pt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ulthese.tlpobj new/tlpkg/tlpobj/ulthese.tlpobj
--- old/tlpkg/tlpobj/ulthese.tlpobj 2019-02-28 04:10:45.000000000 +0100
+++ new/tlpkg/tlpobj/ulthese.tlpobj 2019-11-30 01:56:54.000000000 +0100
@@ -1,6 +1,6 @@
name ulthese
category Package
-revision 48802
+revision 52972
shortdesc Thesis class and templates for Universite Laval
relocated 1
longdesc The package provides a class based on memoir to prepare theses
@@ -18,7 +18,7 @@
catalogue-also memoir babel
catalogue-contact-repository https://gitlab.com/vigou3/ulthese
catalogue-ctan /macros/latex/contrib/ulthese
-catalogue-date 2018-10-01 05:30:04 +0200
+catalogue-date 2019-11-29 19:04:58 +0100
catalogue-license lppl1.3c
catalogue-topics dissertation class french
-catalogue-version 5.1
+catalogue-version 5.3
++++++ unicode-data.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/unicode-data/README.md new/doc/generic/unicode-data/README.md
--- old/doc/generic/unicode-data/README.md 2019-03-09 23:13:59.000000000 +0100
+++ new/doc/generic/unicode-data/README.md 2020-04-15 23:33:21.000000000 +0200
@@ -24,7 +24,7 @@
point itself, and `\lccode` to the lower case mapping (or if
not given to the code point itself)
- `\lccode` and `\uccode` for all of class "Lt" (title case
- letters) to the lower can upper case mappings (or if not given
+ letters) to the lower and upper case mappings (or if not given
to the code point itself)
- `\lccode` and `\uccode` for all other letter code points are
set to the code point itself
@@ -32,7 +32,11 @@
which an upper or lower case mapping is given
- `\sfcode` 0 (ignored) for code points of Unicode classes "Pe"
(closing punctuation marks) and "Pf" (final quotation marks)
-- `\Umathcode` for all letters as TeX class 7 (var)
+- `\Umathcode` for all letters (Unicode class "L") and combining
+ marks (Unicode class "M") as TeX class 7 (var)
+
+In the above, 'letters' refers to code points with Unicode class
+"L", irrespective of their TeX category code.
File: `load-unicode-math-classes.tex`
======================================
@@ -96,15 +100,30 @@
The following data files are included here with permission of the
Unicode Consortium (see below):
- `UnicodeData.txt`
+- `BidiBrackets.txt`
+- `BidiMirroring.txt`
+- `BidiMirroring-5-1-0.txt`
- `CaseFolding.txt`
- `EastAsianWidth.txt`
+- `emoji-data.txt`
+- `GraphemeBreakProperty.txt`
- `LineBreak.txt`
- `MathClass.txt`
+- `PropList.txt`
- `SpecialCasing.txt`
+- `Scripts.txt`
+- `ScriptExtension.txt`
With the exception of `MathClass.txt`, which is currently not
-formally part of the Unicode Character Database, all of the
-data files here are for Unicode 10.0.0.
+formally part of the Unicode Character Database, and
+`BidiMirroring-5-1-0.txt`, which is a data file for Unicode 5.1.0,
+all of the data files here are for Unicode 13.0.0.
+
+`BidiMirroring-5-1-0.txt` will never be updated and is included for
+OpenType font support: While `BidiMirroring.txt` lists all mirror
+pairs in the current Unicode version, only the pairs from Unicode 5.1.0
+are handled directly by the OpenType rendering system. All newer pairs
+have to be handled through font features.
Requests to include additional Unicode data files in this bundle are
welcome. Ideally this bundle will act as a single location for all
@@ -159,11 +178,22 @@
- Update data files to Unicode release 11.0.0
- v1.8 (2019-03-09)
- Update data files to Unicode release 12.0.0
+- v1.9 (2019-08-13)
+ - Update data files to Unicode release 12.1.0
+ - Add `BidiBrackets.txt`, `Scripts.txt` and `ScriptExtension.txt`
+- v1.10 (2019-08-21)
+ - Add `PropList.txt`
+- v1.11 (2019-11-28)
+ - Add `BidiMirroring.txt` and `BidiMirroring-5-1-0.txt`
+- v1.12 (2020-03-11)
+ - Update data files to Unicode release 13.0.0
+- v1.13 (2020-04-15)
+ - Add `emoji-data.txt` and `GraphemeBreakProperty.txt`
License and permission
======================
-This bundle is copyright (C) 2015-2019 The LaTeX3 Project
+This bundle is copyright (C) 2015-2020 The LaTeX3 Project
It may be distributed and/or modified under the conditions of
the LaTeX Project Public License (LPPL), either version 1.3c of
@@ -177,7 +207,7 @@
COPYRIGHT AND PERMISSION NOTICE
-Copyright © 1991-2019 Unicode, Inc. All rights reserved.
+Copyright © 1991-2020 Unicode, Inc. All rights reserved.
Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
Permission is hereby granted, free of charge, to any person obtaining
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/unicode-data.doc.tlpobj new/tlpkg/tlpobj/unicode-data.doc.tlpobj
--- old/tlpkg/tlpobj/unicode-data.doc.tlpobj 2019-03-10 02:24:13.000000000 +0100
+++ new/tlpkg/tlpobj/unicode-data.doc.tlpobj 2020-04-16 01:57:28.000000000 +0200
@@ -1,7 +1,7 @@
name unicode-data.doc
category Package
-revision 50303
+revision 54758
shortdesc doc files of unicode-data
relocated 1
-docfiles size=2
+docfiles size=3
RELOC/doc/generic/unicode-data/README.md
++++++ unicode-data.tar.xz ++++++
++++ 11402 lines of diff (skipped)
++++++ unicode-math.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/unicode-math/CHANGES.md new/doc/latex/unicode-math/CHANGES.md
--- old/doc/latex/unicode-math/CHANGES.md 2019-03-05 23:33:41.000000000 +0100
+++ new/doc/latex/unicode-math/CHANGES.md 2020-01-30 23:21:18.000000000 +0100
@@ -1,6 +1,21 @@
CHANGE HISTORY
==============
+## v0.8q (2020/01/31)
+
+ * Update to adapt to / support new features in the upcoming 2e kernel.
+ * Give a better error message if used on non-supported engines that are not pdfTeX.
+
+
+## v0.8p (2019/09/26)
+
+ * Remove dependency on `filehook` package. Just to simplify.
+ * Remove patch code for the `colonequals` package; now if you use that package
+ you will simply receive its standard ‘constructed’ symbols.
+ * Load `amsmath` automatically. This is not intended to save time for the user,
+ but to simplify the code logic. Users should continue to load `amsmath` explicitly IMO.
+
+
## v0.8o (2019/03/04)
* Avoid `'Dimension too large' error` for some (unpredictable) combinations of font
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/unicode-math/README.md new/doc/latex/unicode-math/README.md
--- old/doc/latex/unicode-math/README.md 2019-03-05 23:33:41.000000000 +0100
+++ new/doc/latex/unicode-math/README.md 2019-09-26 23:49:25.000000000 +0200
@@ -76,7 +76,7 @@
------------
As well as running XeTeX or LuaTeX, this package requires recent versions of the
-`lm-math`, `fontspec`, `expl3`, `xpackages`, `filehook`, and `lualatex-math` packages.
+`lm-math`, `fontspec`, `expl3`, `xpackages`, and `lualatex-math` packages.
THANKS
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/unicode-math/um-doc-main.tex new/doc/latex/unicode-math/um-doc-main.tex
--- old/doc/latex/unicode-math/um-doc-main.tex 2019-02-15 23:23:04.000000000 +0100
+++ new/doc/latex/unicode-math/um-doc-main.tex 2019-09-26 23:49:25.000000000 +0200
@@ -69,7 +69,7 @@
after any other maths or font-related package in case it needs to overwrite
their definitions. Here's an example using the filename syntax to load the \TeX\ Gyre Pagella Math font: (this works for both \XeLaTeX\ and \LuaLaTeX)
\begin{Verbatim}
-\usepackage{amsmath} % if desired
+\usepackage{amsmath}
\usepackage{unicode-math}
\setmathfont{texgyrepagella-math.otf}
\end{Verbatim}
@@ -78,6 +78,10 @@
you can only switch to a different OpenType maths font using the \cs{setmathfont} command.
If you do not load an OpenType maths font before |\begin{document}|, Latin Modern Math will be loaded automatically.
+Note that \pkg{amsmath} should be loaded before \pkg{unicode-math} to avoid conflicts, and
+it will be loaded automatically if not requested earlier in the preamble.
+
+
\subsection{New commands}
\LaTeX, since the first version of \LaTeXe, changed the math group
selection from, say, |{\bf x}| to |\mathbf{x}|. It introduced commands
@@ -111,7 +115,7 @@
in math and a command like |\symbf| (for the bold math font).
The five new symbol font commands that behave in this way are: \cs{symup},
-\cs{symit}, \cs{symbf}, \cs{symsf}, and \cs{symit}.
+\cs{symit}, \cs{symbf}, \cs{symsf}, and \cs{symtt}.
These commands switch to single-letter mathematical symbols
(generally within the same OpenType font).
Binary files old/doc/latex/unicode-math/unicode-math-code.pdf and new/doc/latex/unicode-math/unicode-math-code.pdf differ
Binary files old/doc/latex/unicode-math/unicode-math.pdf and new/doc/latex/unicode-math/unicode-math.pdf differ
Binary files old/doc/latex/unicode-math/unimath-example.pdf and new/doc/latex/unicode-math/unimath-example.pdf differ
Binary files old/doc/latex/unicode-math/unimath-symbols.pdf and new/doc/latex/unicode-math/unimath-symbols.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/unicode-math.doc.tlpobj new/tlpkg/tlpobj/unicode-math.doc.tlpobj
--- old/tlpkg/tlpobj/unicode-math.doc.tlpobj 2019-03-06 02:24:27.000000000 +0100
+++ new/tlpkg/tlpobj/unicode-math.doc.tlpobj 2020-01-31 01:55:53.000000000 +0100
@@ -1,9 +1,9 @@
name unicode-math.doc
category Package
-revision 50245
+revision 53609
shortdesc doc files of unicode-math
relocated 1
-docfiles size=465
+docfiles size=461
RELOC/doc/latex/unicode-math/CHANGES.md
RELOC/doc/latex/unicode-math/LICENSE
RELOC/doc/latex/unicode-math/MANIFEST.md
++++++ unicode-math.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/unicode-math/unicode-math-luatex.sty new/tex/latex/unicode-math/unicode-math-luatex.sty
--- old/tex/latex/unicode-math/unicode-math-luatex.sty 2019-03-05 23:33:41.000000000 +0100
+++ new/tex/latex/unicode-math/unicode-math-luatex.sty 2020-01-30 23:21:18.000000000 +0100
@@ -43,14 +43,26 @@
%%^^A%% Metadata for the package code, including files and versioning
\ProvidesExplPackage{unicode-math-luatex}
- {2019/03/04} {0.8o} {Unicode maths in XeLaTeX and LuaLaTeX}
+ {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX}
%%^^A%% um-code-opening.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Assorted initialisation tasks, including some low-level function definitions.
\RequirePackage{xparse,l3keys2e}
\RequirePackage{fontspec}
-\RequirePackage{filehook}
+\RequirePackage{fix-cm}
+\RequirePackage{amsmath}
+\RequirePackage{lualatex-math}
+\cs_set_protected:Npn \__um_after_package:nNn #1 #2 #3
+ {
+ \AtBeginDocument
+ {
+ \cs_new_protected:Npn #2 {#3}
+ \@ifpackageloaded {#1} {#2} {}
+ }
+ }
+\RequirePackage{xparse,l3keys2e}
+\RequirePackage{fontspec}
\RequirePackage{fix-cm}
\RequirePackage{lualatex-math}
\cs_set_protected_nopar:Npn \exp_last_unbraced:NNx { \::N \::x_unbraced \::: }
@@ -672,13 +684,13 @@
}
\__um_msg_new:nn {no-main-font}
{
- No main maths font has been set up yet.\\If you simply want ^^e2^^80^^98the default^^e2^^80^^99, use: \\
+ No main maths font has been set up yet.\\If you simply want ‘the default’, use: \\
\iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}}
}
\__um_msg_new:nn {not-ot-math}
{
The first font loaded by unicode-math must be an OpenType Math font (with script=math).
- If you simply want ^^e2^^80^^98the default^^e2^^80^^99 before loading supplementary fonts over the top for certain
+ If you simply want ‘the default’ before loading supplementary fonts over the top for certain
ranges, use: \\
\iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}}
}
@@ -1096,10 +1108,10 @@
\tl_if_empty:NT \l__um_mversion_tl
{
\tl_set:Nn \l__um_mversion_tl {normal}
- \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+ \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault}
}
- \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+ \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault}
% integrate with fontspec's \setmathrm etc:
\tl_case:Nn #1
@@ -1161,27 +1173,35 @@
\__fontspec_setmathtt_hook:nn {#1} {#2}
}
}
+\cs_new:Nn \__um_rm_series_default:n
+ {
+ \ifcsname #1series@rm\endcsname
+ \csname #1series@rm\endcsname
+ \else
+ \csname #1default\endcsname
+ \fi
+ }
\__um_cs_set:Nn \__fontspec_setmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
- \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\itdefault
+ \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\__um_cs_set:Nn \__fontspec_setboldmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault
\SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault
}
\__um_cs_set:Nn \__fontspec_setmathsf_hook:nn
{
- \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
- \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+ \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\__um_cs_set:Nn \__fontspec_setmathtt_hook:nn
{
- \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
- \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+ \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\tl_if_eq:onF {\g__fontspec_mathrm_tl} {\rmdefault} { \__fontspec_setmathrm_hook:nn {} {} }
\tl_if_eq:onF {\g__fontspec_mathsf_tl} {\sfdefault} { \__fontspec_setmathsf_hook:nn {} {} }
@@ -1373,14 +1393,14 @@
\cs_if_exist:cF { sym \l__um_symfont_label_tl }
{
\DeclareSymbolFont{\l__um_symfont_label_tl}
- {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault}
}
\SetSymbolFont{\l__um_symfont_label_tl}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{\l__um_symfont_label_tl}{bold}
- {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_setup_legacy_fam_two:
@@ -1410,12 +1430,12 @@
} {\l__um_fontname_tl}
\SetSymbolFont{symbols}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{symbols}{bold}
- {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_setup_legacy_fam_three:
@@ -1435,12 +1455,12 @@
} {\l__um_fontname_tl}
\SetSymbolFont{largesymbols}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{largesymbols}{bold}
- {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_onceoff_setup:
@@ -3626,34 +3646,7 @@
%%^^A%% um-code-compat.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Compatibility with 3rd party packages.
-\cs_new_protected_nopar:Nn \__um_check_and_fix:NNnnn
- {
- \cs_if_exist:NT #1
- {
- \token_if_macro:NTF #1
- {
- \group_begin:
- #2 \__um_tmpa:w #3 { #4 }
- \cs_if_eq:NNTF #1 \__um_tmpa:w
- {
- \msg_info:nnx { unicode-math } { patch-macro } { \token_to_str:N #1 }
- \group_end:
- #2 #1 #3 { #5 }
- }
- {
- \msg_warning:nnxxx { unicode-math } { wrong-meaning }
- { \token_to_str:N #1 } { \token_to_meaning:N #1 }
- { \token_to_meaning:N \__um_tmpa:w }
- \group_end:
- }
- }
- {
- \msg_warning:nnx { unicode-math } { macro-expected }
- { \token_to_str:N #1 }
- }
- }
- }
-\AtEndOfPackageFile * {url}
+\__um_after_package:nNn {url} \__um_patch_url:
{
\tl_put_left:Nn \Url@FormatString { \__um_switch_to:n {literal} }
\tl_put_right:Nn \UrlSpecials
@@ -3664,7 +3657,7 @@
\do \& { \mathchar`\& }
}
}
-\AtEndOfPackageFile * { mathtools }
+\__um_after_package:nNn { mathtools } \__um_patch_mathtools_B:
{
\cs_set_eq:NN \MToverbracket \overbracket
\cs_set_eq:NN \MTunderbracket \underbracket
@@ -3673,20 +3666,20 @@
{
\msg_warning:nn { unicode-math } { mathtools-overbracket }
- \cs_set:Npn \downbracketfill #1 #2
+ \cs_set:Npn \downbracketfill ##1 ##2
{
\tl_set:Nn \l_MT_bracketheight_fdim {.27ex}
- \downbracketend {#1} {#2}
- \leaders \vrule \@height #1 \@depth \z@ \hfill
- \downbracketend {#1} {#2}
+ \downbracketend {##1} {##2}
+ \leaders \vrule \@height ##1 \@depth \z@ \hfill
+ \downbracketend {##1} {##2}
}
- \cs_set:Npn \upbracketfill #1 #2
+ \cs_set:Npn \upbracketfill ##1 ##2
{
\tl_set:Nn \l_MT_bracketheight_fdim {.27ex}
- \upbracketend {#1} {#2}
- \leaders \vrule \@height \z@ \@depth #1 \hfill
- \upbracketend {#1} {#2}
+ \upbracketend {##1} {##2}
+ \leaders \vrule \@height \z@ \@depth ##1 \hfill
+ \upbracketend {##1} {##2}
}
\cs_set_eq:NN \Uoverbracket \overbracket
@@ -3695,30 +3688,18 @@
\cs_set_eq:NN \underbracket \MTunderbracket
}
}
-\AtEndOfPackageFile * { mathtools }
+\__um_after_package:nNn { mathtools } \__um_patch_mathtools_C:
{
\msg_warning:nn { unicode-math } { mathtools-colon }
- \NewDocumentCommand \dblcolon { } { \Colon }
- \NewDocumentCommand \coloneqq { } { \coloneq }
- \NewDocumentCommand \Coloneqq { } { \Coloneq }
- \NewDocumentCommand \eqqcolon { } { \eqcolon }
- }
-\AtEndOfPackageFile * { colonequals }
- {
- \msg_warning:nn { unicode-math } { colonequals }
- \RenewDocumentCommand \ratio { } { \mathratio }
- \RenewDocumentCommand \coloncolon { } { \Colon }
- \RenewDocumentCommand \minuscolon { } { \dashcolon }
- \RenewDocumentCommand \colonequals { } { \coloneq }
- \RenewDocumentCommand \equalscolon { } { \eqcolon }
- \RenewDocumentCommand \coloncolonequals { } { \Coloneq }
+ \DeclareDocumentCommand \dblcolon { } { \Colon }
+ \DeclareDocumentCommand \coloneqq { } { \coloneq }
+ \DeclareDocumentCommand \Coloneqq { } { \Coloneq }
+ \DeclareDocumentCommand \eqqcolon { } { \eqcolon }
}
%%^^A%% um-code-amsmath.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Compatibility with amsmath.
-\AtEndOfPackageFile * {amsmath}
- {
\tl_remove_once:Nn \@begindocumenthook
{
\mathchardef\std@minus\mathcode`\-\relax
@@ -3731,19 +3712,7 @@
}
\cs_set:Npn \@cdots {\mathinner{\unicodecdots}}
\cs_set_eq:NN \dotsb@ \cdots
- \__um_check_and_fix:NNnnn \plainroot@ \cs_set_nopar:Npn { #1 \of #2 }
- {
- \setbox \rootbox \hbox
- {
- $ \m@th \scriptscriptstyle { #1 } $
- }
- \mathchoice
- { \r@@t \displaystyle { #2 } }
- { \r@@t \textstyle { #2 } }~
- { \r@@t \scriptstyle { #2 } }
- { \r@@t \scriptscriptstyle { #2 } }
- \egroup
- }
+ \cs_set_nopar:Npn \plainroot@ #1 \of #2
{
\bool_if:nTF
{
@@ -3767,20 +3736,7 @@
}
\c_group_end_token
}
- \__um_check_and_fix:NNnnn \r@@t \cs_set_nopar:Npn { #1 #2 }
- {
- \setboxz@h { $ \m@th #1 \sqrtsign { #2 } $ }
- \dimen@ \ht\z@
- \advance \dimen@ -\dp\z@
- \setbox\@ne \hbox { $ \m@th #1 \mskip \uproot@ mu $ }
- \advance \dimen@ by 1.667 \wd\@ne
- \mkern -\leftroot@ mu
- \mkern 5mu
- \raise .6\dimen@ \copy\rootbox
- \mkern -10mu
- \mkern \leftroot@ mu
- \boxz@
- }
+ \cs_set_nopar:Npn \r@@t #1 #2
{
\hbox_set:Nn \l_tmpa_box
{
@@ -3804,7 +3760,6 @@
}
{ #2 }
}
- }
%%^^A%% um-code-epilogue.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Assorted definitions to close up.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/unicode-math/unicode-math-xetex.sty new/tex/latex/unicode-math/unicode-math-xetex.sty
--- old/tex/latex/unicode-math/unicode-math-xetex.sty 2019-03-05 23:33:41.000000000 +0100
+++ new/tex/latex/unicode-math/unicode-math-xetex.sty 2020-01-30 23:21:18.000000000 +0100
@@ -43,14 +43,25 @@
%%^^A%% Metadata for the package code, including files and versioning
\ProvidesExplPackage{unicode-math-xetex}
- {2019/03/04} {0.8o} {Unicode maths in XeLaTeX and LuaLaTeX}
+ {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX}
%%^^A%% um-code-opening.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Assorted initialisation tasks, including some low-level function definitions.
\RequirePackage{xparse,l3keys2e}
\RequirePackage{fontspec}
-\RequirePackage{filehook}
+\RequirePackage{fix-cm}
+\RequirePackage{amsmath}
+\cs_set_protected:Npn \__um_after_package:nNn #1 #2 #3
+ {
+ \AtBeginDocument
+ {
+ \cs_new_protected:Npn #2 {#3}
+ \@ifpackageloaded {#1} {#2} {}
+ }
+ }
+\RequirePackage{xparse,l3keys2e}
+\RequirePackage{fontspec}
\RequirePackage{fix-cm}
\cs_set_protected_nopar:Npn \exp_last_unbraced:NNx { \::N \::x_unbraced \::: }
\cs_generate_variant:Nn \fontspec_set_family:Nnn {Nx,Nxx}
@@ -664,13 +675,13 @@
}
\__um_msg_new:nn {no-main-font}
{
- No main maths font has been set up yet.\\If you simply want ^^e2^^80^^98the default^^e2^^80^^99, use: \\
+ No main maths font has been set up yet.\\If you simply want ‘the default’, use: \\
\iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}}
}
\__um_msg_new:nn {not-ot-math}
{
The first font loaded by unicode-math must be an OpenType Math font (with script=math).
- If you simply want ^^e2^^80^^98the default^^e2^^80^^99 before loading supplementary fonts over the top for certain
+ If you simply want ‘the default’ before loading supplementary fonts over the top for certain
ranges, use: \\
\iow_indent:n {\token_to_str:N\setmathfont{latinmodern-math.otf}}
}
@@ -1088,10 +1099,10 @@
\tl_if_empty:NT \l__um_mversion_tl
{
\tl_set:Nn \l__um_mversion_tl {normal}
- \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+ \DeclareMathAlphabet #1 {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault}
}
- \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\updefault}
+ \SetMathAlphabet #1 {\l__um_mversion_tl} {\g_fontspec_encoding_tl} {\l__um_tmpa_tl} {\mddefault} {\shapedefault}
% integrate with fontspec's \setmathrm etc:
\tl_case:Nn #1
@@ -1153,27 +1164,35 @@
\__fontspec_setmathtt_hook:nn {#1} {#2}
}
}
+\cs_new:Nn \__um_rm_series_default:n
+ {
+ \ifcsname #1series@rm\endcsname
+ \csname #1series@rm\endcsname
+ \else
+ \csname #1default\endcsname
+ \fi
+ }
\__um_cs_set:Nn \__fontspec_setmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\mddefault\itdefault
- \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathit{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {md}}\itdefault
+ \SetMathAlphabet\mathbf{normal}\g_fontspec_encoding_tl\g__fontspec_mathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\__um_cs_set:Nn \__fontspec_setboldmathrm_hook:nn
{
- \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\updefault
- \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\bfdefault\updefault
+ \SetMathAlphabet\mathrm{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathbf{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl{\__um_rm_series_default:n {bf}}\shapedefault
\SetMathAlphabet\mathit{bold}\g_fontspec_encoding_tl\g__fontspec_bfmathrm_tl\mddefault\itdefault
}
\__um_cs_set:Nn \__fontspec_setmathsf_hook:nn
{
- \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl\mddefault\updefault
- \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl\bfdefault\updefault
+ \SetMathAlphabet\mathsf{normal}\g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathsf{bold} \g_fontspec_encoding_tl\g__fontspec_mathsf_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\__um_cs_set:Nn \__fontspec_setmathtt_hook:nn
{
- \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl\mddefault\updefault
- \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl\bfdefault\updefault
+ \SetMathAlphabet\mathtt{normal}\g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {md}}\shapedefault
+ \SetMathAlphabet\mathtt{bold} \g_fontspec_encoding_tl\g__fontspec_mathtt_tl{\__um_rm_series_default:n {bf}}\shapedefault
}
\tl_if_eq:onF {\g__fontspec_mathrm_tl} {\rmdefault} { \__fontspec_setmathrm_hook:nn {} {} }
\tl_if_eq:onF {\g__fontspec_mathsf_tl} {\sfdefault} { \__fontspec_setmathsf_hook:nn {} {} }
@@ -1338,14 +1357,14 @@
\cs_if_exist:cF { sym \l__um_symfont_label_tl }
{
\DeclareSymbolFont{\l__um_symfont_label_tl}
- {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault}
}
\SetSymbolFont{\l__um_symfont_label_tl}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_family_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{\l__um_symfont_label_tl}{bold}
- {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_family_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_setup_legacy_fam_two:
@@ -1375,12 +1394,12 @@
} {\l__um_fontname_tl}
\SetSymbolFont{symbols}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_two_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{symbols}{bold}
- {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_two_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_setup_legacy_fam_three:
@@ -1400,12 +1419,12 @@
} {\l__um_fontname_tl}
\SetSymbolFont{largesymbols}{\l__um_mversion_tl}
- {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_three_tl}{\mddefault}{\shapedefault}
\str_if_eq:eeT {\l__um_mversion_tl} {normal}
{
\SetSymbolFont{largesymbols}{bold}
- {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\updefault}
+ {\encodingdefault}{\l__um_fam_three_tl}{\bfdefault}{\shapedefault}
}
}
\__um_cs_new:Nn \__um_onceoff_setup:
@@ -3555,34 +3574,7 @@
%%^^A%% um-code-compat.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Compatibility with 3rd party packages.
-\cs_new_protected_nopar:Nn \__um_check_and_fix:NNnnn
- {
- \cs_if_exist:NT #1
- {
- \token_if_macro:NTF #1
- {
- \group_begin:
- #2 \__um_tmpa:w #3 { #4 }
- \cs_if_eq:NNTF #1 \__um_tmpa:w
- {
- \msg_info:nnx { unicode-math } { patch-macro } { \token_to_str:N #1 }
- \group_end:
- #2 #1 #3 { #5 }
- }
- {
- \msg_warning:nnxxx { unicode-math } { wrong-meaning }
- { \token_to_str:N #1 } { \token_to_meaning:N #1 }
- { \token_to_meaning:N \__um_tmpa:w }
- \group_end:
- }
- }
- {
- \msg_warning:nnx { unicode-math } { macro-expected }
- { \token_to_str:N #1 }
- }
- }
- }
-\AtEndOfPackageFile * {url}
+\__um_after_package:nNn {url} \__um_patch_url:
{
\tl_put_left:Nn \Url@FormatString { \__um_switch_to:n {literal} }
\tl_put_right:Nn \UrlSpecials
@@ -3593,48 +3585,26 @@
\do \& { \mathchar`\& }
}
}
-\AtEndOfPackageFile * { mathtools }
+\__um_after_package:nNn { mathtools } \__um_patch_mathtools_A:
{
- \__um_check_and_fix:NNnnn \MT_cramped_internal:Nn \cs_set_nopar:Npn { #1 #2 }
- {
- \sbox \z@ { $ \m@th #1 \nulldelimiterspace = \z@ \radical \z@ { #2 } $ }
- \ifx #1 \displaystyle
- \dimen@ = \fontdimen 8 \textfont 3
- \advance \dimen@ .25 \fontdimen 5 \textfont 2
- \else
- \dimen@ = 1.25 \fontdimen 8
- \ifx #1 \textstyle
- \textfont
- \else
- \ifx #1 \scriptstyle
- \scriptfont
- \else
- \scriptscriptfont
- \fi
- \fi
- 3
- \fi
- \advance \dimen@ -\ht\z@
- \ht\z@ = -\dimen@
- \box\z@
- }
+ \cs_set_nopar:Npn \MT_cramped_internal:Nn ##1 ##2
{
\hbox_set:Nn \l_tmpa_box
{
\color@setgroup \c_math_toggle_token \m@th
- #1
+ ##1
\dim_zero:N \nulldelimiterspace
- \XeTeXradical 255 ~ 0 ~ { #2 }
+ \XeTeXradical 255 ~ 0 ~ { ##2 }
\c_math_toggle_token \color@endgroup
}
\box_set_ht:Nn \l_tmpa_box
{
- \box_ht:N \l_tmpa_box - \__um_radical_vgap:N #1
+ \box_ht:N \l_tmpa_box - \__um_radical_vgap:N ##1
}
\box_use_drop:N \l_tmpa_box
}
}
-\AtEndOfPackageFile * { mathtools }
+\__um_after_package:nNn { mathtools } \__um_patch_mathtools_B:
{
\cs_set_eq:NN \MToverbracket \overbracket
\cs_set_eq:NN \MTunderbracket \underbracket
@@ -3643,20 +3613,20 @@
{
\msg_warning:nn { unicode-math } { mathtools-overbracket }
- \cs_set:Npn \downbracketfill #1 #2
+ \cs_set:Npn \downbracketfill ##1 ##2
{
\tl_set:Nn \l_MT_bracketheight_fdim {.27ex}
- \downbracketend {#1} {#2}
- \leaders \vrule \@height #1 \@depth \z@ \hfill
- \downbracketend {#1} {#2}
+ \downbracketend {##1} {##2}
+ \leaders \vrule \@height ##1 \@depth \z@ \hfill
+ \downbracketend {##1} {##2}
}
- \cs_set:Npn \upbracketfill #1 #2
+ \cs_set:Npn \upbracketfill ##1 ##2
{
\tl_set:Nn \l_MT_bracketheight_fdim {.27ex}
- \upbracketend {#1} {#2}
- \leaders \vrule \@height \z@ \@depth #1 \hfill
- \upbracketend {#1} {#2}
+ \upbracketend {##1} {##2}
+ \leaders \vrule \@height \z@ \@depth ##1 \hfill
+ \upbracketend {##1} {##2}
}
\cs_set_eq:NN \Uoverbracket \overbracket
@@ -3665,30 +3635,18 @@
\cs_set_eq:NN \underbracket \MTunderbracket
}
}
-\AtEndOfPackageFile * { mathtools }
+\__um_after_package:nNn { mathtools } \__um_patch_mathtools_C:
{
\msg_warning:nn { unicode-math } { mathtools-colon }
- \NewDocumentCommand \dblcolon { } { \Colon }
- \NewDocumentCommand \coloneqq { } { \coloneq }
- \NewDocumentCommand \Coloneqq { } { \Coloneq }
- \NewDocumentCommand \eqqcolon { } { \eqcolon }
- }
-\AtEndOfPackageFile * { colonequals }
- {
- \msg_warning:nn { unicode-math } { colonequals }
- \RenewDocumentCommand \ratio { } { \mathratio }
- \RenewDocumentCommand \coloncolon { } { \Colon }
- \RenewDocumentCommand \minuscolon { } { \dashcolon }
- \RenewDocumentCommand \colonequals { } { \coloneq }
- \RenewDocumentCommand \equalscolon { } { \eqcolon }
- \RenewDocumentCommand \coloncolonequals { } { \Coloneq }
+ \DeclareDocumentCommand \dblcolon { } { \Colon }
+ \DeclareDocumentCommand \coloneqq { } { \coloneq }
+ \DeclareDocumentCommand \Coloneqq { } { \Coloneq }
+ \DeclareDocumentCommand \eqqcolon { } { \eqcolon }
}
%%^^A%% um-code-amsmath.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Compatibility with amsmath.
-\AtEndOfPackageFile * {amsmath}
- {
\tl_remove_once:Nn \@begindocumenthook
{
\mathchardef\std@minus\mathcode`\-\relax
@@ -3706,24 +3664,7 @@
\setbox\z@\hbox{$($}%)
\ht\Mathstrutbox@\ht\z@ \dp\Mathstrutbox@\dp\z@
}
- \__um_check_and_fix:NNnnn \subarray \cs_set:Npn { #1 }
- {
- \vcenter
- \bgroup
- \Let@
- \restore@math@cr
- \default@tag
- \baselineskip \fontdimen 10~ \scriptfont \tw@
- \advance \baselineskip \fontdimen 12~ \scriptfont \tw@
- \lineskip \thr@@ \fontdimen 8~ \scriptfont \thr@@
- \lineskiplimit \lineskip
- \ialign
- \bgroup
- \ifx c #1 \hfil \fi
- $ \m@th \scriptstyle ## $
- \hfil
- \crcr
- }
+ \cs_set:Npn \subarray #1
{
\vcenter
\c_group_begin_token
@@ -3748,20 +3689,7 @@
\hfil
\crcr
}
- \__um_check_and_fix:NNnnn \r@@t \cs_set_nopar:Npn { #1 #2 }
- {
- \setboxz@h { $ \m@th #1 \sqrtsign { #2 } $ }
- \dimen@ \ht\z@
- \advance \dimen@ -\dp\z@
- \setbox\@ne \hbox { $ \m@th #1 \mskip \uproot@ mu $ }
- \advance \dimen@ by 1.667 \wd\@ne
- \mkern -\leftroot@ mu
- \mkern 5mu
- \raise .6\dimen@ \copy\rootbox
- \mkern -10mu
- \mkern \leftroot@ mu
- \boxz@
- }
+ \cs_set_nopar:Npn \r@@t #1 #2
{
\hbox_set:Nn \l_tmpa_box
{
@@ -3787,7 +3715,6 @@
\mkern \leftroot@ mu
\box_use_drop:N \l_tmpa_box
}
- }
%%^^A%% um-code-epilogue.dtx -- part of UNICODE-MATH <wspr.io/unicode-math>
%%^^A%% Assorted definitions to close up.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/unicode-math/unicode-math.sty new/tex/latex/unicode-math/unicode-math.sty
--- old/tex/latex/unicode-math/unicode-math.sty 2019-03-05 23:33:41.000000000 +0100
+++ new/tex/latex/unicode-math/unicode-math.sty 2020-01-30 23:21:18.000000000 +0100
@@ -24,14 +24,19 @@
\RequirePackage{expl3}
\ProvidesExplPackage{unicode-math}
- {2019/03/04} {0.8o} {Unicode maths in XeLaTeX and LuaLaTeX}
-\sys_if_engine_luatex:T { \RequirePackageWithOptions{unicode-math-luatex} }
-\sys_if_engine_xetex:T { \RequirePackageWithOptions{unicode-math-xetex} }
-\sys_if_engine_pdftex:T
+ {2020/01/31} {0.8q} {Unicode maths in XeLaTeX and LuaLaTeX}
+\sys_if_engine_luatex:T
{
- \msg_new:nnn {unicode-math} {not-pdftex}
- { Cannot~ be~ run~ with~ pdfLaTeX!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. }
- \msg_error:nn {unicode-math} {not-pdftex}
+ \RequirePackageWithOptions{unicode-math-luatex}
+ \endinput
}
+\sys_if_engine_xetex:T
+ {
+ \RequirePackageWithOptions{unicode-math-xetex}
+ \endinput
+ }
+\msg_new:nnn {unicode-math} {unsupported-engine}
+ { Cannot~ be~ run~ with~ \c_sys_engine_str!\\ Use~ XeLaTeX~ or~ LuaLaTeX~ instead. }
+\msg_error:nn {unicode-math} {unsupported-engine}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/unicode-math.tlpobj new/tlpkg/tlpobj/unicode-math.tlpobj
--- old/tlpkg/tlpobj/unicode-math.tlpobj 2019-03-06 02:24:28.000000000 +0100
+++ new/tlpkg/tlpobj/unicode-math.tlpobj 2020-01-31 01:55:53.000000000 +0100
@@ -1,20 +1,29 @@
name unicode-math
category Package
-revision 50245
+revision 53609
shortdesc Unicode mathematics support for XeTeX and LuaTeX
relocated 1
longdesc This package will provide a complete implementation of unicode
longdesc maths for XeLaTeX and LuaLaTeX. Unicode maths is currently
-longdesc supported by the following fonts: Cambria Math (Microsoft),
-longdesc Minion Math (Johannes Kuster, typoma GmbH) Latin Modern Math
-longdesc (Boguslaw Jackowski, Janusz M. Nowacki) TeX Gyre Pagella Math
-longdesc (Boguslaw Jackowski, Janusz M. Nowacki) Asana-Math fonts
-longdesc (Apostolos Syropolous), Neo Euler (Khaled Hosny), STIX (STI
-longdesc Pub), and XITS Math (Khaled Hosny). As well as running XeTeX or
-longdesc LuaTeX, this package requires recent versions of the fontspec,
-longdesc expl3, xpackages, filehook, ucharcat and lualatex-math
-longdesc packages.
+longdesc supported by the following freely available fonts: Latin Modern
+longdesc Math (Boguslaw Jackowski, Janusz M. Nowacki), TeX Gyre Bonum
+longdesc Math (Boguslaw Jackowski, , P. Strzelczyk, Janusz M. Nowacki),
+longdesc TeX Gyre Pagella Math (Boguslaw Jackowski, , P. Strzelczyk,
+longdesc Janusz M. Nowacki), TeX Gyre Schola Math (Boguslaw Jackowski,
+longdesc P. Strzelczyk, Janusz M. Nowacki), TeX Gyre Termes Math
+longdesc (Boguslaw Jackowski, P. Strzelczyk, Janusz M. Nowacki), DejaVu
+longdesc Math TeX Gyre (Boguslaw Jackowski, P. Strzelczyk, Janusz M.
+longdesc Nowacki), Asana-Math fonts (Apostolos Syropolous), STIX (STI
+longdesc Pub), XITS Math (Khaled Hosny), Libertinus Math (Philipp H.
+longdesc Poll and Khaled Hosny), and Fira Math (Xiangdong Zeng). The
+longdesc following fonts are proprietary with OpenType maths support:
+longdesc Lucida Bright Math (Charles Bigelow and Kris Holmes), Cambria
+longdesc Math (Microsoft), Minion Math (Johannes Kuster, typoma GmbH).
+longdesc As well as running XeTeX or LuaTeX, this package requires
+longdesc recent versions of the fontspec, expl3, xpackages, ucharcat and
+longdesc lualatex-math packages.
depend fontspec
+depend lm-math
runfiles size=127
RELOC/tex/latex/unicode-math/unicode-math-luatex.sty
RELOC/tex/latex/unicode-math/unicode-math-table.tex
@@ -24,7 +33,6 @@
catalogue-contact-home http://wspr.io/unicode-math/
catalogue-contact-repository https://github.com/wspr/unicode-math/
catalogue-ctan /macros/latex/contrib/unicode-math
-catalogue-date 2019-03-05 08:54:40 +0100
catalogue-license lppl1.3c
catalogue-topics maths font-use luatex xetex unicode
-catalogue-version 0.8o
+catalogue-version 0.8q
++++++ universa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/universa/README.md new/doc/fonts/universa/README.md
--- old/doc/fonts/universa/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/universa/README.md 2019-08-30 00:50:25.000000000 +0200
@@ -0,0 +1,100 @@
+# The Metafont Implementation of the Universal font
+
+## Version 2.1, 2019/08/26
+## by Christian Holm
+
+This is the universal package containing my implementation of Herbert
+Bayers `universal' font in Metafont, with LaTeX2e support.
+
+
+## Installation
+
+## Using Autotools
+
+ autoreconf -i -f
+ ./configure
+ make
+ make install
+
+## By hand
+
+To install the package do:
+
+1. Make sure you have created the following directories:
+
+ <TeX-base>/tex/latex/universa/
+ <TeX-base>/doc/latex/universa/
+ <TeX-base>/fonts/source/public/universa/
+
+ Where _TeX-base_ is the root of you TeX installation. The most
+ common values of _TeX-base_ is
+
+ /usr/local/lib/texmf (teTeX on Unix-like systems)
+ C:\EMTEX (emTeX on DOS-like systems)
+
+ but could also be something like:
+
+ /home/johndoe/lib/texmf (user installation on Unix-like systems)
+ D:\Program Files\TeX (Some wierd Windows95 installation)
+
+2. Put the files `universa.ins' and `universa.dtx' in some temporary
+ directory.
+
+3. Do
+ latex universa.ins
+
+ 1. If you `docstrip` program is set up correctly, that is,
+ `docstrip.cfg` exists and contains the line
+
+ \BaseDirectory{<TeX-base>}
+
+ then all files will be put in the right directories, and you
+ need to do nothing more.
+
+ 2. If no `docstrip.cfg' is present on the system, then you need to
+ move the files your self. You should move the files as
+ specified below:
+
+ *.mf => <TeX-base>/fonts/source/public/universa/
+ *.fd => <TeX-base>/tex/latex/universa/
+ uni.sty => <TeX-base>/tex/latex/universa/
+ unidoc.sty => <TeX-base>/doc/latex/universa/
+ copyright => <TeX-base>/doc/latex/universa/
+
+ 4. In any case you need to move the files below as specified
+ below:
+
+ universa.dtx => <TeX-base>/tex/latex/universa/
+ universa.ins => <TeX-base>/tex/latex/universa/
+ README.md => <TeX-base>/tex/latex/universa/
+
+ so that you can produce the documentation. You can of course
+ compress those file to save disk space.
+
+5. If you are using some TeX distribution that has a database (that is
+ proberly the case if your TeX distribution uses `kpathsea'), you
+ should update that database.
+
+6. To produce the documentation go to the directory where you put
+ `unidoc`, i.e., `<TeX-base>/doc/latex/universa/`, and do
+
+ latex universa.dtx
+ latex universa.dtx
+ makeindex -s gind -o uni.ind uni.idx
+ makeindex -s gglo -o uni.gls uni.glo
+ latex universa.dtx
+ latex universa.dtx
+
+ This should leave you with a file `uni.dvi` (or `uni.pdf`). You
+ can remove the files
+
+ uni.idx uni.glo uni.log uni.aux uni.toc uni.ilg uni.out
+
+ You may need to substitute `makeindex` with what is relevant for
+ your system, e.g., `makeindx` in emTeX.
+
+I hope you will enjoy this package.
+
+Please read the file `copyright` in the documentation directory, for
+the copyright notice.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/universa/README.uni new/doc/fonts/universa/README.uni
--- old/doc/fonts/universa/README.uni 2008-10-31 19:42:03.000000000 +0100
+++ new/doc/fonts/universa/README.uni 1970-01-01 01:00:00.000000000 +0100
@@ -1,75 +0,0 @@
-The Metafont Implementation of the Universal font
-Version 2.0, 98/08/01
-by Christian Holm
-
-This is the universal package containing my implementation of Herbert
-Bayers `universal' font in Metafont, with LaTeX2e support.
-
-To install the package do:
-
-1. Make sure you have created the following directories:
- <TeX-base>/tex/latex/universa/
- <TeX-base>/doc/latex/universa/
- <TeX-base>/fonts/source/public/universa/
-Where <TeX-base> is the root of you TeX installation. The most common
-values of <TeX-base> is
- /usr/local/lib/texmf (teTeX on Unix-like systems)
- C:\EMTEX (emTeX on DOS-like systems)
-but could also be something like:
- /home/johndoe/lib/texmf (user installation on Unix-like systems)
- D:\Program Files\TeX (Some wierd Windows95 installation)
-
-2. Put the files `uni.ins' and `uni.dtx' in some temporary directory.
-
-3. Do
- latex uni.ins
-3.1 If you `docstrip' program is setup correctly, that is,
-`docstrip.cfg' exists and contains the line
- \BaseDirectory{<TeX-base>}
-then all files will be put in the right directories, and you need to
-do nothing more.
-3.2 If no `docstrip.cfg' is present on the system, then you need to
-move the files your self. You should move the files as specified
-below:
- *.mf => <TeX-base>/fonts/source/public/universa/
- *.fd => <TeX-base>/tex/latex/universa/
- uni.sty => <TeX-base>/tex/latex/universa/
- unidoc.sty => <TeX-base>/doc/latex/universa/
- copyright => <TeX-base>/doc/latex/universa/
-
-4. In any case you need to move the files below as specified below:
- uni.dtx => <TeX-base>/tex/latex/universa/
- uni.ins => <TeX-base>/tex/latex/universa/
- README => <TeX-base>/tex/latex/universa/
-so that you can produce the documentation. You can ofcourse compress
-those file to save disk space.
-
-5. If you are using some TeX distribution that has a database (that is
-proberly the case if your TeX distribution uses `kpathsea'), you
-should update that database.
-
-6. To produce the documentation go to the directory where you put
-`uni.doc', i.e., <TeX-base>/doc/latex/universa/, and do
- latex uni.dtx
- latex uni.dtx
- makeindex -s gind -o uni.ind uni.idx
- makeindex -s gglo -o uni.gls uni.glo
- latex uni.dtx
- latex uni.dtx
-This should leave you with a file `uni.dvi'. You can remove the files
- uni.idx uni.glo uni.log uni.aux uni.toc uni.ilg
-You may need to substitute `makeindex' with what is relevant for your
-system, e.g., `makeindx' in emTeX.
-
-I hope you will enjoy this package. I can be reached at
- Normal Mail:
- Christian Holm
- Sankt Hansgade 23, 1. th
- DK-2200 Copenhagen N
- Denmark
- E-mail:
- cholm(a)fys.ku.dk
- cholm(a)nbi.dk
-Please read the file `copyright' in the documantation directory, for
-the copyright notice.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/universa/copying.tex new/doc/fonts/universa/copying.tex
--- old/doc/fonts/universa/copying.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/universa/copying.tex 2019-08-30 00:50:25.000000000 +0200
@@ -0,0 +1,378 @@
+%%
+%% This is file `copying',
+%% generated with the docstrip utility.
+%%
+%% The original source files were:
+%%
+%% universa.dtx (with options: `copyright')
+%%
+%% Copyright (C) 1998 Christian Holm.
+%%
+%% This file is NOT the source for universal, because almost all
+%% comments have been stripped from it. It is NOT the preferred
+%% form of universal for making modifications to it.
+%%
+%% Therefore you can NOT redistribute and/or modify THIS file.
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
+%% General Public License as published by the Free Software
+%% Foundation; either version 2, or (at your option) any later
+%% version.
+%%
+%% The universal font and package 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 package; if not, write to the
+%% Free Software Foundation, Inc.,
+%% 675 Mass Ave, Cambridge,
+%% MA 02139, USA.
+%%
+%% See the file universa.dtx for further comments and documentation.
+%%
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 675 Mass Ave, Cambridge, MA 02139, 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) 19yy <name of author>
+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 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., 675 Mass Ave, Cambridge, MA 02139, 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) 19yy 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.
+
+
+\endinput
+%%
+%% End of file `copying'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/universa/copyright.tex new/doc/fonts/universa/copyright.tex
--- old/doc/fonts/universa/copyright.tex 2006-01-09 01:56:57.000000000 +0100
+++ new/doc/fonts/universa/copyright.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,379 +0,0 @@
-%%
-%% This is file `copyright',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% uni.dtx (with options: `copyright')
-%%
-%% Copyright (C) 1998 Christian Holm.
-%%
-%% This file is NOT the source for universal, because almost all
-%% comments have been stripped from it. It is NOT the preferred
-%% form of universal for making modifications to it.
-%%
-%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
-%% General Public License as published by the Free Software
-%% Foundation; either version 2, or (at your option) any later
-%% version.
-%%
-%% The universal font and package 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 package; if not, write to the
-%% Free Software Foundation, Inc.,
-%% 675 Mass Ave, Cambridge,
-%% MA 02139, USA.
-%%
-%% See the file uni.dtx for further comments and documentation.
-%%
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.
- 675 Mass Ave, Cambridge, MA 02139, 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) 19yy <name of author>
-
- This program is free software; you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation; either version 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., 675 Mass Ave, Cambridge, MA 02139, 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) 19yy 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.
-
-
-
-\endinput
-%%
-%% End of file `copyright'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/universa/unidoc.sty new/doc/fonts/universa/unidoc.sty
--- old/doc/fonts/universa/unidoc.sty 2008-10-31 19:42:03.000000000 +0100
+++ new/doc/fonts/universa/unidoc.sty 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `docpackage')
+%% universa.dtx (with options: `docpackage')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,19 +30,28 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
-\def\fileversion{v2.0}
-\def\filedate{98/08/01}
-\ProvidesPackage{unidoc}[\filedate\space\fileversion\space universal
- documenation package.]
+\ProvidesPackage{unidoc}
+ [\unifiledate\space\unifileversion\space universal documenation package.]
\newif\ifeepic\eepicfalse
\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{uni}}
\ProcessOptions\relax
\RequirePackage{doc}
\RequirePackage{mflogo}
+\RequirePackage[colorlinks,%
+ linkcolor=red,%
+ anchorcolor=black,%
+ citecolor=green,%
+ filecolor=black,%
+ menucolor=black,%
+ urlcolor=blue,%
+ hyperindex,%
+ linktocpage,%
+ pdfduplex=duplexFlipLongEdge,%
+ a4paper,%
+ bookmarks=true]{hyperref}
\RequirePackage{uni}
\IfFileExists{eepic.sty}{%
\RequirePackage{eepic}\eepictrue}{%
@@ -107,7 +116,6 @@
\let\beginillu\ifeepic
\let\illuother\else
\let\endillu\fi
-
\def\Newestchanges#1#2#3{
\ifx\saved@macroname\@empty%
\marginpar{\small\raggedright{\sl Change on} #2, {\sl Version}
@@ -177,15 +185,17 @@
&\hex C&&\hex D&&\hex E&&\hex F&\cr
\egroup$$\par}
-\def\FontChart#1{
+\def\FontChart#1#2{
%% \marginpar{\small\raggedright Letters and symbols in \texttt{#1}
%% font.}
- \begin{figure}
+ \begin{figure}[htbp]
\begingroup
\font\chart@font=#1
\chart@font
\chart
- \endgroup
+ \endgroup
+ \caption{Letters and symbols in \texttt{#1} --- #2}
+ \label{fig:font:#1}
\end{figure}}
\IndexPrologue{%
@@ -225,7 +235,11 @@
\small,\smash,\space,\special@index,\SpecialMainIndex,\stop,\string,%
\strut,\tabskip,\TeX,\TeXbook,\textit,\textsf,\textsl,\texttt,\the,%
\thepage,\tt,\typeout,\unhbox,\universal,\upshape,\usefont,\vbox,%
- \vcenter,\vrule,\write,\xdef,\z@}
+ \vcenter,\vrule,\write,\xdef,\z@,\PackageError,\PackageWarning,
+ \PassOptionsToPackage,\GlossaryPrologue,\',\0,\1,\bfseries,
+ \centerlargechars,\DeclareRobustCommand,\DeclareTextFontCommand,
+ \ExecuteOptions,\familydefault,\fontencoding,\fontfamily,\hex,\oct,
+ \IndexPrologue,\oddline}
\EnableCrossrefs
\CodelineIndex
@@ -234,9 +248,8 @@
\marginparwidth=54pt
\newcommand{\NFSS}{\textsf{NFSS}}
\newcommand{\ftnguide}{\textit{\LaTeXe{} Font Selection}}
-\newcommand{\clsguide}{
- \textit{\LaTeXe{} for Class and Packages Writers}}
-\newcommand{\TeXbook}{\TeX\textsf{book}}
+\newcommand{\clsguide}{ \textit{\LaTeXe{} for Class and Packages
+ Writers}} \newcommand{\TeXbook}{\TeX\textsf{book}}
\newcommand{\MFbook}{\MF\textsf{book}}
\newcommand{\universal}{\textunibf{universal}}
Binary files old/doc/fonts/universa/universa.pdf and new/doc/fonts/universa/universa.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/universa.doc.tlpobj new/tlpkg/tlpobj/universa.doc.tlpobj
--- old/tlpkg/tlpobj/universa.doc.tlpobj 2019-02-28 04:11:21.000000000 +0100
+++ new/tlpkg/tlpobj/universa.doc.tlpobj 2019-08-30 01:54:08.000000000 +0200
@@ -1,9 +1,10 @@
name universa.doc
category Package
-revision 15878
+revision 51984
shortdesc doc files of universa
relocated 1
-docfiles size=9
- RELOC/doc/fonts/universa/README.uni
- RELOC/doc/fonts/universa/copyright.tex
+docfiles size=210
+ RELOC/doc/fonts/universa/README.md
+ RELOC/doc/fonts/universa/copying.tex
RELOC/doc/fonts/universa/unidoc.sty
+ RELOC/doc/fonts/universa/universa.pdf
++++++ universa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbc10.mf new/fonts/source/public/universa/fulbc10.mf
--- old/fonts/source/public/universa/fulbc10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbc10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,caps,ten')
+%% universa.dtx (with options: `font,bold,caps,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbc12.mf new/fonts/source/public/universa/fulbc12.mf
--- old/fonts/source/public/universa/fulbc12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbc12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,caps,twelve')
+%% universa.dtx (with options: `font,bold,caps,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbc17.mf new/fonts/source/public/universa/fulbc17.mf
--- old/fonts/source/public/universa/fulbc17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbc17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,caps,seventeen')
+%% universa.dtx (with options: `font,bold,caps,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbc8.mf new/fonts/source/public/universa/fulbc8.mf
--- old/fonts/source/public/universa/fulbc8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbc8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,caps,eight')
+%% universa.dtx (with options: `font,bold,caps,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbc9.mf new/fonts/source/public/universa/fulbc9.mf
--- old/fonts/source/public/universa/fulbc9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbc9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,caps,nine')
+%% universa.dtx (with options: `font,bold,caps,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbo10.mf new/fonts/source/public/universa/fulbo10.mf
--- old/fonts/source/public/universa/fulbo10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbo10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,slanted,ten')
+%% universa.dtx (with options: `font,bold,slanted,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbo12.mf new/fonts/source/public/universa/fulbo12.mf
--- old/fonts/source/public/universa/fulbo12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbo12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,slanted,twelve')
+%% universa.dtx (with options: `font,bold,slanted,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbo17.mf new/fonts/source/public/universa/fulbo17.mf
--- old/fonts/source/public/universa/fulbo17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbo17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,slanted,seventeen')
+%% universa.dtx (with options: `font,bold,slanted,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbo8.mf new/fonts/source/public/universa/fulbo8.mf
--- old/fonts/source/public/universa/fulbo8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbo8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,slanted,eight')
+%% universa.dtx (with options: `font,bold,slanted,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbo9.mf new/fonts/source/public/universa/fulbo9.mf
--- old/fonts/source/public/universa/fulbo9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbo9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,slanted,nine')
+%% universa.dtx (with options: `font,bold,slanted,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbr10.mf new/fonts/source/public/universa/fulbr10.mf
--- old/fonts/source/public/universa/fulbr10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbr10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,ten')
+%% universa.dtx (with options: `font,bold,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbr12.mf new/fonts/source/public/universa/fulbr12.mf
--- old/fonts/source/public/universa/fulbr12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbr12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,twelve')
+%% universa.dtx (with options: `font,bold,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbr17.mf new/fonts/source/public/universa/fulbr17.mf
--- old/fonts/source/public/universa/fulbr17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbr17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,seventeen')
+%% universa.dtx (with options: `font,bold,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbr8.mf new/fonts/source/public/universa/fulbr8.mf
--- old/fonts/source/public/universa/fulbr8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbr8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,eight')
+%% universa.dtx (with options: `font,bold,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbr9.mf new/fonts/source/public/universa/fulbr9.mf
--- old/fonts/source/public/universa/fulbr9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbr9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,nine')
+%% universa.dtx (with options: `font,bold,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbst10.mf new/fonts/source/public/universa/fulbst10.mf
--- old/fonts/source/public/universa/fulbst10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbst10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,strict,ten')
+%% universa.dtx (with options: `font,bold,strict,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbst12.mf new/fonts/source/public/universa/fulbst12.mf
--- old/fonts/source/public/universa/fulbst12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbst12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,strict,twelve')
+%% universa.dtx (with options: `font,bold,strict,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbst17.mf new/fonts/source/public/universa/fulbst17.mf
--- old/fonts/source/public/universa/fulbst17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbst17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,strict,seventeen')
+%% universa.dtx (with options: `font,bold,strict,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbst8.mf new/fonts/source/public/universa/fulbst8.mf
--- old/fonts/source/public/universa/fulbst8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbst8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,strict,eight')
+%% universa.dtx (with options: `font,bold,strict,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulbst9.mf new/fonts/source/public/universa/fulbst9.mf
--- old/fonts/source/public/universa/fulbst9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulbst9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,bold,strict,nine')
+%% universa.dtx (with options: `font,bold,strict,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmc10.mf new/fonts/source/public/universa/fulmc10.mf
--- old/fonts/source/public/universa/fulmc10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmc10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,caps,ten')
+%% universa.dtx (with options: `font,medium,caps,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmc12.mf new/fonts/source/public/universa/fulmc12.mf
--- old/fonts/source/public/universa/fulmc12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmc12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,caps,twelve')
+%% universa.dtx (with options: `font,medium,caps,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmc17.mf new/fonts/source/public/universa/fulmc17.mf
--- old/fonts/source/public/universa/fulmc17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmc17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,caps,seventeen')
+%% universa.dtx (with options: `font,medium,caps,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmc8.mf new/fonts/source/public/universa/fulmc8.mf
--- old/fonts/source/public/universa/fulmc8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmc8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,caps,eight')
+%% universa.dtx (with options: `font,medium,caps,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmc9.mf new/fonts/source/public/universa/fulmc9.mf
--- old/fonts/source/public/universa/fulmc9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmc9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,caps,nine')
+%% universa.dtx (with options: `font,medium,caps,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmo10.mf new/fonts/source/public/universa/fulmo10.mf
--- old/fonts/source/public/universa/fulmo10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmo10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,slanted,ten')
+%% universa.dtx (with options: `font,medium,slanted,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmo12.mf new/fonts/source/public/universa/fulmo12.mf
--- old/fonts/source/public/universa/fulmo12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmo12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,slanted,twelve')
+%% universa.dtx (with options: `font,medium,slanted,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmo17.mf new/fonts/source/public/universa/fulmo17.mf
--- old/fonts/source/public/universa/fulmo17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmo17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,slanted,seventeen')
+%% universa.dtx (with options: `font,medium,slanted,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmo8.mf new/fonts/source/public/universa/fulmo8.mf
--- old/fonts/source/public/universa/fulmo8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmo8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,slanted,eight')
+%% universa.dtx (with options: `font,medium,slanted,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmo9.mf new/fonts/source/public/universa/fulmo9.mf
--- old/fonts/source/public/universa/fulmo9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmo9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,slanted,nine')
+%% universa.dtx (with options: `font,medium,slanted,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmr10.mf new/fonts/source/public/universa/fulmr10.mf
--- old/fonts/source/public/universa/fulmr10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmr10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,ten')
+%% universa.dtx (with options: `font,medium,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmr12.mf new/fonts/source/public/universa/fulmr12.mf
--- old/fonts/source/public/universa/fulmr12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmr12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,twelve')
+%% universa.dtx (with options: `font,medium,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmr17.mf new/fonts/source/public/universa/fulmr17.mf
--- old/fonts/source/public/universa/fulmr17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmr17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,seventeen')
+%% universa.dtx (with options: `font,medium,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmr8.mf new/fonts/source/public/universa/fulmr8.mf
--- old/fonts/source/public/universa/fulmr8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmr8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,eight')
+%% universa.dtx (with options: `font,medium,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmr9.mf new/fonts/source/public/universa/fulmr9.mf
--- old/fonts/source/public/universa/fulmr9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmr9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,nine')
+%% universa.dtx (with options: `font,medium,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmst10.mf new/fonts/source/public/universa/fulmst10.mf
--- old/fonts/source/public/universa/fulmst10.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmst10.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,strict,ten')
+%% universa.dtx (with options: `font,medium,strict,ten')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmst12.mf new/fonts/source/public/universa/fulmst12.mf
--- old/fonts/source/public/universa/fulmst12.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmst12.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,strict,twelve')
+%% universa.dtx (with options: `font,medium,strict,twelve')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmst17.mf new/fonts/source/public/universa/fulmst17.mf
--- old/fonts/source/public/universa/fulmst17.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmst17.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,strict,seventeen')
+%% universa.dtx (with options: `font,medium,strict,seventeen')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmst8.mf new/fonts/source/public/universa/fulmst8.mf
--- old/fonts/source/public/universa/fulmst8.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmst8.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,strict,eight')
+%% universa.dtx (with options: `font,medium,strict,eight')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/fulmst9.mf new/fonts/source/public/universa/fulmst9.mf
--- old/fonts/source/public/universa/fulmst9.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/fulmst9.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `font,medium,strict,nine')
+%% universa.dtx (with options: `font,medium,strict,nine')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if unknown unibase : input unibase; fi;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/uniacc.mf new/fonts/source/public/universa/uniacc.mf
--- old/fonts/source/public/universa/uniacc.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/uniacc.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `acc')
+%% universa.dtx (with options: `acc')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
beginchar(hex"12",x_w#,l_h#,0) ; "The accent `" ;
uniend(P_T/2,(w/2,a_h+P_T/2),90,270,10) ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unibase.mf new/fonts/source/public/universa/unibase.mf
--- old/fonts/source/public/universa/unibase.mf 2008-10-31 19:42:03.000000000 +0100
+++ new/fonts/source/public/universa/unibase.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `unibase')
+%% universa.dtx (with options: `unibase')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,10 +30,9 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
unibase := 1 ;
string univer ;
univer = "2.0" ;
@@ -45,8 +44,8 @@
caps := false ; strict := false ;
font_identifier:="universal";
-def start_font(expr size) =
- u# := size/18 ;
+def start_font(expr size) =
+ u# := size/18 ;
mode_setup;
x_h# := 8u# ; x_w# := 8u# ; m_w# := 11u# ; l_h# := 13u# ;
p_d# := 5u# ; l_s# := 2u# ; r_s# := 2u# ; A_w# := 10u# ;
@@ -120,7 +119,7 @@
fi
enddef ;
-inner bye; % so we can use it inside a macro
+inner bye;
def end_font =
ligtable "u" : "h" kern u# ;
ligtable "f" : "f" kern 0 , "l" kern 0 , "i" kern 0 ;
@@ -138,7 +137,7 @@
"l" kern -3c_d#*cosd(15)-p_t#*sind(15)-l_s#-r_s# ,
"L" kern -3c_d#*cosd(15)-p_t#*sind(15)-l_s#-r_s# ;
bye
-enddef;
+enddef ;
def do_caps(expr offset) =
sc_shrink := x_h#/l_h# ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unidig.mf new/fonts/source/public/universa/unidig.mf
--- old/fonts/source/public/universa/unidig.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/unidig.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `dig')
+%% universa.dtx (with options: `dig')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
beginchar("0",A_w#,l_h#,0) ; "The number 0" ;
uniarc(w/2,p_t,(w/2,h-w/2),0,180,10) ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/uniext.mf new/fonts/source/public/universa/uniext.mf
--- old/fonts/source/public/universa/uniext.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/uniext.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `ext')
+%% universa.dtx (with options: `ext')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
currenttransform := identity ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unilig.mf new/fonts/source/public/universa/unilig.mf
--- old/fonts/source/public/universa/unilig.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/unilig.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `lig')
+%% universa.dtx (with options: `lig')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if caps:
beginchar(hex"19",5/2x_w#,x_h#,0) ; "Ligature SS" ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unilow.mf new/fonts/source/public/universa/unilow.mf
--- old/fonts/source/public/universa/unilow.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/unilow.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `low')
+%% universa.dtx (with options: `low')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if not caps :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unipun.mf new/fonts/source/public/universa/unipun.mf
--- old/fonts/source/public/universa/unipun.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/unipun.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `pun')
+%% universa.dtx (with options: `pun')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
beginchar("!",P_T#,l_h#,0) ; "The exclamation mark (!)" ;
pickup UniPensqu ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/unispe.mf new/fonts/source/public/universa/unispe.mf
--- old/fonts/source/public/universa/unispe.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/unispe.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `spe')
+%% universa.dtx (with options: `spe')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
beginchar(hex"10",p_t#,x_h#,0) ; "The dotless letter i" ;
pickup unipensqu ;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/universa/uniupp.mf new/fonts/source/public/universa/uniupp.mf
--- old/fonts/source/public/universa/uniupp.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/universa/uniupp.mf 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `upp')
+%% universa.dtx (with options: `upp')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,9 +13,9 @@
%% implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
%% PURPOSE. See the GNU General Public License for more details.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
+%%
%%
-
if not strict :
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/omluni.fd new/tex/latex/universa/omluni.fd
--- old/tex/latex/universa/omluni.fd 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/omluni.fd 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `oml')
+%% universa.dtx (with options: `oml')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,11 +30,12 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
\ProvidesFile{omluni.fd}
- [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+ [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
\DeclareFontFamily{OML}{uni}{\skewchar\font127 }
\DeclareFontShape{OML}{uni}{m}{n}{<-> ssub * cmm/m/it}{}
\DeclareFontShape{OML}{uni}{m}{it}{<-> ssub * cmm/m/it}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/omsuni.fd new/tex/latex/universa/omsuni.fd
--- old/tex/latex/universa/omsuni.fd 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/omsuni.fd 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `oms')
+%% universa.dtx (with options: `oms')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,11 +30,12 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
\ProvidesFile{omsuni.fd}
- [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+ [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
\DeclareFontFamily{OMS}{uni}{\skewchar\font48 }
\DeclareFontShape{OMS}{uni}{m}{n}{<-> ssub * cmsy/m/n}{}
\DeclareFontShape{OMS}{uni}{m}{it}{<-> ssub * cmsy/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/ot1uni.fd new/tex/latex/universa/ot1uni.fd
--- old/tex/latex/universa/ot1uni.fd 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/ot1uni.fd 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `ot1')
+%% universa.dtx (with options: `ot1')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,11 +30,12 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
\ProvidesFile{ot1uni.fd}%
- [1998/08/01 v2.0 Non standard LaTeX font definitions]
+ [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
\DeclareFontFamily{OT1}{uni}{\hyphenchar\font45 }
\DeclareFontShape{OT1}{uni}{m}{n}{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/t1uni.fd new/tex/latex/universa/t1uni.fd
--- old/tex/latex/universa/t1uni.fd 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/t1uni.fd 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `t1')
+%% universa.dtx (with options: `t1')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,11 +30,12 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
\ProvidesFile{t1uni.fd}
- [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+ [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
\typeout{WARNING: universal font not avaliable in t1 definition.}
\typeout{WARNING: exiting, correct your source.}
\stop
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/uni.sty new/tex/latex/universa/uni.sty
--- old/tex/latex/universa/uni.sty 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/uni.sty 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `package')
+%% universa.dtx (with options: `package')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,18 +30,16 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
-\def\fileversion{v2.0}
-\def\filedate{98/08/01}
-\ProvidesPackage{uni}[\filedate\space\fileversion\space universal
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
+\ProvidesPackage{uni}[\unifiledate\space\unifileversion\space universal
package.]
\newif\if@uni\@unifalse
\newif\ifstri@t\stri@tfalse
\newif\ifdef@ult\def@ultfalse
\newif\ifm@dium\m@diumfalse
-
\DeclareOption{strict}{\stri@ttrue}
\DeclareOption{default}{\def@ulttrue}
\DeclareOption{medium}{\m@diumtrue}
@@ -56,7 +54,7 @@
\@ifundefined{\temp@}{%
\edef\temp@c{{%
\noexpand\if@uni\noexpand\aftergroup\temp@a\noexpand%
- \else\noexpand\UniError{#1}\noexpand\fi}}}{%
+ \else\noexpand\UniError{\noexpand#1}\noexpand\fi}}}{%
\edef\temp@b{\csname no@uni@\temp@\endcsname}
\edef\temp@c{{%
\noexpand\if@uni\noexpand\aftergroup\temp@a\noexpand%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/universa/uuni.fd new/tex/latex/universa/uuni.fd
--- old/tex/latex/universa/uuni.fd 2006-01-13 01:10:43.000000000 +0100
+++ new/tex/latex/universa/uuni.fd 2019-08-30 00:50:25.000000000 +0200
@@ -4,7 +4,7 @@
%%
%% The original source files were:
%%
-%% uni.dtx (with options: `u')
+%% universa.dtx (with options: `u')
%%
%% Copyright (C) 1998 Christian Holm.
%%
@@ -13,8 +13,8 @@
%% form of universal for making modifications to it.
%%
%% Therefore you can NOT redistribute and/or modify THIS file.
-%% You can however redistribute the complete source (uni.dtx
-%% and uni.ins) and/or modify it under the terms of the GNU
+%% You can however redistribute the complete source (universa.dtx
+%% and universa.ins) and/or modify it under the terms of the GNU
%% General Public License as published by the Free Software
%% Foundation; either version 2, or (at your option) any later
%% version.
@@ -30,11 +30,12 @@
%% 675 Mass Ave, Cambridge,
%% MA 02139, USA.
%%
-%% See the file uni.dtx for further comments and documentation.
+%% See the file universa.dtx for further comments and documentation.
%%
-
+\def\unifileversion{v2.1}
+\def\unifiledate{2019/08/26}
\ProvidesFile{uuni.fd}
- [1998/08/01 v2.0 Non Standard LaTeX font definitions]
+ [\unifiledate\space\unifileversion\space Non Standard LaTeX font definitions]
\DeclareFontFamiliy{U}{uni}{\hyphenchar\font45}
\DeclareFontShape{U}{uni}{m}{n}{
<5><6><7><8>fulmr8
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/universa.tlpobj new/tlpkg/tlpobj/universa.tlpobj
--- old/tlpkg/tlpobj/universa.tlpobj 2019-02-28 04:11:21.000000000 +0100
+++ new/tlpkg/tlpobj/universa.tlpobj 2019-08-30 01:54:08.000000000 +0200
@@ -1,12 +1,12 @@
name universa
category Package
-revision 15878
+revision 51984
shortdesc Herbert Bayer's 'universal' font
relocated 1
-longdesc An implementation of the universal font by Herbert Bayer of the
-longdesc Bauhaus school. The Metafont sources of the fonts, and their
-longdesc LaTeX support, are all supplied in a LaTeX documented source
-longdesc (.dtx) file.
+longdesc An implementation of the "universal" font by Herbert Bayer of
+longdesc the Bauhaus school. The Metafont sources of the fonts, and
+longdesc their LaTeX support, are all supplied in a LaTeX documented
+longdesc source (.dtx) file.
runfiles size=104
RELOC/fonts/source/public/universa/fulbc10.mf
RELOC/fonts/source/public/universa/fulbc12.mf
@@ -104,7 +104,7 @@
RELOC/tex/latex/universa/uni.sty
RELOC/tex/latex/universa/uuni.fd
catalogue-ctan /fonts/universa
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-08-29 19:08:05 +0200
catalogue-license gpl
-catalogue-topics font font-mf
-catalogue-version 2.0
+catalogue-topics font font-proportional font-sans font-mf
+catalogue-version 2.1
++++++ unravel.doc.tar.xz ++++++
Binary files old/doc/latex/unravel/unravel.pdf and new/doc/latex/unravel/unravel.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/unravel.doc.tlpobj new/tlpkg/tlpobj/unravel.doc.tlpobj
--- old/tlpkg/tlpobj/unravel.doc.tlpobj 2019-03-24 02:24:35.000000000 +0100
+++ new/tlpkg/tlpobj/unravel.doc.tlpobj 2019-11-17 01:55:38.000000000 +0100
@@ -1,6 +1,6 @@
name unravel.doc
category Package
-revision 50557
+revision 52822
shortdesc doc files of unravel
relocated 1
docfiles size=170
++++++ unravel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/unravel/unravel.sty new/tex/latex/unravel/unravel.sty
--- old/tex/latex/unravel/unravel.sty 2019-03-23 23:05:48.000000000 +0100
+++ new/tex/latex/unravel/unravel.sty 2019-11-16 23:15:42.000000000 +0100
@@ -153,7 +153,7 @@
{%
\csname __unravel_setup_restore:\endcsname
\ProvidesExplPackage
- {unravel} {2019/03/23} {0.2g} {Watching TeX digest tokens}%
+ {unravel} {2019/11/15} {0.2h} {Watching TeX digest tokens}%
\csname __unravel_setup_unravel:\endcsname
}%
\cs_new_eq:NN \__unravel_currentgrouptype: \tex_currentgrouptype:D
@@ -324,11 +324,6 @@
}
\cs_new_eq:NN \__unravel_exit_point: \prg_do_nothing:
\cs_new:Npn \__unravel_exit:w #1 \__unravel_exit_point: { }
-\cs_new:Npn \__unravel_exit_error:w #1 \__unravel_exit_point: #2 \__unravel_final_bad:
- {
- \__unravel_error:nnnnn { runaway-unravel } { } { } { } { }
- #2
- }
\cs_new:Npn \__unravel_exit_hard:w #1 \__unravel_exit_point: #2 \__unravel_exit_point: { }
\cs_new_eq:NN \__unravel_break_point: \prg_do_nothing:
\cs_new:Npn \__unravel_break:w #1 \__unravel_break_point: { }
@@ -473,23 +468,23 @@
\gtl_concat:NNN \l__unravel_prev_input_gtl \l__unravel_prev_input_gtl #1
\__unravel_prev_input_gpush_gtl:N \l__unravel_prev_input_gtl
}
-\cs_new_protected:Npn \__unravel_prev_input_join_get:nN #1
+\cs_new_protected:Npn \__unravel_prev_input_join_get:nnN #1
{
\int_case:nnF {#1}
{
- { 2 } { \__unravel_join_get_aux:NNN \skip_eval:n \tex_glueexpr:D }
- { 3 } { \__unravel_join_get_aux:NNN \muskip_eval:n \tex_muexpr:D }
+ { 2 } { \__unravel_join_get_aux:NNnN \skip_eval:n \tex_glueexpr:D }
+ { 3 } { \__unravel_join_get_aux:NNnN \muskip_eval:n \tex_muexpr:D }
}
{
\__unravel_error:nnnnn { internal } { join-factor } { } { } { }
- \__unravel_join_get_aux:NNN \use:n \prg_do_nothing:
+ \__unravel_join_get_aux:NNnN \use:n \prg_do_nothing:
}
}
-\cs_new_protected:Npn \__unravel_join_get_aux:NNN #1#2#3
+\cs_new_protected:Npn \__unravel_join_get_aux:NNnN #1#2#3#4
{
\__unravel_prev_input_gpop:N \l__unravel_head_tl
\__unravel_prev_input_gpop:N \l__unravel_tmpa_tl
- \tl_set:Nx #3 { #1 { \l__unravel_tmpa_tl #2 \l__unravel_head_tl } }
+ \tl_set:Nx #4 { #1 { \l__unravel_tmpa_tl #2 \l__unravel_head_tl #3 } }
}
\tl_new:N \g__unravel_before_print_state_tl
\tl_new:N \g__unravel_before_prompt_tl
@@ -499,6 +494,7 @@
\bool_new:N \g__unravel_default_internal_debug_bool
\bool_new:N \g__unravel_default_number_steps_bool
\int_new:N \g__unravel_default_online_int
+\clist_new:N \g__unravel_default_prompt_input_clist
\bool_new:N \g__unravel_default_trace_assigns_bool
\bool_new:N \g__unravel_default_trace_expansion_bool
\bool_new:N \g__unravel_default_trace_other_bool
@@ -513,6 +509,7 @@
\bool_new:N \g__unravel_internal_debug_bool
\bool_new:N \g__unravel_number_steps_bool
\int_new:N \g__unravel_online_int
+\clist_new:N \g__unravel_prompt_input_clist
\bool_new:N \g__unravel_trace_assigns_bool
\bool_new:N \g__unravel_trace_expansion_bool
\bool_new:N \g__unravel_trace_other_bool
@@ -1263,11 +1260,10 @@
\__unravel_tex_primitive:nnn { pdfximagebbox } { convert } { 31 }
\__unravel_tex_primitive:nnn { jobname } { convert } { 32 }
\sys_if_engine_luatex:T
- {
- \__unravel_tex_primitive:nnn { directlua } { convert } { 33 }
- \__unravel_tex_primitive:nnn { expanded } { convert } { 34 }
- \__unravel_tex_primitive:nnn { luaescapestring } { convert } { 35 }
- }
+ { \__unravel_tex_primitive:nnn { directlua } { convert } { 33 } }
+\__unravel_tex_primitive:nnn { expanded } { convert } { 34 }
+\sys_if_engine_luatex:T
+ { \__unravel_tex_primitive:nnn { luaescapestring } { convert } { 35 } }
\sys_if_engine_xetex:T
{
\__unravel_tex_primitive:nnn { Ucharcat } { convert } { 40 }
@@ -1288,20 +1284,22 @@
\cs_new_protected:Npn \__unravel_get_next:
{
\__unravel_input_if_empty:TF
- { \__unravel_exit_error:w }
{
- \__unravel_input_gpop:N \l__unravel_head_gtl
- \gtl_head_do:NN \l__unravel_head_gtl \__unravel_get_next_aux:w
- \gtl_if_tl:NTF \l__unravel_head_gtl
- {
- \tl_set:Nx \l__unravel_head_tl
- { \gtl_head:N \l__unravel_head_gtl }
- \token_if_eq_meaning:NNT
- \l__unravel_head_token \__unravel_special_relax:
- \__unravel_get_next_notexpanded:
- }
- { \tl_clear:N \l__unravel_head_tl }
+ \__unravel_error:nnnnn { runaway-unravel } { } { } { } { }
+ \__unravel_back_input_gtl:N \c__unravel_frozen_relax_gtl
}
+ { }
+ \__unravel_input_gpop:N \l__unravel_head_gtl
+ \gtl_head_do:NN \l__unravel_head_gtl \__unravel_get_next_aux:w
+ \gtl_if_tl:NTF \l__unravel_head_gtl
+ {
+ \tl_set:Nx \l__unravel_head_tl
+ { \gtl_head:N \l__unravel_head_gtl }
+ \token_if_eq_meaning:NNT
+ \l__unravel_head_token \__unravel_special_relax:
+ \__unravel_get_next_notexpanded:
+ }
+ { \tl_clear:N \l__unravel_head_tl }
}
\cs_new_protected:Npn \__unravel_get_next_aux:w
{ \cs_set_eq:NN \l__unravel_head_token }
@@ -1470,6 +1468,7 @@
{ char } { \__unravel_set_cmd_aux_given:n { char_given } }
{ kchar } { \__unravel_set_cmd_aux_given:n { char_given } }
{ mathchar } { \__unravel_set_cmd_aux_given:n { math_given } }
+ { omathchar } { \__unravel_set_cmd_aux_given:n { math_given } }
}
{
\__unravel_set_cmd_aux_primitive:nTF {#1}
@@ -2386,11 +2385,14 @@
{
\__unravel_prev_input_gpush:
\__unravel_scan_something_internal:n {#1}
- \__unravel_prev_input_join_get:nN {#1} \l__unravel_tmpa_tl
+ \int_compare:nNnTF \g__unravel_val_level_int = { 0 }
+ { \__unravel_prev_input_join_get:nnN {#1} { sp } \l__unravel_tmpa_tl }
+ { \__unravel_prev_input_join_get:nnN {#1} { } \l__unravel_tmpa_tl }
\__unravel_prev_input_gpush:N \l__unravel_tmpa_tl
- \__unravel_break:w
+ \exp_after:wN \use_none:n \__unravel_break:w
}
- { \__unravel_back_input: }
+ { }
+ \__unravel_back_input:
\int_compare:nNnT {#1} = { 3 }
{
\__unravel_scan_keyword:nT { mMuU } { \__unravel_break:w }
@@ -2417,6 +2419,7 @@
\__unravel_tex_error:nV { missing-pt } \l__unravel_head_tl
\__unravel_prev_input:n { pt }
\__unravel_break_point:
+ \__unravel_skip_optional_space:
}
\cs_new_protected:Npn \__unravel_scan_inf_unit_loop:
{ \__unravel_scan_keyword:nT { lL } { \__unravel_scan_inf_unit_loop: } }
@@ -2457,7 +2460,7 @@
{ \__unravel_break:w }
}
{ \__unravel_back_input: \__unravel_scan_dimen:nN {#1} \c_false_bool }
- \__unravel_prev_input_join_get:nN {#1} \l__unravel_tmpa_tl
+ \__unravel_prev_input_join_get:nnN {#1} { } \l__unravel_tmpa_tl
\__unravel_prev_input_gpush:
\__unravel_prev_input_gpush:N \l__unravel_tmpa_tl
\__unravel_scan_keyword:nT { pPlLuUsS }
@@ -2465,7 +2468,7 @@
\__unravel_scan_keyword:nT { mMiInNuUsS }
{ \__unravel_scan_dimen:nN {#1} \c_true_bool }
\__unravel_break_point:
- \__unravel_prev_input_join_get:nN {#1} \l__unravel_tmpa_tl
+ \__unravel_prev_input_join_get:nnN {#1} { } \l__unravel_tmpa_tl
\__unravel_prev_input_silent:V \l__unravel_tmpa_tl
}
\cs_new_protected:Npn \__unravel_scan_file_name:
@@ -3002,15 +3005,8 @@
}
\__unravel_print_action:
}
-\cs_new_protected:Npn \__unravel_do_step:
- {
- \__unravel_set_action_text:
- \bool_if:NT \g__unravel_internal_debug_bool
- { \__unravel_exp_args:Nx \iow_term:n { Cmd:~\int_to_arabic:n { \l__unravel_head_cmd_int } } }
- \cs_if_exist_use:cF
- { __unravel_cmd_ \int_use:N \l__unravel_head_cmd_int : }
- { \__unravel_error:nxxxx { internal } { unknown-command } { } { } { } }
- }
+\cs_new_protected:Npn \__unravel_forbidden_case:
+ { \__unravel_tex_error:nV { forbidden-case } \l__unravel_head_tl }
\__unravel_new_tex_cmd:nn { relax } % 0
{
\token_if_eq_meaning:NNT \l__unravel_head_token \__unravel_special_relax:
@@ -4730,7 +4726,8 @@
\cs_if_eq:NNTF #1 \__unravel_get_token_xdef:
{
\tl_put_right:NV \l__unravel_defining_tl \l__unravel_head_tl
- \__unravel_prev_input:V \l__unravel_head_tl
+ \__unravel_prev_input_silent:x { \l__unravel_head_tl }
+ \__unravel_print_action:
}
{
\cs_if_eq:NNTF #1 \__unravel_get_token_x:
@@ -4905,7 +4902,7 @@
\__unravel_print_expansion:x
{
\g__unravel_action_text_str = false ~
- => ~ skipped ~ to ~ \iow_char:N\\fi
+ => ~ skip ~ to ~ \tl_to_str:N \l__unravel_head_tl
}
}
\cs_new_protected:Npn \__unravel_cond_false_loop:n #1
@@ -4980,7 +4977,10 @@
\gtl_if_head_is_group_begin:NTF #1 { \c_group_begin_token }
{
\gtl_if_head_is_group_end:NTF #1 { \c_group_end_token }
- { \exp_not:N \exp_not:N \gtl_head_do:NN #1 \exp_not:N }
+ {
+ \exp_not:N \exp_not:N
+ \exp_not:f { \gtl_head_do:NN #1 \exp_stop_f: }
+ }
}
}
}
@@ -5106,10 +5106,9 @@
\__unravel_set_action_text:x
{
\g__unravel_action_text_str \c_space_tl
- => ~ skipped ~ to ~ \tl_to_str:N \l__unravel_head_tl
+ => ~ skip ~ to ~ \tl_to_str:N \l__unravel_head_tl
}
}
- % ^^A todo: in the terminal output the token itself is missing.
\__unravel_print_expansion:
\__unravel_cond_pop:
}
@@ -5347,13 +5346,28 @@
}
\cs_new_protected:Npn \__unravel_prompt_aux:
{
- \int_compare:nNnT { \tex_interactionmode:D } = { 3 }
+ \clist_if_empty:NTF \g__unravel_prompt_input_clist
{
- \bool_if:NTF \g__unravel_explicit_prompt_bool
- { \__unravel_ior_str_get:Nc \c__unravel_prompt_ior }
- { \__unravel_ior_str_get:Nc \c__unravel_noprompt_ior }
- { Your~input }
- \exp_args:Nv \__unravel_prompt_treat:n { Your~input }
+ \int_compare:nNnT { \tex_interactionmode:D } = { 3 }
+ {
+ \bool_if:NTF \g__unravel_explicit_prompt_bool
+ { \__unravel_ior_str_get:Nc \c__unravel_prompt_ior }
+ { \__unravel_ior_str_get:Nc \c__unravel_noprompt_ior }
+ { Your~input }
+ \exp_args:Nv \__unravel_prompt_treat:n { Your~input }
+ }
+ }
+ {
+ \clist_gpop:NN \g__unravel_prompt_input_clist \l__unravel_tmpa_tl
+ \group_begin:
+ \__unravel_set_escapechar:n { 92 }
+ \__unravel_print:x
+ {
+ \bool_if:NT \g__unravel_explicit_prompt_bool { Your~input= }
+ \tl_to_str:N \l__unravel_tmpa_tl
+ }
+ \group_end:
+ \exp_args:NV \__unravel_prompt_treat:n \l__unravel_tmpa_tl
}
}
\cs_new_protected:Npn \__unravel_prompt_treat:n #1
@@ -5373,7 +5387,11 @@
\group_end:
\__unravel_exit_hard:w
}
- { X } { \tex_batchmode:D \tex_end:D }
+ { X }
+ {
+ \tex_batchmode:D
+ \tex_read:D -1 to \l__unravel_tmpa_tl
+ }
{ s } { \__unravel_prompt_scan_int:nn {#1}
\__unravel_prompt_silent_steps:n }
{ o } { \__unravel_prompt_scan_int:nn {#1}
@@ -5496,6 +5514,7 @@
{ \exp_not:N \__unravel:nn \tl_to_str:N \g__unravel_until_tl }
}
{
+ \int_gzero:N \g__unravel_nonstop_int
\int_gset:Nn \g__unravel_online_int { 1 }
\tl_gclear:N \g__unravel_before_print_state_tl
}
@@ -5552,6 +5571,7 @@
max-input .int_gset:N = \g__unravel_default_max_input_int ,
number-steps .bool_gset:N = \g__unravel_default_number_steps_bool ,
online .int_gset:N = \g__unravel_default_online_int ,
+ prompt-input .clist_gset:N = \g__unravel_default_prompt_input_clist ,
trace-assigns .bool_gset:N = \g__unravel_default_trace_assign_bool ,
trace-expansion .bool_gset:N = \g__unravel_default_trace_expansion_bool ,
trace-other .bool_gset:N = \g__unravel_default_trace_other_bool ,
@@ -5566,6 +5586,7 @@
max-input .int_gset:N = \g__unravel_max_input_int ,
number-steps .bool_gset:N = \g__unravel_number_steps_bool ,
online .int_gset:N = \g__unravel_online_int ,
+ prompt-input .clist_gset:N = \g__unravel_prompt_input_clist ,
trace-assigns .bool_gset:N = \g__unravel_trace_assigns_bool ,
trace-expansion .bool_gset:N = \g__unravel_trace_expansion_bool ,
trace-other .bool_gset:N = \g__unravel_trace_other_bool ,
@@ -5617,6 +5638,7 @@
\__unravel_exit_point:
\__unravel_print_outcome:
\__unravel_final_test:
+ \__unravel_final_after_assignment:
\__unravel_exit_point:
}
\cs_new_protected:Npn \unravel_get:nnN #1#2#3
@@ -5630,6 +5652,7 @@
\bool_gset_eq:NN \g__unravel_internal_debug_bool \g__unravel_default_internal_debug_bool
\bool_gset_eq:NN \g__unravel_number_steps_bool \g__unravel_default_number_steps_bool
\int_gset_eq:NN \g__unravel_online_int \g__unravel_default_online_int
+ \clist_gset_eq:NN \g__unravel_prompt_input_clist \g__unravel_default_prompt_input_clist
\bool_gset_eq:NN \g__unravel_trace_assigns_bool \g__unravel_default_trace_assigns_bool
\bool_gset_eq:NN \g__unravel_trace_expansion_bool \g__unravel_default_trace_expansion_bool
\bool_gset_eq:NN \g__unravel_trace_other_bool \g__unravel_default_trace_other_bool
@@ -5666,6 +5689,15 @@
\__unravel_do_step:
\__unravel_main_loop:
}
+\cs_new_protected:Npn \__unravel_do_step:
+ {
+ \__unravel_set_action_text:
+ \bool_if:NT \g__unravel_internal_debug_bool
+ { \__unravel_exp_args:Nx \iow_term:n { Cmd:~\int_to_arabic:n { \l__unravel_head_cmd_int } } }
+ \cs_if_exist_use:cF
+ { __unravel_cmd_ \int_use:N \l__unravel_head_cmd_int : }
+ { \__unravel_error:nxxxx { internal } { unknown-command } { } { } { } }
+ }
\cs_new_protected:Npn \__unravel_final_test:
{
\bool_if:nTF
@@ -5683,6 +5715,11 @@
\__unravel_error:nnnnn { internal }
{ the-last-unravel-finished-badly } { } { } { }
}
+\cs_new_protected:Npn \__unravel_final_after_assignment:
+ {
+ \gtl_if_empty:NF \g__unravel_after_assignment_gtl
+ { \gtl_head_do:NN \g__unravel_after_assignment_gtl \tex_afterassignment:D }
+ }
\msg_new:nnn { unravel } { unknown-primitive }
{ Internal~error:~the~primitive~'#1'~is~not~known. }
\msg_new:nnn { unravel } { extra-fi-or-else }
@@ -5731,12 +5768,14 @@
\msg_new:nnn { unravel } { bad-unless }
{ \iow_char:N\\unless~not~followed~by~conditional. }
\msg_new:nnn { unravel } { runaway-if }
- { Runaway~\iow_char:N\\if... }
+ { Runaway~\iow_char:N\\if...~Exiting~\iow_char:N\\unravel }
\msg_new:nnn { unravel } { runaway-macro-parameter }
{
Runaway~macro~parameter~\# #2~after \\\\
\iow_indent:n {#1}
}
+\msg_new:nnn { unravel } { runaway-text }
+ { Runaway~braced~argument~for~TeX~primitive.~Exiting~\iow_char:N\\unravel }
\msg_new:nnn { unravel } { extra-or }
{ Extra~\iow_char:N\\or. }
\msg_new:nnn { unravel } { missing-equals }
@@ -5765,8 +5804,28 @@
{ TeX~provides~no~further~help~for~this~error. }
{ TeX's~advice~is:\\\\ \iow_indent:n {#3} }
}
-\msg_new:nnn { unravel } { runaway-unravel }
- { Runaway~\iow_char:N\\unravel }
+\msg_new:nnnn { unravel } { runaway-unravel }
+ { Runaway~\iow_char:N\\unravel,~so~\iow_char:N\\relax~inserted. }
+ {
+ Some~TeX~command~expects~input~beyond~the~end~of~
+ the~argument~of~\iow_char:N\\unravel.
+ }
+\__unravel_tex_msg_new:nnn { forbidden-case }
+ {
+ You~can't~use~`\exp_after:wN \token_to_str:N \l__unravel_head_tl'~in~
+ \mode_if_vertical:TF { vertical }
+ {
+ \mode_if_horizontal:TF { horizontal }
+ { \mode_if_math:TF { math } { no } }
+ } ~ mode.
+ }
+ {
+ Sorry,~but~I'm~not~programmed~to~handle~this~case;~
+ I'll~just~pretend~that~you~didn't~ask~for~it.~
+ If~you're~in~the~wrong~mode,~you~might~be~able~to~
+ return~to~the~right~one~by~typing~`I\iow_char:N\}'~or~
+ `I\iow_char:N\$'~or~`I\iow_char:N\\par'.
+ }
\__unravel_tex_msg_new:nnn { incompatible-mag }
{
Incompatible~magnification~
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/unravel.tlpobj new/tlpkg/tlpobj/unravel.tlpobj
--- old/tlpkg/tlpobj/unravel.tlpobj 2019-03-24 02:24:35.000000000 +0100
+++ new/tlpkg/tlpobj/unravel.tlpobj 2019-11-17 01:55:38.000000000 +0100
@@ -1,6 +1,6 @@
name unravel
category Package
-revision 50557
+revision 52822
shortdesc Watching TeX digest tokens
relocated 1
longdesc The aim of this LaTeX package is to help debug complicated
@@ -11,11 +11,11 @@
longdesc run TeX in a terminal. The unravel package requires up-to-date
longdesc versions of the l3kernel, l3packages and l3experimental
longdesc bundles.
-runfiles size=57
+runfiles size=58
RELOC/tex/latex/unravel/unravel.sty
catalogue-contact-repository https://github.com/blefloch/latex-unravel
catalogue-ctan /macros/latex/contrib/unravel
-catalogue-date 2019-03-23 10:21:18 +0100
+catalogue-date 2019-11-16 09:25:23 +0100
catalogue-license lppl1.3c
catalogue-topics macro-supp
-catalogue-version 0.2g
+catalogue-version 0.2h
++++++ uowthesistitlepage.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uowthesistitlepage.doc.tlpobj new/tlpkg/tlpobj/uowthesistitlepage.doc.tlpobj
--- old/tlpkg/tlpobj/uowthesistitlepage.doc.tlpobj 2019-02-28 04:11:24.000000000 +0100
+++ new/tlpkg/tlpobj/uowthesistitlepage.doc.tlpobj 2020-03-24 02:04:19.000000000 +0100
@@ -1,6 +1,6 @@
name uowthesistitlepage.doc
category Package
-revision 45022
+revision 54512
shortdesc doc files of uowthesistitlepage
relocated 1
docfiles size=556
++++++ uowthesistitlepage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uowthesistitlepage.tlpobj new/tlpkg/tlpobj/uowthesistitlepage.tlpobj
--- old/tlpkg/tlpobj/uowthesistitlepage.tlpobj 2019-02-28 04:11:24.000000000 +0100
+++ new/tlpkg/tlpobj/uowthesistitlepage.tlpobj 2020-03-24 02:04:19.000000000 +0100
@@ -1,6 +1,6 @@
name uowthesistitlepage
category Package
-revision 45022
+revision 54512
shortdesc Title page for dissertations at the University of Wollongong
relocated 1
longdesc The package redefines \maketitle to generate a title page for a
@@ -14,7 +14,6 @@
RELOC/tex/latex/uowthesistitlepage/uowthesistitlepage.sty
catalogue-also uowthesis
catalogue-ctan /macros/latex/contrib/uowthesistitlepage
-catalogue-date 2017-08-11 08:56:36 +0200
-catalogue-license lppl1.3ccc-by-sa-4
+catalogue-license lppl1.3c cc-by-sa-4
catalogue-topics dissertation
catalogue-version 3.0.1
++++++ updmap-map.tar.xz ++++++
++++ 213144 lines of diff (skipped)
++++++ uplatex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/uplatex.man1.pdf and new/texmf-dist/doc/man/man1/uplatex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/uplatex/base/LICENSE new/texmf-dist/doc/uplatex/base/LICENSE
--- old/texmf-dist/doc/uplatex/base/LICENSE 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/doc/uplatex/base/LICENSE 2020-02-02 23:31:17.000000000 +0100
@@ -1,6 +1,6 @@
Copyright (c) 2010 ASCII MEDIA WORKS
Copyright (c) 2016 Takuji Tanaka
-Copyright (c) 2016-2019 Japanese TeX Development Community
+Copyright (c) 2016-2020 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/uplatex/base/README.md new/texmf-dist/doc/uplatex/base/README.md
--- old/texmf-dist/doc/uplatex/base/README.md 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/doc/uplatex/base/README.md 2020-02-02 23:31:17.000000000 +0100
@@ -1,7 +1,10 @@
# uplatex
-The bundle provides pLaTeX2e macros for [upTeX by Takuji Tanaka](http://www.t-lab.opal.ne.jp/tex/uptex_en.html).
-This is a community edition syncing with [platex](https://github.com/texjporg/platex).
+The bundle provides pLaTeX2e format
+for [upTeX by Takuji Tanaka](http://www.t-lab.opal.ne.jp/tex/uptex_en.html).
+This is a community edition maintained by
+[Japanese TeX Development Community](http://texjp.org),
+syncing with [platex](https://github.com/texjporg/platex).
## Repository
@@ -17,6 +20,6 @@
## Release Date
-2019-04-06
+2020-02-02
Japanese TeX Development Community
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/uplatex/base/README_uplatex.txt new/texmf-dist/doc/uplatex/base/README_uplatex.txt
--- old/texmf-dist/doc/uplatex/base/README_uplatex.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/uplatex/base/README_uplatex.txt 2020-02-02 23:31:17.000000000 +0100
@@ -0,0 +1,57 @@
+upLaTeX standard format files and class files
+
+
+#### Contents
+## ins files
+ uplfmt.ins: "uptex uplfmt.ins" generates
+ uplatex.ltx, uplcore.ltx, upldefs.ltx,
+ jy2{mc,gt}.fd, jt2{mc,gt}.fd, uptrace.sty, ukinsoku.tex
+ from uplatex.dtx, uplvers.dtx, uplfonts.dtx, ukinsoku.dtx
+ uplcls.ins: "uptex uplcls.ins" generates
+ ujarticle.cls, ujreport.cls, ujbook.cls, ujsize{10,11,12}.clo, ujbk{10,11,12}.clo,
+ utarticle.cls, utreport.cls, utbook.cls, utsize{10,11,12}.clo, utbk{10,11,12}.clo
+ from ujclasses.dtx
+## dtx files
+ uplatex.dtx, uplvers.dtx: for format files.
+ uplfonts.dtx: for font files.
+ ukinsoku.dtx: for kinsoku file.
+ ujclasses.dtx: for class files.
+ Document (*.dvi) generation has not been checked yet.
+## fd files, cls files, sty files, tex files
+ these are generated by uptex and above sources.
+
+
+#### Copyright
+
+See a file LICENSE.
+
+
+#### ChangeLog
+
+Since 2016-04-17, upLaTeX is maintained by Japanese TeX Development Community.
+See https://github.com/texjporg/uplatex/releases for recent changes.
+
+uptex-1.20 [2014/12/29] TTK
+ * re-package for upTeX/upLaTeX Ver.1.20 distribution.
+
+uptex-1.10 [2012/04/29] TTK
+ * Update config/uplatex.ini to Tono-san's style.
+ Ref. http://oku.edu.mie-u.ac.jp/~okumura/texfaq/qa/31691.html
+
+uptex-1.00 [2012/01/15] TTK
+ * re-package for upTeX/upLaTeX Ver.1.00 distribution.
+
+v20110507a [2011/05/07] TTK
+ * re-package for upTeX/upLaTeX based on uptex-0.30 distribution
+ and ptex-texmf-2.5.tar.gz .
+ * reset version number for upTeX/upLaTeX.
+ - uplvers.dtx [2011/05/07 v1.0q_u00], \pfmtversion{2011/05/07u00}
+ - uplpatch.ltx \pfmtversion{2011/05/07u00}
+ - ujclasses.dtx [2011/05/07 v1.6_u00]
+ - uplatex.dtx [2011/05/07 v1.0c_u00]
+ - uplfonts.dtx [2011/05/07 v1.5_u00]
+ - ukinsoku.dtx [2011/05/07 v1.0_u00]
+ * rename plpatch.ltx to uplpatch.ltx .
+ * rename pldefs.cfg to updefs.cfg .
+ * add ujbk{10,11,12}.clo .
+ * converte files to UTF-8 encoding.
Binary files old/texmf-dist/doc/uplatex/base/uplatex-en.pdf and new/texmf-dist/doc/uplatex/base/uplatex-en.pdf differ
Binary files old/texmf-dist/doc/uplatex/base/uplatex.pdf and new/texmf-dist/doc/uplatex/base/uplatex.pdf differ
Binary files old/texmf-dist/doc/uplatex/base/upldoc.pdf and new/texmf-dist/doc/uplatex/base/upldoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uplatex.doc.tlpobj new/tlpkg/tlpobj/uplatex.doc.tlpobj
--- old/tlpkg/tlpobj/uplatex.doc.tlpobj 2019-04-06 23:35:04.000000000 +0200
+++ new/tlpkg/tlpobj/uplatex.doc.tlpobj 2020-03-14 01:43:44.000000000 +0100
@@ -1,12 +1,13 @@
name uplatex.doc
category Package
-revision 50811
+revision 54276
shortdesc doc files of uplatex
-docfiles size=227
+docfiles size=228
texmf-dist/doc/man/man1/uplatex.1
texmf-dist/doc/man/man1/uplatex.man1.pdf
texmf-dist/doc/uplatex/base/LICENSE
texmf-dist/doc/uplatex/base/README.md
+ texmf-dist/doc/uplatex/base/README_uplatex.txt
texmf-dist/doc/uplatex/base/uplatex-en.pdf
texmf-dist/doc/uplatex/base/uplatex.pdf
texmf-dist/doc/uplatex/base/upldoc.pdf
++++++ uplatex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujarticle.cls new/texmf-dist/tex/uplatex/base/ujarticle.cls
--- old/texmf-dist/tex/uplatex/base/ujarticle.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujarticle.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujarticle}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -506,16 +506,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujbk10.clo new/texmf-dist/tex/uplatex/base/ujbk10.clo
--- old/texmf-dist/tex/uplatex/base/ujbk10.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujbk10.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk10.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -43,7 +46,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -53,13 +56,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{.25in}
\setlength\topskip{1\Cht}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujbk11.clo new/texmf-dist/tex/uplatex/base/ujbk11.clo
--- old/texmf-dist/tex/uplatex/base/ujbk11.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujbk11.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk11.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -43,7 +46,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -53,13 +56,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{.275in}
\setlength\topskip{1\Cht}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujbk12.clo new/texmf-dist/tex/uplatex/base/ujbk12.clo
--- old/texmf-dist/tex/uplatex/base/ujbk12.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujbk12.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujbk12.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -43,7 +46,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,12 +56,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\setlength\headsep{.275in}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujbook.cls new/texmf-dist/tex/uplatex/base/ujbook.cls
--- old/texmf-dist/tex/uplatex/base/ujbook.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujbook.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujbook}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -595,16 +595,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujreport.cls new/texmf-dist/tex/uplatex/base/ujreport.cls
--- old/texmf-dist/tex/uplatex/base/ujreport.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujreport.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{ujreport}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -591,16 +591,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujsize10.clo new/texmf-dist/tex/uplatex/base/ujsize10.clo
--- old/texmf-dist/tex/uplatex/base/ujsize10.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujsize10.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize10.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{15}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -43,7 +46,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -53,13 +56,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
\setlength\topskip{1\Cht}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujsize11.clo new/texmf-dist/tex/uplatex/base/ujsize11.clo
--- old/texmf-dist/tex/uplatex/base/ujsize11.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujsize11.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize11.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{15.5}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -43,7 +46,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -53,13 +56,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
\setlength\topskip{1\Cht}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/ujsize12.clo new/texmf-dist/tex/uplatex/base/ujsize12.clo
--- old/texmf-dist/tex/uplatex/base/ujsize12.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/ujsize12.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{ujsize12.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{16.5}%
@@ -26,6 +26,9 @@
\belowdisplayskip \abovedisplayskip
\let\@listi\@listI}
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -33,7 +36,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -43,7 +46,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -53,12 +56,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\setlength\headsep{25\p@}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/uplcore.ltx new/texmf-dist/tex/uplatex/base/uplcore.ltx
--- old/texmf-dist/tex/uplatex/base/uplcore.ltx 2018-04-02 00:30:23.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/uplcore.ltx 2020-02-02 23:31:17.000000000 +0100
@@ -25,17 +25,17 @@
removing old `uplatex.ltx' and install the
latest one}\@@end
\else
- \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20180309
+ \ifnum\expandafter\@parse@version\pfmtversion//00\@nil<20200202
\errhelp{Please update your TeX installation; if not available,
obtain it^^Jmanually from CTAN
(https://ctan.org/pkg/platex) or from^^JGitHub
(https://github.com/texjporg/platex).}%
- \errmessage{This version of upLaTeX2e requires pLaTeX2e 2018/03/09
+ \errmessage{This version of upLaTeX2e requires pLaTeX2e 2020/02/02
or newer!^^JObtain a newer version of `platex',
otherwise upLaTeX2e setup will^^Jnever succeed}\@@end
\fi
\fi
-\def\uppatch@level{u02}
+\def\uppatch@level{u03}
\edef\pfmtversion{\pfmtversion\uppatch@level}
%% File: uplvers.dtx
\def\documentstyle{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/upldefs.ltx new/texmf-dist/tex/uplatex/base/upldefs.ltx
--- old/texmf-dist/tex/uplatex/base/upldefs.ltx 2018-03-09 23:46:27.000000000 +0100
+++ new/texmf-dist/tex/uplatex/base/upldefs.ltx 2020-02-02 23:31:17.000000000 +0100
@@ -15,9 +15,13 @@
%%
%% File: uplfonts.dtx
\ProvidesFile{upldefs.ltx}
- [2018/02/04 v1.6l-u02 upLaTeX Kernel (Default settings)]
+ [2020/02/01 v1.6v-u02 upLaTeX Kernel (Default settings)]
\DeclareKanjiEncodingDefaults{}{}
\DeclareErrorKanjiFont{JY2}{mc}{m}{n}{10}
+\kanjifamily{mc}
+\kanjiseries{m}
+\kanjishape{n}
+\fontsize{10}{10}
\DeclareYokoKanjiEncoding{JY2}{}{}
\DeclareKanjiSubstitution{JY2}{mc}{m}{n}
\DeclareTateKanjiEncoding{JT2}{}{}
@@ -28,7 +32,7 @@
\newcommand\kanjiencodingdefault{JY2}
\newcommand\kanjifamilydefault{\mcdefault}
\newcommand\kanjiseriesdefault{\mddefault}
-\newcommand\kanjishapedefault{\updefault}
+\newcommand\kanjishapedefault{n}% formerly \updefault
\kanjiencoding{JY2}
\input{jy2mc.fd}
\input{jy2gt.fd}
@@ -36,12 +40,6 @@
\input{jt2gt.fd}
\fontencoding{JT2}\selectfont
\fontencoding{JY2}\selectfont
-\DeclareTextFontCommand{\textmc}{\mcfamily}
-\DeclareTextFontCommand{\textgt}{\gtfamily}
-\DeclareRobustCommand\em
- {\@nomath\em \ifdim \fontdimen\@ne\font >\z@
- \eminnershape \else \gtfamily \itshape \fi}%
-\def\eminnershape{\mcfamily \upshape}%
\DeclarePreloadSizes{JY2}{mc}{m}{n}{5,7,10,12}
\DeclarePreloadSizes{JY2}{gt}{m}{n}{5,7,10,12}
\DeclarePreloadSizes{JT2}{mc}{m}{n}{5,7,10,12}
@@ -59,11 +57,6 @@
\xkanjiskip=.25zw plus1pt minus1pt
\autoxspacing
\jcharwidowpenalty=500
-\ifx\protected\@undefined
-\def\<{\inhibitglue}
-\else
-\protected\def\<{\ifvmode\leavevmode\fi\inhibitglue}
-\fi
\endinput
%%
%% End of file `upldefs.ltx'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/uptrace.sty new/texmf-dist/tex/uplatex/base/uptrace.sty
--- old/texmf-dist/tex/uplatex/base/uptrace.sty 2018-03-09 23:46:27.000000000 +0100
+++ new/texmf-dist/tex/uplatex/base/uptrace.sty 2019-10-02 23:09:20.000000000 +0200
@@ -16,7 +16,7 @@
%% File: uplfonts.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesPackage{uptrace}
- [2017/12/10 v1.6k-u02 Standard upLaTeX package (font tracing)]
+ [2019/09/22 v1.6t-u02 Standard upLaTeX package (font tracing)]
\RequirePackageWithOptions{ptrace}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utarticle.cls new/texmf-dist/tex/uplatex/base/utarticle.cls
--- old/texmf-dist/tex/uplatex/base/utarticle.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utarticle.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utarticle}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -510,16 +510,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utbk10.clo new/texmf-dist/tex/uplatex/base/utbk10.clo
--- old/texmf-dist/tex/uplatex/base/utbk10.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utbk10.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk10.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -45,7 +48,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -55,13 +58,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utbk11.clo new/texmf-dist/tex/uplatex/base/utbk11.clo
--- old/texmf-dist/tex/uplatex/base/utbk11.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utbk11.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk11.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -45,7 +48,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -55,13 +58,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utbk12.clo new/texmf-dist/tex/uplatex/base/utbk12.clo
--- old/texmf-dist/tex/uplatex/base/utbk12.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utbk12.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utbk12.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -45,7 +48,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -55,12 +58,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\if@stysize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utbook.cls new/texmf-dist/tex/uplatex/base/utbook.cls
--- old/texmf-dist/tex/uplatex/base/utbook.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utbook.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utbook}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -599,16 +599,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utreport.cls new/texmf-dist/tex/uplatex/base/utreport.cls
--- old/texmf-dist/tex/uplatex/base/utreport.cls 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utreport.cls 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesClass{utreport}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX class]
\newcounter{@paper}
\newif\if@landscape \@landscapefalse
@@ -595,16 +595,17 @@
\usecounter{\@enumctr}%
\def\makelabel##1{\hss\llap{##1}}}%
\fi}{\endlist}
-\newcommand{\labelitemi}{\textbullet}
+\newcommand{\labelitemi}{\labelitemfont \textbullet}
\newcommand{\labelitemii}{%
\iftdir
- {\textcircled{~}}
+ {\labelitemfont \textcircled{~}}
\else
- {\normalfont\bfseries\textendash}
+ {\labelitemfont \bfseries\textendash}
\fi
}
-\newcommand{\labelitemiii}{\textasteriskcentered}
-\newcommand{\labelitemiv}{\textperiodcentered}
+\newcommand{\labelitemiii}{\labelitemfont \textasteriskcentered}
+\newcommand{\labelitemiv}{\labelitemfont \textperiodcentered}
+\newcommand\labelitemfont{\normalfont}
\renewenvironment{itemize}
{\ifnum \@itemdepth >\thr@@\@toodeep\else
\advance\@itemdepth\@ne
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utsize10.clo new/texmf-dist/tex/uplatex/base/utsize10.clo
--- old/texmf-dist/tex/uplatex/base/utsize10.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utsize10.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize10.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xpt{17}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@ixpt{11}%
\abovedisplayskip 8.5\p@ \@plus3\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus2\p@
@@ -45,7 +48,7 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@viiipt{9.5}%
\abovedisplayskip 6\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -55,13 +58,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
-\newcommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viipt\@viiipt}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vpt\@vipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utsize11.clo new/texmf-dist/tex/uplatex/base/utsize11.clo
--- old/texmf-dist/tex/uplatex/base/utsize11.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utsize11.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize11.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xipt{17}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -45,7 +48,7 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@ixpt{11}%
\abovedisplayskip 8\p@ \@plus2\p@ \@minus4\p@
\abovedisplayshortskip \z@ \@plus\p@
@@ -55,13 +58,13 @@
\parsep 2\p@ \@plus\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xiipt{17}}
-\newcommand{\Large}{\@setfontsize\Large\@xivpt{21}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
-\newcommand{\huge}{\@setfontsize\huge\@xxpt{28}}
-\newcommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xiipt{17}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xivpt{21}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xviipt{25}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxpt{28}}
+\DeclareRobustCommand{\Huge}{\@setfontsize\Huge\@xxvpt{33}}
\setlength\headheight{12\p@}
\if@stysize
\ifnum\c@@paper=2 % A5
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/uplatex/base/utsize12.clo new/texmf-dist/tex/uplatex/base/utsize12.clo
--- old/texmf-dist/tex/uplatex/base/utsize12.clo 2019-04-06 23:07:49.000000000 +0200
+++ new/texmf-dist/tex/uplatex/base/utsize12.clo 2020-02-02 23:31:17.000000000 +0100
@@ -16,7 +16,7 @@
%% File: ujclasses.dtx
\NeedsTeXFormat{pLaTeX2e}
\ProvidesFile{utsize12.clo}
- [2019/04/02 v1.8b-u00
+ [2020/01/03 v1.8e-u00
Standard upLaTeX file (size option)]
\renewcommand{\normalsize}{%
\@setfontsize\normalsize\@xiipt{18}%
@@ -28,6 +28,9 @@
\def\kanjiencodingdefault{JT2}%
\kanjiencoding{\kanjiencodingdefault}%
\normalsize
+\ifx\MakeRobust\@undefined \else
+ \MakeRobust\normalsize
+\fi
\setbox0\hbox{\char\jis"3441}%
\setlength\Cht{\ht0}
\setlength\Cdp{\dp0}
@@ -35,7 +38,7 @@
\setlength\Cvs{\baselineskip}
\setlength\Chs{\wd0}
\setbox0=\box\voidb@x
-\newcommand{\small}{%
+\DeclareRobustCommand{\small}{%
\@setfontsize\small\@xipt{13.6}%
\abovedisplayskip 11\p@ \@plus3\p@ \@minus6\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -45,7 +48,7 @@
\parsep 4.5\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\footnotesize}{%
+\DeclareRobustCommand{\footnotesize}{%
\@setfontsize\footnotesize\@xpt\@xiipt
\abovedisplayskip 10\p@ \@plus2\p@ \@minus5\p@
\abovedisplayshortskip \z@ \@plus3\p@
@@ -55,12 +58,12 @@
\parsep 3\p@ \@plus2\p@ \@minus\p@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip}
-\newcommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
-\newcommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
-\newcommand{\large}{\@setfontsize\large\@xivpt{21}}
-\newcommand{\Large}{\@setfontsize\Large\@xviipt{25}}
-\newcommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
-\newcommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
+\DeclareRobustCommand{\scriptsize}{\@setfontsize\scriptsize\@viiipt{9.5}}
+\DeclareRobustCommand{\tiny}{\@setfontsize\tiny\@vipt\@viipt}
+\DeclareRobustCommand{\large}{\@setfontsize\large\@xivpt{21}}
+\DeclareRobustCommand{\Large}{\@setfontsize\Large\@xviipt{25}}
+\DeclareRobustCommand{\LARGE}{\@setfontsize\LARGE\@xxpt{28}}
+\DeclareRobustCommand{\huge}{\@setfontsize\huge\@xxvpt{33}}
\let\Huge=\huge
\setlength\headheight{12\p@}
\if@stysize
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uplatex.tlpobj new/tlpkg/tlpobj/uplatex.tlpobj
--- old/tlpkg/tlpobj/uplatex.tlpobj 2019-04-06 23:35:04.000000000 +0200
+++ new/tlpkg/tlpobj/uplatex.tlpobj 2020-03-14 01:43:44.000000000 +0100
@@ -1,6 +1,6 @@
name uplatex
category Package
-revision 50811
+revision 54276
shortdesc pLaTeX2e and miscellaneous macros for upTeX
longdesc The bundle provides pLaTeX2e macros for upTeX by Takuji Tanaka.
longdesc This is a community edition syncing with platex. The bundle
@@ -8,13 +8,21 @@
depend uptex
depend babel
depend cm
+depend hyph-utf8
depend hyphen-base
-depend latex
depend latex-fonts
+depend l3backend
+depend l3kernel
+depend l3packages
+depend tex-ini-files
+depend unicode-data
depend uptex-fonts
depend platex
+depend latex
+depend latex-base-dev
depend uplatex.ARCH
-execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,hyphen-base,latex,latex-fonts,uptex-fonts,platex
+execute AddFormat name=uplatex engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,hyph-utf8,hyphen-base,latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data,uptex-fonts,platex,latex
+execute AddFormat name=uplatex-dev engine=euptex options="*uplatex.ini" patterns=language.dat fmttriggers=babel,cm,hyph-utf8,hyphen-base,latex-fonts,l3backend,l3kernel,l3packages,tex-ini-files,unicode-data,uptex-fonts,platex,l3kernel,latex-base-dev
runfiles size=94
texmf-dist/tex/uplatex/base/jt2gt.fd
texmf-dist/tex/uplatex/base/jt2mc.fd
@@ -46,6 +54,5 @@
texmf-dist/tex/uplatex/config/uplatex.ini
catalogue-contact-repository https://github.com/texjporg/uplatex
catalogue-ctan /language/japanese/uplatex
-catalogue-date 2019-04-06 09:47:29 +0200
catalogue-license bsd3
catalogue-topics format class japanese
++++++ upmethodology.doc.tar.xz ++++++
Binary files old/doc/latex/upmethodology/upm_caution.pdf and new/doc/latex/upmethodology/upm_caution.pdf differ
Binary files old/doc/latex/upmethodology/upm_caution.png and new/doc/latex/upmethodology/upm_caution.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/upmethodology/upm_caution.svg new/doc/latex/upmethodology/upm_caution.svg
--- old/doc/latex/upmethodology/upm_caution.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/upmethodology/upm_caution.svg 2019-09-28 23:34:06.000000000 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="459.36514mm"
+ height="403.86578mm"
+ viewBox="0 0 459.36514 403.86578"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="upm_caution.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="752.37725"
+ inkscape:cy="438.39011"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="1"
+ fit-margin-left="1"
+ fit-margin-right="1"
+ fit-margin-bottom="1"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(266.72422,139.04175)">
+ <path
+ style="fill:#000000;stroke-width:0.62582618"
+ d="m -212.60337,263.42429 c -20.40713,-2.18391 -38.15074,-14.72666 -47.23856,-33.39241 -4.4232,-9.08493 -5.88229,-15.5486 -5.88229,-26.05812 0,-9.97926 1.38896,-16.61129 5.16106,-24.64315 2.13063,-4.53669 170.094856,-285.58754 174.872396,-292.61014 2.80467,-4.12262 10.14804,-11.27841 14.78013,-14.40257 5.70158,-3.84549 13.43076,-7.30997 19.86487,-8.90409 7.84855,-1.94456 20.16195,-1.94025 28.0852,0.01 14.0265597,3.45225 27.3429997,12.69057 35.32656,24.50787 5.20966,7.71139 171.908824,286.69932 174.114994,291.39909 3.77147,8.03431 5.15993,14.66542 5.15993,24.64315 0,10.49408 -1.46147,16.98488 -5.84784,25.97179 -8.02871,16.44946 -21.03035,27.05403 -39.39326,32.13045 l -6.01974,1.66416 -174.292604,0.0774 c -95.860926,0.0426 -176.271806,-0.13441 -178.690846,-0.39328 z m 353.41703,-41.18362 c 4.09926,-2.01916 7.84833,-5.86726 9.77569,-10.03393 2.26834,-4.90381 2.30606,-11.50764 0.0924,-16.17113 -0.84707,-1.78445 -39.69986,-66.93911 -86.339554,-144.788154 -54.32854,-90.682917 -85.69897,-142.454558 -87.30276,-144.078583 -7.62051,-7.716653 -20.54911,-7.715273 -28.16218,0.0031 -1.60072,1.622843 -33.07831,53.57449 -87.302746,144.087313 -46.6397,77.852064 -85.49249,143.005384 -86.33954,144.785024 -1.22003,2.56328 -1.53635,4.21116 -1.52209,7.92942 0.0266,6.93942 2.9323,12.73748 8.19953,16.36143 5.60714,3.85782 -8.39743,3.59061 181.671766,3.46619 l 174.292594,-0.1141 z M -41.997334,182.98534 c -4.38549,-1.22063 -6.93988,-2.8342 -10.01226,-6.32461 -4.46309,-5.07034 -5.814,-12.64867 -3.49706,-19.61775 1.57453,-4.73601 6.82348,-9.99491 11.5871,-11.60905 7.68828,-2.60516 15.09255,-0.93488 20.69614,4.66871 7.87961,7.87961 7.87961,19.75688 0,27.63648 -5.18434,5.18435 -12.07655,7.11032 -18.77392,5.24622 z m 0,-80.10576 c -4.38549,-1.22062 -6.93988,-2.83419 -10.01226,-6.324604 -4.90404,-5.57129 -4.74558,-3.80848 -4.74558,-52.79273 0,-50.4000303 -0.29789,-47.6779503 5.89528,-53.87111 7.92613,-7.92613 19.71036,-7.92613 27.63648,0 6.19317,6.1931597 5.89529,3.4710797 5.89529,53.87111 0,50.40003 0.29788,47.67795 -5.89529,53.87112 -5.18434,5.184354 -12.07655,7.110324 -18.77392,5.246214 z"
+ id="path826"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
Binary files old/doc/latex/upmethodology/upm_info.pdf and new/doc/latex/upmethodology/upm_info.pdf differ
Binary files old/doc/latex/upmethodology/upm_info.png and new/doc/latex/upmethodology/upm_info.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/upmethodology/upm_info.svg new/doc/latex/upmethodology/upm_info.svg
--- old/doc/latex/upmethodology/upm_info.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/upmethodology/upm_info.svg 2019-09-28 23:34:06.000000000 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="483.41724mm"
+ height="483.58493mm"
+ viewBox="0 0 483.41724 483.58493"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="upm_info.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.35"
+ inkscape:cx="786.40841"
+ inkscape:cy="738.47373"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="1"
+ fit-margin-left="1"
+ fit-margin-right="1"
+ fit-margin-bottom="1"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(275.7283,139.36375)">
+ <path
+ style="fill:#000000;stroke-width:0.94228286"
+ d="M -50.629174,342.63035 C -148.23295,335.6258 -231.66491,270.94797 -262.44275,178.42896 c -13.72051,-41.24422 -16.01412,-86.353786 -6.55164,-128.854516 14.61802,-65.65686 56.78878,-122.656827 115.77775,-156.490604 51.23814,-29.38821 113.509446,-38.7035 171.966626,-25.72484 65.35134,14.50931 122.724244,56.898004 156.323384,115.496065 29.53965,51.518189 38.88881,113.716409 25.89205,172.255055 C 187.74026,214.67757 150.67357,268.6707 99.786306,302.4925 55.206316,332.12222 1.7426262,346.38883 -50.629174,342.63035 Z M 1.7888862,310.71155 C 90.655376,294.58538 158.39702,226.83612 174.33204,138.14903 176.82229,124.28935 177.75515,95.574844 176.19823,80.705324 165.8096,-18.51181 88.446736,-96.298711 -11.307384,-107.82805 c -14.32949,-1.65617 -44.71464,-0.70735 -58.72313,1.83371 -88.725516,16.094288 -156.229676,83.59845 -172.323966,172.323964 -2.54106,14.00849 -3.48988,44.393636 -1.83371,58.723136 5.62974,48.70962 26.59842,92.35266 60.8347,126.61795 33.57995,33.6084 77.34927,54.90662 124.836276,60.74555 12.49887,1.53685 47.96805,0.53421 60.3061002,-1.70471 z M -72.180314,222.05146 c -5.84584,-1.09145 -8.3517,-2.4051 -11.561623,-6.06101 -5.72662,-6.52227 -6.122841,-14.84656 -1.564029,-32.85907 2.988384,-11.80753 6.517502,-21.47779 23.878282,-65.42978 7.81983,-19.797306 14.21787,-37.076416 14.21787,-38.398026 0,-2.89548 -3.35806,-6.53144 -5.33249,-5.77378 -0.77969,0.2992 -1.94629,0.544 -2.59243,0.544 -2.98701,0 -11.02384,6.93723 -20.09923,17.34926 -10.479228,12.022606 -13.223316,14.391016 -15.611805,13.474466 -5.25969,-2.01833 -3.06198,-7.989866 7.276694,-19.771926 18.025341,-20.54187 36.562011,-31.87892 56.704351,-34.68047 8.94164,-1.24366 14.34434,-0.5838 20.8810302,2.55033 8.9149,4.2744 12.44687,14.77514 9.69678,28.82902 -0.99107,5.06472 -12.83123,38.496196 -31.0451802,87.658136 -5.07705,13.70363 -5.89677,19.26179 -3.23353,21.92503 3.93427,3.93427 11.28544,-1.04288 26.5802802,-17.99635 10.23477,-11.34466 12.58354,-12.99952 15.0086098,-10.57445 3.52307,3.52307 -1.3112798,12.59349 -13.3445798,25.03766 -22.9692802,23.75357 -51.3418102,37.63419 -69.8590002,34.17696 z m 56.16454,-189.094266 c -14.58873,-7.26987 -16.60484,-29.0672942 -3.86671,-41.8054222 13.9393902,-13.9393878 37.00993,-11.0148908 44.06881,5.586296 2.21956,5.22003 1.88071,15.5571272 -0.70558,21.5244162 -2.69677,6.222195 -10.50783,13.5736 -16.6437098,15.66431 -7.10534001,2.42104 -16.8810102,2.00627 -22.8528102,-0.9696 z"
+ id="path826"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
Binary files old/doc/latex/upmethodology/upm_question.pdf and new/doc/latex/upmethodology/upm_question.pdf differ
Binary files old/doc/latex/upmethodology/upm_question.png and new/doc/latex/upmethodology/upm_question.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/upmethodology/upm_question.svg new/doc/latex/upmethodology/upm_question.svg
--- old/doc/latex/upmethodology/upm_question.svg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/upmethodology/upm_question.svg 2019-09-28 23:34:06.000000000 +0200
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="272.62253mm"
+ height="272.69568mm"
+ viewBox="0 0 272.62253 272.69568"
+ version="1.1"
+ id="svg8"
+ inkscape:version="0.92.3 (2405546, 2018-03-11)"
+ sodipodi:docname="upm_question.svg">
+ <defs
+ id="defs2" />
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.7"
+ inkscape:cx="284.24507"
+ inkscape:cy="557.15914"
+ inkscape:document-units="mm"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ fit-margin-top="1"
+ fit-margin-left="1"
+ fit-margin-right="1"
+ fit-margin-bottom="1"
+ inkscape:window-width="1920"
+ inkscape:window-height="1016"
+ inkscape:window-x="0"
+ inkscape:window-y="27"
+ inkscape:window-maximized="1" />
+ <metadata
+ id="metadata5">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Calque 1"
+ inkscape:groupmode="layer"
+ id="layer1"
+ transform="translate(82.263126,11.644881)">
+ <path
+ style="fill:#000000;stroke-width:0.26458332"
+ d="m 47.696668,259.83414 c -53.2068575,-2.50997 -99.768707,-35.83013 -119.592857,-85.58191 -10.87333,-27.2883 -12.3394,-58.55107 -4.08835,-87.180208 6.35254,-22.041762 17.96837,-41.669022 34.37821,-58.088835 21.37988,-21.3928775 48.4781595,-34.7253809 78.45901,-38.6022619 10.57707,-1.3677421 23.818756,-1.3677421 34.395829,0 29.89096,3.865258 57.06573,17.2143174 78.32385,38.4750189 14.21716,14.218887 24.74675,30.620937 31.59834,49.221067 9.68204,26.283999 10.82247,56.070249 3.18588,83.210629 -13.78275,48.98375 -54.38371,86.46101 -104.157021,96.14355 -7.278023,1.41581 -12.464017,2.02753 -20.460424,2.41345 -5.734372,0.27673 -5.95754,0.27654 -12.042467,-0.0106 z m 13.100801,-17.1949 c 36.472887,-2.16696 69.087171,-20.41893 90.287381,-50.52764 4.57375,-6.49567 9.66356,-15.92252 12.71417,-23.54791 12.50792,-31.26516 11.05543,-66.66762 -3.9666,-96.68055 -4.15086,-8.293118 -9.3939,-16.257772 -15.51756,-23.572575 C 141.45109,44.889743 133.27988,36.789707 129.72142,33.844244 102.4261,11.25089 67.362146,2.0589791 32.619341,8.3892255 12.849791,11.991298 -5.6954795,20.677504 -21.487939,33.731923 c -3.65673,3.022738 -11.80419,11.088814 -14.72573,14.578642 -27.3699,32.69377 -35.23711,76.390085 -20.9576,116.403355 9.19158,25.75615 27.93914,48.19964 51.9551995,62.19775 19.8162305,11.55018 43.0712805,17.09064 66.0135385,15.72757 z M 41.350595,190.5241 v -14.81667 h 14.816666 14.816665 v 14.81667 14.81667 H 56.167261 41.350595 Z m 0.0083,-34.99114 c 0.01468,-11.40727 1.317902,-18.13398 4.816347,-24.85992 3.258116,-6.2639 9.041895,-12.42289 21.236857,-22.61458 8.492331,-7.09729 13.036478,-11.248854 14.510549,-13.256938 2.629585,-3.58222 3.877989,-7.514201 3.877989,-12.214151 0,-5.697254 -1.732084,-10.008327 -5.744389,-14.297511 -5.60139,-5.987925 -13.707874,-8.848492 -23.756651,-8.383103 -8.213103,0.380376 -14.533218,2.898172 -19.833516,7.901239 -4.52386,4.270176 -7.34469,9.27224 -9.55034,16.935277 -0.51121,1.776079 -0.96859,3.26835 -1.0164,3.316158 -0.0478,0.04781 -0.90684,-0.03297 -1.90896,-0.179502 -1.00212,-0.146536 -7.29891,-0.927512 -13.9928605,-1.735505 -6.69396,-0.807992 -12.45352,-1.53112 -12.79903,-1.606949 -0.6121,-0.13434 -0.62347,-0.186661 -0.44402,-2.042808 0.84075,-8.696415 4.09672005,-17.077285 9.43042,-24.273885 1.94824,-2.628707 6.4672905,-7.345351 9.1285605,-9.527704 6.16061,-5.052002 13.69744,-8.821935 21.88403,-10.946455 14.294481,-3.709588 33.357741,-2.837921 46.720577,2.136301 5.68738,2.117085 12.154873,5.926008 16.438422,9.681142 9.33319,8.181831 14.59731,17.045373 16.30313,27.450643 0.60341,3.680675 0.54209,10.001533 -0.13014,13.413864 -2.33014,11.828257 -8.65027,20.065057 -28.43589,37.059477 -7.810084,6.7083 -9.259411,8.05632 -11.85419,11.02559 -4.216066,4.82455 -5.380249,8.59564 -5.703308,18.47452 L 70.37385,161.9491 H 55.862222 41.350595 Z"
+ id="path826"
+ inkscape:connector-curvature="0" />
+ </g>
+</svg>
Binary files old/doc/latex/upmethodology/upmethodology-doc.pdf and new/doc/latex/upmethodology/upmethodology-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/upmethodology/upmethodology-doc.tex new/doc/latex/upmethodology/upmethodology-doc.tex
--- old/doc/latex/upmethodology/upmethodology-doc.tex 2017-12-11 23:22:10.000000000 +0100
+++ new/doc/latex/upmethodology/upmethodology-doc.tex 2020-04-12 00:46:29.000000000 +0200
@@ -1,13 +1,17 @@
-\documentclass[book]{upmethodology-document}
+\documentclass[book,taskpackage,specpackage,codepackage]{upmethodology-document}
\setfrontcover{classic}
-\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2017-02}
+\declaredocument{\LaTeX\ Packages for Unified Process Methodology}{Official Documentation}{UPM-2019-01}
\updateversion{23.0}{\makedate{17}{02}{2017}}{Replace the package \texttt{subfigure} by \texttt{subcaption}.}{\upmpublic}
\incsubversion{\makedate{10}{03}{2017}}{Fixing subfigure invalid alignement.}{\upmpublic}
\incsubversion{\makedate{08}{08}{2017}}{Fixing spelling errors and typos.}{\upmpublic}
\incsubversion{\makedate{28}{11}{2017}}{Add 'standardlists' option.}{\upmpublic}
+\incsubversion{\makedate{04}{08}{2019}}{Add 'graphicspathcontext' option.}{\upmpublic}
+\incversion{\makedate{17}{09}{2019}}{Add class options to include optional packages.}{\upmpublic}
+\incversion{\makedate{06}{04}{2020}}{Add explainations for \texttt{{\textbackslash}Append} and \texttt{{\textbackslash}setdocumentpurpose}.}{\upmpublic}
+%\incversion{\makedate{17}{09}{2019}}{Add the documentation for the \texttt{upmethodology-spec} package.}{\upmpublic}
\addauthorvalidator*[galland(a)arakhne.org]{St{\'e}phane}{Galland}{Original Author}
\addauthor*{Frans}{van Dunn\'e}{Reviewer}
@@ -26,6 +30,7 @@
\let\VERtask\upm@package@task@ver
\let\VERdocclazz\upm@package@docclazz@ver
\let\VERcode\upm@package@code@ver
+\let\VERspec\upm@package@spec@ver
\makeatother
\setpublisher{Arakhn\^e.org Group}
@@ -65,9 +70,10 @@
\item \texttt{upmethodology-document.sty}: provides functions to manage the project, the subproject and the status of the document;
\item \texttt{upmethodology-frontpage.sty}: formats and provides a front page for the document;
\item \texttt{upmethodology-backpage.sty}: formats and provides a back page for the document;
-\item \texttt{upmethodology-task.sty}: is the \LaTeXe\xspace package that provides macros to manage project's tasks.
+\item \texttt{upmethodology-task.sty}: is the \emph{optional} \LaTeXe\xspace package that provides macros to manage project's tasks.
+\item \texttt{upmethodology-spec.sty}: is the \emph{optional} \LaTeXe\xspace package that provides macros to build a specification description.
\item \texttt{upmethodology-document.cls}: is the \LaTeXe\xspace class that provides the whole document specification. It is based on \texttt{book} and on the previous packages;
-\item \texttt{upmethodology-code.sty}: provides macros for source code formatting;
+\item \texttt{upmethodology-code.sty}: provides \emph{optional} macros for source code formatting;
\item \texttt{upmethodology-extension.sty}: provides macros for extension mechanism.
\end{itemize}
@@ -135,13 +141,13 @@
\item \texttt{a4wide}
\item \texttt{hyperref}
\item \texttt{upmethodology-backpage}
-\item \texttt{upmethodology-code}
+\item \texttt{upmethodology-code} (optional)
\item \texttt{upmethodology-document}
\item \texttt{upmethodology-extension}
\item \texttt{upmethodology-frontpage}
\item \texttt{upmethodology-p-common}
-\item \texttt{upmethodology-spec}
-\item \texttt{upmethodology-task}
+\item \texttt{upmethodology-spec} (optionnal)
+\item \texttt{upmethodology-task} (optionnal)
\item \texttt{url}
\end{itemize}
@@ -231,6 +237,7 @@
\item \texttt{upmethodology-p-common}
\end{itemize}
+
%###########################################################
\part{Package Documentation}
@@ -318,6 +325,18 @@
standardlists & The style does not override the standard list, description and enumeration definitions. \\
+\hline\hline
+
+codepackage & Include the \texttt{upmethodology-code} package. \\
+
+\hline
+
+specpackage & Include the \texttt{upmethodology-spec} package. \\
+
+\hline
+
+taskpackage & Include the \texttt{upmethodology-task} package. \\
+
\hline
\end{mtable}
@@ -423,6 +442,26 @@
Example: \texttt{{\textbackslash}graphicspath\{\{./imgs/\},\{./imgs/auto/\}\}} \\
\end{description}
+\section{Contextual Search Path for \texttt{graphicx}}
+
+As described into the previous section, the \texttt{graphicx} package is able to search for files into a set of defined paths.
+
+In order to define a search path that is valid for a part of the document, the \texttt{graphicspathcontext} environment is defined. This environment redefines the \texttt{graphicx} path with the environment's parameter. The original value of the \texttt{graphicx} path is restored when existing of the environment.
+
+The defined environment is: \\
+\texttt{{\textbackslash}begin\{graphicspathcontext\}\{path\}} \\
+\texttt{...}\\
+\texttt{{\textbackslash}end\{graphicspathcontext\}} \\
+
+
+The parameter \texttt{path} must follow the syntactic definition of the \texttt{graphicx} path. If you want to reuse the current value of the \texttt{graphicx} path, you could obtain it by using the \texttt{{\textbackslash}old} macro, such as: \\
+\texttt{{\textbackslash}begin\{graphicspathcontext\}\{{mypath},{\textbackslash}old\}} \\
+\texttt{...}\\
+\texttt{{\textbackslash}end\{graphicspathcontext\}} \\
+
+\emph{Note that \texttt{{\textbackslash}old} must not be inside curly braces.}
+
+
\section{Figures}
It may be verbose to put \LaTeX\ code to include a figure inside your document. To simplify your life, you could include a figure with the following macros: \\
@@ -1671,6 +1710,11 @@
\texttt{{\textbackslash}setissn\{number\}}\\
\texttt{{\textbackslash}setdoi\{number\}}\\
+The specific text may be provided for explaining the purpose of the document. The text is shown into the copyright page.
+In order to change the document's purpose, the following macro is provided: \\
+\texttt{{\textbackslash}setdocumentpurpose\{text\}}\\
+
+
\subsection{Retreiving Information}
The information set by the macros described in the previous section may be retreived with the following macros: \\
@@ -1769,7 +1813,7 @@
The \texttt{upmethodology-frontpage} package is able to use a page layout defined in a document extension (see chapter~\ref{section:document:extension} for details on document extension).
\pagebreak A \LaTeX\ macro must be defined in the \texttt{upmext-NAME.cfg} file of the extension. The name of this macro (for example \texttt{mylayout}) must be set with the \texttt{{\textbackslash}set} macro in the same file:\\
-\texttt{{\textbackslash}set\{frontpage\}\{mylayout\}}\\
+\texttt{{\textbackslash}Set\{frontpage\}\{mylayout\}}\\
\section{Localization}
@@ -1876,6 +1920,9 @@
The \texttt{{\textbackslash}Get} macro allows you to retrieve the value defined by a \texttt{{\textbackslash}Set}:\\
\texttt{{\textbackslash}Get\{variable\_name\}} \\
+The \texttt{{\textbackslash}Append} macro allows you to append text to an existing definition of a value:\\
+\texttt{{\textbackslash}Append\{variable\_name\}\{text to append\}} \\
+
The \texttt{{\textbackslash}Unset} macro allows you to remove the definition of a value:\\
\texttt{{\textbackslash}Unset\{variable\_name\}} \\
@@ -2053,6 +2100,86 @@
%###########################################################
+%\chapter{Package upmethodology-spec}
+
+%\begin{center}
+% \texttt{Version: \VERspec}
+%\end{center}
+
+%The \LaTeX\ package \texttt{upmethodology-spec} provides a set of macros for building a specification document.
+
+%\section{Specification Definition}
+
+%The definition of a specification could be made only inside one of the following environments: \\
+%\texttt{{\textbackslash}begin\{detailspec\}[width]\{title\}...{\textbackslash}end\{detailspec\}} \\
+%\texttt{{\textbackslash}begin\{detailspec*\}[width]\{title\}...{\textbackslash}end\{detailspec*\}} \\
+%where \texttt{width} is the width of the specification box on the page, and \texttt{title} is the title of the specification box.
+
+%The environment \texttt{specdetail} displays the detailed description and uses a more complex rendering. On the other hand, \texttt{specdetail*} never displays the description and uses a simpler rendering.
+
+%\section{Components of a Specification}
+
+%A specification has several components that may be defined by the macros in the following table:
+%\begin{tabularx}{\linewidth}{|>{\ttfamily}l|X|}
+% \hline
+% {\normalfont Macro} & Description \\
+% \hline\hline
+% {\textbackslash}specfunc[modifiers]\{return type\}\{name\}\{parameters\} & \\
+% \hline
+% {\textbackslash}speccons[modifiers]\{name\}\{parameters\} & \\
+% \hline
+% {\textbackslash}specget[modifiers]\{return type\}\{name\} & \\
+% \hline
+% {\textbackslash}specset[modifiers]\{return type\}\{name\} & \\
+% \hline\hline
+% {\textbackslash}specparam[in|inout|out]\{name\}\{description\} & \\
+% \hline\hline
+% {\textbackslash}specreturn[modifiers]\{description\} & \\
+% \hline
+% {\textbackslash}specglobalreturn[modifiers]\{description\} & \\
+% \hline\hline
+% {\textbackslash}specstarthline & \\
+% \hline
+% {\textbackslash}specendhline & \\
+% \hline
+%\end{tabularx}
+
+%\section{Examples of Specifications}
+
+%\subsection{Description of the specification}
+
+%Let consider a specification with a description:
+%\begin{verbatim}
+%\begin{detailspec}{Example 1}
+% This is a description.
+%\end{detailspec}
+%\end{verbatim}
+
+%The previous \LaTeX\ code generates the following figure:
+%\begin{detailspec}{Example 1}
+% This is a description.
+%\end{detailspec}
+
+%\subsection{Returned Values}
+
+%Let add into the previous example the specification of returned values:
+%\begin{verbatim}
+%\begin{detailspec}{Example 2}
+% This is a description.
+% \specreturn{description of a first returned value}
+% \specreturn{description of a second returned value}
+%\end{detailspec}
+%\end{verbatim}
+
+%The previous \LaTeX\ code generates the following figure:
+%\begin{detailspec}{Example 2}
+%% This is a description.
+%% \specreturn{description of a first returned value}
+%% \specreturn{description of a second returned value}
+%\end{detailspec}
+
+%###########################################################
+
\chapter{Authors and License}
Copyright \copyright\ \upmcopyrightdate\ \makename{St\'ephane}{Galland}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/upmethodology.doc.tlpobj new/tlpkg/tlpobj/upmethodology.doc.tlpobj
--- old/tlpkg/tlpobj/upmethodology.doc.tlpobj 2019-02-28 04:11:31.000000000 +0100
+++ new/tlpkg/tlpobj/upmethodology.doc.tlpobj 2020-04-16 01:57:29.000000000 +0200
@@ -1,9 +1,9 @@
name upmethodology.doc
category Package
-revision 46037
+revision 54758
shortdesc doc files of upmethodology
relocated 1
-docfiles size=183
+docfiles size=186
RELOC/doc/latex/upmethodology/AUTHORS
RELOC/doc/latex/upmethodology/CONTRIBUTING.textile
RELOC/doc/latex/upmethodology/COPYING
@@ -17,8 +17,14 @@
RELOC/doc/latex/upmethodology/frontclassic.jpg
RELOC/doc/latex/upmethodology/frontmodern.jpg
RELOC/doc/latex/upmethodology/illustration.jpg
+ RELOC/doc/latex/upmethodology/upm_caution.pdf
RELOC/doc/latex/upmethodology/upm_caution.png
+ RELOC/doc/latex/upmethodology/upm_caution.svg
+ RELOC/doc/latex/upmethodology/upm_info.pdf
RELOC/doc/latex/upmethodology/upm_info.png
+ RELOC/doc/latex/upmethodology/upm_info.svg
+ RELOC/doc/latex/upmethodology/upm_question.pdf
RELOC/doc/latex/upmethodology/upm_question.png
+ RELOC/doc/latex/upmethodology/upm_question.svg
RELOC/doc/latex/upmethodology/upmethodology-doc.pdf
RELOC/doc/latex/upmethodology/upmethodology-doc.tex
++++++ upmethodology.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/UPMVERSION.def new/tex/latex/upmethodology/UPMVERSION.def
--- old/tex/latex/upmethodology/UPMVERSION.def 2017-12-11 23:22:10.000000000 +0100
+++ new/tex/latex/upmethodology/UPMVERSION.def 2020-04-12 00:46:29.000000000 +0200
@@ -1 +1 @@
-\def\UPMVERSION{20171210}
+\def\UPMVERSION{20200406}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/upmethodology-document.cls new/tex/latex/upmethodology/upmethodology-document.cls
--- old/tex/latex/upmethodology/upmethodology-document.cls 2014-10-15 00:23:13.000000000 +0200
+++ new/tex/latex/upmethodology/upmethodology-document.cls 2019-09-17 23:11:19.000000000 +0200
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@docclazz@ver{2014/09/11}
+\global\edef\upm@package@docclazz@ver{2019/09/17}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesClass{upmethodology-document}[\upm@package@docclazz@ver]
@@ -35,6 +35,13 @@
\newif\ifupm@package@docclazz@addbackcover
\upm@package@docclazz@addbackcovertrue
+\newif\ifupm@package@docclazz@taskpackage
+\upm@package@docclazz@taskpackagefalse
+\newif\ifupm@package@docclazz@specpackage
+\upm@package@docclazz@specpackagefalse
+\newif\ifupm@package@docclazz@codepackage
+\upm@package@docclazz@codepackagefalse
+
\gdef\upm@package@docclazz@optionstopass{a4paper,11pt}
\DeclareOption{twoside}{%
@@ -91,6 +98,15 @@
\DeclareOption{backcover}{%
\global\upm@package@docclazz@addbackcovertrue%
}
+\DeclareOption{taskpackage}{%
+ \global\upm@package@docclazz@taskpackagetrue%
+}
+\DeclareOption{specpackage}{%
+ \global\upm@package@docclazz@specpackagetrue%
+}
+\DeclareOption{codepackage}{%
+ \global\upm@package@docclazz@codepackagetrue%
+}
\DeclareOption{book}{%
\global\upmbookformattrue
\global\upmreportformatfalse
@@ -139,9 +155,15 @@
\RequirePackage{upmethodology-extension}
\RequirePackage{upmethodology-frontpage}
\RequirePackage{upmethodology-backpage}
-\RequirePackage{upmethodology-task}
-\RequirePackage{upmethodology-code}
-\RequirePackage{upmethodology-spec}
+\ifupm@package@docclazz@taskpackage
+ \RequirePackage{upmethodology-task}
+\fi
+\ifupm@package@docclazz@codepackage
+ \RequirePackage{upmethodology-code}
+\fi
+\ifupm@package@docclazz@specpackage
+ \RequirePackage{upmethodology-spec}
+\fi
\RequirePackage{url}
\ifpdf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/upmethodology-document.sty new/tex/latex/upmethodology/upmethodology-document.sty
--- old/tex/latex/upmethodology/upmethodology-document.sty 2017-02-19 00:08:26.000000000 +0100
+++ new/tex/latex/upmethodology/upmethodology-document.sty 2020-04-12 00:46:29.000000000 +0200
@@ -1,6 +1,6 @@
% Package for Unified Process Methodology's documents
%
-% Copyright (c) 2006-2013 Stephane GALLAND <galland(a)arakhne.org>
+% Copyright (c) 2006-2020 Stephane GALLAND <galland(a)arakhne.org>
%
% This program is free library; you can redistribute it and/or modify
% it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@doc@ver{2015/04/24}
+\global\edef\upm@package@doc@ver{2020/04/06}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-document}[\upm@package@doc@ver]
@@ -48,7 +48,7 @@
\gdef\upm@lang@document@abstract{Abstract}%
\gdef\upm@lang@document@keywords{Key-words}%
\gdef\upm@lang@document@copyright@purpose{This document describes the \theupmproject\ project\Ifnotempty{\theupmsubproject}{ and its \theupmsubproject\ subproject}.}%
- \gdef\upm@lang@document@copyright@tex{\TeX\ is a trademark of the American Mathematical Society.}%
+ \gdef\upm@lang@document@copyright@tex{\TeX\ and \LaTeX\ are a trademarks of the American Mathematical Society.}%
\gdef\upm@lang@document@copyright@upmethodology{\texttt{tex-upmethodology} is owned by St\'ephane Galland, \arakhneorg, France.}%
\gdef\upm@lang@document@copyright@madewith{This document was realised with \LaTeX\ and \texttt{tex-upmethodology}.}%
\gdef\upm@lang@document@copyright@trademarks{This document is published by the \theupmformattedpublisher. All rights reserved. No part of this publication may be reproduced, stored in a retreival system, or transmitted, in any form or by any means, electronic, mechanical, photocopying, recording, or otherwise, without the prior written permission of the publishers.}
@@ -509,6 +509,13 @@
\newcommand{\theupmformattedcopyrighter}{\Ifelsedefined{copyrighter}{\theupmcopyrighter}{\textcolor{red}{???}}}
%-----
+%Set the purpose of this document
+%\setdocumentpurpose{text}
+\newcommand{\setdocumentpurpose}[1]{%
+ \gdef\upm@lang@document@copyright@purpose{#1}%
+}
+
+%-----
%Set the publisher identity
%\setpublisher{name}
\newcommand{\setpublisher}[1]{\Set{publisher}{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/upmethodology-extension.sty new/tex/latex/upmethodology/upmethodology-extension.sty
--- old/tex/latex/upmethodology/upmethodology-extension.sty 2017-08-10 00:15:53.000000000 +0200
+++ new/tex/latex/upmethodology/upmethodology-extension.sty 2020-04-12 00:46:29.000000000 +0200
@@ -1,6 +1,6 @@
% Package for Unified Process Methodology's extensions
%
-% Copyright (c) 2006-2009 Stephane GALLAND <galland(a)arakhne.org>
+% Copyright (c) 2006-2020 Stephane GALLAND <galland(a)arakhne.org>
%
% This program is free library; you can redistribute it and/or modify
% it under the terms of the GNU Lesser General Public License as
@@ -18,7 +18,7 @@
% 330, Boston, MA 02111-1307, USA.
%
-\global\edef\upm@package@ext@ver{2017/08/08}
+\global\edef\upm@package@ext@ver{2020/04/06}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-extension}[\upm@package@ext@ver]
@@ -62,7 +62,7 @@
}{}%
}{%
\ifthenelse{\equal{\upmcurrentlang}{#1}}{%
- \message{*** define extension value #2 ****}%
+ \message{*** define the extension value #2 ****}%
\global\@namedef{upmext@extension@value@#2}{#3}%
}{}%
\ifupm@extension@savealllang%
@@ -72,9 +72,19 @@
}
\let\Set\upm@extension@Set
+\newcommand{\Append}[3][\upmcurrentlang]{%
+ \ifthenelse{\equal{\upmcurrentlang}{#1}}{%
+ \message{*** append to extension value #2 ****}%
+ \expandafter\expandafter\expandafter\global\expandafter\protected@edef\csname upmext@extension@value@#2\endcsname{\@nameuse{upmext@extension@value@#2}\xspace#3}%
+ }{}%
+ %\ifupm@extension@savealllang%
+ % \global\expandafter\g@addto@macro\csname upmext@extension@value@#2#1\endcsname{#3}%
+ %\fi
+}
+
\newcommand{\Unset}[2][\upmcurrentlang]{%
\ifthenelse{\equal{\upmcurrentlang}{#1}}{%
- \message{*** undefine extension value #2 ****}%
+ \message{*** undefine the extension value #2 ****}%
\global\expandafter\let\csname upmext@extension@value@#2\endcsname\@undefined%
\ifupm@extension@savealllang%
\global\expandafter\let\csname upmext@extension@value@#2@#1\endcsname\@undefined%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/upmethodology-fmt.sty new/tex/latex/upmethodology/upmethodology-fmt.sty
--- old/tex/latex/upmethodology/upmethodology-fmt.sty 2017-12-11 23:22:10.000000000 +0100
+++ new/tex/latex/upmethodology/upmethodology-fmt.sty 2019-09-28 23:34:06.000000000 +0200
@@ -1,6 +1,6 @@
% Layout and Pagraph Format for Unified Process Methodology
%
-% Copyright (c) 2006-2009, 2012-2015 Stephane GALLAND <galland(a)arakhne.org>
+% Copyright (c) 2006-2009, 2012-2019 Stephane GALLAND <galland(a)arakhne.org>
%
% This program is free library; you can redistribute it and/or modify
% it under the terms of the GNU Lesser General Public License as
@@ -17,7 +17,7 @@
% write to the Free Software Foundation, Inc., 59 Temple Place - Suite
% 330, Boston, MA 02111-1307, USA.
-\global\edef\upm@package@fmt@ver{2017/12/10}
+\global\edef\upm@package@fmt@ver{2019/09/28}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-fmt}[\upm@package@fmt@ver]
@@ -161,6 +161,20 @@
\fi
\graphicspath{{./}}
+%-----------------------------------------
+% LOCAL DEFINITION OF TH GRAPHICS PATH
+%-----------------------------------------
+
+\newenvironment{graphicspathcontext}[1]{%
+ \bgroup%
+ \let\upm@tmp@graphicspathcontext@ginputpath\Ginput@path%
+ \def\old{\upm@tmp@graphicspathcontext@ginputpath}%
+ \protected@edef\upm@tmp@graphicspathcontext@tmp{\protect\graphicspath{#1}}%
+ \upm@tmp@graphicspathcontext@tmp%
+}{%
+ \egroup%
+}
+
%----------------------------------------
% FIGURES
%----------------------------------------
@@ -1356,34 +1370,54 @@
\newsavebox{\upm@highlight@box@save}
-\newenvironment{upm@highligh@box}[2]{%
+% Parameters are:
+% #1: the width of the box
+% #2: the name of the picture
+% #3: the name of the border color
+% #4: the name of the background color
+% #5: the name of the text color
+\newenvironment{upm@highligh@box}[5]{%
\par
\vspace{.5cm}
\begin{tabular}{|p{#1}|}
- \hline
- \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}]
-}{%
- \end{window}\\ \hline \end{tabular}
+ \arrayrulecolor{#3}%
+ \hline
+ \cellcolor{#4}
+ \begin{window}[0,l,{\mbox{\includegraphics[width=1cm]{#2}}},{}]
+ \color{#5}
+ }{%
+ \normalcolor\end{window}\\ \hline \end{tabular}
\vspace{.5cm}
\par
}
-\newenvironment{upmcaution}[1][\linewidth]{%
- \upm@highligh@box{#1}{upm_caution.png}%
+% Colors for the highligh boxes
+\colorlet{highlightboxbackground_caution}{white}
+\colorlet{highlightboxforeground_caution}{black}
+\colorlet{highlightboxborder_caution}{black}
+\colorlet{highlightboxbackground_info}{white}
+\colorlet{highlightboxforeground_info}{black}
+\colorlet{highlightboxborder_info}{black}
+\colorlet{highlightboxbackground_question}{white}
+\colorlet{highlightboxforeground_question}{black}
+\colorlet{highlightboxborder_question}{black}
+
+\newenvironment{upmcaution}[1][.8\linewidth]{%
+ \bgroup\centering\upm@highligh@box{#1}{upm_caution.pdf}{highlightboxborder_caution}{highlightboxbackground_caution}{highlightboxforeground_caution}%
}{%
- \endupm@highligh@box%
+ \endupm@highligh@box\egroup%
}
-\newenvironment{upminfo}[1][\linewidth]{%
- \upm@highligh@box{#1}{upm_info.png}%
+\newenvironment{upminfo}[1][.8\linewidth]{%
+ \bgroup\centering\upm@highligh@box{#1}{upm_info.pdf}{highlightboxborder_info}{highlightboxbackground_info}{highlightboxforeground_info}%
}{%
- \endupm@highligh@box%
+ \endupm@highligh@box\egroup%
}
-\newenvironment{upmquestion}[1][\linewidth]{%
- \upm@highligh@box{#1}{upm_question.png}%
+\newenvironment{upmquestion}[1][.8\linewidth]{%
+ \bgroup\centering\upm@highligh@box{#1}{upm_question.pdf}{highlightboxborder_question}{highlightboxbackground_question}{highlightboxforeground_question}%
}{%
- \endupm@highligh@box%
+ \endupm@highligh@box\egroup%
}
%----------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/upmethodology/upmethodology-spec.sty new/tex/latex/upmethodology/upmethodology-spec.sty
--- old/tex/latex/upmethodology/upmethodology-spec.sty 2009-11-17 19:02:43.000000000 +0100
+++ new/tex/latex/upmethodology/upmethodology-spec.sty 2019-09-17 23:11:19.000000000 +0200
@@ -23,7 +23,7 @@
% 2007-03-19 Add localization.
%
-\global\edef\upm@package@spec@ver{2009/10/30}
+\global\edef\upm@package@spec@ver{2019/09/17}
\NeedsTeXFormat{LaTeX2e}[1995/12/01]
\ProvidesPackage{upmethodology-spec}[\upm@package@spec@ver]
@@ -133,7 +133,7 @@
\upm@spec@func@modifiers@scan{#1}%
}
\newcommand{\upm@spec@func@modifiers@scan}[1]{%
- \upm@ifnotempty{#1}{%
+ \Ifnotempty{#1}{%
\edef\upm@reserved@a{\upm@spec@head #1\@empty\@empty}%
\edef\upm@reserved@b{\upm@spec@tail #1\@empty\@empty}%
\ifthenelse{\equal{\upm@reserved@a}{+}}{%
@@ -187,7 +187,7 @@
%-----
%\upm@spec@param@modifiers{modifiers}
\newcommand{\upm@spec@param@modifiers}[1]{%
- \upm@ifnotempty{#1}{%
+ \Ifnotempty{#1}{%
\ifthenelse{\equal{#1}{out}}{%
%out
\upm@spec@lang@modifier@out%
@@ -205,7 +205,7 @@
%-----
\def\upm@spec@trim#1{#1}
\newcommand{\upm@spec@splitparams}[1]{%
- \upm@ifnotempty{#1}{%
+ \Ifnotempty{#1}{%
\upm@spec@firstparamtrue
\@for\reserved@a:=#1\do{%
\ifupm@spec@firstparam\upm@spec@firstparamfalse\else, \fi%
@@ -247,7 +247,7 @@
\addtocounter{upm@detailspec@function@counter}{1}%
\protected@xdef\upm@spec@reserved@a{\protect\csname upm@detailspec@return@ptr@\theupm@detailspec@function@counter\endcsname}%
\gdef\upm@spec@reserved@b{}
- \upm@ifnotempty{##2}{\gdef\upm@spec@reserved@b{\string:\ }}
+ \Ifnotempty{##2}{\gdef\upm@spec@reserved@b{\string:\ }}
\gdef\upm@spec@reserved@c{}%
\upm@spec@func@modifiers{##1}%
@@ -271,17 +271,17 @@
\gdef\upm@spec@reserved@e{\upm@spec@lang@modifier@const}%
\fi
\ifupm@spec@modifier@has@final%
- \upm@ifnotempty{\upm@spec@reserved@e}{%
+ \Ifnotempty{\upm@spec@reserved@e}{%
\xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}%
\protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@final}%
\fi
\ifupm@spec@modifier@has@abstract%
- \upm@ifnotempty{\upm@spec@reserved@e}{%
+ \Ifnotempty{\upm@spec@reserved@e}{%
\xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}%
\protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@abstract}%
\fi
\ifupm@spec@modifier@has@root%
- \upm@ifnotempty{\upm@spec@reserved@e}{%
+ \Ifnotempty{\upm@spec@reserved@e}{%
\xdef\upm@spec@reserved@e{\upm@spec@reserved@e,}}%
\protected@xdef\upm@spec@reserved@e{\upm@spec@reserved@e\protect\upm@spec@lang@modifier@root}%
\fi
@@ -343,13 +343,13 @@
\ifthenelse{\equal{\upm@spec@global@return}{\@empty}}{%
\gdef\upm@detailspec@return@section{}
- \upm@ifnotempty{\upm@spec@local@return}{
+ \Ifnotempty{\upm@spec@local@return}{
\gdef\upm@detailspec@separator{ & & & \\}
\protected@xdef\upm@detailspec@return@section{\upm@spec@local@return}%
\upm@spec@showreturnstrue%
}%
}{%
- \upm@ifnotempty{\upm@spec@local@return}{%
+ \Ifnotempty{\upm@spec@local@return}{%
\gdef\upm@detailspec@separator{ & & & \\}
\gdef\upm@spec@reserved@a{ \upm@spec@lang@except@for:\protect\upm@spec@local@return}}%
\protected@xdef\upm@detailspec@return@section{%
@@ -358,9 +358,8 @@
\upm@spec@showreturnstrue%
}
- \ifthenelse{\equal{\upm@spec@detailspec@title}{\@empty}}{
- \gdef\upm@spec@reserved@c{}
- }{
+ \gdef\upm@spec@reserved@c{}
+ \Ifnotempty{\upm@spec@detailspec@title}{
\gdef\upm@spec@reserved@c{\hline%
\multicolumn{4}{>{\columncolor{backtableheader}}l}{\color{fronttableheader}{\large\textsc{\upm@spec@detailspec@title}}} \\%
}
@@ -370,11 +369,11 @@
\upm@spec@showparamsfalse%
- \upm@ifnotempty{\upm@spec@parameters}{%
+ \Ifnotempty{\upm@spec@parameters}{%
\ifupm@spec@showdescription%
\gdef\upm@detailspec@separator{ & & & \\}%
\fi%
- \upm@ifnotempty{\upm@spec@functions}{%
+ \Ifnotempty{\upm@spec@functions}{%
\gdef\upm@detailspec@separator{ & & & \\}%
}%
\upm@spec@showparamstrue%
@@ -429,7 +428,7 @@
}
%-----
-%\begin{detailspec}}[width]{title}...\end{detailspec}....
+%\begin{detailspec}[width]{title}...\end{detailspec}....
\newenvironment{detailspec}[2][\linewidth]
{%
\upm@spec@showdescriptiontrue%
@@ -442,7 +441,7 @@
}
%-----
-%\begin{detailspec}}[width]{title}...\end{detailspec}....
+%\begin{detailspec*}[width]{title}...\end{detailspec*}....
\newenvironment{detailspec*}[2][\linewidth]
{%
\upm@spec@showdescriptionfalse%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/upmethodology.tlpobj new/tlpkg/tlpobj/upmethodology.tlpobj
--- old/tlpkg/tlpobj/upmethodology.tlpobj 2019-02-28 04:11:31.000000000 +0100
+++ new/tlpkg/tlpobj/upmethodology.tlpobj 2020-04-16 01:57:29.000000000 +0200
@@ -1,6 +1,6 @@
name upmethodology
category Package
-revision 46037
+revision 54758
shortdesc Writing specifications such as for UP-based methodologies
relocated 1
longdesc The bundle allows the user to create Unified Process
@@ -8,7 +8,7 @@
longdesc document versioning, document history, document authors,
longdesc document validators, specification description, task
longdesc management, and several helping macros.
-runfiles size=46
+runfiles size=49
RELOC/bibtex/bst/upmethodology/upmplainnat.bst
RELOC/tex/latex/upmethodology/UPMVERSION.def
RELOC/tex/latex/upmethodology/upmethodology-backpage.sty
@@ -23,12 +23,9 @@
RELOC/tex/latex/upmethodology/upmethodology-task.sty
RELOC/tex/latex/upmethodology/upmethodology-version.sty
catalogue-contact-bugs https://github.com/gallandarakhneorg/tex-upmethodology/issues
-catalogue-contact-development https://github.com/gallandarakhneorg/tex-upmethodology
catalogue-contact-home http://www.arakhne.org/tex-upmethodology
catalogue-contact-repository https://github.com/gallandarakhneorg/tex-upmethodology
-catalogue-contact-support https://github.com/gallandarakhneorg/tex-upmethodology
catalogue-ctan /macros/latex/contrib/upmethodology
-catalogue-date 2018-10-09 09:45:09 +0200
catalogue-license lgpl3
catalogue-topics doc-mgmt
-catalogue-version 20171210
+catalogue-version 20200406
++++++ uptex-base.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/00readme_uptex.txt new/doc/uptex/uptex-base/00readme_uptex.txt
--- old/doc/uptex/uptex-base/00readme_uptex.txt 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/00readme_uptex.txt 2020-03-04 00:01:38.000000000 +0100
@@ -1,5 +1,5 @@
upTeX, upLaTeX --- unicode version of ASCII pTeX, pLaTeX
-2019.02.23 Ver1.24
+2020.02.22 Ver1.26
TANAKA, Takuji ttk(at)t-lab(dot)opal(dot)ne(dot)jp
[ Contents ]
@@ -24,6 +24,7 @@
ASCII MEDIA WORKS
http://ascii.asciimw.jp/pb/ptex/ (dead link)
https://web.archive.org/web/20161229061414/http://ascii.asciimw.jp/pb/ptex/ (web archive)
+ https://asciidwango.github.io/ptex/ (by DWANGO Co., Ltd.)
[2] upTeX, upLaTeX ― unicode version of pTeX, pLaTeX
http://www.t-lab.opal.ne.jp/tex/uptex_en.html
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/01uptex_doc_utf8.txt new/doc/uptex/uptex-base/01uptex_doc_utf8.txt
--- old/doc/uptex/uptex-base/01uptex_doc_utf8.txt 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/01uptex_doc_utf8.txt 2020-03-04 00:01:38.000000000 +0100
@@ -1,5 +1,5 @@
upTeX, upLaTeX --- 内部unicode版 pTeX, pLaTeX の実装
-2019.02.23 Ver1.24
+2020.02.22 Ver1.26
TANAKA, Takuji ttk(at)t-lab(dot)opal(dot)ne(dot)jp
◇ upTeX開発のねらい
@@ -176,7 +176,7 @@
この仕様は pTeX でも同様となっている。
<14> 新しく \kchar, \kchardef プリミティヴをを追加。
\char`<文字>, \chardef では文字コードが255以下の場合には欧文動作、
- 265以上の場合には和文動作となる。
+ 256以上の場合には和文動作となる。
\kchar`<文字>, \kchardef では文字コード範囲によらず和文動作となる。
<15> 従来デフォルトのフォントはset2の範囲で済むようにし、
set3を含むフォント(vf)はオプションとしていたが、
@@ -222,7 +222,7 @@
※1: 欧文はcatcode 4bit + 文字コード8bit
(Omegaではcatcode 4bit + 文字コード16bitだが、Omegaへの拡張を視野にいれたい。)
和文はkcatcode 5bit + 文字コード24bit。
-オリジナルpTeXでは、和文は文字コード16bit,
+オリジナルpTeXでは、和文は文字コード16bit,
kcatcodeは、文字コードを引数として表を参照して求めていたが、
upTeXでは、欧文と同等に(k)catcodeと文字コードの組となるように変更した。
和文/欧文トークンは 29bit を重ならないように使用していることになる。
@@ -451,15 +451,16 @@
(0x92) 0xAC00.. 0xD7AF <19> Hangul Syllables
(0x93) 0xD7B0.. 0xD7FF <19> Hangul Jamo Extended-B
(0x98) 0xF900.. 0xFAFF <16> CJK Compatibility Ideographs
- (0xFD) 0x1B000..0x1B0FF <17> Kana Supplement
- (0xFE) 0x1B100..0x1B12F <17> Kana Extended-A
- (0xFF) 0x1B130..0x1B16F <17> Small Kana Extension
- (0x122) 0x20000..0x2A6FF <16> CJK Unified Ideographs Extension B
- (0x123) 0x2A700..0x2B73F <16> CJK Unified Ideographs Extension C
- (0x124) 0x2B740..0x2B81F <16> CJK Unified Ideographs Extension D
- (0x125) 0x2B820..0x2CEAF <16> CJK Unified Ideographs Extension E
- (0x126) 0x2CEB0..0x2F7FF <16> CJK Unified Ideographs Extension F
- (0x127) 0x2F800..0x2FFFF <16> CJK Compatibility Ideographs Supplement
+ (0x103) 0x1B000..0x1B0FF <17> Kana Supplement
+ (0x104) 0x1B100..0x1B12F <17> Kana Extended-A
+ (0x105) 0x1B130..0x1B16F <17> Small Kana Extension
+ (0x129) 0x20000..0x2A6FF <16> CJK Unified Ideographs Extension B
+ (0x12A) 0x2A700..0x2B73F <16> CJK Unified Ideographs Extension C
+ (0x12B) 0x2B740..0x2B81F <16> CJK Unified Ideographs Extension D
+ (0x12C) 0x2B820..0x2CEAF <16> CJK Unified Ideographs Extension E
+ (0x12D) 0x2CEB0..0x2F7FF <16> CJK Unified Ideographs Extension F
+ (0x12E) 0x2F800..0x2FFFF <16> CJK Compatibility Ideographs Supplement
+ (0x12F) 0x30000..0x3134F <16> CJK Unified Ideographs Extension G
(上記の文字の範囲は実装に基づいており、Blocks.txtに記述されている範囲より広い場合がある)
○Unicode blockの例外
(0x1FD) 0xAA, 0xBA, 0xC0..0xD6, 0xD8..0xF6, 0xF8..0xFF <15> Latin-1 Letters
@@ -498,8 +499,6 @@
upbibtex ほぼ動いている。しかし、jalpha.bst 使用時に
一部のエントリーでeuc動作と同等にならない問題がある。
ukinsoku.tex JIS X 0213 に対応した。
-CMap UTF8-UTF16
- TeX Live svn に r26540 で取り込まれた。
◎ 別の配布に含めたもの
otfパッケージ japanese-otf-uptex として公開、CTANに登録した。
(以前は otfbeta-uptex-x.xx.tar.xz として公開していた。)
@@ -512,6 +511,11 @@
convbkmk としてCTANに登録した。
https://ctan.org/pkg/convbkmk
https://github.com/t-tk/convbkmk
+CMap UTF8-UTF16
+ TeX Live svn に r26540 で取り込まれた。
+ 一次配布は http://www.t-lab.opal.ne.jp/tex/uptex.html
+ uptex-fonts の配布に含まれている。
+ https://github.com/texjporg/uptex-fonts
◎ 日本語TeX開発コミュニティに移管したもの
upjisr-h.tfmなど
JIS X 0208の範囲ではほぼUnicodeに移植出来ていると思う。
@@ -541,20 +545,23 @@
set3も含めて動いている。
ただし、set3で、「内部コードがUTF-32, CMapがUniXXX-UTF16」であること
を仮定したハードコーディングになっているおり、柔軟性は乏しい。
- bookmark 作成は UTF8-UCS2, UTF8-UTF16 の CMAP または、
+ bookmark 作成は UTF8-UCS2, UTF8-UTF16 の CMap または、
convbkmk.rbの-oオプションを必要とする。
dvi2tty TeX Live svn に r24634 あたりで取り込まれた。
dvi2tty の NTT JTeX/pTeX 対応版を upTeX 対応にした。
オプション -J を変更し、 -U, -E を新設した。
さらに、T1,TS1,OT2,T2A,T2B,T2C,X2エンコーディング対応機能が
TeX Live に r39942 あたりで取り込まれた。
+ https://github.com/t-tk/dvi2tty
mendex TeX Live r33962 あたりで、見出しをUnicode対応とした。
さらに r47721 あたりで見出しのデフォルトエンコーディングをUTF-8とした。
+ https://github.com/texjporg/tex-jp-build
upmendex mendex をベースに新規に作成した。
mendex の内部コードをUnicode化し、ICUによるソート、
読みをJIS X 0213のかなに対応、CJK対応、ラテン文字(含非英語)対応、
キリル文字対応、ギリシャ文字対応となっている。
TeX Live svn に r39638 あたりで取り込まれた。
+ https://github.com/t-tk/upmendex-package
upmpost TeX Live r35188 あたりでupmetapostの名前で取り込まれ、
現在upmpostの名前になっている。
ただし、おそらくuptex-0.30の頃と同様、
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/02uptex_changelog_utf8.txt new/doc/uptex/uptex-base/02uptex_changelog_utf8.txt
--- old/doc/uptex/uptex-base/02uptex_changelog_utf8.txt 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/02uptex_changelog_utf8.txt 2020-03-04 00:01:38.000000000 +0100
@@ -1,5 +1,62 @@
### ChangeLog / 変更履歴
+2020.02.29 Ver1.26-20200229a
+ samples:
+ Update.
+ 01uptex_doc_utf8.txt:
+ Update.
+
+2020.02.22 Ver1.26-20200222a
+ TeXLive svn r53078 base
+ Build/source/texk/web2c/uptexdir:
+ * uptex-m.ch, uppltotf.ch, uptftopl.ch, updvitype.ch, upbibtex.ch,
+ uptex_version.h:
+ Update upTeX version number.
+ * uptex-m.ch, kanji.c:
+ Update reference of Unicode blocks to
+ "Blocks-13.0.0.txt Date: 2019-07-10, 19:06:00 GMT [KW]".
+ * COPYRIGHT, COPYRIGHT.ja:
+ Update copyright year.
+ Master/texmf-dist/tex/uptex/uptex-base:
+ * ukinsoku.tex:
+ Import from GitHub
+ https://github.com/texjporg/uptex-base
+ samples:
+ Update.
+ 00readme_uptex.txt, 01uptex_doc_utf8.txt:
+ Update.
+
+2019.05.12 Ver1.25-20190512a
+ TeXLive svn r51021 base
+ Build/source/texk/web2c/uptexdir:
+ * uptex-m.ch, uppltotf.ch, uptftopl.ch, updvitype.ch, upbibtex.ch,
+ uptex_version.h:
+ Update upTeX version number.
+ * kanji.c:
+ Fix bug of kcatcode for Fullwidth ASCII variants,
+ Halfwidth Katakana variants and Halfwidth and Fullwidth Forms
+ in Ver1.24 from Yusuke Terada san
+ https://github.com/texjporg/tex-jp-build/pull/79
+ * kanji.c, kanji.h:
+ Set default internal encoding EUC/SJIS if a command name is
+ with prefix of "p" or "ep", intending to be compatible with
+ pTeX family (ptex, eptex, pbibtex, pdvitype, ppltotf, ptftopl)
+ (experimental).
+ * uptex-m.ch:
+ Make appropreate comparison of U+0100 by \if
+ from Hironori Kitagawa san
+ https://github.com/texjporg/tex-jp-build/issues/68
+ Master/texmf-dist/tex/uptex/uptex-base:
+ * ukinsoku.tex:
+ Add setting of kcatcode for block
+ "Halfwidth and Fullwidth Forms" to work around
+ for bug of Ver1.24
+ https://github.com/texjporg/uptex-base/issues/3
+ samples:
+ Update.
+ 01uptex_doc_utf8.txt:
+ Update.
+
2019.02.23 Ver1.24-20190223a
TeXLive svn r50082 base
Build/source/texk/web2c/uptexdir:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/LICENSE new/doc/uptex/uptex-base/LICENSE
--- old/doc/uptex/uptex-base/LICENSE 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/LICENSE 2020-03-04 00:01:38.000000000 +0100
@@ -1,6 +1,6 @@
Copyright (c) 2010 ASCII MEDIA WORKS
-Copyright (c) 2016-2019 Takuji Tanaka
-Copyright (c) 2016-2019 Japanese TeX Development Community
+Copyright (c) 2016-2020 Takuji Tanaka
+Copyright (c) 2016-2020 Japanese TeX Development Community
All rights reserved.
Redistribution and use in source and binary forms, with or without
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/README.md new/doc/uptex/uptex-base/README.md
--- old/doc/uptex/uptex-base/README.md 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/README.md 2020-03-04 00:01:38.000000000 +0100
@@ -17,6 +17,6 @@
## Release Date
-2019-02-23
+2020-02-29
Japanese TeX Development Community
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt new/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt
--- old/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/samples/00readme_uptex_samples.txt 2019-05-12 22:17:39.000000000 +0200
@@ -78,3 +78,6 @@
texxet-jis.tex
: test for TeX-XeT with e-{p,up}LaTeX
+
+show_kcat.tex (plain upTeX)
+ : show kcatcode default value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/samples/show_kcat.tex new/doc/uptex/uptex-base/samples/show_kcat.tex
--- old/doc/uptex/uptex-base/samples/show_kcat.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/uptex/uptex-base/samples/show_kcat.tex 2020-03-04 00:01:38.000000000 +0100
@@ -0,0 +1,385 @@
+%%% memo
+% not_cjk=15 {is not cjk characters}
+% kanji=16 {kanji}
+% kana=17 {hiragana, katakana}
+% other_kchar=18 {cjk symbol codes}
+% hangul=19 {hangul codes}
+
+\def\KC#1#2{[#1] \the\kcatcode"#2}
+\def\kc#1#2{[#1] \the\kcatcode`#1,\the\kcatcode"#2\ifnum`#1="#2 \else !! No match !!\fi}
+\def\kco#1{\the\kcatcode"#1}
+
+\message{not cjk:}
+\message{\KC{A}{0041}}% U+0041 Basic Latin
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{Ā}{0100}}% U+0100 Latin Extended-A
+\message{\KC{ƀ}{0180}}% U+0180 Latin Extended-B
+\message{\KC{Ḁ}{1E00}}% U+1E00 Latin Extended Additional
+
+\message{kanji:}
+\message{\kc{⺀}{2E80}}% U+2E80 CJK Radicals Supplement
+\message{\kc{⼀}{2F00}}% U+2F00 Kangxi Radicals
+\message{\kc{⿰}{2FF0}}% U+2FF0 Ideographic Description Characters
+\message{\kc{ㄅ}{3105}}% U+3105 Bopomofo
+\message{\kc{㆐}{3190}}% U+3190 Kanbun
+\message{\kc{ㆠ}{31A0}}% U+31A0 Bopomofo Extended
+\message{\kc{㇀}{31C0}}% U+31C0 CJK Strokes
+\message{\kc{㐀}{3400}}% U+3400 CJK Unified Ideographs Extension A
+\message{\kc{一}{4E00}}% U+4E00 CJK Unified Ideographs
+\message{\kc{豈}{F900}}% U+F900 CJK Compatibility Ideographs
+\message{\kc{𠀀}{20000}}% U+20000 CJK Unified Ideographs Extension B
+\message{\kc{𪜀}{2A700}}% U+2A700 CJK Unified Ideographs Extension C
+\message{\kc{𫝀}{2B740}}% U+2B740 CJK Unified Ideographs Extension D
+\message{\kc{𫠠}{2B820}}% U+2B820 CJK Unified Ideographs Extension E
+\message{\kc{𬺰}{2CEB0}}% U+2CEB0 CJK Unified Ideographs Extension F
+\message{\kc{丽}{2F800}}% U+2F800 CJK Compatibility Ideographs Supplement
+\message{\kc{𰀀}{30000}}% U+30000 CJK Unified Ideographs Extension G
+
+\message{kana:}
+\message{\kc{あ}{3042}}% U+3042 Hiragana
+\message{\kc{ア}{30A2}}% U+30A2 Katakana
+\message{\kc{ㇰ}{31F0}}% U+31F0 Katakana Phonetic Extensions
+\message{\kc{𛀀}{1B000}}% U+1B000 Kana Supplement
+\message{\kc{𛄀}{1B100}}% U+1B100 Kana Extended-A
+\message{\kc{𛅐}{1B150}}% U+1B150 Small Kana Extension
+\message{\kc{0}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\kc{ヲ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+\message{other kchar:}
+\message{\kc{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\kc{@}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+
+\message{hangul:}
+\message{\kc{ᄀ}{1100}}% U+1100 Hangul Jamo
+\message{\kc{ㄱ}{3131}}% U+3131 Hangul Compatibility Jamo
+\message{\kc{ꥠ}{A960}}% U+A960 Hangul Jamo Extended-A
+\message{\kc{가}{AC00}}% U+AC00 Hangul Syllables
+\message{\kc{ힰ}{D7B0}}% U+D7B0 Hangul Jamo Extended-B
+
+\message{others:}
+\message{\kco{0250}}% IPA Extensions
+\message{\kco{02B0}}% Spacing Modifier Letters
+\message{\kco{0300}}% Combining Diacritical Marks
+\message{\kco{0370}}% Greek and Coptic
+\message{\kco{0400}}% Cyrillic
+\message{\kco{0500}}% Cyrillic Supplement
+\message{\kco{0530}}% Armenian
+\message{\kco{0590}}% Hebrew
+\message{\kco{0600}}% Arabic
+\message{\kco{0700}}% Syriac
+\message{\kco{0750}}% Arabic Supplement
+\message{\kco{0780}}% Thaana
+\message{\kco{07C0}}% NKo
+\message{\kco{0800}}% Samaritan
+\message{\kco{0840}}% Mandaic
+\message{\kco{0860}}% Syriac Supplement
+\message{\kco{08A0}}% Arabic Extended-A
+\message{\kco{0900}}% Devanagari
+\message{\kco{0980}}% Bengali
+\message{\kco{0A00}}% Gurmukhi
+\message{\kco{0A80}}% Gujarati
+\message{\kco{0B00}}% Oriya
+\message{\kco{0B80}}% Tamil
+\message{\kco{0C00}}% Telugu
+\message{\kco{0C80}}% Kannada
+\message{\kco{0D00}}% Malayalam
+\message{\kco{0D80}}% Sinhala
+\message{\kco{0E00}}% Thai
+\message{\kco{0E80}}% Lao
+\message{\kco{0F00}}% Tibetan
+\message{\kco{1000}}% Myanmar
+\message{\kco{10A0}}% Georgian
+\message{\kco{1200}}% Ethiopic
+\message{\kco{1380}}% Ethiopic Supplement
+\message{\kco{13A0}}% Cherokee
+\message{\kco{1400}}% Unified Canadian Aboriginal Syllabics
+\message{\kco{1680}}% Ogham
+\message{\kco{16A0}}% Runic
+\message{\kco{1700}}% Tagalog
+\message{\kco{1720}}% Hanunoo
+\message{\kco{1740}}% Buhid
+\message{\kco{1760}}% Tagbanwa
+\message{\kco{1780}}% Khmer
+\message{\kco{1800}}% Mongolian
+\message{\kco{18B0}}% Unified Canadian Aboriginal Syllabics Extended
+\message{\kco{1900}}% Limbu
+\message{\kco{1950}}% Tai Le
+\message{\kco{1980}}% New Tai Lue
+\message{\kco{19E0}}% Khmer Symbols
+\message{\kco{1A00}}% Buginese
+\message{\kco{1A20}}% Tai Tham
+\message{\kco{1AB0}}% Combining Diacritical Marks Extended
+\message{\kco{1B00}}% Balinese
+\message{\kco{1B80}}% Sundanese
+\message{\kco{1BC0}}% Batak
+\message{\kco{1C00}}% Lepcha
+\message{\kco{1C50}}% Ol Chiki
+\message{\kco{1C80}}% Cyrillic Extended-C
+\message{\kco{1C90}}% Georgian Extended
+\message{\kco{1CC0}}% Sundanese Supplement
+\message{\kco{1CD0}}% Vedic Extensions
+\message{\kco{1D00}}% Phonetic Extensions
+\message{\kco{1D80}}% Phonetic Extensions Supplement
+\message{\kco{1DC0}}% Combining Diacritical Marks Supplement
+\message{\kco{1F00}}% Greek Extended
+\message{\kco{2000}}% General Punctuation
+\message{\kco{2070}}% Superscripts and Subscripts
+\message{\kco{20A0}}% Currency Symbols
+\message{\kco{20D0}}% Combining Diacritical Marks for Symbols
+\message{\kco{2100}}% Letterlike Symbols
+\message{\kco{2150}}% Number Forms
+\message{\kco{2190}}% Arrows
+\message{\kco{2200}}% Mathematical Operators
+\message{\kco{2300}}% Miscellaneous Technical
+\message{\kco{2400}}% Control Pictures
+\message{\kco{2440}}% Optical Character Recognition
+\message{\kco{2460}}% Enclosed Alphanumerics
+\message{\kco{2500}}% Box Drawing
+\message{\kco{2580}}% Block Elements
+\message{\kco{25A0}}% Geometric Shapes
+\message{\kco{2600}}% Miscellaneous Symbols
+\message{\kco{2700}}% Dingbats
+\message{\kco{27C0}}% Miscellaneous Mathematical Symbols-A
+\message{\kco{27F0}}% Supplemental Arrows-A
+\message{\kco{2800}}% Braille Patterns
+\message{\kco{2900}}% Supplemental Arrows-B
+\message{\kco{2980}}% Miscellaneous Mathematical Symbols-B
+\message{\kco{2A00}}% Supplemental Mathematical Operators
+\message{\kco{2B00}}% Miscellaneous Symbols and Arrows
+\message{\kco{2C00}}% Glagolitic
+\message{\kco{2C60}}% Latin Extended-C
+\message{\kco{2C80}}% Coptic
+\message{\kco{2D00}}% Georgian Supplement
+\message{\kco{2D30}}% Tifinagh
+\message{\kco{2D80}}% Ethiopic Extended
+\message{\kco{2DE0}}% Cyrillic Extended-A
+\message{\kco{2E00}}% Supplemental Punctuation
+\message{\kco{3000}}% CJK Symbols and Punctuation
+\message{\kco{3200}}% Enclosed CJK Letters and Months
+\message{\kco{3300}}% CJK Compatibility
+\message{\kco{4DC0}}% Yijing Hexagram Symbols
+\message{\kco{A000}}% Yi Syllables
+\message{\kco{A490}}% Yi Radicals
+\message{\kco{A4D0}}% Lisu
+\message{\kco{A500}}% Vai
+\message{\kco{A640}}% Cyrillic Extended-B
+\message{\kco{A6A0}}% Bamum
+\message{\kco{A700}}% Modifier Tone Letters
+\message{\kco{A720}}% Latin Extended-D
+\message{\kco{A800}}% Syloti Nagri
+\message{\kco{A830}}% Common Indic Number Forms
+\message{\kco{A840}}% Phags-pa
+\message{\kco{A880}}% Saurashtra
+\message{\kco{A8E0}}% Devanagari Extended
+\message{\kco{A900}}% Kayah Li
+\message{\kco{A930}}% Rejang
+\message{\kco{A980}}% Javanese
+\message{\kco{A9E0}}% Myanmar Extended-B
+\message{\kco{AA00}}% Cham
+\message{\kco{AA60}}% Myanmar Extended-A
+\message{\kco{AA80}}% Tai Viet
+\message{\kco{AAE0}}% Meetei Mayek Extensions
+\message{\kco{AB00}}% Ethiopic Extended-A
+\message{\kco{AB30}}% Latin Extended-E
+\message{\kco{AB70}}% Cherokee Supplement
+\message{\kco{ABC0}}% Meetei Mayek
+\message{\kco{D800}}% High Surrogates
+\message{\kco{DB80}}% High Private Use Surrogates
+\message{\kco{DC00}}% Low Surrogates
+\message{\kco{E000}}% Private Use Area
+\message{\kco{FB00}}% Alphabetic Presentation Forms
+\message{\kco{FB50}}% Arabic Presentation Forms-A
+\message{\kco{FE00}}% Variation Selectors
+\message{\kco{FE10}}% Vertical Forms
+\message{\kco{FE20}}% Combining Half Marks
+\message{\kco{FE30}}% CJK Compatibility Forms
+\message{\kco{FE50}}% Small Form Variants
+\message{\kco{FE70}}% Arabic Presentation Forms-B
+\message{\kco{FF00}}% Halfwidth and Fullwidth Forms
+\message{\kco{FFF0}}% Specials
+\message{\kco{10000}}% Linear B Syllabary
+\message{\kco{10080}}% Linear B Ideograms
+\message{\kco{10100}}% Aegean Numbers
+\message{\kco{10140}}% Ancient Greek Numbers
+\message{\kco{10190}}% Ancient Symbols
+\message{\kco{101D0}}% Phaistos Disc
+\message{\kco{10280}}% Lycian
+\message{\kco{102A0}}% Carian
+\message{\kco{102E0}}% Coptic Epact Numbers
+\message{\kco{10300}}% Old Italic
+\message{\kco{10330}}% Gothic
+\message{\kco{10350}}% Old Permic
+\message{\kco{10380}}% Ugaritic
+\message{\kco{103A0}}% Old Persian
+\message{\kco{10400}}% Deseret
+\message{\kco{10450}}% Shavian
+\message{\kco{10480}}% Osmanya
+\message{\kco{104B0}}% Osage
+\message{\kco{10500}}% Elbasan
+\message{\kco{10530}}% Caucasian Albanian
+\message{\kco{10600}}% Linear A
+\message{\kco{10800}}% Cypriot Syllabary
+\message{\kco{10840}}% Imperial Aramaic
+\message{\kco{10860}}% Palmyrene
+\message{\kco{10880}}% Nabataean
+\message{\kco{108E0}}% Hatran
+\message{\kco{10900}}% Phoenician
+\message{\kco{10920}}% Lydian
+\message{\kco{10980}}% Meroitic Hieroglyphs
+\message{\kco{109A0}}% Meroitic Cursive
+\message{\kco{10A00}}% Kharoshthi
+\message{\kco{10A60}}% Old South Arabian
+\message{\kco{10A80}}% Old North Arabian
+\message{\kco{10AC0}}% Manichaean
+\message{\kco{10B00}}% Avestan
+\message{\kco{10B40}}% Inscriptional Parthian
+\message{\kco{10B60}}% Inscriptional Pahlavi
+\message{\kco{10B80}}% Psalter Pahlavi
+\message{\kco{10C00}}% Old Turkic
+\message{\kco{10C80}}% Old Hungarian
+\message{\kco{10D00}}% Hanifi Rohingya
+\message{\kco{10E60}}% Rumi Numeral Symbols
+\message{\kco{10E80}}% Yezidi
+\message{\kco{10F00}}% Old Sogdian
+\message{\kco{10F30}}% Sogdian
+\message{\kco{10FB0}}% Chorasmian
+\message{\kco{10FE0}}% Elymaic
+\message{\kco{11000}}% Brahmi
+\message{\kco{11080}}% Kaithi
+\message{\kco{110D0}}% Sora Sompeng
+\message{\kco{11100}}% Chakma
+\message{\kco{11150}}% Mahajani
+\message{\kco{11180}}% Sharada
+\message{\kco{111E0}}% Sinhala Archaic Numbers
+\message{\kco{11200}}% Khojki
+\message{\kco{11280}}% Multani
+\message{\kco{112B0}}% Khudawadi
+\message{\kco{11300}}% Grantha
+\message{\kco{11400}}% Newa
+\message{\kco{11480}}% Tirhuta
+\message{\kco{11580}}% Siddham
+\message{\kco{11600}}% Modi
+\message{\kco{11660}}% Mongolian Supplement
+\message{\kco{11680}}% Takri
+\message{\kco{11700}}% Ahom
+\message{\kco{11800}}% Dogra
+\message{\kco{118A0}}% Warang Citi
+\message{\kco{11900}}% Dives Akuru
+\message{\kco{119A0}}% Nandinagari
+\message{\kco{11A00}}% Zanabazar Square
+\message{\kco{11A50}}% Soyombo
+\message{\kco{11AC0}}% Pau Cin Hau
+\message{\kco{11C00}}% Bhaiksuki
+\message{\kco{11C70}}% Marchen
+\message{\kco{11D00}}% Masaram Gondi
+\message{\kco{11D60}}% Gunjala Gondi
+\message{\kco{11EE0}}% Makasar
+\message{\kco{11FB0}}% Lisu Supplement
+\message{\kco{11FC0}}% Tamil Supplement
+\message{\kco{12000}}% Cuneiform
+\message{\kco{12400}}% Cuneiform Numbers and Punctuation
+\message{\kco{12480}}% Early Dynastic Cuneiform
+\message{\kco{13000}}% Egyptian Hieroglyphs
+\message{\kco{13430}}% Egyptian Hieroglyph Format Controls
+\message{\kco{14400}}% Anatolian Hieroglyphs
+\message{\kco{16800}}% Bamum Supplement
+\message{\kco{16A40}}% Mro
+\message{\kco{16AD0}}% Bassa Vah
+\message{\kco{16B00}}% Pahawh Hmong
+\message{\kco{16E40}}% Medefaidrin
+\message{\kco{16F00}}% Miao
+\message{\kco{16FE0}}% Ideographic Symbols and Punctuation
+\message{\kco{17000}}% Tangut
+\message{\kco{18800}}% Tangut Components
+\message{\kco{18B00}}% Khitan Small Script
+\message{\kco{18D00}}% Tangut Supplement
+\message{\kco{1B170}}% Nushu
+\message{\kco{1BC00}}% Duployan
+\message{\kco{1BCA0}}% Shorthand Format Controls
+\message{\kco{1D000}}% Byzantine Musical Symbols
+\message{\kco{1D100}}% Musical Symbols
+\message{\kco{1D200}}% Ancient Greek Musical Notation
+\message{\kco{1D2E0}}% Mayan Numerals
+\message{\kco{1D300}}% Tai Xuan Jing Symbols
+\message{\kco{1D360}}% Counting Rod Numerals
+\message{\kco{1D400}}% Mathematical Alphanumeric Symbols
+\message{\kco{1D800}}% Sutton SignWriting
+\message{\kco{1E000}}% Glagolitic Supplement
+\message{\kco{1E100}}% Nyiakeng Puachue Hmong
+\message{\kco{1E2C0}}% Wancho
+\message{\kco{1E800}}% Mende Kikakui
+\message{\kco{1E900}}% Adlam
+\message{\kco{1EC70}}% Indic Siyaq Numbers
+\message{\kco{1ED00}}% Ottoman Siyaq Numbers
+\message{\kco{1EE00}}% Arabic Mathematical Alphabetic Symbols
+\message{\kco{1F000}}% Mahjong Tiles
+\message{\kco{1F030}}% Domino Tiles
+\message{\kco{1F0A0}}% Playing Cards
+\message{\kco{1F100}}% Enclosed Alphanumeric Supplement
+\message{\kco{1F200}}% Enclosed Ideographic Supplement
+\message{\kco{1F300}}% Miscellaneous Symbols and Pictographs
+\message{\kco{1F600}}% Emoticons
+\message{\kco{1F650}}% Ornamental Dingbats
+\message{\kco{1F680}}% Transport and Map Symbols
+\message{\kco{1F700}}% Alchemical Symbols
+\message{\kco{1F780}}% Geometric Shapes Extended
+\message{\kco{1F800}}% Supplemental Arrows-C
+\message{\kco{1F900}}% Supplemental Symbols and Pictographs
+\message{\kco{1FA00}}% Chess Symbols
+\message{\kco{1FA70}}% Symbols and Pictographs Extended-A
+\message{\kco{1FB00}}% Symbols for Legacy Computing
+\message{\kco{E0000}}% Tags
+\message{\kco{E0100}}% Variation Selectors Supplement
+\message{\kco{F0000}}% Supplementary Private Use Area-A
+\message{\kco{100000}}% Supplementary Private Use Area-B
+
+
+%%% block separation
+\message{check block separation default:}
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{0}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{@}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ヲ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{1st:}
+\kcatcode"00A7=18% U+00A7+§ Latin-1 Supplement, symbols
+\kcatcode"00C0=18% U+00C0:À Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=18% U+FF10:0 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=18% U+FF20:@ Halfwidth and Fullwidth Forms
+\kcatcode"FF66=18% U+FF66:ヲ "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{0}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{@}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ヲ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{2nd:}
+\kcatcode"00A7=17% U+00A7+§ Latin-1 Supplement, symbols
+\kcatcode"00C0=18% U+00C0:À Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=16% U+FF10:0 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=17% U+FF20:@ Halfwidth and Fullwidth Forms
+\kcatcode"FF66=18% U+FF66:ヲ "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{0}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{@}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ヲ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\message{3rd:}
+\kcatcode"00A7=18% U+00A7+§ Latin-1 Supplement, symbols
+\kcatcode"00C0=17% U+00C0:À Latin-1 Supplement, Latin-1 letters
+\kcatcode"FF10=19% U+FF10:0 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\kcatcode"FF20=18% U+FF20:@ Halfwidth and Fullwidth Forms
+\kcatcode"FF66=17% U+FF66:ヲ "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+\message{\KC{§}{00A7}}% U+00A7 Latin-1 Supplement
+\message{\KC{À}{00C0}}% U+00C0 "Latin-1 Letters" in Latin-1 Supplement
+\message{\KC{0}{FF10}}% U+FF10 "Fullwidth ASCII variants" in Halfwidth and Fullwidth Forms
+\message{\KC{@}{FF20}}% U+FF20 Halfwidth and Fullwidth Forms
+\message{\KC{ヲ}{FF66}}% U+FF66 "Halfwidth Katakana variants" in Halfwidth and Fullwidth Forms
+
+
+\end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/uptex/uptex-base/samples/testrun.bat new/doc/uptex/uptex-base/samples/testrun.bat
--- old/doc/uptex/uptex-base/samples/testrun.bat 2019-02-23 23:18:01.000000000 +0100
+++ new/doc/uptex/uptex-base/samples/testrun.bat 2020-03-04 00:01:38.000000000 +0100
@@ -1,135 +1,135 @@
-del *.dvi *.aux *.log *.ps *.pdf *.1 *.mpx
-
-rem misc
-for %%f in (misc set3) ^
-do ( ^
-uplatex %%f-check-utf8 && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
-updvitype -kanji=uptex %%f-check-utf8.dvi > %%f-check-utf8.pdvitype && ^
-updvipdfmx %%f-check-utf8 && ^
-uplatex "\def\withhyperref{dvips}\input" %%f-check-utf8.tex && ^
-updvips %%f-check-utf8 && ^
-uplatex %%f-check-utf8 )
-for %%f in (misc) ^
-do ( ^
-uplatex %%f-check-v-utf8 && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
-uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
-updvitype -kanji=uptex %%f-check-v-utf8.dvi > %%f-check-v-utf8.pdvitype && ^
-updvipdfmx -l %%f-check-v-utf8 && ^
-uplatex "\def\withhyperref{dvips}\input" %%f-check-v-utf8.tex && ^
-updvips -t landscape %%f-check-v-utf8 && ^
-uplatex %%f-check-v-utf8 )
-
-rem kinsoku
-uplatex kinsoku-chk-utf8
-dvipdfmx kinsoku-chk-utf8
-updvips kinsoku-chk-utf8
-
-rem widow
-platex widow
-move widow.dvi widow-platex.dvi
-dvipdfmx widow-platex.dvi
-uplatex widow
-move widow.dvi widow-u-uptex.dvi
-dvipdfmx widow-u-uptex.dvi
-
-rem uptex
-uptex sangoku-uptex
-dvipdfmx sangoku-uptex
-updvips sangoku-uptex
-
-rem uplatex
-uplatex sangoku-uplatex
-dvipdfmx sangoku-uplatex
-updvips sangoku-uplatex
-
-rem aozora
-for %%c in (ujarticle ujreport ujbook utarticle utreport utbook) ^
-do ( ^
-uplatex aozora-%%c-utf8 && ^
-dvipdfmx aozora-%%c-utf8 && ^
-updvips aozora-%%c-utf8 )
-
-rem adobe
-for %%c in (jp kr gb cns) ^
-do ( ^
-uptex adobe-%%c-utf8 && ^
-updvipdfmx adobe-%%c-utf8 && ^
-updvips adobe-%%c-utf8 )
-
-rem jbib
-uplatex jbib2-utf8.tex
-upjbibtex -kanji=uptex --kanji-internal=uptex jbib2-utf8
-uplatex jbib2-utf8.tex
-uplatex jbib2-utf8.tex
-
-rem jmpost
-for %%f in (area jstr) ^
-do ( ^
-upjmpost -kanji=uptex -tex=uplatex %%f-uptex.mp && ^
-uplatex %%f-uptex-incl.tex && ^
-updvips %%f-uptex-incl.dvi && ^
-updvipdfmx %%f-uptex-incl.dvi )
-
-rem updvi2tty
-platex -kanji=jis simple-jis.tex
-move simple-jis.dvi simple-jis-platex.dvi
-for %%f in (j e s u) ^
-do ( ^
-updvi2tty -w 62 -o simple-jis-platex-%%f.dvi2tty -E %%f simple-jis-platex.dvi )
-uplatex simple-u-jis.tex
-move simple-u-jis.dvi simple-u-jis-uptex.dvi
-for %%f in (j e s u) ^
-do ( ^
-updvi2tty -w 62 -o simple-u-jis-uptex-%%f.dvi2tty -E %%f simple-u-jis-uptex.dvi )
-
-
-rem
-rem following samples require the utf package
-rem
-
-rem utf
-uplatex utfsmpl-uplatex
-updvipdfmx utfsmpl-uplatex
-updvips utfsmpl-uplatex
-
-rem
-rem following samples require the otf package
-rem
-
-rem otf
-uplatex otfsmpl-uplatex
-updvipdfmx otfsmpl-uplatex
-updvips otfsmpl-uplatex
-
-rem adobe
-for %%c in (jp kr gb cns) ^
-do ( ^
-uplatex "\def\adobe{%%c}\input" adobe-cid && ^
-move adobe-cid.dvi adobe-%%c-mc-cid.dvi && ^
-updvipdfmx adobe-%%c-mc-cid && ^
-updvips adobe-%%c-mc-cid )
-for %%c in (jp kr cns) ^
-do ( ^
-uplatex "\def\adobe{%%c}\def\family{gt}\input" adobe-cid && ^
-move adobe-cid.dvi adobe-%%c-gt-cid.dvi && ^
-updvipdfmx adobe-%%c-gt-cid && ^
-updvips adobe-%%c-gt-cid )
-
-rem uotftest
-for %%o in (default deluxe expert bold noreplace) ^
-do ( ^
-uplatex "\def\option{%%o}\def\class{ujarticle}\input" uotftest-utf8.tex && ^
-move uotftest-utf8.dvi uotftest-%%o-h-uplatex.dvi && ^
-updvipdfmx uotftest-%%o-h-uplatex.dvi && ^
-uplatex "\def\option{%%o}\def\class{utarticle}\input" uotftest-utf8.tex && ^
-move uotftest-utf8.dvi uotftest-%%o-v-uplatex.dvi && ^
-updvipdfmx uotftest-%%o-v-uplatex.dvi && ^
-platex "\def\option{%%o}\def\class{jarticle}\input" uotftest.tex && ^
-move uotftest.dvi uotftest-%%o-h-platex.dvi && ^
-dvipdfmx uotftest-%%o-h-platex.dvi && ^
-platex "\def\option{%%o}\def\class{tarticle}\input" uotftest.tex && ^
-move uotftest.dvi uotftest-%%o-v-platex.dvi && ^
-dvipdfmx uotftest-%%o-v-platex.dvi )
+del *.dvi *.aux *.log *.ps *.pdf *.1 *.mpx
+
+rem misc
+for %%f in (misc set3) ^
+do ( ^
+uplatex %%f-check-utf8 && ^
+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-utf8.tex && ^
+updvitype -kanji=uptex %%f-check-utf8.dvi > %%f-check-utf8.pdvitype && ^
+updvipdfmx %%f-check-utf8 && ^
+uplatex "\def\withhyperref{dvips}\input" %%f-check-utf8.tex && ^
+updvips %%f-check-utf8 && ^
+uplatex %%f-check-utf8 )
+for %%f in (misc) ^
+do ( ^
+uplatex %%f-check-v-utf8 && ^
+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
+uplatex "\def\withhyperref{dvipdfmx}\input" %%f-check-v-utf8.tex && ^
+updvitype -kanji=uptex %%f-check-v-utf8.dvi > %%f-check-v-utf8.pdvitype && ^
+updvipdfmx -l %%f-check-v-utf8 && ^
+uplatex "\def\withhyperref{dvips}\input" %%f-check-v-utf8.tex && ^
+updvips -t landscape %%f-check-v-utf8 && ^
+uplatex %%f-check-v-utf8 )
+
+rem kinsoku
+uplatex kinsoku-chk-utf8
+dvipdfmx kinsoku-chk-utf8
+updvips kinsoku-chk-utf8
+
+rem widow
+platex widow
+move widow.dvi widow-platex.dvi
+dvipdfmx widow-platex.dvi
+uplatex widow
+move widow.dvi widow-u-uptex.dvi
+dvipdfmx widow-u-uptex.dvi
+
+rem uptex
+uptex sangoku-uptex
+dvipdfmx sangoku-uptex
+updvips sangoku-uptex
+
+rem uplatex
+uplatex sangoku-uplatex
+dvipdfmx sangoku-uplatex
+updvips sangoku-uplatex
+
+rem aozora
+for %%c in (ujarticle ujreport ujbook utarticle utreport utbook) ^
+do ( ^
+uplatex aozora-%%c-utf8 && ^
+dvipdfmx aozora-%%c-utf8 && ^
+updvips aozora-%%c-utf8 )
+
+rem adobe
+for %%c in (jp kr gb cns) ^
+do ( ^
+uptex adobe-%%c-utf8 && ^
+updvipdfmx adobe-%%c-utf8 && ^
+updvips adobe-%%c-utf8 )
+
+rem jbib
+uplatex jbib2-utf8.tex
+upjbibtex -kanji=uptex --kanji-internal=uptex jbib2-utf8
+uplatex jbib2-utf8.tex
+uplatex jbib2-utf8.tex
+
+rem jmpost
+for %%f in (area jstr) ^
+do ( ^
+upjmpost -kanji=uptex -tex=uplatex %%f-uptex.mp && ^
+uplatex %%f-uptex-incl.tex && ^
+updvips %%f-uptex-incl.dvi && ^
+updvipdfmx %%f-uptex-incl.dvi )
+
+rem updvi2tty
+platex -kanji=jis simple-jis.tex
+move simple-jis.dvi simple-jis-platex.dvi
+for %%f in (j e s u) ^
+do ( ^
+updvi2tty -w 62 -o simple-jis-platex-%%f.dvi2tty -E %%f simple-jis-platex.dvi )
+uplatex simple-u-jis.tex
+move simple-u-jis.dvi simple-u-jis-uptex.dvi
+for %%f in (j e s u) ^
+do ( ^
+updvi2tty -w 62 -o simple-u-jis-uptex-%%f.dvi2tty -E %%f simple-u-jis-uptex.dvi )
+
+
+rem
+rem following samples require the utf package
+rem
+
+rem utf
+uplatex utfsmpl-uplatex
+updvipdfmx utfsmpl-uplatex
+updvips utfsmpl-uplatex
+
+rem
+rem following samples require the otf package
+rem
+
+rem otf
+uplatex otfsmpl-uplatex
+updvipdfmx otfsmpl-uplatex
+updvips otfsmpl-uplatex
+
+rem adobe
+for %%c in (jp kr gb cns) ^
+do ( ^
+uplatex "\def\adobe{%%c}\input" adobe-cid && ^
+move adobe-cid.dvi adobe-%%c-mc-cid.dvi && ^
+updvipdfmx adobe-%%c-mc-cid && ^
+updvips adobe-%%c-mc-cid )
+for %%c in (jp kr cns) ^
+do ( ^
+uplatex "\def\adobe{%%c}\def\family{gt}\input" adobe-cid && ^
+move adobe-cid.dvi adobe-%%c-gt-cid.dvi && ^
+updvipdfmx adobe-%%c-gt-cid && ^
+updvips adobe-%%c-gt-cid )
+
+rem uotftest
+for %%o in (default deluxe expert bold noreplace) ^
+do ( ^
+uplatex "\def\option{%%o}\def\class{ujarticle}\input" uotftest-utf8.tex && ^
+move uotftest-utf8.dvi uotftest-%%o-h-uplatex.dvi && ^
+updvipdfmx uotftest-%%o-h-uplatex.dvi && ^
+uplatex "\def\option{%%o}\def\class{utarticle}\input" uotftest-utf8.tex && ^
+move uotftest-utf8.dvi uotftest-%%o-v-uplatex.dvi && ^
+updvipdfmx uotftest-%%o-v-uplatex.dvi && ^
+platex "\def\option{%%o}\def\class{jarticle}\input" uotftest.tex && ^
+move uotftest.dvi uotftest-%%o-h-platex.dvi && ^
+dvipdfmx uotftest-%%o-h-platex.dvi && ^
+platex "\def\option{%%o}\def\class{tarticle}\input" uotftest.tex && ^
+move uotftest.dvi uotftest-%%o-v-platex.dvi && ^
+dvipdfmx uotftest-%%o-v-platex.dvi )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uptex-base.doc.tlpobj new/tlpkg/tlpobj/uptex-base.doc.tlpobj
--- old/tlpkg/tlpobj/uptex-base.doc.tlpobj 2019-02-28 04:11:32.000000000 +0100
+++ new/tlpkg/tlpobj/uptex-base.doc.tlpobj 2020-03-04 23:54:30.000000000 +0100
@@ -1,9 +1,9 @@
name uptex-base.doc
category Package
-revision 50103
+revision 54043
shortdesc doc files of uptex-base
relocated 1
-docfiles size=188
+docfiles size=192
RELOC/doc/uptex/uptex-base/00readme_uptex.txt
RELOC/doc/uptex/uptex-base/01uptex_doc_utf8.txt
RELOC/doc/uptex/uptex-base/02uptex_changelog_utf8.txt
@@ -70,6 +70,7 @@
RELOC/doc/uptex/uptex-base/samples/sangoku-uplatex.tex
RELOC/doc/uptex/uptex-base/samples/sangoku-uptex.tex
RELOC/doc/uptex/uptex-base/samples/set3-check-h-utf8.tex
+ RELOC/doc/uptex/uptex-base/samples/show_kcat.tex
RELOC/doc/uptex/uptex-base/samples/simple-euc.tex
RELOC/doc/uptex/uptex-base/samples/simple-jis.tex
RELOC/doc/uptex/uptex-base/samples/simple-sjis.tex
++++++ uptex-base.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/uptex/uptex-base/ukinsoku.tex new/tex/uptex/uptex-base/ukinsoku.tex
--- old/tex/uptex/uptex-base/ukinsoku.tex 2019-02-23 23:18:01.000000000 +0100
+++ new/tex/uptex/uptex-base/ukinsoku.tex 2019-09-23 00:16:22.000000000 +0200
@@ -1,4 +1,4 @@
-%% (Last update: 2019/01/29 ttk, texjporg)
+%% (Last update: 2019/09/22 ttk, texjporg)
%%
\ifnum\ucs"3000="3000 \else
\errhelp{Please try to run (e)uptex with option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uptex-base.tlpobj new/tlpkg/tlpobj/uptex-base.tlpobj
--- old/tlpkg/tlpobj/uptex-base.tlpobj 2019-02-28 04:11:32.000000000 +0100
+++ new/tlpkg/tlpobj/uptex-base.tlpobj 2020-03-04 23:54:31.000000000 +0100
@@ -1,6 +1,6 @@
name uptex-base
category Package
-revision 50103
+revision 54043
shortdesc Plain TeX formats and documents for upTeX
relocated 1
longdesc The bundle contains plain TeX format files and documents for
@@ -13,6 +13,5 @@
RELOC/tex/uptex/uptex-base/uptex.tex
catalogue-contact-repository https://github.com/texjporg/uptex-base
catalogue-ctan /language/japanese/uptex-base
-catalogue-date 2019-02-23 10:14:52 +0100
catalogue-license bsd3
catalogue-topics format japanese
++++++ uptex-fonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/uptex-fonts/README.md new/doc/fonts/uptex-fonts/README.md
--- old/doc/fonts/uptex-fonts/README.md 2019-02-09 23:18:16.000000000 +0100
+++ new/doc/fonts/uptex-fonts/README.md 2020-03-04 00:02:36.000000000 +0100
@@ -18,6 +18,6 @@
## Release Date
-2019-02-09
+2020-02-29
Japanese TeX Development Community
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/uptex-fonts/README_uptex_font.md new/doc/fonts/uptex-fonts/README_uptex_font.md
--- old/doc/fonts/uptex-fonts/README_uptex_font.md 2019-02-09 23:18:16.000000000 +0100
+++ new/doc/fonts/uptex-fonts/README_uptex_font.md 2020-03-04 00:02:36.000000000 +0100
@@ -94,6 +94,12 @@
ChangeLog
---------
+### uptex-fonts-20200229
+* cmap/UTF8-UTF16:
+ Updated (Version: 1.007).
+* cmap/UniJISup-UTF16-H,UniJIS2004up-UTF16-H:
+ Refer to Adobe-Japan1-7 (2019/07/30).
+
### uptex-fonts-20190209
* cmap/UTF8-UTF16:
Updated (Version: 1.006).
@@ -130,3 +136,8 @@
### v20110507a [2011/05/07] TTK
* re-package for upTeX/upLaTeX based on uptex-0.30 distribution.
+
+
+References
+----------
+1. [Adobe Type Tools / CMap Resources @ GitHub](https://github.com/adobe-type-tools/cmap-resources)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uptex-fonts.doc.tlpobj new/tlpkg/tlpobj/uptex-fonts.doc.tlpobj
--- old/tlpkg/tlpobj/uptex-fonts.doc.tlpobj 2019-02-28 04:11:32.000000000 +0100
+++ new/tlpkg/tlpobj/uptex-fonts.doc.tlpobj 2020-03-04 23:54:31.000000000 +0100
@@ -1,6 +1,6 @@
name uptex-fonts.doc
category Package
-revision 49985
+revision 54045
shortdesc doc files of uptex-fonts
relocated 1
docfiles size=6
++++++ uptex-fonts.tar.xz ++++++
++++ 5593 lines of diff (skipped)
++++++ uptex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/euptex.man1.pdf and new/texmf-dist/doc/man/man1/euptex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/uppltotf.man1.pdf and new/texmf-dist/doc/man/man1/uppltotf.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/uptex.man1.pdf and new/texmf-dist/doc/man/man1/uptex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/uptftopl.man1.pdf and new/texmf-dist/doc/man/man1/uptftopl.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uptex.doc.tlpobj new/tlpkg/tlpobj/uptex.doc.tlpobj
--- old/tlpkg/tlpobj/uptex.doc.tlpobj 2019-04-01 02:25:12.000000000 +0200
+++ new/tlpkg/tlpobj/uptex.doc.tlpobj 2020-03-14 01:43:45.000000000 +0100
@@ -1,6 +1,6 @@
name uptex.doc
category Package
-revision 50664
+revision 54287
shortdesc doc files of uptex
docfiles size=156
texmf-dist/doc/man/man1/euptex.1
++++++ urlbst.doc.tar.xz ++++++
++++ 2774 lines of diff (skipped)
++++++ urlbst.tar.xz ++++++
++++ 2269 lines of diff (skipped)
++++++ velthuis.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/devnag.man1.pdf and new/texmf-dist/doc/man/man1/devnag.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/velthuis.doc.tlpobj new/tlpkg/tlpobj/velthuis.doc.tlpobj
--- old/tlpkg/tlpobj/velthuis.doc.tlpobj 2019-03-27 02:29:17.000000000 +0100
+++ new/tlpkg/tlpobj/velthuis.doc.tlpobj 2019-11-19 01:55:55.000000000 +0100
@@ -1,6 +1,6 @@
name velthuis.doc
category Package
-revision 50602
+revision 52851
shortdesc doc files of velthuis
docfiles size=289
texmf-dist/doc/generic/velthuis/README
++++++ velthuis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/velthuis.tlpobj new/tlpkg/tlpobj/velthuis.tlpobj
--- old/tlpkg/tlpobj/velthuis.tlpobj 2019-03-27 02:29:17.000000000 +0100
+++ new/tlpkg/tlpobj/velthuis.tlpobj 2019-11-19 01:55:56.000000000 +0100
@@ -1,6 +1,6 @@
name velthuis
category Package
-revision 50602
+revision 52851
catalogue devanagari
shortdesc Typeset Devanagari
longdesc Frans Velthuis' preprocessor for Devanagari text, and fonts and
++++++ versonotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/versonotes/README new/doc/latex/versonotes/README
--- old/doc/latex/versonotes/README 2015-12-12 00:19:37.000000000 +0100
+++ new/doc/latex/versonotes/README 2019-07-06 22:41:23.000000000 +0200
@@ -1,7 +1,7 @@
Package versonotes
==================
-Version 0.3, 2015 December 8
+Version 0.4, 2019 July 6
This package allows you to place notes on the verso pages of an
otherwise single-sided document.
@@ -13,33 +13,40 @@
You can see a sample of how to use the package, and its results, in
sample.tex and sample.pdf.
-The source is at https://bitbucket.org/nxg/versonotes ,
+The source is at [bitbucket][bitbucket],
and the package is distributed on CTAN in
[macros/latex/contrib/versonotes/][ctan]
+Copyright 2014, 2015, 2019, Norman Gray.
+
The package is distributed under the conditions of the LaTeX Project
Public License, either version 1.3 of this license or (at your option)
any later version.
-Release notes
--------------
+Acknowledgements, and release notes
+-----------------------------------
+
+Thanks to Thomas H. Luxon for permission to include the
+“Paradise Lost” notes in the sample text.
+
+Version 0.4, 2019 July 6
+ Support changing the initial page number (thanks to P J
+ Couch for the suggestion).
Version 0.3, 2015 December 8
* Minor documentation adjustments.
- * Added the [rectonotes] option.
-Version 0.2, 2015 February 16
-
- * Fixed a few formatting and distribution infelicities.
+ * Added the [rectonotes] option (thanks to Axel Berger for
+ this suggestion).
-Version 0.1, 2015 February 14
+Version 0.2, 2015 February 16
+ Initial public release.
- * Initial release
Norman Gray
-http://nxg.me.uk
-
+https://nxg.me.uk
+[bitbucket]: https://bitbucket.org/nxg/versonotes
[ctan]: http://www.ctan.org/pkg/versonotes
Binary files old/doc/latex/versonotes/sample.pdf and new/doc/latex/versonotes/sample.pdf differ
Binary files old/doc/latex/versonotes/versonotes.pdf and new/doc/latex/versonotes/versonotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/versonotes.doc.tlpobj new/tlpkg/tlpobj/versonotes.doc.tlpobj
--- old/tlpkg/tlpobj/versonotes.doc.tlpobj 2019-02-28 04:14:18.000000000 +0100
+++ new/tlpkg/tlpobj/versonotes.doc.tlpobj 2019-07-07 01:53:17.000000000 +0200
@@ -1,9 +1,9 @@
name versonotes.doc
category Package
-revision 39084
+revision 51568
shortdesc doc files of versonotes
relocated 1
-docfiles size=54
+docfiles size=58
RELOC/doc/latex/versonotes/LICENCE.txt
RELOC/doc/latex/versonotes/README
RELOC/doc/latex/versonotes/sample.pdf
++++++ versonotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/versonotes/versonotes.sty new/tex/latex/versonotes/versonotes.sty
--- old/tex/latex/versonotes/versonotes.sty 2015-12-12 00:19:37.000000000 +0100
+++ new/tex/latex/versonotes/versonotes.sty 2019-07-06 22:41:23.000000000 +0200
@@ -7,9 +7,9 @@
%% versonotes.dtx (with options: `package')
%% versonotes: Notes on verso pages
%%
-%% Release version 0.3, 2015 December 8.
+%% Release version 0.4, 2019 July 6.
%%
-%% Copyright 2014, 2015 Norman Gray <http://nxg.me.uk>
+%% Copyright 2014, 2015, 2019 Norman Gray <https://nxg.me.uk>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -28,10 +28,10 @@
%%
%%%% File: versonotes.dtx
-%%%% Source: 1ce01fd3d4fc, 2015-09-16T13:05:15+01:00
+%%%% Source: 7d4f5fb7b19e, 2019-07-06T19:09:45+01:00
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{versonotes}[2015/12/08 v0.3]
+\ProvidesPackage{versonotes}[2019/07/06 v0.4]
\newif\if@verso@notesonleft
\@verso@notesonlefttrue
@@ -79,7 +79,7 @@
\fi
\newtoks\verso@currentpage
\newcount\verso@currentpagenum
- \verso@currentpagenum=1
+ \verso@currentpagenum=\c@page
\newcount\verso@currentnotenum
\verso@currentnotenum=0
\newdimen\verso@spacerskip
@@ -98,9 +98,6 @@
\long\def\verso@note#1#2#3{%
\global\@verso@processversonotestrue
\@tempcnta=#1
- \ifnum\@tempcnta=1
- \PackageWarning{versopages}{page 1 verso text will be ignored}
- \fi
\@tempdima=#2 % #2 < 0pt is the end-of-document flag
\loop
\@tempswafalse
@@ -197,14 +194,15 @@
\def\verso@mergenotelist{}
\def\verso@mergenote#1{\xdef\verso@mergenotelist{\verso@mergenotelist #1,}}
\let\verso@orig@shipout\shipout
+\newcount\verso@pagestoskip
+\if@verso@notesonleft
+ \verso@pagestoskip=1
+\else
+ \verso@pagestoskip=2
+\fi
\long\def\verso@processonepage@#1#2\@nil{
\def\@tempa{#1}
- \if@verso@notesonleft
- \@tempcnta=1
- \else
- \@tempcnta=2
- \fi
- \ifnum\c@page>\@tempcnta
+ \ifnum\verso@pagestoskip=0
\ifx\@tempa\@empty
\verso@orig@shipout\vbox{}
\else
@@ -225,6 +223,8 @@
#1}
\endgroup
\fi
+ \else
+ \global\advance\verso@pagestoskip -1
\fi
\global\verso@pages={#2}}
\def\verso@processonepage{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/versonotes.tlpobj new/tlpkg/tlpobj/versonotes.tlpobj
--- old/tlpkg/tlpobj/versonotes.tlpobj 2019-02-28 04:14:18.000000000 +0100
+++ new/tlpkg/tlpobj/versonotes.tlpobj 2019-07-07 01:53:17.000000000 +0200
@@ -1,6 +1,6 @@
name versonotes
category Package
-revision 39084
+revision 51568
shortdesc Display brief notes on verso pages
relocated 1
longdesc This package allows you to place notes on the verso pages of an
@@ -10,9 +10,11 @@
longdesc lined up with the macro call.
runfiles size=2
RELOC/tex/latex/versonotes/versonotes.sty
+catalogue-contact-bugs https://bitbucket.org/nxg/versonotes/issues
+catalogue-contact-home https://nxg.me.uk/dist/versonotes/
catalogue-contact-repository https://bitbucket.org/nxg/versonotes
catalogue-ctan /macros/latex/contrib/versonotes
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2019-07-06 20:49:47 +0200
catalogue-license lppl1.3
catalogue-topics notes
-catalogue-version 0.3
+catalogue-version 0.4
++++++ visualtikz.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/visualtikz.doc.tlpobj new/tlpkg/tlpobj/visualtikz.doc.tlpobj
--- old/tlpkg/tlpobj/visualtikz.doc.tlpobj 2019-02-28 04:14:33.000000000 +0100
+++ new/tlpkg/tlpobj/visualtikz.doc.tlpobj 2020-03-04 23:55:06.000000000 +0100
@@ -1,6 +1,6 @@
name visualtikz.doc
category Package
-revision 47888
+revision 54080
shortdesc doc files of visualtikz
relocated 1
docfiles size=1737
++++++ vlna.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/vlna.man1.pdf and new/texmf-dist/doc/man/man1/vlna.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/vlna.doc.tlpobj new/tlpkg/tlpobj/vlna.doc.tlpobj
--- old/tlpkg/tlpobj/vlna.doc.tlpobj 2019-03-27 02:29:19.000000000 +0100
+++ new/tlpkg/tlpobj/vlna.doc.tlpobj 2020-03-04 23:55:08.000000000 +0100
@@ -1,6 +1,6 @@
name vlna.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of vlna
docfiles size=43
texmf-dist/doc/man/man1/vlna.1
++++++ wasy.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/wasy/README new/doc/fonts/wasy/README
--- old/doc/fonts/wasy/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/wasy/README 2020-01-24 22:45:43.000000000 +0100
@@ -0,0 +1,20 @@
+This is version 2.5, a 2020 update of the wasy fonts of 1990.
+
+The font wasy contains all lasy characters (by L.Lamport, copyright
+notice in lasychr.mf), and a lot more symbols. Provided are the
+Metafont files for 5-10pt, and bold and slanted 10pt fonts, together
+with a tex and pdf documentation, and a file for using the fonts
+in a PLAIN-TeX document.
+
+Type-1 fonts by Michael Sharpe and Taco Hoekwater are available
+as separate package wasy-type1.
+
+A LaTeX implementation is in the separate package wasysym by Axel
+Kielhorn.
+
+The files of this package (wasy2.4) are hereby released into the public
+domain. Permission is granted to use and/or distribute these files.
+Extensions and modifications should be restricted to those that are
+downward compatible with this release.
+
+Jan 2020, Roland Waldi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/wasy/legal.txt new/doc/fonts/wasy/legal.txt
--- old/doc/fonts/wasy/legal.txt 2006-01-09 01:56:57.000000000 +0100
+++ new/doc/fonts/wasy/legal.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-The files of this package "wasy2" are hereby released into the public
-domain. So, permission is granted to use and/or distribute these files.
-The scope of this license are the following files:
- rsym.mf wasy10.mf wasy5.mf wasy6.mf wasy7.mf wasy8.mf wasy9.mf
- wasyb10.mf wasychr.mf wasydoc.tex wasyfont.2 wasyfont.tex
-
-As for lasychr.mf, the license is given in the header of the file.
-
-June 2002, Roland Waldi
Binary files old/doc/fonts/wasy/wasydoc.pdf and new/doc/fonts/wasy/wasydoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/wasy/wasydoc.tex new/doc/fonts/wasy/wasydoc.tex
--- old/doc/fonts/wasy/wasydoc.tex 2006-01-09 01:56:57.000000000 +0100
+++ new/doc/fonts/wasy/wasydoc.tex 2020-01-24 22:45:43.000000000 +0100
@@ -1,19 +1,30 @@
\magnification\magstep1
\parskip 1.1ex plus 0.4ex
+\advance\hsize -5truemm
+\ifx\pdfoutput\undefines\else
+ \pdfhorigin=1truein
+ \pdfvorigin=1truein
+ \pdfpagewidth=210truemm
+ \pdfpageheight=297truemm
+\fi
\parindent 0pt
\pretolerance 1000
\tolerance 2000
\hbadness 2000
-\advance\hsize -5truemm
%
\font\tenssf = cmss10 % sans-serif font
\def\ssf{\tenssf}
\def\\{\char"5C{}} % define backslash
+\def\({\char`\{} % define {
+\def\){\char`\}} % define }
\def\newline{\hfill\break}
\def\de{\,{\rm d}}
\def\LaTeX{{\rm L\kern-.36em\raise.3ex\hbox{\sevenrm A}\kern-.15em\TeX}}
%
-\input wasyfont
+% the next line is used for development, to get alias-font names
+% wasym...
+%\def\newwasy{}
+\input WASYFONT
%
%%% START %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -21,12 +32,12 @@
\vskip 1\parskip
\centerline{\it Roland Waldi}
\vskip 1mm
-\centerline{Institut f\"ur Experimentelle Kernphysik}
-\centerline{Universit\"at Karlsruhe}
-\centerline{Physikhochhaus, P.O.Box 6980}
-\centerline{D-7500 Karlsruhe, Fed.~Rep.~Germany}
+\centerline{Institut f\"ur Physik}
+\centerline{Universit\"at Rostock}
+\centerline{D-18051 Rostock, Germany}
+\centerline{roland.waldi(a)uni-rostock.de}
\vskip 1mm
-\centerline{Version 2.0 -- September 1992}
+\centerline{Version 2.5 -- January 2020}
\vskip 1.5\parskip
@@ -35,10 +46,13 @@
New characters
were modified from the {\tt mf} files of the standard \TeX\ fonts,
and many were designed from scratch.
-Metafont sources for 5--10pt and a bold 10pt font are available.
+The first version was released in 1990.
+Metafont sources for 5--10pt and a bold and slanted 10pt font
+are available in the present version.
An extension to PLAIN-\TeX\ for using the fonts is included
-in the file {\tt wasyfont.tex}.
+in the file {\tt WASYFONT.tex}.
+
This can probably be used in \LaTeX\ documents,
but a new \LaTeX\ format with the bindings already included and with
{\tt wasy} replacing the {\tt lasy} font would be the superiour
@@ -46,13 +60,28 @@
This version includes all {\tt lasy} characters at the proper codes
(causing some incompatibilities with version 1 of {\tt wasy})
to make such a procedure easy.
-The file {\tt wasyfont.2} contains substitutes for some macros
-of {\tt wasyfont.tex} to be used
+
+The file {\tt WASYFONT.2} contains substitutes for some macros
+of {\tt WASYFONT.tex} to be used
at installations, that do not
support the {\tt wasy} fonts.
+Some characters make sense in slanted or boldface form (only available at 10pt,
+although scaled fonts can be defined by the user).
+These are included in slanted text, if instead of {\tt\\sl}
+the command {\tt\\wsl} is used, and in bold text,\
+if instead of {\tt\\bf}
+the command {\tt\\wbf} is used. Analogue commands for
+\LaTeX\ are easy to define, too.
+
+Symbols (not letters) are defined in {\tt WASYFONT.tex} as
+boxes, which simplifies their use in math-mode, but the {\tt\\/}
+for italic correction for the slanted characters
+will not work after a symbol. If this feature is
+required, the {\tt\\hbox\(...\)} should be removed from the definition.
+
A list of characters with their bindings in
-{\tt wasyfont.tex} follows.
+{\tt WASYFONT.tex} follows.
Some macros are actually compositions of several characters useful in
the given context.
Macros using symbols
@@ -60,12 +89,14 @@
are also included; these are marked
with $^*$.
+\bigskip
+
general symbols
$$
\halign{&\tt\\# \hfil&#\qquad\hfil\cr
male&\male &female&\female \cr
currency&\currency ¢ &\cent \cr
-lozenge&\lozenge &kreuz&\kreuz \cr
+euro &\euro &kreuz&\kreuz \cr
smiley&\smiley &blacksmiley&\blacksmiley \cr
frownie&\frownie &sun&\sun \cr
checked&\checked &brokenvert&\brokenvert \cr
@@ -74,13 +105,9 @@
clock&\clock &permil &\permil \cr
bell&\bell &ataribox &\ataribox \cr
pointer&\pointer &lightning &\lightning \cr
-agemO &\agemO \cr}
-$$
-
-diagrams
-$$
-\halign{&\tt\\# \hfil&#\qquad\hfil\cr
-photon &\photon &gluon &\gluon \cr}
+agemO &\agemO &Paragraph &\Paragraph \cr
+lozenge&\lozenge &applecmd &\applecmd \cr
+therefore&\therefore \cr}
$$
music notes
@@ -108,13 +135,13 @@
APLinput&\APLinput &APLminus$^*$&\APLminus \cr
APLlog &\APLlog &APLstar &\APLstar \cr
APLvert$^*$&\APLvert{\ } &
- APLvert\char`\{\\APLdown\char`\} &\APLvert{\APLdown} \cr
+ APLvert\(\\APLdown\) &\APLvert{\APLdown} \cr
APLnot$^*$&\APLnot{\ } &
- APLnot\char`\{\\APLdown\char`\} &\APLnot{\APLdown} \cr
-APLnot\char`\{\\land\char`\} &\APLnot{\land} &
- APLnot\char`\{\\lor\char`\} &\APLnot{\lor} \cr
+ APLnot\(\\APLdown\) &\APLnot{\APLdown} \cr
+APLnot\(\\land\) &\APLnot{\land} &
+ APLnot\(\\lor\) &\APLnot{\lor} \cr
APLcirc$^*$&\APLcirc{\ } &
- APLcirc\char`\{\\bot\char`\} &\APLcirc{\bot} \cr
+ APLcirc\(\\bot\) &\APLcirc{\bot} \cr
notbackslash$^*$ &\notbackslash &
notslash$^*$ &\notslash \cr
APLcomment &\APLcomment \cr}
@@ -170,29 +197,30 @@
$$
\halign{&\tt# \hfil&#\qquad\hfil\cr
\\varangle&\varangle &\$\\invneg\$ &$\invneg$\cr
+\\diameter &\diameter &\\therefore&\therefore \cr
\\leftturn &\leftturn &\\rightturn &\rightturn \cr
-\\diameter &\diameter &\\therefore&\therefore \cr}
+\\photon &\photon &\\gluon &\gluon \cr}
$$
math operators
$$
-\halign{&\tt\$a\\# b \hfil&$a#b$\qquad\hfil\cr
-ocircle&\ocircle &logof&\logof \cr
-oplus$^*$&\oplus &otimes$^*$&\otimes \cr
-le$^*$ &\le &ge$^*$&\ge \cr
-apprle &\apprle &apprge&\apprge \cr
+\halign{&\tt\$a\\#b\$ \hfil&$a#b$\qquad\hfil\cr
+ocircle &\ocircle &logof &\logof \cr
+oplus$^*$ &\oplus &otimes$^*$ &\otimes \cr
+le$^*$ &\le &ge$^*$ &\ge \cr
+apprle &\apprle &apprge &\apprge \cr
lhd &\lhd &rhd &\rhd \cr
-unlhd &\unlhd &unrhd&\unrhd \cr
+unlhd &\unlhd &unrhd &\unrhd \cr
LHD &\LHD &RHD &\RHD \cr
-sqsubset&\sqsubset &sqsupset&\sqsupset \cr
-sqsubseteq$^*$&\sqsubseteq &sqsupseteq$^*$&\sqsupseteq \cr
-propto$^*$&\propto &varpropto &\varpropto \cr
+sqsubset &\sqsubset &sqsupset &\sqsupset \cr
+sqsubseteq$^*$ &\sqsubseteq &sqsupseteq$^*$ &\sqsupseteq \cr
+propto$^*$ &\propto &varpropto &\varpropto \cr
leadsto &\leadsto \cr}
$$
integrals (text style)
$$
-\halign{&\tt\$\\#\_a\char`\^b f(x)dx \hfil&$#_a^b f(x)dx$\qquad\hfil\cr
+\halign{&\tt\$\\#\_a\char`\^b f(x)dx\$ \hfil&$#_a^b f(x)dx$\qquad\hfil\cr
varint&\varint &iint&\iint \cr
iiint&\iiint &varoint&\varoint \cr
oiint&\oiint \cr}
@@ -207,7 +235,7 @@
{\tt\\newpropto} you can change the proportional sign to the
thin {\tt wasy} symbol ($\varpropto$),
which is more distinct from alpha ($\alpha$)
-then the default symbol ($\propto$).
+than the default symbol ($\propto$).
With the control sequence
{\tt\\newint} you can change the \TeX\ integrals from $\int,\oint$
@@ -217,16 +245,21 @@
$$
There are also a few letters
-in roman style added (although these and some symbols as
-\agemO, \permil\ should
+in roman style added, although these and some symbols as
+\agemO, \permil\ should
be in a separate font, to be created in different
styles like italic, sans serif etc. -- the {\tt wasychr.mf} source
-is prepared for that.
+is prepared for that, and now has bold and slanted versions.
$$
\halign{&\tt\\# \hfil&#\qquad\hfil\cr
-thorn &\thorn &Thorn &\Thorn \cr
-dh &\dh &Dh$^*$ &\Dh \cr
-inve &\inve &openo &\openo \cr
+thorn &\thorn { \wbf\thorn} {\wsl\thorn}
+ &Thorn &\Thorn { \wbf\Thorn} {\wsl\Thorn}\cr
+dh &\dh { \wbf\dh} {\wsl\dh}
+ &Dh$^*$ &\Dh { \wbf \Dh} {\wsl \Dh}\cr
+inve &\inve { \wbf\inve} {\wsl\inve}
+ &openo &\openo { \wbf\openo} {\wsl\openo}\cr
+s &\s { \wbf\s } {\wsl\s }
+ &z &\z { \wbf\z} {\wsl\z}\cr
}
$$
@@ -239,9 +272,9 @@
The planets ($\astrosun\to{}$outer space):
\mercury\ \venus\ \earth\ \mars\ asteroids
-\jupiter\ \saturn\ \uranus\ \neptune\ \pluto.
+\jupiter\ \saturn\ \uranus\ \neptune\ (\pluto). $r_{\mercury} < r_{\earth}$
-special characters on IBM PC's: \smiley, \blacksmiley, $\heartsuit$,
+special characters on PCs: \smiley, \blacksmiley, $\heartsuit$,
$\diamondsuit$, $\clubsuit$, $\spadesuit$, $\bullet$,
$\ocircle$, \male, \female, \eighthnote, \twonotes, \sun, \RIGHTarrow,
\LEFTarrow, $\updownarrow$, !!, \P, \S,
@@ -250,7 +283,7 @@
$\uparrow$, $\downarrow$, $\to$, $\leftarrow$, \UParrow, \DOWNarrow,
\brokenvert, $\invneg$, $\neg$, \dots
-special characters on Atari ST's: \pointer, \ataribox,
+special characters on Atari STs: \pointer, \ataribox,
\checked, \clock, \bell,
\eighthnote, \inve,
$\invneg$, $\neg$, $\varoint$, \dots
@@ -258,6 +291,23 @@
tube dimensions: $\diameter 5\,{\rm mm}$, $d = 0.5\,{\rm mm}$,
$l = 50\,{\rm mm}$
+prices 1\$ 2\cent\ or 0.95\euro\ or 0.80{\it\$}.\newline
+{\wsl prices 1\$ 2\cent\ or 0.95\euro\ or 0.80{\it\$}.}
+
+legal text: \Paragraph\Paragraph\ 9--22 StVG, \Paragraph\ 12 StVO oder
+{\wsl \Paragraph\Paragraph\ 9--22 StVG, \Paragraph\ 12 StVO}
+
+Icelandic text: \'Eg veit \thorn a\dh\ ekki e\dh a
+{\wbf \'Eg veit \thorn a\dh\ ekki}.
+
+traditional typography: ligature \s\z=\ss, \s ure to po\s\s e\s s
+\s atisfaction
+
+simple phonetic notation:
+corner ['k\openo:n\inve], this [\dh is],
+thrash [{\teni\char"12}r\ae{\tensy\char"73\kern 0.3pt}],
+vision ['v\i\z n]
+
display math:
$$
\mathop{\varangle}(\vec a,\vec b) = 30^{\circ}
@@ -283,8 +333,9 @@
\leftarrow \APLbox$ \qquad \APLcomment\quad generate vectors of odd and
even numbers
+\goodbreak
APL keyboard layout:
-
+\par\nobreak
\def\1{\underbar}
\halign{&#\ \cr
&1& &2& &3& &4& &5& &6& &7& &8& &9& &0& &+& &$\times$& &$\diamond$\cr
@@ -317,10 +368,6 @@
}
\medskip
-simple phonetic notation:
-corner [{\tt'}k\openo:n\inve], this [\dh is],
-thrash [{\teni\char"12}r\ae{\tensy\char"73\kern 0.3pt}]
-
check the appropriate box like this \XBox\ or that
\Box\kern-.6em\checked:
@@ -332,6 +379,7 @@
\bigskip
+\goodbreak
\centerline{\bf Font Table}
@@ -470,6 +518,141 @@
\bigskip
+{\tt wasy 5pt}:
+{\fivewasy$$
+\halign {&#\quad\hfil\cr
+ {\tt 00 =} \char"00%
+&{\tt 01 =} \char"01%
+&{\tt 02 =} \char"02%
+&{\tt 03 =} \char"03%
+&{\tt 04 =} \char"04%
+&{\tt 05 =} \char"05%
+&{\tt 06 =} \char"06%
+&{\tt 07 =} \char"07\cr
+ {\tt 08 =} \char"08%
+&{\tt 09 =} \char"09%
+&{\tt 0A =} \char"0A%
+&{\tt 0B =} \char"0B%
+&{\tt 0C =} \char"0C%
+&{\tt 0D =} \char"0D%
+&{\tt 0E =} \char"0E%
+&{\tt 0F =} \char"0F\cr
+ {\tt 10 =} \char"10%
+&{\tt 11 =} \char"11%
+&{\tt 12 =} \char"12%
+&{\tt 13 =} \char"13%
+&{\tt 14 =} \char"14%
+&{\tt 15 =} \char"15%
+&{\tt 16 =} \char"16%
+&{\tt 17 =} \char"17\cr
+ {\tt 18 =} \char"18%
+&{\tt 19 =} \char"19%
+&{\tt 1A =} \char"1A%
+&{\tt 1B =} \char"1B%
+&{\tt 1C =} \char"1C%
+&{\tt 1D =} \char"1D%
+&{\tt 1E =} \char"1E%
+&{\tt 1F =} \char"1F\cr
+ {\tt 20 =} \char"20%
+&{\tt 21 =} \char"21%
+&{\tt 22 =} \char"22%
+&{\tt 23 =} \char"23%
+&{\tt 24 =} \char"24%
+&{\tt 25 =} \char"25%
+&{\tt 26 =} \char"26%
+&{\tt 27 =} \char"27\cr
+ {\tt 28 =} \char"28%
+&{\tt 29 =} \char"29%
+&{\tt 2A =} \char"2A%
+&{\tt 2B =} \char"2B%
+&{\tt 2C =} \char"2C%
+&{\tt 2D =} \char"2D%
+&{\tt 2E =} \char"2E%
+&{\tt 2F =} \char"2F\cr
+ {\tt 30 =} \char"30%
+&{\tt 31 =} \char"31%
+&{\tt 32 =} \char"32%
+&{\tt 33 =} \char"33%
+&{\tt 34 =} \char"34%
+&{\tt 35 =} \char"35%
+&{\tt 36 =} \char"36%
+&{\tt 37 =} \char"37\cr
+ {\tt 38 =} \char"38%
+&{\tt 39 =} \char"39%
+&{\tt 3A =} \char"3A%
+&{\tt 3B =} \char"3B%
+&{\tt 3C =} \char"3C%
+&{\tt 3D =} \char"3D%
+&{\tt 3E =} \char"3E%
+&{\tt 3F =} \char"3F\cr
+ {\tt 40 =} \char"40%
+&{\tt 41 =} \char"41%
+&{\tt 42 =} \char"42%
+&{\tt 43 =} \char"43%
+&{\tt 44 =} \char"44%
+&{\tt 45 =} \char"45%
+&{\tt 46 =} \char"46%
+&{\tt 47 =} \char"47\cr
+ {\tt 48 =} \char"48%
+&{\tt 49 =} \char"49%
+&{\tt 4A =} \char"4A%
+&{\tt 4B =} \char"4B%
+&{\tt 4C =} \char"4C%
+&{\tt 4D =} \char"4D%
+&{\tt 4E =} \char"4E%
+&{\tt 4F =} \char"4F\cr
+ {\tt 50 =} \char"50%
+&{\tt 51 =} \char"51%
+&{\tt 52 =} \char"52%
+&{\tt 53 =} \char"53%
+&{\tt 54 =} \char"54%
+&{\tt 55 =} \char"55%
+&{\tt 56 =} \char"56%
+&{\tt 57 =} \char"57\cr
+ {\tt 58 =} \char"58%
+&{\tt 59 =} \char"59%
+&{\tt 5A =} \char"5A%
+&{\tt 5B =} \char"5B%
+&{\tt 5C =} \char"5C%
+&{\tt 5D =} \char"5D%
+&{\tt 5E =} \char"5E%
+&{\tt 5F =} \char"5F\cr
+ {\tt 60 =} \char"60%
+&{\tt 61 =} \char"61%
+&{\tt 62 =} \char"62%
+&{\tt 63 =} \char"63%
+&{\tt 64 =} \char"64%
+&{\tt 65 =} \char"65%
+&{\tt 66 =} \char"66%
+&{\tt 67 =} \char"67\cr
+ {\tt 68 =} \char"68%
+&{\tt 69 =} \char"69%
+&{\tt 6A =} \char"6A%
+&{\tt 6B =} \char"6B%
+&{\tt 6C =} \char"6C%
+&{\tt 6D =} \char"6D%
+&{\tt 6E =} \char"6E%
+&{\tt 6F =} \char"6F\cr
+ {\tt 70 =} \char"70%
+&{\tt 71 =} \char"71%
+&{\tt 72 =} \char"72%
+&{\tt 73 =} \char"73%
+&{\tt 74 =} \char"74%
+&{\tt 75 =} \char"75%
+&{\tt 76 =} \char"76%
+&{\tt 77 =} \char"77\cr
+ {\tt 78 =} \char"78%
+&{\tt 79 =} \char"79%
+&{\tt 7A =} \char"7A%
+&{\tt 7B =} \char"7B%
+&{\tt 7C =} \char"7C%
+&{\tt 7D =} \char"7D%
+&{\tt 7E =} \char"7E%
+&{\tt 7F =} \char"7F\cr}
+$$}
+
+\bigskip
+
{\tt wasyb}:
{\wasyb$$
\halign {&#\quad\hfil\cr
@@ -605,6 +788,141 @@
\bigskip
+{\tt wasysl}:
+{\wasysl$$
+\halign {&#\quad\hfil\cr
+ {\tt 00 =} \char"00%
+&{\tt 01 =} \char"01%
+&{\tt 02 =} \char"02%
+&{\tt 03 =} \char"03%
+&{\tt 04 =} \char"04%
+&{\tt 05 =} \char"05%
+&{\tt 06 =} \char"06%
+&{\tt 07 =} \char"07\cr
+ {\tt 08 =} \char"08%
+&{\tt 09 =} \char"09%
+&{\tt 0A =} \char"0A%
+&{\tt 0B =} \char"0B%
+&{\tt 0C =} \char"0C%
+&{\tt 0D =} \char"0D%
+&{\tt 0E =} \char"0E%
+&{\tt 0F =} \char"0F\cr
+ {\tt 10 =} \char"10%
+&{\tt 11 =} \char"11%
+&{\tt 12 =} \char"12%
+&{\tt 13 =} \char"13%
+&{\tt 14 =} \char"14%
+&{\tt 15 =} \char"15%
+&{\tt 16 =} \char"16%
+&{\tt 17 =} \char"17\cr
+ {\tt 18 =} \char"18%
+&{\tt 19 =} \char"19%
+&{\tt 1A =} \char"1A%
+&{\tt 1B =} \char"1B%
+&{\tt 1C =} \char"1C%
+&{\tt 1D =} \char"1D%
+&{\tt 1E =} \char"1E%
+&{\tt 1F =} \char"1F\cr
+ {\tt 20 =} \char"20%
+&{\tt 21 =} \char"21%
+&{\tt 22 =} \char"22%
+&{\tt 23 =} \char"23%
+&{\tt 24 =} \char"24%
+&{\tt 25 =} \char"25%
+&{\tt 26 =} \char"26%
+&{\tt 27 =} \char"27\cr
+ {\tt 28 =} \char"28%
+&{\tt 29 =} \char"29%
+&{\tt 2A =} \char"2A%
+&{\tt 2B =} \char"2B%
+&{\tt 2C =} \char"2C%
+&{\tt 2D =} \char"2D%
+&{\tt 2E =} \char"2E%
+&{\tt 2F =} \char"2F\cr
+ {\tt 30 =} \char"30%
+&{\tt 31 =} \char"31%
+&{\tt 32 =} \char"32%
+&{\tt 33 =} \char"33%
+&{\tt 34 =} \char"34%
+&{\tt 35 =} \char"35%
+&{\tt 36 =} \char"36%
+&{\tt 37 =} \char"37\cr
+ {\tt 38 =} \char"38%
+&{\tt 39 =} \char"39%
+&{\tt 3A =} \char"3A%
+&{\tt 3B =} \char"3B%
+&{\tt 3C =} \char"3C%
+&{\tt 3D =} \char"3D%
+&{\tt 3E =} \char"3E%
+&{\tt 3F =} \char"3F\cr
+ {\tt 40 =} \char"40%
+&{\tt 41 =} \char"41%
+&{\tt 42 =} \char"42%
+&{\tt 43 =} \char"43%
+&{\tt 44 =} \char"44%
+&{\tt 45 =} \char"45%
+&{\tt 46 =} \char"46%
+&{\tt 47 =} \char"47\cr
+ {\tt 48 =} \char"48%
+&{\tt 49 =} \char"49%
+&{\tt 4A =} \char"4A%
+&{\tt 4B =} \char"4B%
+&{\tt 4C =} \char"4C%
+&{\tt 4D =} \char"4D%
+&{\tt 4E =} \char"4E%
+&{\tt 4F =} \char"4F\cr
+ {\tt 50 =} \char"50%
+&{\tt 51 =} \char"51%
+&{\tt 52 =} \char"52%
+&{\tt 53 =} \char"53%
+&{\tt 54 =} \char"54%
+&{\tt 55 =} \char"55%
+&{\tt 56 =} \char"56%
+&{\tt 57 =} \char"57\cr
+ {\tt 58 =} \char"58%
+&{\tt 59 =} \char"59%
+&{\tt 5A =} \char"5A%
+&{\tt 5B =} \char"5B%
+&{\tt 5C =} \char"5C%
+&{\tt 5D =} \char"5D%
+&{\tt 5E =} \char"5E%
+&{\tt 5F =} \char"5F\cr
+ {\tt 60 =} \char"60%
+&{\tt 61 =} \char"61%
+&{\tt 62 =} \char"62%
+&{\tt 63 =} \char"63%
+&{\tt 64 =} \char"64%
+&{\tt 65 =} \char"65%
+&{\tt 66 =} \char"66%
+&{\tt 67 =} \char"67\cr
+ {\tt 68 =} \char"68%
+&{\tt 69 =} \char"69%
+&{\tt 6A =} \char"6A%
+&{\tt 6B =} \char"6B%
+&{\tt 6C =} \char"6C%
+&{\tt 6D =} \char"6D%
+&{\tt 6E =} \char"6E%
+&{\tt 6F =} \char"6F\cr
+ {\tt 70 =} \char"70%
+&{\tt 71 =} \char"71%
+&{\tt 72 =} \char"72%
+&{\tt 73 =} \char"73%
+&{\tt 74 =} \char"74%
+&{\tt 75 =} \char"75%
+&{\tt 76 =} \char"76%
+&{\tt 77 =} \char"77\cr
+ {\tt 78 =} \char"78%
+&{\tt 79 =} \char"79%
+&{\tt 7A =} \char"7A%
+&{\tt 7B =} \char"7B%
+&{\tt 7C =} \char"7C%
+&{\tt 7D =} \char"7D%
+&{\tt 7E =} \char"7E%
+&{\tt 7F =} \char"7F\cr}
+$$}
+
+\bigskip
+
{\bf Changes since version 1.0}
version 1.1:
@@ -627,4 +945,40 @@
{\tt wasyb10} font for bold math added
+version 2.1:
+
+new spacing for \openo
+
+version 2.2:
+
+{\tt wasysl10} font for slanted characters added
+
+new German Paragraph \Paragraph, currency \euro
+
+new commands {\tt \\wsl, \\wbf}
+
+version 2.3:
+
+new scaling for \ataribox\ (bugfix)
+
+corrections for \APLuparrowbox\ and \APLdownarrowbox\ at small fonts (bugfix)
+
+italic corrections improved ({\tt\\/} for {\tt wasysl10}; works for
+symbols only without {\tt\\hbox} in the definition!)
+
+new apple cmd symbol \applecmd
+
+version 2.4:
+
+new characters long-s \s\ and round-z \z
+
+improved \opposition\ (bugfix)
+
+new macros for planets and some other astronomy symbols for use
+in math mode subscripts (i.e.\ proper size change).
+
+version 2.5
+
+improved {\wbf\z} (bugfix)
+
\bye
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/wasy/wasyfont.2 new/doc/fonts/wasy/wasyfont.2
--- old/doc/fonts/wasy/wasyfont.2 2006-01-09 01:56:57.000000000 +0100
+++ new/doc/fonts/wasy/wasyfont.2 2020-01-20 23:49:56.000000000 +0100
@@ -14,6 +14,7 @@
\textfont\wasyfam=\tenwasy
\scriptfont\wasyfam=\sevenwasy
\scriptscriptfont\wasyfam=\fivewasy
+\let\wsl\sl \let\wbf\bf
%%%%%% special macro
\def\overstrike#1#2{{\setbox0\hbox{$#2$}\hbox to \wd0{\hss
$#1$\hss}\kern-\wd0\box0}}
@@ -38,6 +39,12 @@
\lower 1.3pt\hbox to 0pt{\char"13\hss}%
\lower 4.4pt\hbox to 0pt{%
\kern 0.82pt\char"12\hss}\kern 4.2pt}}
+\def\euro{\leavevmode\hbox{\kern 0.03em
+ \vrule height 0.7ex depth -0.6ex width 0.5em
+ \kern -0.47em
+ \vrule height 1.0ex depth -0.9ex width 0.5em
+ \kern -0.5em C}}
+\def\z{{\teni 3}}
%%%%%%%%%%%%%%%%%%%%%%
\def\clock{\hbox{\kern 1pt
\vrule width 0.4pt height 3.6pt depth -1.2pt
@@ -81,6 +88,7 @@
\def\APLcirc#1{\overstrike{\circ}{#1}}
\def\APLvert#1{\overstrike{\vert}{#1}}
\def\APLminus{\raise0.7ex\hbox{$-$}}
+\def\diameter{\overstrike{\circ}{/}}
%%%%%%%%%%%%%%%%%%%%%%
\def\AC{\hbox{\kern0.5pt\wasy\char"3A\kern0.5pt}}
\def\HF{\lower0.9pt\hbox to 0pt{\kern0.5pt\wasy\char"3A\hss}%
@@ -94,13 +102,14 @@
%%%%%% math characters
\def\Bowtie{\hbox{\wasy\char"31}}
%%%%%% special characters
-\def\permil{$^0\!{/}\!{}_{00}$}
+\def\permil{\ifmmode{^0\!{/}\!{}_{00}}\else$^0\!{/}\!{}_{00}$\fi}
\def\agemO{{\wasy\char"30}}
-\def\Dh{\leavevmode{\rm\setbox0\hbox{D}%
+\def\Dh{\leavevmode{\setbox0\hbox{D}%
\hbox to\wd0{\kern 0.04em\char32\hss D}}}
\def\cent{\overstrike/{\rm c}}
\def\thorn{\overstrike{\rm b}{\rm p}}
\def\astrosun{\hbox{\tensy\char"0C}}
+\let\Paragraph\S
%%%%%% math operators as mathchars
\def\wasymathchardef#1#2{%
\count"FF=\wasyfamcount
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasy.doc.tlpobj new/tlpkg/tlpobj/wasy.doc.tlpobj
--- old/tlpkg/tlpobj/wasy.doc.tlpobj 2019-02-28 04:14:56.000000000 +0100
+++ new/tlpkg/tlpobj/wasy.doc.tlpobj 2020-01-25 01:55:33.000000000 +0100
@@ -1,10 +1,10 @@
name wasy.doc
category Package
-revision 35831
+revision 53533
shortdesc doc files of wasy
relocated 1
-docfiles size=53
- RELOC/doc/fonts/wasy/legal.txt
+docfiles size=86
+ RELOC/doc/fonts/wasy/README
RELOC/doc/fonts/wasy/wasydoc.pdf
RELOC/doc/fonts/wasy/wasydoc.tex
RELOC/doc/fonts/wasy/wasyfont.2
++++++ wasy.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/wasy/rsym.mf new/fonts/source/public/wasy/rsym.mf
--- old/fonts/source/public/wasy/rsym.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/wasy/rsym.mf 2020-01-20 23:49:56.000000000 +0100
@@ -1,4 +1,4 @@
-% This is RSYM.MF in text format, version 1.1
+% This is RSYM.MF in text format, version 2.3
cmchar "therefore";
beginchar(hex"05",12u#,x_height#,0);
@@ -54,7 +54,7 @@
cmchar "aries";
beginchar(hex"17",asc_height#+2u#,asc_height#,0);
-italcorr 2/3asc_height#*slant;
+italcorr asc_height#*slant-.5u#;
adjust_fit(0,0); pickup rule.nib;
y1=y6; y2-y1=x2-x1; top y2 = h+oo; y5=y2; bot y4 = 0-oo;
y3=.85[y4,y1];
@@ -82,7 +82,7 @@
italcorr 2/3asc_height#*slant;
adjust_fit(0,0); pickup rule.nib;
top y2 = h+u; bot y1 = 0-u; y4 = y1; y3 = y2;
-x1 = x2 = u; x3 = x4 = w-u;
+x1 = x2 = u; x3 = x4 = w-u;
bot y5 = 1/18h; top y6 = 17/18h; y8 = y5; y7 = y6;
x5 = x6 = 1/3w; x7 = x8 = 2/3w;
draw z5--z6;
@@ -111,7 +111,7 @@
top y2 = h; bot y1 = 0; y4 = y1; y3 = y2;
y2 - y5 = y5 - y1; y6 = y5;
x5 = 1/3w; x5-x1 = x3-x6;
-x1 = x2 = hround u; x3 = x4 = hround w-u;
+x1 = x2 = hround u; x3 = x4 = hround w-u;
draw z5--z6;
draw z1..z5..z2;
draw z3..z6..z4;
@@ -486,7 +486,7 @@
cmchar "conjunction";
numeric this_size#;
this_size# = x_height#*(1+0.9/sqrt2);
-beginchar(hex"56",this_size#+1.7u#,this_size#,0);
+beginchar(hex"56",this_size#+0.7u#,this_size#,0);
italcorr this_size#*slant;
adjust_fit(if monospace: u#,u# else: 0,0 fi);
pickup rule.nib; autorounded;
@@ -500,16 +500,17 @@
labels(1,2,3,4,5,6,7,8,9); endchar;
cmchar "opposition";
-beginchar(hex"57",2x_height#+2u#,
- 2.2x_height#-0.5desc_depth#,0.5desc_depth#);
+beginchar(hex"57",2x_height#+1.5u#,
+ 2x_height#-0.7desc_depth#,0.7desc_depth#);
italcorr 1.5x_height#*slant;
adjust_fit(if monospace: u#,u# else: 0,0 fi);
pickup rule.nib; autorounded;
-lft x6=hround u; x2-x6=y8-y4=x_height; bot y4=-d-oo;
+lft x6=hround u; x2=x_height+2u-x6; bot y4=-d; y2=-d+.5x_height;
circle_points;
draw_circle;
-x10 = w-u-x2; y10=h+oo-y8;
-for n=1 upto 8: z[n]' = z[n] + z10; endfor
+z5'=1.5[z5,z1];
+for n=1 upto 4: z[n]' = z[n] + z5' - z5; endfor
+for n=6 upto 8: z[n]' = z[n] + z5' - z5; endfor
draw z8'{right}...z1'{z2-z8}...z2'{down}...z3'{z4-z2}...z4'{left}
...z5'{z6-z4}...z6'{up}...z7'{z8-z6}...cycle;
draw z1--z5';
@@ -1123,11 +1124,19 @@
cmchar "APLuparrowbox";
beginchar(hex"6E",14u#,7u#+math_axis#,7u#-math_axis#);
italcorr math_axis#*slant-.5u#;
-adjust_fit(0,0); pickup crisp.nib;
+adjust_fit(0,0);
+pickup rule.nib;
+y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height]
++.5dot_size);
+lft x11=hround u-eps; x11'=x11; x12=x12'=w-x11;
+y11=y12=math_axis-1.8(y-math_axis);
+y11'=y12'=math_axis+1.8(y-math_axis);
+draw z11--z12--z12'--z11'--cycle;
+pickup crisp.nib;
pos1(rule_thickness,0); pos2(rule_thickness,0);
pos3(bar,90); pos4(bar,90);
-lft x1l=hround(.5w-.5rule_thickness); bot y1-rule_thickness=-d;
-x0=x1=x2; top y0=h-.5u; x0-x3=x4-x0=3u+eps;
+lft x1l=hround(.5w-.5rule_thickness); bot y1-rule_thickness=y11+.5u;
+x0=x1=x2; top y0=y11'-1u; x0-x3=x4-x0=3u+eps;
y3=y4=y0-.24asc_height-eps;
pos5(bar,angle(z4-z0)); z5l=z0;
pos6(bar,angle(z3-z0)); z6l=z0;
@@ -1138,6 +1147,12 @@
--z2r---z1r..z1l---z2l--subpath (t,0) of\\(z3l{z9-z3}..z5r)
--z3r{z9-z3}..z0 & cycle; % arrowhead and stem
penlabels(0,1,2,3,4,5,6,9);
+penlabels(11,12,11',12'); endchar;
+
+cmchar "APLdownarrowbox";
+beginchar(hex"6F",14u#,7u#+math_axis#,7u#-math_axis#);
+italcorr math_axis#*slant-.5u#;
+adjust_fit(0,0);
pickup rule.nib;
y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height]
+.5dot_size);
@@ -1145,16 +1160,11 @@
y11=y12=math_axis-1.8(y-math_axis);
y11'=y12'=math_axis+1.8(y-math_axis);
draw z11--z12--z12'--z11'--cycle;
-penlabels(11,12,11',12'); endchar;
-
-cmchar "APLdownarrowbox";
-beginchar(hex"6F",14u#,7u#+math_axis#,7u#-math_axis#);
-italcorr math_axis#*slant-.5u#;
-adjust_fit(0,0); pickup crisp.nib;
+pickup crisp.nib;
pos1(rule_thickness,0); pos2(rule_thickness,0);
pos3(bar,90); pos4(bar,90);
-lft x1l=hround(.5w-.5rule_thickness); top y1+rule_thickness=h;
-x0=x1=x2; bot y0=-d+.5u; x0-x3=x4-x0=3u+eps;
+lft x1l=hround(.5w-.5rule_thickness); top y1+rule_thickness=y11'-.5u;
+x0=x1=x2; bot y0=y11+1u; x0-x3=x4-x0=3u+eps;
y3=y4=y0+.24asc_height+eps;
pos5(bar,angle(z4-z0)); z5l=z0;
pos6(bar,angle(z3-z0)); z6l=z0;
@@ -1165,13 +1175,6 @@
--z2r---z1r..z1l---z2l--subpath (t,0) of\\(z3r{z9-z3}..z5r)
--z3l{z9-z3}..z0 & cycle; % arrowhead and stem
penlabels(0,1,2,3,4,5,6,9);
-pickup rule.nib;
-y+.5dot_size=vround(math_axis+math_spread[.5x_height,.6x_height]
-+.5dot_size);
-lft x11=hround u-eps; x11'=x11; x12=x12'=w-x11;
-y11=y12=math_axis-1.8(y-math_axis);
-y11'=y12'=math_axis+1.8(y-math_axis);
-draw z11--z12--z12'--z11'--cycle;
penlabels(11,12,11',12'); endchar;
cmchar "APL box";
@@ -1707,21 +1710,39 @@
penlabels(11,12,13,14,15,16,17,18,19);
penlabels(21,22,23,24,25,26,27,28,29); endchar;
-cmchar "ataribox (Alternate)";
-beginchar(hex"6D",5.5pt#,7.5pt#,0);
- pickup pencircle scaled .85pt;
- x1=0.05w; y1=0;
- x2=x1; y2=h;
- x3=0.95w; y3=y2;
- x4=x3; y4=y1;
- fill z1--z2--z3--z4--cycle;
- x5=x1; y5=.5h;
- x6=.5w; y6=h;
- x7=x3; y7=y5;
- x8=x6; y8=0;
- undraw z5--z6--z7--z8--cycle;
- penlabels(1,2,3,4,5,6,7,8);
-endchar;
+cmchar "ataribox (Alternate)";
+beginchar(hex"6D",33/45asc_height#,asc_height#,0);
+italcorr asc_height#*slant;
+ pickup pencircle scaled .15w;
+ x1=0.05w; y1=0;
+ x2=x1; y2=h;
+ x3=0.95w; y3=y2;
+ x4=x3; y4=y1;
+ fill z1--z2--z3--z4--cycle;
+ x5=x1; y5=.5h;
+ x6=.5w; y6=h;
+ x7=x3; y7=y5;
+ x8=x6; y8=0;
+ undraw z5--z6--z7--z8--cycle;
+ penlabels(1,2,3,4,5,6,7,8);
+endchar;
+
+cmchar "apple cmd";
+beginchar(hex"53",asc_height#,0.92asc_height#,0);
+italcorr 3/4asc_height#*slant;
+adjust_fit(0,0); pickup rule.nib;
+x1 = good.x .5w;
+y1 = good.y .5h;
+numeric a; a = 1/7h;
+x2=x17=x1-a; x9=x10=x1+a; lft x4=lft x15=x1-1/2h; rt x7=rt x12=x1+1/2h;
+x3=x5=x14=x16=.5[x2,x4];
+x6=x8=x11=x13=.5[x9,x7];
+y13=y14=y1-a; y5=y6=y1+a; bot y11=bot y16=y1-1/2h; top y3=top y8=y1+1/2h;
+y2=y4=y7=y9=.5[y3,y5];
+y10=y12=y15=y17=.5[y14,y16];
+draw z2..z3..z4..z5---z6..z7..z8..z9---z10..z11..z12..z13---z14..z15..z16..z17---z2;
+labels(1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16,17);
+endchar;
charlist hex"72": hex"77"; % integral signs
charlist hex"73": hex"78"; % iintegral signs
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/wasy/wasychr.mf new/fonts/source/public/wasy/wasychr.mf
--- old/fonts/source/public/wasy/wasychr.mf 2006-01-10 00:38:21.000000000 +0100
+++ new/fonts/source/public/wasy/wasychr.mf 2020-01-24 22:45:43.000000000 +0100
@@ -1,5 +1,5 @@
%
-% These characters should rather be in an character font than in a
+% These characters should rather be in a character font than in a
% symbol font
%
@@ -29,14 +29,14 @@
p.e:=z4e{right}..tension atleast.9 and 1..{dir 75}z5e; fi endfor
filldraw stroke pulled_super_arc.e(2,3)(.7superpull)
& pulled_super_arc.e(3,4)(.5superpull) & p.e; fi % arc and lower terminal
-pickup crisp.nib;
+pickup crisp.nib;
x6=x7=x8=x9=x2; y7=y2; y8=y4; bot y9=-d; y6-y7 = y8-y9;
pos6(bar,0); pos7(bar,0);
pos8(bar,0); pos9(bar,0);
filldraw stroke z6e--z7e; % upper bar
filldraw stroke z8e--z9e; % lower bar
penlabels(0,1,2,3,4,5,6,7,8,9); endchar;
-
+
cmchar "Upside down e";
beginchar(hex"55",7.25u#+max(.75u#,.5curve#),x_height#,0);
italcorr .5[bar_height#,x_height#]*slant+.5min(curve#-1.5u#,0);
@@ -67,7 +67,7 @@
path testpath; testpath=super_arc.l(2,3) & super_arc.l(3,4);
y1'r=y0r=y0l-.6[thin_join,vair]; y1'l=y0l; x1'l=x1'r=x1;
forsuffixes $=l,r:
- x0$=xpart(((2h,y0$)--(x1,y0$)) intersectionpoint testpath); endfor
+ x0$=xpart(((2h,y0$)--(x1,y0$)) intersectionpoint testpath); endfor % old
fill stroke z0e--z1'e; % crossbar
penlabels(0,1,2,3,4,5); endchar;
@@ -77,11 +77,11 @@
adjust_fit(if monospace: .5u#,.5u# else: 0,0 fi);
pickup fine.nib; pos2(vair',270); pos4(vair',90);
x2=x4=.5w; top y4r=vround(h+oo); bot y2r=-1.5oo;
-pos3(curve,0); rt x3l=hround (w-max(.6u,1.35u-.5curve)); y3=.5h;
+pos3(curve,0); rt x3l=hround (w-max(1.6u,2.35u-.5curve)); y3=.5h;
if serifs: pos1(hair,180); pos0(flare,180);
y1=h-.70[bar_height,h]+.5flare;
- lft x1r=hround(1.0u); bulb(2,1,0); % bulb
- pos5(hair,180); lft x5r=hround(1.2u);
+ lft x1r=hround(0.5u); bulb(2,1,0); % bulb
+ pos5(hair,180); lft x5r=hround(0.7u);
y5=min(good.y(h+oo-.45bar_height+.9),y4l-vair');
(x,y4l)=whatever[z4l,z5r]; x4l:=max(x,x4l-.5u);
filldraw stroke pulled_super_arc.e(2,3)(.7superpull)
@@ -98,7 +98,7 @@
filldraw stroke pulled_super_arc.e(2,3)(.7superpull)
& pulled_super_arc.e(3,4)(.5superpull) & p.e; fi % arc and upper terminal
penlabels(0,1,2,3,4,5); endchar;
-
+
cmchar "The small islandic thorn";
beginchar(hex"69",10u#+serif_fit#,asc_height#,desc_depth#);
italcorr .5x_height#*slant+min(.5curve#-.85u#,-.1u#);
@@ -151,21 +151,21 @@
if serifs: dish_serif(1,0,a,1/3,cap_jut,b,1/3,cap_jut); % upper serif
dish_serif(2,0',c,1/3,cap_jut,d,1/3,cap_jut); fi % lower serif
math_fit(0,ic#-2.5u#); penlabels(0,1,2,3,4,5,6,7); endchar;
-
+
cmchar "Islandic edh";
beginchar(hex"6B",9u#,asc_height#,0);
italcorr .8x_height#*slant;
adjust_fit(0,0);
penpos1(vair,90); penpos3(vair',-90);
penpos1'(hair,0);
-penpos2(curve,180); penpos4(curve,0); penpos4'(curve,0);
+penpos2(curve,180); penpos4(curve,0); penpos4'(curve,0);
penpos5(curve,0); penpos6(curve,0);
x2r=hround max(.5u,1.25u-.5curve);
x4r=w-x2r; x1=x3=.5w; y1r=x_height; y3r=-oo;
y2=y4=.5(x_height-oo)-vair_corr; y2l:=y4l:=.5x_height;
y4'=y4+1.5u; x4'=x4;
-top y6 = h;
-x6= if monospace: 2/3 else: 1/3 fi [x2,x5];
+top y6 = h;
+x6= if monospace: 2/3 else: 1/3 fi [x2,x5];
y5=0.66[y4',y6];
x5=0.60[x4',x6];
z1' = z4';
@@ -181,9 +181,26 @@
(y6-y)/(y6-y5) = (x6-x)/(x6-x5);
penstroke z7e--z8e; % bar
penlabels(1,2,3,4,5,6,7,8); endchar;
-
+
+cmchar "The letter long-s";
+beginchar(hex"54",5.5u#,asc_height#,0);
+italcorr asc_height#*slant+if serifs:flare#-.25u# else: 1.25u# fi;
+adjust_fit(stem_shift#,if monospace: .5u# else:-stem_shift# fi);
+pickup tiny.nib; pos1(stem',0); lft x1l=hround(2.5u-.5stem');
+pickup fine.nib; numeric bulb_diam;
+if serifs: bulb_diam=hround .8[stem,flare];
+ pos2(bulb_diam,0); y2+.5bulb_diam=.9[x_height,h+oo];
+ if monospace: rt x2r=hround(w-.5u)+1 else: lft x2l=hround(w-.75u+.5) fi;
+else: pos2(5/7[vair,flare],90); top y2r=h;
+ rt x2=hround(if monospace:w-.5u else:w+.75u fi); fi
+f_stroke(1,2,a,b,c,jut,if not monospace:1.25fi\\ jut); % stem, terminal, serif
+pickup crisp.nib; top y3r=top y4r=x_height; lft x3=hround .7u;
+pos3(bar,90); pos4(bar,90);
+rt x4=hround(2.5u);
+filldraw stroke z3e--z4e; % bar
+penlabels(1,2,3,4); endchar;
+
cmchar "Permille sign";
-cmchar "Per mille sign";
beginchar(hex"68",9u#+max(9u#,3fudge*(hair#+stem#)),
body_height#,body_height#-asc_height#);
italcorr if hefty: .4asc_height#*slant-.5u# else: h#*slant-u# fi;
@@ -198,7 +215,7 @@
filldraw stroke pulled_super_arc.e(1,2)(superpull)
& pulled_super_arc.e(2,3)(superpull); % left half of upper bowl
filldraw stroke super_arc.e(3,4) & super_arc.e(4,1); % right half of upper bowl
-pos5(vair,90); pos6(left_curve,180); pos7(vair,270);
+pos5(vair,90); pos6(left_curve,180); pos7(vair,270);
pos8(right_curve,360);
bot y7r=-d; rt x8r=hround(.70w-u); x6-x8 = x2-x4;
top y5r=vround(if monospace: .3 else: .5 fi\\ asc_height);
@@ -206,7 +223,7 @@
filldraw stroke pulled_super_arc.e(5,6)(superpull)
& pulled_super_arc.e(6,7)(superpull); % left half of lower bowl
filldraw stroke super_arc.e(7,8) & super_arc.e(8,5); % right half of lower bowl
-pos5'(vair,90); pos6'(left_curve,180); pos7'(vair,270);
+pos5'(vair,90); pos6'(left_curve,180); pos7'(vair,270);
pos8'(right_curve,360);
bot y7'r=-d; rt x8'r=hround(w-u); x6'-x8' = x6-x8;
top y5'r=vround(if monospace: .3 else: .5 fi\\ asc_height);
@@ -223,3 +240,77 @@
path p; p=super_arc.r(1,4); z11r=point 2/3 of p; z12r=z9r;
filldraw stroke z11e{direction 2/3 of p}...{z9-z10}z12e; fi % link
penlabels(1,2,3,4,5,6,7,8,9,10,11,12); endchar;
+
+cmchar "German Paragraph sign, similar to section";
+beginchar(hex"4D",8.5u#+max(1.5u#,stem#),asc_height#,1/2desc_depth#);
+italcorr cap_height#*slant-u#;
+adjust_fit(0,0); pickup fine.nib;
+ pos0(stem,0); pos1(hair,0); pos2(vair,90); pos3(curve,180);
+ pos4(vair,270); pos5'(curve,0); pos5(curve,180);
+% pos6(9/10curve,0);
+pos6(vair,90); pos7(curve,0); pos8(vair,-90); pos9(hair,-180); pos10(stem,-180);
+top y2r=h+oo; bot y8r=-d-oo; y2-y1=y9-y8=(y2-y8)/8;
+y3=.52[y4,y2]; y5=.52[y4,y6]; y7=.52[y6,y8]; y5'=.52[y6,y4];
+y2-y4=y4-y6=y6-y8;
+rt x1r=hround(w-1.5u); lft x3r=hround 1.25u;
+x2=x4=x6=x8=.5w; x5=x7=w-x3; x5'=x3; x9=w-x1;
+bulb(2,1,0); bulb(8,9,10); % bulbs
+filldraw stroke z2e{left}...z3e{down}...z4e{3(x5-x3),y5-y3}
+ ...z5e{down}...{left}z6e; % upper stroke
+filldraw stroke z4e{left}...z5'e{down}...z6e{3(x7-x5'),y7-y5'}
+ ...z7e{down}...{left}z8e; % upper stroke
+penlabels(0,1,2,3,4,5,6,7,8,9,10); endchar;
+
+cmchar "Euro symbol";
+ beginchar(hex"4E",12.5u#,cap_height#,0);
+ italcorr cap_height#*slant-.5u#;
+ adjust_fit(0,0);
+ pickup fine.nib; pos1(25/33flare,80); pos2(15/11slab,90);
+ pos3(30/37cap_curve,180); pos4(18/11slab,270); pos5(22/33flare,275);
+ rt x1r=hround(w-1.1u); x2=x4=.5w+1.75u;
+ lft x3r=hround max(2u,3u-32/64cap_curve); x5r=x1r-0.1u;
+ top y1r=vround .95h+oo; top y2r=h+oo; y3=.5h;
+ bot y4r=-oo; bot y5r=vround .08h-oo; y5l:=good.y y5l; x5l:=good.x x5l;
+ filldraw stroke rterm.e(2,1,right,.9,4) & super_arc.e(2,3)
+ & super_arc.e(3,4) & term.e(4,5,right,.8,4); % arc and terminals
+italcorr h#*slant-.5u#;
+adjust_fit(0,0); pickup rule.nib;
+lft x9=hround 0.5u-eps; x7=x9+0.1u; x10=0.6w; x8=x10+0.3u;
+y7=y8; y9=y10; y7-y9=1/5h; .5[y7,y9]=.5h;
+draw z7--z8; % upper bar
+draw z9--z10; % upper bar
+penlabels(1,1',2,3,4,5,6,7,8,9,10); endchar;
+
+cmchar "round z zh";
+beginchar(hex"4F",8u#,x_height#,desc_depth#);
+italcorr x_height#*slant-.5serif_fit#-.3u#;
+adjust_fit(0,.5serif_fit#);
+numeric arm_thickness[],z_stem;
+if hefty: arm_thickness1=Vround(vair-vair_corr); arm_thickness2=vair;
+ z_stem=.6[vair,stem];
+else: arm_thickness1=vair; arm_thickness2=vair'; z_stem=.9[vair,stem]; fi
+pickup tiny.nib; rt x1r=rt x2r=hround(w-.8u); lft x3l=3u; x4l = x3l;
+top y1=h; y2=min(y1,h-2/3arm_thickness1);
+y3=vround(-d+.85x_height); y4=y3-2/3arm_thickness1;
+numeric alpha; alpha=diag_ratio(1,z_stem-tiny,y2-y3,x2r-x3l-slant*(y2-y3));
+penpos1(alpha*(z_stem-tiny),0); penpos2(alpha*(z_stem-tiny),0);
+penpos3(alpha*(z_stem-tiny),0);
+penpos4(alpha*(z_stem-tiny),0);
+pair delta; delta=penoffset z3-z2 of currentpen;
+fill top lft z1l--z2l+delta---z3l+delta..lft z3l---lft z4l--z4r
+ --z3r-delta---z2r-delta..rt z2r---rt z1r..top z1r
+ ---cycle; % diagonal
+pickup crisp.nib; pos5(arm_thickness1,90); pos6(hair,180);
+top y5r=h; x5=x1; lft x6r=hround .75u; y6=good.y(y5l-beak/1.4)-eps;
+arm(5,6,a,beak_darkness,-.4beak_jut); % upper arm and beak
+pos12(vair',270); pos14(vair',90);
+x12=x14=x3; bot y14l=y4; bot y12r=-d;
+pos13(curve,0); rt x13l=hround (w-max(1.9u,2.65u-.5curve));
+y13=.5[y12,y14];
+%if serifs:
+ pos11(hair,180); pos10(flare,180);
+ y11=y14-.70[bar_height,0.85x_height]+.75flare;
+ lft x11r=hround(0.3u); bulb(12,11,10); % bulb
+ filldraw stroke pulled_super_arc.e(12,13)(.7superpull)
+ & pulled_super_arc.e(13,14)(.5superpull);
+penlabels(1,2,3,4,10,11,12,13,14); endchar;
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/wasy/wasysl10.mf new/fonts/source/public/wasy/wasysl10.mf
--- old/fonts/source/public/wasy/wasysl10.mf 1970-01-01 01:00:00.000000000 +0100
+++ new/fonts/source/public/wasy/wasysl10.mf 2020-01-20 23:49:56.000000000 +0100
@@ -0,0 +1,100 @@
+% This is WASY10.MF in text format
+% additional symbols for math, physics, astronomy and other fields
+
+%input modes;
+%mode=hp_laser;
+
+if unknown cmbase: input cmbase fi
+
+font_identifier:="WASY"; font_size 10pt#;
+
+u#:=20/36pt#; % unit width
+width_adj#:=0pt#; % width adjustment for certain characters
+serif_fit#:=0pt#; % extra sidebar near lowercase serifs
+cap_serif_fit#:=5/36pt#; % extra sidebar near uppercase serifs
+letter_fit#:=0pt#; % extra space added to all sidebars
+
+body_height#:=270/36pt#; % height of tallest characters
+asc_height#:=250/36pt#; % height of lowercase ascenders
+cap_height#:=246/36pt#; % height of caps
+fig_height#:=232/36pt#; % height of numerals
+x_height#:=155/36pt#; % height of lowercase without ascenders
+math_axis#:=90/36pt#; % axis of symmetry for math symbols
+bar_height#:=87/36pt#; % height of crossbar in lowercase e
+comma_depth#:=70/36pt#; % depth of comma below baseline
+desc_depth#:=70/36pt#; % depth of lowercase descenders
+
+crisp#:=0pt#; % diameter of serif corners
+tiny#:=8/36pt#; % diameter of rounded corners
+fine#:=7/36pt#; % diameter of sharply rounded corners
+thin_join#:=7/36pt#; % width of extrafine details
+hair#:=9/36pt#; % lowercase hairline breadth
+stem#:=25/36pt#; % lowercase stem breadth
+curve#:=30/36pt#; % lowercase curve breadth
+ess#:=27/36pt#; % breadth in middle of lowercase s
+flare#:=33/36pt#; % diameter of bulbs or breadth of terminals
+dot_size#:=38/36pt#; % diameter of dots
+cap_hair#:=11/36pt#; % uppercase hairline breadth
+cap_stem#:=32/36pt#; % uppercase stem breadth
+cap_curve#:=37/36pt#; % uppercase curve breadth
+cap_ess#:=35/36pt#; % breadth in middle of uppercase s
+rule_thickness#:=.4pt#; % thickness of lines in math symbols
+
+dish#:=1/36pt#; % amount erased at top or bottom of serifs
+bracket#:=20/36pt#; % vertical distance from serif base to tangent
+jut#:=28/36pt#; % protrusion of lowercase serifs
+cap_jut#:=37/36pt#; % protrusion of uppercase serifs
+beak_jut#:=10/36pt#; % horizontal protrusion of beak serifs
+beak#:=70/36pt#; % vertical protrusion of beak serifs
+vair#:=8/36pt#; % vertical diameter of hairlines
+notch_cut#:=10pt#; % maximum breadth above or below notches
+bar#:=11/36pt#; % lowercase bar thickness
+slab#:=11/36pt#; % serif and arm thickness
+cap_bar#:=11/36pt#; % uppercase bar thickness
+cap_band#:=11/36pt#; % uppercase thickness above/below lobes
+cap_notch_cut#:=10pt#; % max breadth above/below uppercase notches
+serif_drop#:=4/36pt#; % vertical drop of sloped serifs
+stem_corr#:=1/36pt#; % for small refinements of stem breadth
+vair_corr#:=1/36pt#; % for small refinements of hairline height
+apex_corr#:=0pt#; % extra width at diagonal junctions
+
+o#:=8/36pt#; % amount of overshoot for curves
+apex_o#:=8/36pt#; % amount of overshoot for diagonal junctions
+
+slant:=1/6; % tilt ratio $(\Delta x/\Delta y)$
+fudge:=1; % factor applied to weights of heavy characters
+math_spread:=0; % extra openness of math symbols
+superness:=1/sqrt2; % parameter for superellipses
+superpull:=1/6; % extra openness inside bowls
+beak_darkness:=11/30; % fraction of triangle inside beak serifs
+ligs:=2; % level of ligatures to be included
+
+square_dots:=false; % should dots be square?
+hefty:=false; % should we try hard not to be overweight?
+serifs:=true; % should serifs and bulbs be attached?
+monospace:=false; % should all characters have the same width?
+variant_g:=false; % should an italic-style g be used?
+low_asterisk:=false; % should the asterisk be centered at the axis?
+math_fitting:=false; % should math-mode spacing be used?
+
+
+if ligs>1: font_coding_scheme:="TeX text";
+else: font_coding_scheme:=if ligs=0: "TeX typewriter text"
+ else: "TeX text without f-ligatures" fi;
+ fi
+
+mode_setup; font_setup;
+
+input rsym; % symbols
+input lasychr; % lasy font symbols
+
+
+font_slant slant; font_x_height x_height#;
+if monospace: font_normal_space 9u#; % no stretching or shrinking
+ font_quad 18u#;
+ font_extra_space 9u#;
+else: font_normal_space 6u#+2letter_fit#;
+ font_normal_stretch 3u#; font_normal_shrink 2u#;
+ font_quad 18u#+4letter_fit#;
+ font_extra_space 2u#; fi
+bye.
Binary files old/fonts/tfm/public/wasy/wasy10.tfm and new/fonts/tfm/public/wasy/wasy10.tfm differ
Binary files old/fonts/tfm/public/wasy/wasy5.tfm and new/fonts/tfm/public/wasy/wasy5.tfm differ
Binary files old/fonts/tfm/public/wasy/wasy6.tfm and new/fonts/tfm/public/wasy/wasy6.tfm differ
Binary files old/fonts/tfm/public/wasy/wasy7.tfm and new/fonts/tfm/public/wasy/wasy7.tfm differ
Binary files old/fonts/tfm/public/wasy/wasy8.tfm and new/fonts/tfm/public/wasy/wasy8.tfm differ
Binary files old/fonts/tfm/public/wasy/wasy9.tfm and new/fonts/tfm/public/wasy/wasy9.tfm differ
Binary files old/fonts/tfm/public/wasy/wasyb10.tfm and new/fonts/tfm/public/wasy/wasyb10.tfm differ
Binary files old/fonts/tfm/public/wasy/wasysl10.tfm and new/fonts/tfm/public/wasy/wasysl10.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/wasy/wasyfont.tex new/tex/plain/wasy/wasyfont.tex
--- old/tex/plain/wasy/wasyfont.tex 2006-01-13 00:46:46.000000000 +0100
+++ new/tex/plain/wasy/wasyfont.tex 2020-01-20 23:49:56.000000000 +0100
@@ -1,10 +1,31 @@
-% this is wasyfont.tex version 2.01--92/10
+% this is WASYFONT.tex version 2.4--2020/01
+% to be used with PlainTeX
+\catcode`@=11 % make @ letter
+\ifx\newwasy\undefined
\font\tenwasy = wasy10
\font\wasyb = wasyb10
\font\ninewasy = wasy9
-\font\eightwasy = wasy8
\font\sevenwasy = wasy7
+\font\bigwasy = wasy10 scaled \magstep1
+\font\bigwasyb = wasyb10 scaled \magstep1
+\font\Bigwasy = wasy10 scaled \magstep2
+\font\Bigwasyb = wasyb10 scaled \magstep2
\font\fivewasy = wasy5
+\font\eightwasy = wasy8
+\font\wasysl = wasysl10
+\else
+\font\tenwasy = wasym10
+\font\wasyb = wasymb10
+\font\ninewasy = wasym9
+\font\sevenwasy = wasym7
+\font\bigwasy = wasym10 scaled \magstep1
+\font\bigwasyb = wasymb10 scaled \magstep1
+\font\Bigwasy = wasym10 scaled \magstep2
+\font\Bigwasyb = wasymb10 scaled \magstep2
+\font\fivewasy = wasym5
+\font\eightwasy = wasym8
+\font\wasysl = wasyml10
+\fi
\newfam\wasyfam
\newcount\wasyfamcount
\wasyfamcount=\wasyfam \multiply\wasyfamcount by 256
@@ -12,6 +33,14 @@
\textfont\wasyfam=\tenwasy
\scriptfont\wasyfam=\sevenwasy
\scriptscriptfont\wasyfam=\fivewasy
+%%%%%% move to slanted or boldface including wasy symbols
+\def\wbf{\bf\let\tenwasy\wasyb}
+\def\wsl{\sl\let\tenwasy\wasysl}
+\def\euro{{\wasy\char"4E}}
+\def\Paragraph{{\wasy\char"4D}}
+\def\s{{\wasy\char"54}}
+\def\z{{\wasy\char"4F}}
+\def\applecmd{{\wasy\char"53}}
%%%%%% special macro
\def\overstrike#1#2{{\setbox0\hbox{$#2$}\hbox to \wd0{\hss
$#1$\hss}\kern-\wd0\box0}}
@@ -69,26 +98,6 @@
\def\RIGHTCIRCLE{\hbox{\wasy\char"48}}
\def\LEFTcircle{\hbox to 0pt{\wasy\char"47\hss}\hbox{\wasy\char"23}}
\def\RIGHTcircle{\hbox to 0pt{\wasy\char"48\hss}\hbox{\wasy\char"23}}
-%%%%%% astronomy
-\def\vernal{\hbox{\wasy\char"17}}
-\def\ascnode{\hbox{\wasy\char"13}}
-\def\descnode{\hbox{\wasy\char"14}}
-\def\fullmoon{\hbox{\wasy\char"23}}
-\def\newmoon{\hbox{\wasy\char"20}}
-\def\leftmoon{\hbox{\wasy\char"24}}
-\def\rightmoon{\hbox{\wasy\char"25}}
-\def\astrosun{\hbox{\tensy\char"0C}}
-\def\mercury{\hbox{\wasy\char"27}}
-\def\venus{\raise0.2ex\hbox{\wasy\char"19}}
-\def\earth{\lower0.3ex\hbox{\wasy\char"26}}
-\def\mars{\lower0.2ex\hbox{\wasy\char"1A}}
-\def\jupiter{\hbox{\wasy\char"58}}
-\def\saturn{\hbox{\wasy\char"59}}
-\def\uranus{\hbox{\wasy\char"5A}}
-\def\neptune{\hbox{\wasy\char"5B}}
-\def\pluto{\hbox{\wasy\char"5C}}
-\def\conjunction{\hbox{\wasy\char"56}}
-\def\opposition{\hbox{\wasy\char"57}}
%%%%%% the zodiac
\def\aries{\hbox{\wasy\char"17}}
\def\taurus{\hbox{\wasy\char"5D}}
@@ -136,7 +145,7 @@
\def\thorn{{\wasy\char"69}}
\def\Thorn{{\wasy\char"6A}}
\def\dh{{\wasy\char"6B}}
-\def\Dh{\leavevmode{\rm\setbox0\hbox{D}%
+\def\Dh{\leavevmode{\setbox0\hbox{D}%
\hbox to\wd0{\kern 0.04em\char32\hss D}}}
\def\openo{{\wasy\char"6C}}
\def\inve{{\wasy\char"55}}
@@ -166,7 +175,43 @@
\wasymathchardef{1075}{\varoint}
\wasymathchardef{1076}{\oiint}
%
+\wasymathchardef{0027}{\mer@@}
+\wasymathchardef{0019}{\ven@@}
+\wasymathchardef{0026}{\ear@@}
+\wasymathchardef{001A}{\mar@@}
+\wasymathchardef{0058}{\jup@@}
+\wasymathchardef{0059}{\sat@@}
+\wasymathchardef{005A}{\ura@@}
+\wasymathchardef{005B}{\nep@@}
+\wasymathchardef{0024}{\moon@@}
+\wasymathchardef{0017}{\vern@@}
+\wasymathchardef{0013}{\ascn@de}
+\wasymathchardef{0014}{\descn@de}
+\wasymathchardef{0056}{\conju@@}
+\wasymathchardef{0057}{\oppos@@}
+%%%%%% astronomy
+\def\vernal{\ifmmode\vern@@\else{\wasy\char"17}\fi}
+\def\ascnode{\ifmmode\ascn@de\else{\wasy\char"13}\fi}
+\def\descnode{\ifmmode\descn@de\else{\wasy\char"14}\fi}
+\def\fullmoon{\hbox{\wasy\char"23}}
+\def\newmoon{\hbox{\wasy\char"20}}
+\def\leftmoon{\ifmmode\moon@@\else{\wasy\char"24}\fi}
+\def\rightmoon{\hbox{\wasy\char"25}}
+\def\astrosun{\ifmmode\odot\else\hbox{\tensy\char"0C}\fi}
+\def\mercury{\ifmmode\mer@@\else{\wasy\char"27}\fi}
+\def\venus{\ifmmode\ven@@\else\raise0.2ex\hbox{\wasy\char"19}\fi}
+\def\earth{\ifmmode\ear@@\else\lower0.3ex\hbox{\wasy\char"26}\fi}
+\def\mars{\ifmmode\mar@@\else\lower0.2ex\hbox{\wasy\char"1A}\fi}
+\def\jupiter{\ifmmode\jup@@\else{\wasy\char"58}\fi}
+\def\saturn{\ifmmode\sat@@\else{\wasy\char"59}\fi}
+\def\uranus{\ifmmode\ura@@\else{\wasy\char"5A}\fi}
+\def\neptune{\ifmmode\nep@@\else{\wasy\char"5B}\fi}
+\def\pluto{\hbox{\wasy\char"5C}}
+\def\conjunction{\ifmmode\conju@@\mkern-4mu{}\else{\wasy\char"56}\fi}
+\def\opposition{\ifmmode\oppos@@\else{\wasy\char"57}\fi}
+%
%%%%%% new definitions
%
\def\newpropto{\let\propto\varpropto}
\def\newint{\let\int\varint \let\oint\varoint} % default limits
+\catcode`@=12 % at signs are no longer letters
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasy.tlpobj new/tlpkg/tlpobj/wasy.tlpobj
--- old/tlpkg/tlpobj/wasy.tlpobj 2019-02-28 04:14:56.000000000 +0100
+++ new/tlpkg/tlpobj/wasy.tlpobj 2020-01-25 01:55:33.000000000 +0100
@@ -1,14 +1,17 @@
name wasy
category Package
-revision 35831
-catalogue wasy2
+revision 53533
shortdesc The wasy fonts (Waldi symbol fonts)
relocated 1
-longdesc These are the wasy (Waldi symbol) fonts, second release. This
-longdesc bundle presents the fonts in Metafont format, but they are also
-longdesc available in Adobe Type 1 format. Support under LaTeX is
-longdesc provided by the wasysym package.
-runfiles size=46
+longdesc This font contains all lasy characters (by L.Lamport, copyright
+longdesc notice in lasychr.mf), and a lot more symbols. Provided are the
+longdesc Metafont files for 5-10pt, and bold and slanted 10pt fonts,
+longdesc together with a .tex and .pdf documentation, and a file for
+longdesc using the fonts in a PLAIN-TeX document. Type-1 fonts by
+longdesc Michael Sharpe and Taco Hoekwater are available as separate
+longdesc package wasy-type1. Support under LaTeX is provided by Axel
+longdesc Kielhorn's wasysym package.
+runfiles size=50
RELOC/fonts/source/public/wasy/lasychr.mf
RELOC/fonts/source/public/wasy/rsym.mf
RELOC/fonts/source/public/wasy/wasy10.mf
@@ -19,6 +22,7 @@
RELOC/fonts/source/public/wasy/wasy9.mf
RELOC/fonts/source/public/wasy/wasyb10.mf
RELOC/fonts/source/public/wasy/wasychr.mf
+ RELOC/fonts/source/public/wasy/wasysl10.mf
RELOC/fonts/tfm/public/wasy/wasy10.tfm
RELOC/fonts/tfm/public/wasy/wasy5.tfm
RELOC/fonts/tfm/public/wasy/wasy6.tfm
@@ -26,8 +30,11 @@
RELOC/fonts/tfm/public/wasy/wasy8.tfm
RELOC/fonts/tfm/public/wasy/wasy9.tfm
RELOC/fonts/tfm/public/wasy/wasyb10.tfm
+ RELOC/fonts/tfm/public/wasy/wasysl10.tfm
RELOC/tex/plain/wasy/wasyfont.tex
-catalogue-ctan /fonts/wasy2
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-alias wasy2
+catalogue-also wasy-type1 wasysym
+catalogue-ctan /fonts/wasy
catalogue-license pd
catalogue-topics font font-mf font-symbol
+catalogue-version 2.5
++++++ wasysym.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/wasysym/README.md new/doc/latex/wasysym/README.md
--- old/doc/latex/wasysym/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/wasysym/README.md 2020-01-20 23:50:10.000000000 +0100
@@ -0,0 +1,81 @@
+# Interface to the wasy fonts for LaTeX2e.
+
+## License
+
+This material is subject to the LATEX Project Public License 1.3c.
+
+wasysym does work with the old wasy-fonts but some characters are
+missing and others may come out wrong. Therefore I suggest
+to upgrade to wasy.
+
+The WASY fonts are provided as METAFONT fonts.
+There is a package wasy-type1 that contains the outline fonts.
+
+Bug reports (and enhancements) to
+
+Axel Kielhorn
+tex(a)axelkielhorn.de
+
+Please note that the EC fonts (former DC fonts) come with
+a textcompanion font that contains a lot of special characters.
+Use the textcomp package to access these symbols.
+
+Many TeX fonts are now supporting a wide range of Unicode symbols.
+You may look there first.
+
+This package supports the WASY fonts version 2.4 or
+wasy-type1 version 001.001.
+When used with older versions some characters may be missing.
+
+## Changes:
+
+1.0b
+: Corrected mathcode of integrals (now 1) (=mathop)
+
+1.0c
+: The command is textwasy as defined and not textlasy as
+ shown in the margin
+
+1.0d
+: Adapted to LaTeX2e[1994/06/01]
+
+1.0e
+: Changed some symbols from mathrel to mathbin as in latexsym
+ Changed the way the documentation is generated form
+ latex2e-beta to official LaTeX2e-way.
+
+1.0f
+: Corrected \dh and \Dh definition for T1 encoding
+ Renamed \Dh to \DH as in T1 encoding but keeping the old
+ name for compatibility
+
+1.0g
+: Reinserted the \hbox commands, wasysym now works in mathmode again
+
+1.0f
+: Changed most \hbox commands to \mbox (thanks to Donald Arseneau)
+ Donald added partial support for AMSmath
+
+1.0i
+: Changed license to LPPL, some documentation updates.
+
+2.0
+: Changed the way integrals are handled
+ Corrected some definitions (missing \leavevmode)
+
+2.0a
+: Removed \rm from \DH command. It now works in
+ italic and bold as well, but the italic version looks
+ somewhat strange. I suggest using a T1 encoded font instead.
+
+2.3
+: Updated to support version 2.3 of the WASY fonts.
+ New characters added: \Paragraph, \euro and \applecmd.
+ Support for the bold and slanted version of wasy10.
+
+2.4
+: Updated to support version 2.4 of the WASY fonts.
+ New characters added: \longs (Unicode 017f) and \roundz a variant of the
+ letter z that got reintroduced to german writing with the
+ Vereinfachte Ausgangsschrift.
+
Binary files old/doc/latex/wasysym/wasysym.pdf and new/doc/latex/wasysym/wasysym.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/wasysym/wasysym.upl new/doc/latex/wasysym/wasysym.upl
--- old/doc/latex/wasysym/wasysym.upl 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/wasysym/wasysym.upl 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-This is an interface to the wasy-2 fonts for LaTeX2e.
-
-It does work with the old wasy-fonts but some characters are
-missing and others may come out wrong. Therefore I suggest
-to upgrade to wasy-2.
-
-These definitions are not 100% compatible to wasy.tex or the
-wasyfont.sty for NFSS1.
-
-Bug reports (and enhancements) to
-
-Axel Kielhorn
-a.kielhorn(a)web.de
-
-Please note that the EC fonts (former DC fonts) come with
-a textcompanion font that contains a lot of special characters.
-Use the textcomp package to acces these symbols.
-
-Changes:
-1.0b Corrected mathcode of integrals (now 1) (=mathop)
-1.0c The command is textwasy as defined and not textlasy as
- shown in the margin
-1.0d Adapted to LaTeX2e[1994/06/01]
-1.0e Changed some symbols from mathrel to mathbin as in latexsym
- Changed the way the documentation is generated form
- latex2e-beta to official LaTeX2e-way.
-1.0f Corrected \dh and \Dh definition for T1 encoding
- Renamed \Dh to \DH as in T1 encoding but keeping the old
- name for compatibility
-1.0g Reinserted the \hbox commands, wasysym now works in mathmode again
-1.0f Changed most \hbox commands to \mbox (thanks to Donald Arseneau)
- Donald added partial support for AMSmath
-1.0i Changed license to LPPL, some documentation updates.
-2.0 Changed the way integrals are handled
- Corrected some definitions (missing \leavevmode)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/wasysym/wasysym.xml new/doc/latex/wasysym/wasysym.xml
--- old/doc/latex/wasysym/wasysym.xml 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/wasysym/wasysym.xml 1970-01-01 01:00:00.000000000 +0100
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!DOCTYPE entry SYSTEM "../catalogue.dtd">
-<entry id="wasysym"
- datestamp="2003/05/31"
- modifier="A.Kielhorn(a)web.de">
- <about>
- <name>wasysym</name>
- <caption>LaTeX support file to use the WASY-2 fonts</caption>
- <author>
- <name>Axel Kielhorn</name>
- <email>A.Kielhorn(a)web.de</email>
- </author>
- <license type="lppl"/>
- <version>
- <number>2.0</number>
- </version>
- </about>
- <description>
- <abstract>
- The WASY (Waldi Symbol) font by Roland Waldi provides many
- characters like male and female symbols and astronomical symbols.
- The wasysym package implements and easy to use interface for these
- symbols.
- </abstract>
- <documentation location="ctan" type="pdf">wasysym.pdf</documentation>
- </description>
- <distribution>
- <ctan>macros/latex/contrib/supported/wasysym</ctan>
- <texlive>???</texlive>
- </distribution>
-</entry>
-
-
-
-
-
-
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasysym.doc.tlpobj new/tlpkg/tlpobj/wasysym.doc.tlpobj
--- old/tlpkg/tlpobj/wasysym.doc.tlpobj 2019-02-28 04:14:57.000000000 +0100
+++ new/tlpkg/tlpobj/wasysym.doc.tlpobj 2020-03-04 23:55:08.000000000 +0100
@@ -1,9 +1,8 @@
name wasysym.doc
category Package
-revision 15878
+revision 54080
shortdesc doc files of wasysym
relocated 1
-docfiles size=27
+docfiles size=41
+ RELOC/doc/latex/wasysym/README.md
RELOC/doc/latex/wasysym/wasysym.pdf
- RELOC/doc/latex/wasysym/wasysym.upl
- RELOC/doc/latex/wasysym/wasysym.xml
++++++ wasysym.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/wasysym/uwasy.fd new/tex/latex/wasysym/uwasy.fd
--- old/tex/latex/wasysym/uwasy.fd 2006-01-13 01:11:21.000000000 +0100
+++ new/tex/latex/wasysym/uwasy.fd 2020-01-20 23:50:10.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% wasysym.dtx (with options: `fd')
%%
-%% Copyright (C) 1994-2003 by Axel Kielhorn. All rights reserved.
+%% Copyright (C) 1994-2020 by Axel Kielhorn. All rights reserved.
%% For additional copyright information see further down in this file.
%%
%% This file is to be used with the LaTeX2e system.
@@ -21,7 +21,7 @@
%%
%% Error reports in case of UNCHANGED versions to
%% Axel Kielhorn
-%% A.Kielhorn(a)web.de
+%% tex(a)axelkielhorn.de
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,14 +39,21 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\ProvidesFile{uwasy.fd}%
- [2003/10/30 v2.0
+ [2020/01/19 v2.4
Wasy-2 symbol font definitions]
\DeclareFontFamily{U}{wasy}{}
-\DeclareFontShape{U}{wasy}{m}{n}{ <5> <6> <7> <8> <9> gen * wasy
- <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88>wasy10 }{}
+\DeclareFontShape{U}{wasy}{m}{n}{%
+<5>
+<6>
+<7>
+<8>
+<9> gen * wasy
+<10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> wasy10 }{}
\DeclareFontShape{U}{wasy}{b}{n}{ <-10> sub * wasy/m/n
- <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88>wasyb10 }{}
+ <10> <10.95> <12> <14.4> <17.28> <20.74> <24.88> wasyb10 }{}
\DeclareFontShape{U}{wasy}{bx}{n}{ <-> sub * wasy/b/n}{}
+\DeclareFontShape{U}{wasy}{m}{sl}{ <-> wasysl10 }{}
+\DeclareFontShape{U}{wasy}{m}{it}{ <-> sub * wasy/m/sl }{}
\endinput
%%
%% End of file `uwasy.fd'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/wasysym/uwasyvar.fd new/tex/latex/wasysym/uwasyvar.fd
--- old/tex/latex/wasysym/uwasyvar.fd 2006-01-13 01:11:21.000000000 +0100
+++ new/tex/latex/wasysym/uwasyvar.fd 2020-01-20 23:50:10.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% wasysym.dtx (with options: `fdvar')
%%
-%% Copyright (C) 1994-2003 by Axel Kielhorn. All rights reserved.
+%% Copyright (C) 1994-2020 by Axel Kielhorn. All rights reserved.
%% For additional copyright information see further down in this file.
%%
%% This file is to be used with the LaTeX2e system.
@@ -21,7 +21,7 @@
%%
%% Error reports in case of UNCHANGED versions to
%% Axel Kielhorn
-%% A.Kielhorn(a)web.de
+%% tex(a)axelkielhorn.de
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\ProvidesFile{uwasy.fd}%
- [2003/10/30 v2.0
+ [2020/01/19 v2.4
Wasy-2 symbol font definitions]
\DeclareFontFamily{U}{wasy}{}
\DeclareFontShape{U}{wasy}{m}{n}{%
@@ -52,6 +52,8 @@
\DeclareFontShape{U}{wasy}{b}{n}{ <-10> sub * wasy/m/n
<10-> wasyb10 }{}
\DeclareFontShape{U}{wasy}{bx}{n}{ <-> sub * wasy/b/n}{}
+\DeclareFontShape{U}{wasy}{m}{sl}{ <-> wasysl10 }{}
+\DeclareFontShape{U}{wasy}{m}{it}{ <-> sub * wasy/m/sl }{}
\endinput
%%
%% End of file `uwasyvar.fd'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/wasysym/wasysym.sty new/tex/latex/wasysym/wasysym.sty
--- old/tex/latex/wasysym/wasysym.sty 2006-01-13 01:11:21.000000000 +0100
+++ new/tex/latex/wasysym/wasysym.sty 2020-01-20 23:50:10.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% wasysym.dtx (with options: `package')
%%
-%% Copyright (C) 1994-2003 by Axel Kielhorn. All rights reserved.
+%% Copyright (C) 1994-2020 by Axel Kielhorn. All rights reserved.
%% For additional copyright information see further down in this file.
%%
%% This file is to be used with the LaTeX2e system.
@@ -21,7 +21,7 @@
%%
%% Error reports in case of UNCHANGED versions to
%% Axel Kielhorn
-%% A.Kielhorn(a)web.de
+%% tex(a)axelkielhorn.de
%%
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -40,16 +40,19 @@
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{wasysym}
- [2003/10/30 v2.0
+ [2020/01/19 v2.4
Wasy-2 symbol support package]
\newif\ifwasy@integrals
\newif\ifwasy@compatibility
+\newif\ifwasy@euro \wasy@eurotrue
\DeclareOption{compat1}{%
\wasy@compatibilitytrue\wasy@integralsfalse}%
\DeclareOption{integrals}{%
\wasy@compatibilityfalse\wasy@integralstrue}%
\DeclareOption{nointegrals}{%
\wasy@compatibilityfalse\wasy@integralsfalse}%
+\DeclareOption{noeuro}{%
+ \wasy@eurofalse}%
\ExecuteOptions{compat1}
\ProcessOptions\relax
\def\wasy@setup{%
@@ -210,7 +213,7 @@
\def\thorn {{\wasyfamily\char105}}
\def\Thorn {{\wasyfamily\char106}}
\DeclareTextCommand{\dh}{OT1}{{\wasyfamily\char107}}
-\DeclareTextCommand{\DH}{OT1}{\leavevmode{\rm\setbox0\hbox{D}%
+\DeclareTextCommand{\DH}{OT1}{\leavevmode{\setbox0\hbox{D}%
\hbox to\wd0{\kern 0.04em\char32\hss D}}}
\def\openo {{\wasyfamily\char108}}
\def\inve {{\wasyfamily\char85}}
@@ -256,6 +259,16 @@
\@ifpackageloaded{amsmath}{\wasy@amssetup}{\wasy@setup}
\fi
}
+\def \wasyparagraph {{\wasyfamily\char"4D}}
+\def \wasyeuro {{\wasyfamily\char"4E}}
+\def \wasycmd {{\wasyfamily\char"53}}
+\ifwasy@euro
+ \let \euro\wasyeuro
+\fi
+\let \Paragraph\wasyparagraph
+\let \applecmd\wasycmd
+\def \longs {{\wasyfamily\char"54}}
+\def \roundz {{\wasyfamily\char"4F}}
\endinput
%%
%% End of file `wasysym.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/wasysym.tlpobj new/tlpkg/tlpobj/wasysym.tlpobj
--- old/tlpkg/tlpobj/wasysym.tlpobj 2019-02-28 04:14:57.000000000 +0100
+++ new/tlpkg/tlpobj/wasysym.tlpobj 2020-03-04 23:55:08.000000000 +0100
@@ -1,19 +1,19 @@
name wasysym
category Package
-revision 15878
-shortdesc LaTeX support file to use the WASY2 fonts
+revision 54080
+shortdesc LaTeX support for the wasy fonts
relocated 1
-longdesc The WASY2 (Waldi Symbol) font by Roland Waldi provides many
+longdesc The wasy (Waldi Symbol) font by Roland Waldi provides many
longdesc glyphs like male and female symbols and astronomical symbols,
longdesc as well as the complete lasy font set and other odds and ends.
-longdesc The wasysym package implements an easy to use interface for
-longdesc these symbols.
+longdesc This package implements an easy to use interface for these
+longdesc symbols.
runfiles size=5
RELOC/tex/latex/wasysym/uwasy.fd
RELOC/tex/latex/wasysym/uwasyvar.fd
RELOC/tex/latex/wasysym/wasysym.sty
+catalogue-also wasy wasy-type1
catalogue-ctan /macros/latex/contrib/wasysym
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-license lppl1.3c
catalogue-topics font-supp
-catalogue-version 2.0
+catalogue-version 2.4
++++++ web.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tangle.1 new/texmf-dist/doc/man/man1/tangle.1
--- old/texmf-dist/doc/man/man1/tangle.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tangle.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TANGLE 1 "16 June 2015" "Web2C 2019"
+.TH TANGLE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/tangle.man1.pdf and new/texmf-dist/doc/man/man1/tangle.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/weave.1 new/texmf-dist/doc/man/man1/weave.1
--- old/texmf-dist/doc/man/man1/weave.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/weave.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH WEAVE 1 "16 June 2015" "Web2C 2019"
+.TH WEAVE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/weave.man1.pdf and new/texmf-dist/doc/man/man1/weave.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/web.doc.tlpobj new/tlpkg/tlpobj/web.doc.tlpobj
--- old/tlpkg/tlpobj/web.doc.tlpobj 2019-03-27 02:29:19.000000000 +0100
+++ new/tlpkg/tlpobj/web.doc.tlpobj 2020-03-04 23:55:08.000000000 +0100
@@ -1,6 +1,6 @@
name web.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of web
docfiles size=16
texmf-dist/doc/man/man1/tangle.1
++++++ widetable.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/widetable/README new/doc/latex/widetable/README
--- old/doc/latex/widetable/README 2018-12-14 22:56:06.000000000 +0100
+++ new/doc/latex/widetable/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,17 +0,0 @@
-Package widetable version 1.x dated 2018
-
-This small package is intended to be a second resource when typesetting
-tables that would look a little better if they were set with a specified width.
-It differs from tabularX since here all cells are widened by working on the
-inter column glue, not on the measure of certain specified textual cells as
-it is done with tabularX.
-
-
- 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
- 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.
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/widetable/README.txt new/doc/latex/widetable/README.txt
--- old/doc/latex/widetable/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/widetable/README.txt 2020-01-15 22:46:31.000000000 +0100
@@ -0,0 +1,35 @@
+Package widetable version 2.x dated 2020
+
+This small package is intended to be a second resource when typesetting
+tables that would look a little better if they were set with a specified width.
+It differs from tabularX since here all cells are widened by working on the
+inter column glue, not on the measure of certain specified textual cells as
+it is done with tabularX.
+
+
+ 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 2003/12/01 or later.
+
+ This work has the LPPL maintenance status "maintained".
+
+ The Current Maintainer of this work is Claudio Beccari
+ claudio dot beccari at gmail dot com
+
+
+ The list of derived (unpacked) files belonging to the distribution
+ and covered by LPPL is defined by the unpacking scripts (with
+ extension .ins) which are part of the distribution.
+
+The main file of this work is
+ widteable.dtx (autoextracting .dtx file)
+The derived files are
+ widetable.pdf (obtained by pdflatexing widetale.dtx)
+ widetable.sty (same as above)
+
+Claudio Beccari
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/widetable/manifest.txt new/doc/latex/widetable/manifest.txt
--- old/doc/latex/widetable/manifest.txt 2018-12-14 22:56:06.000000000 +0100
+++ new/doc/latex/widetable/manifest.txt 2020-01-15 22:46:31.000000000 +0100
@@ -1,4 +1,4 @@
-Package widetable, version 1.x dated 2018
+Package widetable, version 2.x dated 2019
This small package is intended to be a second resource when typesetting
tables that would look a little better if they were set with a specified width.
@@ -9,7 +9,7 @@
This work may be distributed and/or modified under the
- conditions of the LaTeX Project Public License, either version 1.3c
+ 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
@@ -19,16 +19,19 @@
This work has the LPPL maintenance status "maintained".
The Current Maintainer of this work is Claudio Beccari
+claudio dot beccari at gmail dot com
The list of all files belonging to the distribution is
given in this file `manifest.txt'.
-
+ The list of derived (unpacked) files belonging to the distribution
+ and covered by LPPL is defined by the unpacking scripts (with
+ extension .ins) which are part of the distribution.
+
The main file of this work is
- widteable.dtx (autoextracting .dtx file when processed by
- pdflatex)
+ widteable.dtx (autoextracting .dtx file)
The derived files are
- widetable.pdf
- widetable.sty
+ widetable.pdf (obtained by pdflatexing widetale.dtx)
+ widetable.sty (same as above)
Claudio Beccari
\ No newline at end of file
Binary files old/doc/latex/widetable/widetable.pdf and new/doc/latex/widetable/widetable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/widetable.doc.tlpobj new/tlpkg/tlpobj/widetable.doc.tlpobj
--- old/tlpkg/tlpobj/widetable.doc.tlpobj 2019-02-28 04:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/widetable.doc.tlpobj 2020-01-16 01:55:24.000000000 +0100
@@ -1,9 +1,9 @@
name widetable.doc
category Package
-revision 49416
+revision 53409
shortdesc doc files of widetable
relocated 1
-docfiles size=103
- RELOC/doc/latex/widetable/README
+docfiles size=116
+ RELOC/doc/latex/widetable/README.txt
RELOC/doc/latex/widetable/manifest.txt
RELOC/doc/latex/widetable/widetable.pdf
++++++ widetable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/widetable/widetable.sty new/tex/latex/widetable/widetable.sty
--- old/tex/latex/widetable/widetable.sty 2018-12-14 22:56:06.000000000 +0100
+++ new/tex/latex/widetable/widetable.sty 2020-01-15 22:46:31.000000000 +0100
@@ -7,102 +7,46 @@
%% widetable.dtx (with options: `package')
%% ______________________________________________________
%% The WIDETABLE bundle
-%% Copyright (C) 2009-2018 Claudio Beccari
+%% Copyright (C) 2009-2020 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-
-\ProvidesPackage{widetable}%
- [2018-12-14 v.1.5 Package for typesetting specified width tables]
\NeedsTeXFormat{LaTeX2e}[2018/01/01]
-\AtBeginDocument{%
- \@ifpackageloaded{array}{}{\RequirePackage{array}}%
- }
-\dimendef\wt@Numer=2
-\dimendef\wt@Denom=4
-\countdef\wt@Num=2
-\countdef\wt@Den=4
-\RequirePackage{xparse}
-\newcommand\WT@scale[4]{\begingroup
-\wt@Num #2\relax \wt@Den #3\relax
-\ifnum#3=\z@
- \@tempdima\ifnum#2<0-\fi\maxdimen
-\else
- \@tempdima\dimexpr#1*#2/#3\relax
-\fi
-\edef\x{\noexpand\endgroup\noexpand\setlength{#4}{\the\@tempdima}}%
-\x}
-\newdimen\wt@width
-\newif\ifwt@scartare\wt@scartarefalse
+\ProvidesPackage{widetable}%
+ [2020-01-13 v.2.1 Package for typesetting specified width tables]
-\DeclareDocumentCommand\widetable{m O{c} m}
-{% OPENING WIDETABLE
- \def\@tempC{widetable}%
- \setlength{\wt@width}{#1}%
- \def\wt@preamble{#3}%
- \def\wt@starttabular{\tabular[#2]{#3}}%
- \wt@getTable}%
-\def\endwidetable{% CLOSING WIDETABLE
- \ifwt@scartare
- \noindent\null
- \else
+\RequirePackage{xparse}[2019-05-01]
+\DeclareDocumentEnvironment{widetabular}{m O{c} m +b}
+{% OPENING WIDETABLE COMMANDS
+}%
+{% CLOSING WIDETABLE
+ \dimen0=#1 % required width
\tabcolsep=\z@
- \setbox\z@=\hbox{\wt@starttabular\the\toks@\endtabular}%
+ \setbox\z@=\hbox{\tabular{#3}#4\endtabular}%
\tabcolsep=6pt\relax
- \setbox\tw@=\hbox{\wt@starttabular\the\toks@\endtabular}%
- \ifdim\wt@width<\wd\z@
- \@tempdimb=\dimexpr\wd\tw@-\wd\z@\relax
- \PackageWarning{widetable}{%
- The natural width \the\wd\z@ \space of the tabular\MessageBreak
- material is larger than the specified width
- \the\wt(a)width.\MessageBreak\MessageBreak
- The table is typeset with the default\MessageBreak
- column spacing}%
+ \setbox\tw@=\hbox{\tabular{#3}#4\endtabular}%
+ \ifdim\dimen0>\wd\z@
+ \tabcolsep=%
+ \dimexpr\tabcolsep*(\dimen0-\wd\z@)/(\wd\tw@-\wd\z@)\relax
\else
- \@tempdimb=\dimexpr\wt@width-\wd\z@\relax
+ \ifdim\dimen0<\wd\z@
+ \PackageWarning{widetable}{%
+ The minimum width of the tabular material\MessageBreak
+ amounts to \the\wd\z@, and is larger\MessageBreak
+ than the required width of \the\dimen0\MessageBreak
+ \MessageBreak
+ The table is typeset with the default\MessageBreak
+ column spacing}%
+ \fi
\fi
- \@tempdimc=\dimexpr\wd\tw@-\wd\z@\relax
- \WT@scale{\tabcolsep}{\@tempdimb}{\@tempdimc}{\tabcolsep}\relax
- \wt@starttabular\the\toks@\endtabular
- \fi
+ \tabular[#2]{#3}#4\endtabular
\ignorespacesafterend
}
-
-\def\wt@finetabella{\end{widetable}}%
-
-\def\wt@getTable#1\end#2{\def\@tempB{#2}%
- \ifx\@tempB\@tempC
- \toks@={#1}%
- \expandafter\wt@finetabella
- \else
- \PackageWarning{widetable}{%
- The table contains environment `\@tempB' %
- \MessageBreak
- not enclosed in braces. This is expressly forbidden!%
- \MessageBreak
- The table is not typeset and is substituted%
- \MessageBreak
- with a framed box}%
- \advance\wt@width-2\fboxsep
- \noindent\fbox{\parbox{\wt@width}{The table was not typeset
- because it contains a visible \texttt{\char`\\end} in one
- or more cells.}}\par
- \expandafter\wt@finishTable
- \fi
-}
-
-\def\wt@finishTable#1\end#2{%
- \def\@tempB{#2}%
- \ifx\@tempB\@tempC
- \wt@scartaretrue\expandafter\wt@finetabella
- \else
- \expandafter\wt@finishTable
- \fi
-}
+\let\widetable\widetabular \let\endwidetable\endwidetabular
%%
-%% Copyright 2009-2017 Claudio Beccari
+%% Copyright 2009-2020 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
@@ -115,9 +59,8 @@
%% widetable.sty and widetable.pdf.
%%
%%
-%% By running pdflatex on widetable.dtx the user gets the sty
-%% file and the English documentation file in
-%% PDF format.
+%% By running pdflatex on widetable.dtx the user gets both
+%% the sty file and the English documentation PDF file.
%%
%%
%% End of file `widetable.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/widetable.tlpobj new/tlpkg/tlpobj/widetable.tlpobj
--- old/tlpkg/tlpobj/widetable.tlpobj 2019-02-28 04:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/widetable.tlpobj 2020-01-16 01:55:24.000000000 +0100
@@ -1,6 +1,6 @@
name widetable
category Package
-revision 49416
+revision 53409
shortdesc An environment for typesetting tables of specified width
relocated 1
longdesc The package defines a new environment that, unlike tabularX,
@@ -12,7 +12,6 @@
runfiles size=1
RELOC/tex/latex/widetable/widetable.sty
catalogue-ctan /macros/latex/contrib/widetable
-catalogue-date 2018-12-14 16:36:59 +0100
catalogue-license lppl1.3
catalogue-topics table-long
-catalogue-version 1.5
+catalogue-version 2.1
++++++ widows-and-orphans.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/widows-and-orphans/README.md new/doc/latex/widows-and-orphans/README.md
--- old/doc/latex/widows-and-orphans/README.md 2018-11-19 22:52:01.000000000 +0100
+++ new/doc/latex/widows-and-orphans/README.md 2020-01-23 18:54:31.000000000 +0100
@@ -14,7 +14,7 @@
https://github.com/FrankMittelbach/fmitex/
-The license is LPPL.
+The license is LPPL 1.3c.
A general discussion on how to manage widows and orphans can be found in a TugBoat article located at
@@ -22,7 +22,7 @@
-----
-Copyright (C) 2018 Frank Mittelbach<br />
+Copyright (C) 2018-2020 Frank Mittelbach<br />
<https://latex-project.org/> <br />
All rights reserved.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/widows-and-orphans/changes.txt new/doc/latex/widows-and-orphans/changes.txt
--- old/doc/latex/widows-and-orphans/changes.txt 2018-11-19 22:52:01.000000000 +0100
+++ new/doc/latex/widows-and-orphans/changes.txt 2020-01-23 18:54:31.000000000 +0100
@@ -1,3 +1,9 @@
+2020-01-22 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * widows-and-orphans.dtx:
+
+ Version 1.0c was a maintenance release without any code changes.
+
2018-11-18 <Frank.Mittelbach(a)latex-project.org>
* widows-and-orphans.dtx: Surplus open parenthese in message,
Binary files old/doc/latex/widows-and-orphans/widows-and-orphans-code.pdf and new/doc/latex/widows-and-orphans/widows-and-orphans-code.pdf differ
Binary files old/doc/latex/widows-and-orphans/widows-and-orphans-doc.pdf and new/doc/latex/widows-and-orphans/widows-and-orphans-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/widows-and-orphans.doc.tlpobj new/tlpkg/tlpobj/widows-and-orphans.doc.tlpobj
--- old/tlpkg/tlpobj/widows-and-orphans.doc.tlpobj 2019-02-28 04:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/widows-and-orphans.doc.tlpobj 2020-01-24 01:57:34.000000000 +0100
@@ -1,9 +1,9 @@
name widows-and-orphans.doc
category Package
-revision 49194
+revision 53505
shortdesc doc files of widows-and-orphans
relocated 1
-docfiles size=200
+docfiles size=212
RELOC/doc/latex/widows-and-orphans/README.md
RELOC/doc/latex/widows-and-orphans/changes.txt
RELOC/doc/latex/widows-and-orphans/widows-and-orphans-code.pdf
++++++ widows-and-orphans.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/widows-and-orphans/widows-and-orphans.sty new/tex/latex/widows-and-orphans/widows-and-orphans.sty
--- old/tex/latex/widows-and-orphans/widows-and-orphans.sty 2018-11-19 22:52:01.000000000 +0100
+++ new/tex/latex/widows-and-orphans/widows-and-orphans.sty 2020-01-23 18:54:31.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2017-2018 Frank Mittelbach
+%% Copyright 2017-2020 Frank Mittelbach
%%
%%
%% This file was generated from file(s) of the LaTeX windows-and-orphans Bundle.
@@ -20,18 +20,18 @@
%% The latest version of this license is in
%% https://www.latex-project.org/lppl/
%% and version 1.3c or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
+%% version 2008 or later.
%%
%% This file may only be distributed together with a copy of the LaTeX
%% windows-and-orphans Bundle. You may however distribute the Bundle
%% without such generated files.
%%
%%
-%% File: widows-and-orphans.dtx (C) Copyright 2017-2018 Frank Mittelbach
+%% File: widows-and-orphans.dtx (C) Copyright 2017-2020 Frank Mittelbach
\NeedsTeXFormat{LaTeX2e} \RequirePackage{xparse,l3keys2e}
-\ProvidesExplPackage{widows-and-orphans}{2018/11/18}{v1.0b}
+\ProvidesExplPackage{widows-and-orphans}{2020/01/22}{v1.0c}
{Detecting widows and orphans (FMi)}
\tl_put_left:Nn \@makecol { \__fmwao_test_for_widows_etc: }
\bool_new:N \g__fmwao_gen_warn_bool
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/widows-and-orphans.tlpobj new/tlpkg/tlpobj/widows-and-orphans.tlpobj
--- old/tlpkg/tlpobj/widows-and-orphans.tlpobj 2019-02-28 04:14:59.000000000 +0100
+++ new/tlpkg/tlpobj/widows-and-orphans.tlpobj 2020-01-24 01:57:35.000000000 +0100
@@ -1,6 +1,6 @@
name widows-and-orphans
category Package
-revision 49194
+revision 53505
shortdesc Identify (typographic) widows and orphans
relocated 1
longdesc This package identifies all widows and orphans in a document to
@@ -13,10 +13,8 @@
runfiles size=3
RELOC/tex/latex/widows-and-orphans/widows-and-orphans.sty
catalogue-also nowidow
-catalogue-contact-bugs https://github.com/FrankMittelbach/fmitex/issues
catalogue-contact-repository https://github.com/FrankMittelbach/fmitex
catalogue-ctan /macros/latex/contrib/widows-and-orphans
-catalogue-date 2018-11-18 22:31:10 +0100
catalogue-license lppl1.3c
catalogue-topics layout
-catalogue-version 1.0b
+catalogue-version 1.0c
++++++ windycity.doc.tar.xz ++++++
++++ 12367 lines of diff (skipped)
++++++ windycity.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/windycity/american-windycity.lbx new/tex/latex/windycity/american-windycity.lbx
--- old/tex/latex/windycity/american-windycity.lbx 2019-04-03 23:39:37.000000000 +0200
+++ new/tex/latex/windycity/american-windycity.lbx 2019-07-18 22:39:56.000000000 +0200
@@ -1,4 +1,4 @@
-% Last modified: Tue 02 Apr 2019 01:51:01 PM CDT
+% Last modified: Wed 17 Jul 2019 09:45:17 AM CDT
% Copyright (c) 2018 Brian Michael Chase.
%
@@ -13,29 +13,111 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{american-windycity.lbx}[2019/04/02 Windy City
+\ProvidesFile{american-windycity.lbx}[2019/07/17 Windy City
localization module for biblatex]
\InheritBibliographyExtras{american}
\InheritBibliographyStrings{american}
-% The code below comes from english.lbx. The only change is to remove
-% '\parentext{}' from '\mkbibtimezone{\thefield{#4}'.
-
\DeclareBibliographyExtras{%
+% Slightly modified from english.lbx:
\expandafter\protected\expandafter\def\csname mkbibtime12h\endcsname#1#2#3#4{%
- \stripzeros{\mktimehh{\thefield{#1}}}%
+ \addcomma\space
+ \stripzeros{\mktimehh{\thefield{#1}}}% needs '%'
\bibtimesep
\forcezerosmdt{\thefield{#2}}%
\iffieldundef{#3}{}
{\bibtimesep
- \forcezerosmdt{\thefield{#3}}}%
+ \forcezerosmdt{\thefield{#3}}}% needs '%'
\space
\ifnumless{\thefield{#1}}{12}
- {\bibstring{am}}
+ {\bibstring{am}}%
{\bibstring{pm}}%
\iffieldundef{#4}{}
{\space\bibtimezonesep
- \mkbibtimezone{\thefield{#4}}}}%
+ \mkbibtimezone{\thefield{#4}}}}% needs '%'
+% Overrides version in windycity.bbx:
+ \protected\def\mkdaterangefull#1#2{%
+ \begingroup
+ \blx@metadateinfo{#2}%
+ \ifboolexpr{ test {\iffieldundef{#2year}}
+ and test {\iffieldundef{#2month}}}
+ {\blx@nounit}%
+ {\ifboolexpr{ test {\iffieldundef{#2endyear}}
+ and test {\iffieldundef{#2endmonth}}}
+ {\printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}}}
+ {\iffieldundef{#2year}
+ {\iffieldundef{#2day}
+ {\csuse{mkmonthrange}{#1}{#2}}%
+ {\csuse{mkmonthdayrange}{#1}{#2}}}
+ {\iffieldsequal{#2year}{#2endyear}
+ {\iffieldundef{#2day}
+ {\csuse{mkmonthrange}{#1}{#2}}%
+ {\csuse{mkmonthdayrange}{#1}{#2}}}
+ {\csuse{mkmonthdayyearrange}{#1}{#2}}}}}% needs '%'
+ \endgroup}%
+% For ranges of months with no year (June--August) and months in the
+% same year (June--August 2001). Also applies to articles with
+% two-month publication dates, both with a year (June/July 2001) and
+% without (June/July).
+ \protected\def\mkmonthrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \csuse{mkbibdate#1}{}{#2month}{}%
+ \dateuncertainprint
+ \ifboolexpr{ test {\ifentrytype{article}}
+ and test {\ifstrequal{#2}{}}}
+ {\ifnumcomp{\thefield{#2endmonth} - \thefield{#2month}}{=}{1}
+ {\addslash}%
+ {\bibdaterangesep}}%
+ {\bibdaterangesep}%
+ \enddatecircaprint
+ \csuse{mkbibdate#1}{#2endyear}{#2endmonth}{}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}
+% For ranges of days and months with no year (June 3--July 1), days
+% in the same month and year (June 3--4, 2001), and days and months in
+% the same year (June 3--July 1, 2001):
+ \protected\def\mkmonthdayrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \csuse{mkbibdate#1}{}{#2month}{#2day}%
+ \blx@printtime{#2}{}%
+ \dateuncertainprint
+ \bibdaterangesep
+ \enddatecircaprint
+ \iffieldsequal{#2month}{#2endmonth}
+ {\csuse{mkbibdate#1}{#2endyear}{}{#2endday}}%
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}}%
+ \blx@printtime{#2}{end}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}
+% For ranges of days, months, and years (June 3, 2001--July 1, 2002):
+ \protected\def\mkmonthdayyearrange#1#2{%
+ \printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}%
+ {\bibdaterangesep
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \blx@printtime{#2}{end}}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}
}
\NewBibliographyString{by}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/windycity/windycity.bbx new/tex/latex/windycity/windycity.bbx
--- old/tex/latex/windycity/windycity.bbx 2019-04-03 23:39:37.000000000 +0200
+++ new/tex/latex/windycity/windycity.bbx 2019-07-18 22:39:56.000000000 +0200
@@ -1,4 +1,4 @@
-% Last modified: Tue 02 Apr 2019 02:13:22 PM CDT
+% Last modified: Wed 17 Jul 2019 09:44:45 AM CDT
% Copyright (c) 2019 Brian Michael Chase.
%
@@ -13,7 +13,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.bbx}[2019/04/02 Windy City bibliography style
+\ProvidesFile{windycity.bbx}[2019/07/17 Windy City bibliography style
for biblatex]
\@ifpackagelater{biblatex}{2017/11/04}
{}
@@ -168,7 +168,14 @@
useprefix=false,
usetranslator=true}
+% If a document's language is English, set by babel or polyglossia or
+% by biblatex when neither babel nor polyglossia has been loaded, use
+% 'american-windycity.lbx':
\DeclareLanguageMapping{english}{american-windycity}
+% If the document's language isn't English, try to override
+% 'american-windycity.lbx' with '<language>-windycity.lbx':
+\DeclareLanguageMappingSuffix{-windycity}
+
\DeclareLabeldate{% 'reflist' preamble option loads an alternative
\field{bookyear}
\field{date}
@@ -1346,12 +1353,45 @@
%% Dates and Times %%
%%%%%%%%%%%%%%%%%%%%%%%
+% The next command should work well enough for most languages but can
+% be overridden by lbx files. This happens when windycity.bbx loads
+% american-windycity.lbx.
+
+\renewcommand*{\mkdaterangefull}[2]{%
+ \begingroup
+ \blx@metadateinfo{#2}%
+ \ifboolexpr{ test {\iffieldundef{#2year}}
+ and test {\iffieldundef{#2month}}}
+ {\blx@nounit}%
+ {\printtext[#2date]{%
+ \datecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2year}{#2month}{#2day}%
+ \blx@printtime{#2}{}}%
+ {\csuse{mkbibseasondate#1}{#2year}{#2season}}%
+ \dateuncertainprint
+ \dateeraprint{#2year}%
+ \ifboolexpr{ test {\iffieldundef{#2endyear}}
+ and test {\iffieldundef{#2endmonth}}}
+ {}
+ {\iffieldequalstr{#2endyear}{}
+ {\mbox{\bibdaterangesep}}%
+ {\bibdaterangesep
+ \enddatecircaprint
+ \iffieldundef{#2season}
+ {\csuse{mkbibdate#1}{#2endyear}{#2endmonth}{#2endday}%
+ \blx@printtime{#2}{end}}%
+ {\csuse{mkbibseasondate#1}{#2endyear}{#2endseason}}%
+ \enddateuncertainprint
+ \dateeraprint{#2endyear}}}}}% needs '%'
+ \endgroup}%
+
\newbibmacro*{issue+month+etc}[1]{%
\iffieldundef{year}
{\iffieldundef{month}
{}
{\setunit{\space}%
- \printtext[parens]{\usebibmacro{month+endmonth}}}}
+ \printtext[parens]{\printdate}}}
{\ifboolexpr{ test {\iffieldundef{volume}}
and test {\iffieldundef{number}}}
{\iffieldundef{journal}
@@ -1359,61 +1399,30 @@
{\setunit{\addcomma\space}}%
\iffieldundef{month}
{\usebibmacro{issue+season+year}}%
- {\usebibmacro{month+day+year}}}
+ {\usebibmacro{reflist+year+day}%
+ \printdate}}%
{\iffieldundef{month}
{\setunit{\space}%
\usebibmacro{reflist+issue+season}}%
{\ifstrequal{#1}{noparens}
- {\newunit
- \usebibmacro{month+day+year}}%
- {\setunit{\space}%
- \printtext[parens]{%
- \usebibmacro{month+day+year}}}}}}}
-
-\newbibmacro*{month+day+year}{%
- \usebibmacro{month+endmonth}%
- \usebibmacro{reflist+day+year}}%
-
-\newbibmacro*{month+endmonth}{%
- \iffieldundef{month}
- {}
- {\printfield{month}%
- \ifboolexpr{ test {\iffieldundef{endmonth}}
- or test {\iffieldsequal{month}{endmonth}}}
- {}
- {\addslash\printfield{endmonth}}}}
+ {\usebibmacro{reflist+year+day}%
+ \newunit
+ \printdate}%
+ {\usebibmacro{reflist+year+day}%
+ \setunit{\space}%
+ \printtext[parens]{\printdate}}}}}}
-\newbibmacro*{reflist+day+year}{%
+\newbibmacro*{reflist+year+day}{%
\ifboolexpr{ togl {bibliography}
- and togl {reflist}}
- {\iffieldundef{day}
- {}
- {\usebibmacro{day+endday+year}}}
- {\iffieldundef{day}
- {\addspace
- \printfield{year}}%
- {\usebibmacro{day+endday+year}}}}
-
-\newbibmacro*{day+endday+year}{%
- \usebibmacro{day+endday}%
- \addcomma\space
- \printfield{year}%
- \usebibmacro{hour+minute+timezone}}%
-
-\newbibmacro*{day+endday}{%
- \iffieldundef{day}
- {}
- {\addspace
- \stripzeros{\thefield{day}}%
- \iffieldundef{endday}
- {}
- {\textendash\stripzeros{\thefield{endday}}}}}
-
-\newbibmacro*{hour+minute+timezone}{%
- \iffieldundef{hour}
- {}
- {\addcomma\space
- \printtime}}%
+ and togl {reflist}
+ and test {\iffieldundef{day}}}
+ {\iffieldundef{endyear}
+ {\clearfield{year}}%
+ {\iffieldsequal{year}{endyear}
+ {\clearfield{year}%
+ \clearfield{endyear}}%
+ {}}}
+ {}}
% Treat 'season' as an alternative for 'issue'.
@@ -1818,7 +1827,8 @@
\setunit{\addcomma\space}%
\printlist{location}%
\setunit{\addcomma\space}%
- \usebibmacro{month+day+year}}%
+ \usebibmacro{reflist+year+day}%
+ \printdate}%
%%%%%%%%%%%%%%%%%%%%%%%%%
%% Third Tier Macros %%
@@ -1986,7 +1996,8 @@
\ifboolexpr{ test {\iflistundef{location}}
and test {\iflistundef{publisher}}}
{\newunit
- \usebibmacro{month+day+year}}%
+ \usebibmacro{reflist+year+day}%
+ \printdate}%
{\iffieldundef{origtitle}
{\iftoggle{bibliography}
{\newunit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/windycity/windycity.cbx new/tex/latex/windycity/windycity.cbx
--- old/tex/latex/windycity/windycity.cbx 2019-04-03 23:39:37.000000000 +0200
+++ new/tex/latex/windycity/windycity.cbx 2019-07-18 22:39:56.000000000 +0200
@@ -1,4 +1,4 @@
-% Last modified: Tue 02 Apr 2019 11:43:21 AM CDT
+% Last modified: Wed 17 Jul 2019 09:44:59 AM CDT
% Copyright (c) 2019 Brian Michael Chase.
%
@@ -13,7 +13,7 @@
% implied warranties of merchantability and fitness for a particular
% purpose.
-\ProvidesFile{windycity.cbx}[2019/04/02 Windy City citation style for
+\ProvidesFile{windycity.cbx}[2019/07/17 Windy City citation style for
biblatex]
\@ifpackagelater{biblatex}{2017/11/04}
{}
@@ -43,13 +43,6 @@
\AtEveryItem}%
\AtEveryMultiCite{\toggletrue{multicite}}%
-% To facilitate uniform output, citations in notes always end with
-% '\addperiod' (see cite:postnote). This makes '\footcite{something}'
-% and '\footnote{\cite{something}}' functionally equivalent. To
-% prevent an extra period from printing in very rare cases, as when
-% '\footcite{something}' ends with a capital letter, remove
-% '\addperiod' from the commands below:
-
\renewcommand{\bibfootnotewrapper}[1]{%
\bibsentence#1}%
\renewcommand{\bibendnotewrapper}[1]{%
@@ -131,6 +124,23 @@
\DeclareMultiCiteCommand{\smartcites}[\iffootnote{}\mkbibfootnote]
{\smartcite}{\multicitedelim}
+\DeclareCiteCommand{\textcite}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \usebibmacro{test:multicite}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
+
+\DeclareCiteCommand*{\textcite}
+ {\usebibmacro{prenote}}%
+ {\usebibmacro{citeindex}%
+ \toggletrue{noauth}%
+ \usebibmacro{test:multicite}%
+ \usebibmacro{cite}}%
+ {\multicitedelim}%
+ {\usebibmacro{postnote}}%
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Parenthetical Citations %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/windycity/windycity.sty new/tex/latex/windycity/windycity.sty
--- old/tex/latex/windycity/windycity.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/windycity/windycity.sty 2019-07-18 22:39:56.000000000 +0200
@@ -0,0 +1,281 @@
+% Last modified: Tue 16 Jul 2019 07:49:59 AM CDT
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{windycity}
+\RequirePackage{ifxetex}
+
+\setlength{\parindent}{1.1em}
+\frenchspacing
+\widowpenalty=1000
+\clubpenalty=1000
+
+\ifxetex
+ \usepackage{xltxtra}
+ \usepackage{xunicode}
+ \usepackage{fontspec}
+ \PassOptionsToPackage{unicode,xetex}{hyperref}
+ \defaultfontfeatures{Ligatures=TeX,Numbers={OldStyle,Proportional}}
+ \setmainfont[
+ Extension=.otf,
+ UprightFont=*-regular,
+ BoldFont=*-bold,
+ ItalicFont=*-italic,
+ BoldItalicFont=*-bolditalic]{texgyretermes}
+ \setmonofont[
+ Scale=0.96,
+ Numbers=Lining,
+ Extension=.otf,
+ UprightFont=*mono10-regular,
+ ItalicFont=*mono10-italic]{lm}
+ \renewcommand{\@makefnmark}{%
+ \hbox{\@textsuperscript{\liningnums{\@thefnmark}}}}
+\else
+ \usepackage[T1]{fontenc}
+ \usepackage{pifont}
+ \usepackage[full]{textcomp}
+ \usepackage[utf8]{inputenc}
+ \usepackage{tgtermes}
+ \usepackage[scaled=.90]{helvet}
+ \newcommand{\liningnums}[1]{#1}%
+ \renewcommand{\ttdefault}{lmtt}%
+\fi
+
+\gdef\@email{}%
+\gdef\@subtitle{}%
+\gdef\@version{}%
+\gdef\@website{}%
+\newcommand{\email}[1]{\gdef\@email{\mailto{#1}}}%
+\newcommand{\mailto}[1]{\href{mailto:#1}{#1}}
+\newcommand{\subtitle}[1]{\gdef\@subtitle{#1}}%
+\newcommand{\version}[1]{\gdef\@version{Version \liningnums{#1}}}
+%\newcommand{\website}[1]{\gdef\@website{\textcolor{blue}{\url{#1}}}}
+\newcommand{\website}[1]{\gdef\@website{\url{#1}}}%
+
+\renewcommand\@maketitle{%
+ \begin{center}%
+ {\LARGE\@title}%
+ \vskip 4ex%
+ {\Large\@subtitle}%
+ \vskip 4ex%
+ {\large\@author\par\@website\par\@email\par\@version\par\@date}%
+ \end{center}%
+ \vskip 4ex}%
+
+\usepackage[american]{babel}
+\usepackage{csquotes}
+\usepackage[style=windycity]{biblatex}
+\addbibresource{windycity.bib}
+\setcounter{biburlnumpenalty}{9000}
+\setcounter{biburllcpenalty}{9000}
+
+\renewcommand\@makefntext[1]{%
+ \parindent 1em%
+ \normalfont\(a)thefnmark.\hspace{0.4em}#1}%
+\newcommand{\nfootnote}[1]{%
+ \insert\footins{\normalfont\footnotesize
+ \interlinepenalty\interfootnotelinepenalty
+ \splittopskip\footnotesep
+ \splitmaxdepth \dp\strutbox \floatingpenalty \@MM
+ \hsize\columnwidth \@parboxrestore
+ \footnoterule
+ {\rule{\z@}{\footnotesep}\ignorespaces
+ #1\strut}}}
+
+\usepackage{tocloft}
+\setcounter{tocdepth}{2}
+\renewcommand{\cftbeforesecskip}{0pt}%
+\renewcommand{\cftmarktoc}{\@mkboth{\contentsname}{\contentsname}}%
+\renewcommand{\cftsecfont}{\normalfont}%
+\renewcommand{\cftsecpagefont}{\normalfont}%
+
+\usepackage{ragged2e}
+\usepackage[inline]{enumitem}
+\setlist[enumerate,itemize]{noitemsep}
+
+% Allow line breaks in '\item[]':
+\newcommand{\tshortstack}{\@ifnextchar[\@tshortstack{\@tshortstack[c]}}%
+\let\@tshortstack\@shortstack
+\patchcmd\@tshortstack\vbox\vtop{}{}%
+
+\newenvironment{citebib}
+ {\begin{enumerate}[%
+ before=\RaggedRight\citereset\newrefsegment\small,
+ itemindent=2.2em,
+ labelsep=0.2em,
+ leftmargin=1.1em]}%
+ {\end{enumerate}
+ \printbibliography[env=bib,heading=none,segment=\therefsegment]
+ \endrefsegment}%
+\newenvironment{citeref}
+ {\begin{itemize}[label=,labelsep=0.2em,leftmargin=1.1em]
+ \item\begin{enumerate*}[%
+ afterlabel=,
+ before=\citereset\newrefsegment\small\noindent,
+ itemjoin={{, }},
+ label=]}%
+ {\end{enumerate*}
+ \end{itemize}
+ \printbibliography[env=ref,heading=none,segment=\therefsegment]
+ \endrefsegment}%
+\newenvironment{citeonly}
+ {\begin{enumerate}[%
+ before=\RaggedRight\citereset\newrefsegment\small,
+ itemindent=2.2em,
+ labelsep=0.2em,
+ leftmargin=1.1em]}%
+ {\end{enumerate}}%
+\newenvironment{bibonly}
+ {\citereset\newrefsegment\small}%
+ {\printbibliography[env=bib,heading=none,segment=\therefsegment]
+ \endrefsegment}%
+\newenvironment{refonly}
+ {\citereset\newrefsegment\small}%
+ {\printbibliography[env=ref,heading=none,segment=\therefsegment]
+ \endrefsegment}%
+\defbibenvironment{bib}
+ {\list{}{%
+ \small
+ \setlength{\leftmargin}{2.2em}%
+ \setlength{\itemindent}{-1.1em}%
+ \itemsep 0\baselineskip
+ \parsep 0\baselineskip}}
+ {\endlist}
+ {\item}
+\defbibenvironment{ref}
+ {\global\toggletrue{reflist}%
+ \list{}{%
+ \small
+ \setlength{\leftmargin}{2.2em}%
+ \setlength{\itemindent}{-1.1em}%
+ \itemsep 0\baselineskip
+ \parsep 0\baselineskip}}
+ {\endlist
+ \global\togglefalse{reflist}}%
+ {\item}
+\defbibheading{none}{}%
+\DeclareSortingTemplate{reverse}{%
+ \sort[direction=descending]{\citeorder}}%
+
+\newcounter{sh}
+\renewcommand{\thesh}{Abbreviations}%
+\newcounter{bib}
+\renewcommand{\thebib}{Bibliography}%
+\newcounter{ref}
+\renewcommand{\theref}{References}%
+
+\defbibheading{biblist}{%
+ \newpage
+ \begin{center}\section*{Abbreviations}\end{center}
+ \addcontentsline{toc}{section}{Abbreviations}
+ \markright{Abbreviations}}%
+\defbibheading{bibliography}{%
+ \newpage
+ \begin{center}\section*{Bibliography (Standard Format)}\end{center}
+ \addcontentsline{toc}{section}{Bibliography (Standard Format)}
+ \markright{Bibliography}}%
+\defbibheading{references}{%
+ \newpage
+ \begin{center}\section*{References (Author-Date Format)}\end{center}
+ \addcontentsline{toc}{section}{References (Author-Date Format)}
+ \markright{References}}%
+\defbibheading{none}{}%
+
+\usepackage{fancyhdr}
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[LO,RE]{\small\rightmark}%
+\fancyhead[LE,RO]{\small\thepage}%
+\renewcommand{\headrulewidth}{0pt}%
+\renewcommand{\footrulewidth}{0pt}%
+\renewcommand{\sectionmark}[1]{\markright{\thesection.\ #1}}%
+\renewcommand{\subsectionmark}[1]{\markright{\thesubsection\ #1}}%
+
+\renewcommand{\cftsecleader}{\cftdotfill{\cftdotsep}}%
+\renewcommand*{\@seccntformat}[1]{%
+ \csname the#1\endcsname
+ \csname adddot@#1\endcsname\quad}%
+\newcommand*{\adddot(a)section}{.}%
+\renewcommand\thesubsubsection{%
+ \normalfont\arabic{subsection}.\@arabic\c@subsubsection}
+
+\renewcommand\section{\@startsection{section}{1}{\z@}%
+ {-3.5ex \@plus -1ex \@minus -.2ex}%
+ {2.3ex \(a)plus.2ex}%
+ {\normalfont\large\bfseries}}
+\renewcommand\subsection{\@startsection{subsection}{2}{\z@}%
+ {-3.5ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\bfseries}}%
+\renewcommand\subsubsection{\@startsection{subsubsection}{3}{\z@}%
+ {-4ex\@plus -1ex \@minus -.2ex}%
+ {1.5ex \@plus .2ex}%
+ {\normalfont\it}}
+
+\AtBeginEnvironment{quote}{\small}
+\AtBeginEnvironment{verbatim}{\small}
+\usepackage[%
+ anchorcolor=,
+ breaklinks=true,
+ citecolor=,
+ colorlinks=true,
+ linkcolor=blue,
+ pdfauthor={Brian Michael Chase},
+ pdftitle={Windy City for biblatex},
+ urlcolor=]{hyperref}
+\urlstyle{rm}
+\newcommand{\biblatex}{%
+ \href{http://www.ctan.org/pkg/biblatex}{\textcolor{blue}{biblatex}}\xspace}%
+\newcommand{\BibTeX}{{\rm B\kern-.05em{\sc i\kern-.025em b}\kern-.08em
+ \TeX}}%
+\emergencystretch=1em
+\hyphenation{bib-la-tex Chi-ca-go}
+\usepackage{btxdockit}% For \bibfield, \bibtype, \cmd, marglist, optionlist, \op, etc.
+\renewenvironment*{marglist}
+ {\list{}{%
+ \setlength{\labelwidth}{\marglistwidth}%
+% Commented next line for normal paragraphing:
+% \setlength{\labelsep}{\marglistsep}%
+ \setlength{\leftmargin}{0pt}%
+% Added next line for normal paragraphing:
+ \setlength{\parsep}{0pt}%
+ \setlength{\listparindent}{\parindent}%
+ \renewcommand*{\makelabel}[1]{\hss\marglistfont##1}}}
+ {\endlist}
+\renewenvironment*{optionlist}
+ {\list{}{%
+ \setlength{\labelwidth}{\marglistwidth}%
+ \setlength{\labelsep}{\z@}%
+% Added next two lines for normal paragraphing:
+ \setlength{\leftmargin}{0pt}%
+ \setlength{\parsep}{0pt}%
+ \setlength{\listparindent}{\parindent}%
+ \renewcommand*{\makelabel}[1]{\hss\optionlistfont##1}}%
+ \ltd@optionlist}
+ {\endlist}
+\renewenvironment*{typelist}
+ {\list{}{%
+ \setlength{\labelwidth}{\marglistwidth}%
+ \setlength{\labelsep}{\marglistsep}%
+ \setlength{\leftmargin}{0pt}%
+% Added next line for less vertical space:
+ \setlength{\itemsep}{0pt}%
+ \renewcommand*{\makelabel}[1]{\hss\marglistfont##1}}%
+ \def\typeitem##1{%
+ \item[{##1}]%
+ \ltd@pdfbookmark{##1}{##1}}%
+ \def\reqitem{%
+ \par\begingroup\itemsep0.5\itemsep\item
+ Required fields: \btd@fieldloop}
+ \def\optitem{%
+ \par\begingroup\itemsep0.5\itemsep\item
+ Optional fields: \btd@fieldloop}}
+ {\endlist}
+\lstset{basicstyle=\small\ttfamily}
+\renewcommand{\bibfield}[1]{\emph{#1}}%
+\renewcommand{\bibtype}[1]{\emph{#1}}% Don't affix with '@'!
+\renewcommand{\cmd}[1]{\textbackslash\emph{#1}}%
+\renewcommand{\env}[1]{\emph{#1}}%
+\renewcommand{\file}[1]{\emph{#1}}%
+\renewcommand{\opt}[1]{\emph{#1}}%
+\renewcommand{\sty}[1]{\emph{#1}}%
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/windycity.tlpobj new/tlpkg/tlpobj/windycity.tlpobj
--- old/tlpkg/tlpobj/windycity.tlpobj 2019-04-04 01:24:57.000000000 +0200
+++ new/tlpkg/tlpobj/windycity.tlpobj 2019-07-20 01:53:30.000000000 +0200
@@ -1,21 +1,21 @@
name windycity
category Package
-revision 50736
+revision 51668
shortdesc A Chicago style for BibLaTeX
relocated 1
longdesc Windy City is a style for BibLaTeX that formats notes,
longdesc bibliographies, parenthetical citations, and reference lists
longdesc according to the 17th edition of The Chicago Manual of Style.
-runfiles size=24
+runfiles size=28
RELOC/tex/latex/windycity/american-windycity.lbx
RELOC/tex/latex/windycity/windycity.bbx
RELOC/tex/latex/windycity/windycity.cbx
RELOC/tex/latex/windycity/windycity.dbx
+ RELOC/tex/latex/windycity/windycity.sty
catalogue-also biblatex-chicago
catalogue-contact-bugs https://github.com/brianchase/windycity/issues
-catalogue-contact-home https://github.com/brianchase/windycity
catalogue-contact-repository https://github.com/brianchase/windycity
catalogue-ctan /macros/latex/contrib/biblatex-contrib/windycity
-catalogue-date 2019-04-03 11:01:15 +0200
+catalogue-date 2019-07-17 19:42:22 +0200
catalogue-license lppl1.3
catalogue-topics biblatex
++++++ withargs.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/withargs/README new/doc/latex/withargs/README
--- old/doc/latex/withargs/README 2016-12-20 23:55:13.000000000 +0100
+++ new/doc/latex/withargs/README 2019-11-04 23:17:41.000000000 +0100
@@ -1,6 +1,6 @@
-LaTeX Package : withargs 0.2.0
+LaTeX Package : withargs 0.3.1
-Last Modified : 2016-12-19
+Last Modified : 2019-11-04
Author : Michiel Helvensteijn (www.mhelvens.net)
Binary files old/doc/latex/withargs/withargs.pdf and new/doc/latex/withargs/withargs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/withargs/withargs.tex new/doc/latex/withargs/withargs.tex
--- old/doc/latex/withargs/withargs.tex 2016-12-20 23:55:13.000000000 +0100
+++ new/doc/latex/withargs/withargs.tex 2019-11-04 23:17:41.000000000 +0100
@@ -30,6 +30,20 @@
withargs:nn,withargs:cn
}
+% Ugly hack, because of the unfortunate deprecation of 'n' to 'c' conversion,
+% plus the fact that kernel errors, even non-fatal ones, cannot be redirected.
+% Will think of a better solution at some point, but not now.
+\ExplSyntaxOn
+\let\__withargs_docs_old_kernel_msg_error:nnnnnn\__kernel_msg_error:nnnnnn
+\def\__kernel_msg_error:nnnnnn#1#2{
+ \str_if_eq:nnTF { #1/#2 } { kernel/deprecated-variant }{
+ \__kernel_msg_warning:nnnnnn{#1}{#2}
+ }{
+ \__withargs_docs_old_kernel_msg_error:nnnnnn{#1}{#2}
+ }
+}
+\ExplSyntaxOff
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Global Changes %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -46,6 +60,9 @@
\changes{0.2.0}{2016/12/19}
{adjusted code to new version of expl3}
+\changes{0.3.1}{2019/11/04}
+ {adjusted code to new version of expl3}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document} %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/withargs.doc.tlpobj new/tlpkg/tlpobj/withargs.doc.tlpobj
--- old/tlpkg/tlpobj/withargs.doc.tlpobj 2019-02-28 04:15:11.000000000 +0100
+++ new/tlpkg/tlpobj/withargs.doc.tlpobj 2019-11-05 01:54:30.000000000 +0100
@@ -1,6 +1,6 @@
name withargs.doc
category Package
-revision 42756
+revision 52641
shortdesc doc files of withargs
relocated 1
docfiles size=120
++++++ withargs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/withargs/withargs.sty new/tex/latex/withargs/withargs.sty
--- old/tex/latex/withargs/withargs.sty 2016-12-20 23:55:13.000000000 +0100
+++ new/tex/latex/withargs/withargs.sty 2019-11-04 23:17:41.000000000 +0100
@@ -17,7 +17,7 @@
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% \fi %%%%
-% \CheckSum{117}
+% \CheckSum{116}
%
% \CharacterTable
% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
@@ -46,7 +46,7 @@
% \begin{macrocode}
\NeedsTeXFormat{LaTeX2e}
\RequirePackage{expl3}
-\ProvidesExplPackage{withargs}{2016/12/19}{0.2.0}
+\ProvidesExplPackage{withargs}{2019/11/04}{0.3.1}
{an inline construct for passing token lists as TeX parameters}
% \end{macrocode}
%
@@ -66,7 +66,6 @@
%
% \begin{macrocode}
\RequirePackage{xparse}
-\RequirePackage{l3regex}
% \end{macrocode}
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/withargs.tlpobj new/tlpkg/tlpobj/withargs.tlpobj
--- old/tlpkg/tlpobj/withargs.tlpobj 2019-02-28 04:15:11.000000000 +0100
+++ new/tlpkg/tlpobj/withargs.tlpobj 2019-11-05 01:54:30.000000000 +0100
@@ -1,15 +1,22 @@
name withargs
category Package
-revision 42756
-shortdesc Ephemeral macro use
+revision 52641
+shortdesc In-place argument substitution
relocated 1
+longdesc The \withargs command provides a clean way to populate a
+longdesc template (containing #1, #2, etc.) using LaTeX argument
+longdesc substitution. It also allows you to carefully control argument
+longdesc expansion using a LaTeX3-style argument specification. Uses
+longdesc range from creating readable string templates (akin to C's
+longdesc printf function) to performing otherwise complex token-list
+longdesc manipulation.
runfiles size=7
RELOC/tex/latex/withargs/withargs-dry.sty
RELOC/tex/latex/withargs/withargs-packagedoc.cls
RELOC/tex/latex/withargs/withargs.sty
catalogue-contact-repository https://github.com/mhelvens/latex-withargs
catalogue-ctan /macros/latex/contrib/withargs
-catalogue-date 2017-06-28 04:59:31 +0200
+catalogue-date 2019-11-04 20:42:23 +0100
catalogue-license lppl1.3
-catalogue-topics macro-supp
-catalogue-version 0.2.0
+catalogue-topics macro-supp expl3
+catalogue-version 0.3.1
++++++ witharrows.doc.tar.xz ++++++
++++ 4389 lines of diff (skipped)
++++++ witharrows.tar.xz ++++++
++++ 4070 lines of diff (skipped)
1
0
Hello community,
here is the log from the commit of package texlive-specs-x for openSUSE:Factory checked in at 2020-05-29 21:19:34
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-x (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-x"
Fri May 29 21:19:34 2020 rev:39 rq:806934 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.changes 2019-11-07 23:12:25.440265167 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606/texlive-specs-x.changes 2020-05-29 21:34:04.258059400 +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:
----
tkz-berge.doc.tar.xz
tkz-berge.tar.xz
tkz-doc.tar.xz
tkz-graph.doc.tar.xz
tkz-graph.tar.xz
tkz-kiviat.doc.tar.xz
tkz-kiviat.tar.xz
tkz-linknodes.doc.tar.xz
tkz-linknodes.tar.xz
tlcockpit.doc.tar.xz
tlcockpit.tar.xz
tlshell.doc.tar.xz
tlshell.tar.xz
New:
----
tikz-planets.doc.tar.xz
tikz-planets.tar.xz
tikz-relay.tar.xz
tikz-trackschematic.doc.tar.xz
tikz-trackschematic.tar.xz
tokcycle.doc.tar.xz
tokcycle.tar.xz
transparent.doc.tar.xz
transparent.tar.xz
tuda-ci.doc.tar.xz
tuda-ci.tar.xz
twemoji-colr.doc.tar.xz
twemoji-colr.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-x.spec ++++++
++++ 12101 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-x/texlive-specs-x.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-x.new.3606/texlive-specs-x.spec
++++++ tikz-feynhand.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/README.md new/doc/latex/tikz-feynhand/README.md
--- old/doc/latex/tikz-feynhand/README.md 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/README.md 2019-08-20 22:44:55.000000000 +0200
@@ -23,7 +23,7 @@
3. tikzfeynhand.keys.code.tex - defines Tikz keys
4. tikz-feynhand.userguide.pdf - a userguide for the package
5. tikz-feynhand.userguide.tex - the tex source of the userguide
-6. changes.txt - lists changes applied to Tikz-Feynman to obtain Tikz-FeynHand
+6. changes.txt - lists changes since last version
7. shell_escape.jpg - a TexWorks screenshot for the userguide
8. README.md - this file
@@ -32,7 +32,7 @@
LICENSE
-------
-Copyright (C) 2018 Max Dohse
+Copyright (C) 2019 Max Dohse
Copyright (C) 2016 Joshua Ellis
This whole package (code and documentation)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/changes.txt new/doc/latex/tikz-feynhand/changes.txt
--- old/doc/latex/tikz-feynhand/changes.txt 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/changes.txt 2019-08-20 22:44:55.000000000 +0200
@@ -1,281 +1,88 @@
LIST OF CHANGES
-by which this package tikz-feynhand (Version 1.0.0 of 2018/01/31)
+by which this package tikz-feynhand (Version 1.1.0 of 2019/08/19)
which is available at https://ctan.org/pkg/tikz-feynhand
-was obtained from the original package tikz-feynman (Version 1.1.0 of 2016/02/05)
-which is available at https://ctan.org/pkg/tikz-feynman
+was obtained from Version 1.0.0
==========================================================================
-The LICENSE has been changed from LPPL to GNU General Public Licence v3.
-
-The changes are rather minor:
-any reference to LuaTex has been removed,
-the definitions that are unnecessary
-for manual diagram creation have been removed,
-and some drawing styles have been added.
-
-In general, I REPLACED each occurence of the string "feynman" by "feynhand",
-in order to avoid clashes when both packages are loaded simultaneously,
-and most of these replacements are NOT listed individually below.
-Apart from that, the list below contains all changes to the best of my knowledge.
-
-The files tikzfeynman.patch.3.0.0.lua and tikzfeynman.patch.3.0.1.lua
-of the original package are not contained in the modified package,
-neither is the documentation of the original package.
-
-All file names and line numbers below refer to
-the files of the original package tikz-feynman (Version 1.1.0 of 2016/02/05).
+All file names and line numbers below refer to the files of Version 1.1.0.
==============================================
- FILE: tikz-feynman.sty
+ FILE: tikz-feynhand.sty
-+ general: package name changed
-+ line 32: removed \RequirePackage{ifluatex}
++ no changes
==============================================
- FILE: tikzlibraryfeynman.code.tex
+ FILE: tikzlibraryfeynhand.code.tex
-+ line 33: removed graphs,
-+ lines 38-48: removed \ifluatex ...
-+ lines 69-84: removed %Luatex warning ...
-+ lines 119-141: removed %% Override Lua ...
-+ line 159: removed \let\tikzfeynman@orig@graph=\graph
-+ lines 162+163: removed, inserted:
- \let\propag=\tikzfeynhand@commands@propag
- \let\propag=\propagator
-+ line 166: removed \tikz@lib@ignore@sizetrue
-+ lines 181-190: removed %% \feynmandiagram ...
-+ lines 266-282: removed %% Diagram ...
-+ lines 284-291: removed %% Graph ...
- inserted:
- %% Propagators
- \newcommand{\tikzfeynhand@commands@propag}[1][]{\draw [#1]}
-+ line 321: removed \pgfkeyslet{/tikzfeynman/rmomentum/.@cmd}...
-+ line 327: removed \pgfkeyslet{/tikzfeynman/rmomentum'/.@cmd}...
- inserted:
- % short versions of momentum styles
- \pgfkeyslet{/tikzfeynhand/rmomentum/.@cmd}{\tikzfeynhand@momentum@stdr}
- \pgfkeyslet{/tikzfeynhand/rmomentum'/.@cmd}{\tikzfeynhand@momentum@stdrp}
++ line 228: inserted:
- \pgfkeyslet{/tikzfeynhand/mom/.@cmd}{\tikzfeynhand@momentum@std}
- \pgfkeyslet{/tikzfeynhand/mom'/.@cmd}{\tikzfeynhand@momentum@stdp}
-
- \pgfkeyslet{/tikzfeynhand/revmom/.@cmd}{\tikzfeynhand@momentum@stdr}
- \pgfkeyslet{/tikzfeynhand/revmom'/.@cmd}{\tikzfeynhand@momentum@stdrp}
+%% Slash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@slash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{slash@@}}
+ {\tikzfeynhand@key@opt{slash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/slash/.@cmd}{\tikzfeynhand@slash}
+
+%% Backslash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@backslash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{backslash@@}}
+ {\tikzfeynhand@key@opt{backslash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/backslash/.@cmd}{\tikzfeynhand@backslash}
==============================================
- FILE: tikzfeynman.keys.code.tex
+ FILE: tikzfeynhand.keys.code.tex
-+ line 22: inserted
- %% Lengths
- \newlength{\feynhanddotsize}
- \setlength{\feynhanddotsize}{1.5mm}
-
- \newlength{\feynhandblobsize}
- \setlength{\feynhandblobsize}{7.5mm}
-
- \newlength{\feynhandlinesize}
- \setlength{\feynhandlinesize}{0.5pt}
-
- \newlength{\feynhandarrowsize}
- \setlength{\feynhandarrowsize}{6pt}
-
- \newlength{\feynhandtopsep}
- \setlength{\feynhandtopsep}{18\feynhandlinesize}
-
- %% Colors
- \newcommand{\feynhandtopsepcolor}{white}
-
-
-+ line 117: replaced \pgfmetadecorationsegmentamplitude
- by 3 * \feynhandlinesize
-+ line 141: removed /tikzfeynman/medium,
-+ lines 145-206: removed %% Diagrams ...
-+ line 219, 258, 280:
- each removed /tikz/graphs/as={},
-+ line 224: replaced /tikz/minimum size=1.5mm,
- by /tikz/minimum size=\feynhanddotsize,
-+ line 225, 264, 337, 348:
- each inserted /tikz/line width = \feynhandlinesize,
-+ lines 230-236: replaced every occurrence of square dot
- by squaredot
-+ lines 238-245: replaced every occurrence of empty dot
- by ringdot
-+ lines 230-236: replaced every occurrence of crossed dot
- by crossdot
-+ line 249: replaced /tikz/minimum size=3mm,
- by /tikz/minimum size=2\feynhanddotsize,
-+ line 260: replaced /tikz/fill=none,
- by /tikz/fill,
-+ lines 261+275:
- each replaced /tikz/outer sep=0.5\pgflinewidth,
- by /tikz/outer sep={0.5*\the\feynhandlinesize},
-+ line 263: replaced /tikz/minimum size=0.75cm,
- by /tikz/minimum size=\feynhandblobsize,
-+ line 264: removed /tikz/pattern=north west lines,
-+ line 269: inserted /tikz/fill=black,
-+ line 270: inserted
- every ringblob@@/.style={
- },
- every ringblob/.style={/tikzfeynhand/every ringblob@@/.append style={#1}},
- ringblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every ringblob@@,
- /tikz/fill=white,
- },
- every NWblob@@/.style={
- },
- every NWblob/.style={/tikzfeynhand/every NWblob@@/.append style={#1}},
- NWblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every NWblob@@,
- /tikz/fill=none,
- /tikz/pattern=north west lines,
- },
- every NEblob@@/.style={
- },
- every NEblob/.style={/tikzfeynhand/every NEblob@@/.append style={#1}},
- NEblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every NEblob@@,
- /tikz/fill=none,
- /tikz/pattern=north east lines,
- },
- every grayblob@@/.style={
- },
- every grayblob/.style={/tikzfeynhand/every grayblob@@/.append style={#1}},
- grayblob/.style={
- /tikzfeynhand/every blob@@,
- /tikzfeynhand/every grayblob@@,
- /tikz/fill=gray!50!white,
- },
-+ line 288: replaced arrow size=1.5pt,
- by arrow size=\feynhandarrowsize,
-+ line 295: replaced xshift...
- by xshift=-0.166666\feynhandarrowsize,
-+ line 297: replaced inner sep=\tikzfeynman@arrow@size,
- by inner sep=0mm,
- minimum width = \tikzfeynhand@arrow@size,
-+ line 309: replaced xshift...
- by xshift=0.166666\feynhandarrowsize,
-+ line 316: replaced inner sep=\tikzfeynman@arrow@size,
- by inner sep=0mm,
- minimum width = \tikzfeynhand@arrow@size,
-+ line 343: inserted
- every top@@/.style={
- /tikz/preaction={draw=\feynhandtopsepcolor,line width=\feynhandtopsep}
- },
- every top/.style={/tikzfeynhand/every top@@/.append style={#1}},
- top/.style={
- /tikzfeynhand/every top@@,
- },
++ line 629: inserted:
-+ lines 350-352: replaced amplitude= ...
- by amplitude=3\feynhandlinesize,
- segment length=7.5\feynhandlinesize,
-+ line 381: inserted /tikz/line width = \feynhandlinesize,
-+ lines 383-384: replaced amplitude= ...
- by amplitude=3\feynhandlinesize,
- segment length=7.5\feynhandlinesize,
-+ line 399: inserted /tikz/line width = \feynhandlinesize,
-+ line 435 replaced /tikz/thick,
- by /tikz/line width = 2\feynhandlinesize,
-+ line 442: inserted
- every charged ghost@@/.style={
- /tikz/draw=none,
- /tikz/decoration={name=none},
+ %% Slashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ slash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ slash/size/.store in=\tikzfeynhand@slash@size,
+ slash/size=5\feynhandlinesize,
+ slash/style/.store in=\tikzfeynhand@slash@style,
+ slash/style={},
+ %% Styles
+ slash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{slash/.cd,#1}
+ \draw [\tikzfeynhand@slash@style] (-\tikzfeynhand@slash@size, -2*\tikzfeynhand@slash@size) -- (\tikzfeynhand@slash@size, 2*\tikzfeynhand@slash@size);
+ },
+ },
/tikz/postaction={
- /tikzfeynhand/with arrow=0.5,
+ /tikz/decorate=true,
},
},
- every charged ghost/.style={/tikzfeynhand/every charged ghost@@/.append style={#1}},
- charged ghost/.style={
- /tikzfeynhand/ghost,
- /tikzfeynhand/every charged ghost@@,
- },
- every anti charged ghost@@/.style={
- /tikz/draw=none,
- /tikz/decoration={name=none},
+ slash@@/.default={[]0.5},
+ %%
+ %% Backslashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ backslash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ backslash/size/.store in=\tikzfeynhand@backslash@size,
+ backslash/size=5\feynhandlinesize,
+ backslash/style/.store in=\tikzfeynhand@backslash@style,
+ backslash/style={},
+ %% Styles
+ backslash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{backslash/.cd,#1}
+ \draw [\tikzfeynhand@backslash@style] (-\tikzfeynhand@backslash@size, 2*\tikzfeynhand@backslash@size) -- (\tikzfeynhand@backslash@size, -2*\tikzfeynhand@backslash@size);
+ },
+ },
/tikz/postaction={
- /tikzfeynhand/with reversed arrow=0.5,
+ /tikz/decorate=true,
},
},
- every anti charged ghost/.style={/tikzfeynhand/every anti charged ghost@@/.append style={#1}},
- anti charged ghost/.style={
- /tikzfeynhand/ghost,
- /tikzfeynhand/every anti charged scalar@@,
- },
-
-+ line 447, 459, 473, 486, 497, 520:
- each inserted /tikz/line width = \feynhandlinesize,
-+ line 501: replaced segment length=1.5mm
- by amplitude=3\feynhandlinesize,
- segment length=8\feynhandlinesize
-+ line 510: inserted:
- % short versions of style names
- pho/.style={
- /tikzfeynhand/photon,
- },
- bos/.style={
- /tikzfeynhand/boson,
- },
- antbos/.style={
- /tikzfeynhand/anti charged boson,
- },
- chabos/.style={
- /tikzfeynhand/charged boson,
- },
- sca/.style={
- /tikzfeynhand/scalar,
- },
- chasca/.style={
- /tikzfeynhand/charged scalar,
- },
- antsca/.style={
- /tikzfeynhand/anti charged scalar,
- },
- fer/.style={
- /tikzfeynhand/fermion,
- },
- antfer/.style={
- /tikzfeynhand/anti fermion,
- },
- gho/.style={
- /tikzfeynhand/ghost,
- },
- chagho/.style={
- /tikzfeynhand/charged ghost,
- },
- antgho/.style={
- /tikzfeynhand/anti charged ghost,
- },
- glu/.style={
- /tikzfeynhand/gluon,
- },
- maj/.style={
- /tikzfeynhand/majorana,
- },
- antmaj/.style={
- /tikzfeynhand/anti majorana,
- },
-
-+ line 515: replaced insertion/size=3pt,
- by insertion/size=5\feynhandlinesize,
-+ line 541: replaced momentum/arrow distance=3mm,
- by momentum/arrow distance={\the\feynhandarrowsize},
-+ line 548: inserted
- momentum/arrow thickness/.store in=\tikzfeynhand@momentum@arrow@thickness,
- momentum/arrow thickness={0.64*\the\feynhandlinesize},
- momentum/arrow size/.store in=\tikzfeynhand@momentum@arrow@size,
- momentum/arrow size={0.8*\the\feynhandarrowsize},
-+ lines 559, 573, 592, 613, 627, 646, 667, 681, 700, 721, 736, 756:
- each replaced \draw [-Stealth, \tikzfeynman@momentum@arrow@style]
- by \draw [-{Stealth[length=\tikzfeynhand@momentum@arrow@size]},
- line width=\tikzfeynhand@momentum@arrow@thickness,
- \tikzfeynhand@momentum@arrow@style]
-+ lines 772+776: each removed /tikz/looseness=1.5,
-+ lines 786-814: removed %% Graceful ...
-
+ backslash@@/.default={[]0.5},
Binary files old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf and new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex
--- old/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/doc/latex/tikz-feynhand/tikz-feynhand.userguide.tex 2019-08-20 22:44:55.000000000 +0200
@@ -2,7 +2,7 @@
%
% TikZ-FeynHand
% Feynman Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
%
% available at https://ctan.org/pkg/tikz-feynhand
%
@@ -116,7 +116,7 @@
%
\hrule
\vspace{3mm}
-{\centering\Large\bfseries Quick Reference\\}
+{\centering\Large\bfseries Quick Reference\vspace{-2mm}\\}
%
\noindent
\textbf{Environment}\\
@@ -158,13 +158,13 @@
\blucol\verb!\feynhandblobsize, \feynhandlinesize, \feynhandarrowsize, \feynhandtopsep!\txcol\\
\blucol\verb!\renewcommand{\feynhandtopsepcolor}{COLOR}!\txcol\\
\blucol\verb!\tikzfeynhandset{every STYLE={/tikz/color=COLOR},}!\txcol\\
-\vspace{1mm}
+\vspace{0mm}
%
% =====================================================================
\hrule
\vspace{2mm}
-{\centering Version 1.0.0 -
+{\centering Version 1.1.0 -
available at\qquad \texttt{https://ctan.org/pkg/tikz-feynhand}\\}
\vspace{1mm}
@@ -172,6 +172,7 @@
\hrule
% ===== TABEL OF CONTENTS ===========================================
%
+\vspace{-2mm}
\tableofcontents
%
% =====================================================================
@@ -1334,7 +1335,7 @@
\end{minipage}
%
% --------------------------------------------------------------------------------
-\newpage\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter}
+\subsubsection{Keys: In, Out, Looseness, Left/Right, Half/Quarter}
\label{sec:_feynmandiagrams_keysinoutetc}
%
\noindent
@@ -1441,7 +1442,7 @@
%
% --------------------------------------------------------------------------------
\vspace{-6mm}
-\subsubsection{Propagator labels and momentum arrows}
+\newpage\subsubsection{Propagator labels and momentum arrows}
\label{sec:_feynmandiagrams_proplabelsmomentum}
%
\noindent
@@ -1562,10 +1563,57 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+%
+% -------------------------------------------------------------------------------------------------------
+\vspace{-3mm}
+\subsubsection{Slashes and backslashes}
+\label{sec:_feynmandiagrams_propagators_slashes}
+%
+\noindent
+Back/slashes work like insertions:
+\\
+%
+\begin{minipage}{0.83\linewidth}
+\vercol\begin{verbatim}
+ \vertex [dot] (a1) at (0,0) {}; \vertex [dot] (a2) at (2,0) {};
+ \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2);
+\end{verbatim}\txcol
+\end{minipage}
+%
+\begin{minipage}{0.16\linewidth}
+\tikzsetnextfilename{propag_slash_1}
+%\tikzset{external/force remake}
+\begin{tikzpicture}
+ \begin{feynhand}
+ \vertex [dot] (a1) at (0,0) {};
+ \vertex [dot] (a2) at (2,0) {};
+ \propag [chabos, red, slash=0.25, slash=0.75] (a1) to (a2);
+ \end{feynhand}
+\end{tikzpicture}
+\end{minipage}
+\\
+\begin{minipage}{0.83\linewidth}
+\vercol\begin{verbatim}
+ \vertex [ringdot] (a1) at (0,0) {}; \vertex [ringdot] (a2) at (2,0) {};
+ \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2);
+\end{verbatim}\txcol
+\end{minipage}
+%
+\begin{minipage}{0.16\linewidth}
+\tikzsetnextfilename{propag_slash_2}
+%\tikzset{external/force remake}
+\begin{tikzpicture}
+ \begin{feynhand}
+ \vertex [ringdot] (a1) at (0,0) {};
+ \vertex [ringdot] (a2) at (2,0) {};
+ \propag [chabos, red, backslash={[size=6pt,style=Green]0.25}] (a1) to (a2);
+ \end{feynhand}
+\end{tikzpicture}
+\end{minipage}
%
% -------------------------------------------------------------------------------------------------------
-\subsubsection{Crossing propagators (one on top of the other)}
+\newpage\subsubsection{Crossing propagators (one on top of the other)}
\label{sec:_feynmandiagrams_propagators_top}
%
\noindent
@@ -1584,7 +1632,7 @@
\blucol\verb$VALUE$\txcol must be a number between 0 and 1,
and indicates the fraction of propagator length at which TikZ inserts the arrow.
The default value of \blucol\verb$VALUE$\txcol is 0.5.
-\vspace{2mm}\\
+\vspace{-1mm}\\
%
\begin{minipage}{0.8\linewidth}
\blucol\begin{verbatim}
@@ -1607,6 +1655,7 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+\vspace{-5mm}
\\
%
\begin{minipage}{0.8\linewidth}
@@ -1629,6 +1678,7 @@
\end{feynhand}
\end{tikzpicture}
\end{minipage}
+\vspace{-3mm}
%
%
% =====================================================================
@@ -1749,7 +1799,8 @@
\setlength{\feynhandarrowsize}{6pt}
\setlength{\feynhandtopsep}{18\feynhandlinesize}
\renewcommand{\feynhandtopsepcolor}{white}
-%
+\vspace{-4mm}
+\\
The color of a vertex/propagator style can be set for all subsequent diagrams
in the current local Tex group (e.g. document or equation, figure, minipage environment)
by the command \vercol\verb$\tikzfeynhandset$\txcol with the key \vercol\verb$every$\txcol:
@@ -1764,6 +1815,7 @@
% =====================================================================
% ===== APPENDICES ============================================
%
+%\newpage
\appendix
%
\section{TikZ Basics}
@@ -2049,7 +2101,7 @@
%
\begin{figure}
\centering
- \includegraphics[width=0.75\linewidth]{shell_escape.jpg}
+ \includegraphics[width=0.7\linewidth]{shell_escape.jpg}
\caption{TexWorks screenshot.}
\label{Fig:_shell_escape}
\end{figure}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj new/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-feynhand.doc.tlpobj 2019-08-21 01:53:49.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-feynhand.doc
category Package
-revision 46502
+revision 51915
shortdesc doc files of tikz-feynhand
relocated 1
-docfiles size=114
+docfiles size=113
RELOC/doc/latex/tikz-feynhand/README.md
RELOC/doc/latex/tikz-feynhand/changes.txt
RELOC/doc/latex/tikz-feynhand/shell_escape.jpg
++++++ tikz-feynhand.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikz-feynhand.sty new/tex/latex/tikz-feynhand/tikz-feynhand.sty
--- old/tex/latex/tikz-feynhand/tikz-feynhand.sty 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikz-feynhand.sty 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
%
@@ -27,7 +27,7 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\def\tikzfeynhand@date{2018/01/31}
+\def\tikzfeynhand@date{2019/08/19}
\def\tikzfeynhand@version@major{1}
\def\tikzfeynhand@version@minor{1}
\def\tikzfeynhand@version@patch{0}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex new/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex
--- old/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikzfeynhand.keys.code.tex 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
%
@@ -625,6 +625,54 @@
},
},
insertion@@/.default={[]0.5},
+ %%
+ %% Slashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ slash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ slash/size/.store in=\tikzfeynhand@slash@size,
+ slash/size=5\feynhandlinesize,
+ slash/style/.store in=\tikzfeynhand@slash@style,
+ slash/style={},
+ %% Styles
+ slash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{slash/.cd,#1}
+ \draw [\tikzfeynhand@slash@style] (-\tikzfeynhand@slash@size, -2*\tikzfeynhand@slash@size) -- (\tikzfeynhand@slash@size, 2*\tikzfeynhand@slash@size);
+ },
+ },
+ /tikz/postaction={
+ /tikz/decorate=true,
+ },
+ },
+ slash@@/.default={[]0.5},
+ %%
+ %% Backslashes
+ %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+ backslash/.search also={/tikzfeynhand,/tikz},
+ %% Parameters
+ backslash/size/.store in=\tikzfeynhand@backslash@size,
+ backslash/size=5\feynhandlinesize,
+ backslash/style/.store in=\tikzfeynhand@backslash@style,
+ backslash/style={},
+ %% Styles
+ backslash@@/.style args={[#1]#2}{
+ /tikz/line width = \feynhandlinesize,
+ /tikz/decoration={
+ markings,
+ mark=at position #2 with {
+ \tikzfeynhandset{backslash/.cd,#1}
+ \draw [\tikzfeynhand@backslash@style] (-\tikzfeynhand@backslash@size, 2*\tikzfeynhand@backslash@size) -- (\tikzfeynhand@backslash@size, -2*\tikzfeynhand@backslash@size);
+ },
+ },
+ /tikz/postaction={
+ /tikz/decorate=true,
+ },
+ },
+ backslash@@/.default={[]0.5},
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% Momentum arrows
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex new/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex
--- old/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex 2018-01-31 22:59:37.000000000 +0100
+++ new/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex 2019-08-20 22:44:55.000000000 +0200
@@ -1,9 +1,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
-% TikZ-FeynHand, Version 1.0.0 of 2018/01/31
+% TikZ-FeynHand, Version 1.1.0 of 2019/08/19
% Feynhand Diagrams with TikZ (LaTex manual version)
-% Copyright (C) 2018 Max Dohse
+% Copyright (C) 2019 Max Dohse
% Copyright (C) 2016 Joshua Ellis
%
% This LaTeX file and the whole package are free:
@@ -225,6 +225,20 @@
{\tikzfeynhand@key@opt{insertion@@}[]}}
\pgfkeyslet{/tikzfeynhand/insertion/.@cmd}{\tikzfeynhand@insertion}
+%% Slash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@slash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{slash@@}}
+ {\tikzfeynhand@key@opt{slash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/slash/.@cmd}{\tikzfeynhand@slash}
+
+%% Backslash
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\tikzfeynhand@backslash{%
+ \pgfutil@ifnextchar[{\tikzfeynhand@key@opt{backslash@@}}
+ {\tikzfeynhand@key@opt{backslash@@}[]}}
+\pgfkeyslet{/tikzfeynhand/backslash/.@cmd}{\tikzfeynhand@backslash}
+
%% Momentum
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\tikzfeynhand@momentum@std{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-feynhand.tlpobj new/tlpkg/tlpobj/tikz-feynhand.tlpobj
--- old/tlpkg/tlpobj/tikz-feynhand.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-feynhand.tlpobj 2019-08-21 01:53:49.000000000 +0200
@@ -1,6 +1,6 @@
name tikz-feynhand
category Package
-revision 46502
+revision 51915
shortdesc Feynman diagrams with TikZ
relocated 1
longdesc This package lets you draw Feynman diagrams using TikZ. It is a
@@ -21,7 +21,7 @@
RELOC/tex/latex/tikz-feynhand/tikzlibraryfeynhand.code.tex
catalogue-also tikz-feynman
catalogue-ctan /graphics/pgf/contrib/tikz-feynhand
-catalogue-date 2018-02-03 06:27:57 +0100
+catalogue-date 2019-08-19 22:08:01 +0200
catalogue-license gpl3+
catalogue-topics physics pgf-tikz
-catalogue-version 1.0.0
+catalogue-version 1.1.0
++++++ tikz-imagelabels.doc.tar.xz ++++++
Binary files old/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf and new/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj new/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-imagelabels.doc.tlpobj 2019-06-28 01:53:54.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-imagelabels.doc
category Package
-revision 49864
+revision 51490
shortdesc doc files of tikz-imagelabels
relocated 1
-docfiles size=365
+docfiles size=366
RELOC/doc/latex/tikz-imagelabels/README.md
RELOC/doc/latex/tikz-imagelabels/pleiades.jpg
RELOC/doc/latex/tikz-imagelabels/tikz-imagelabels.pdf
++++++ tikz-imagelabels.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-imagelabels/tikz-imagelabels.sty new/tex/latex/tikz-imagelabels/tikz-imagelabels.sty
--- old/tex/latex/tikz-imagelabels/tikz-imagelabels.sty 2019-01-29 23:13:18.000000000 +0100
+++ new/tex/latex/tikz-imagelabels/tikz-imagelabels.sty 2019-06-27 22:58:38.000000000 +0200
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[2011/06/27]
\ProvidesPackage{tikz-imagelabels}
- [2019/01/29 v0.1 put labels on images using TikZ]
+ [2019/06/27 v0.2 put labels on images using TikZ]
\RequirePackage{tikz}
\RequirePackage{xifthen}
\usetikzlibrary{
@@ -52,6 +52,13 @@
}
\imagelabelset{
+ coordinate label font/.store in = \coordinatelabelfont,
+ coordinate label distance/.store in = \coordinatelabelsep,
+ coordinate label back/.store in = \coordinatelabelback,
+ coordinate label text/.store in = \coordinatelabeltext,
+}
+
+\imagelabelset{
annotation font/.store in = \annotationfont,
arrow distance/.store in = \arrowdistance,
arrow thickness/.store in = \arrowthickness,
@@ -66,6 +73,10 @@
image label distance = 2mm,
image label back = black,
image label text = white,
+ coordinate label font = \sffamily\bfseries\scriptsize,
+ coordinate label distance = 2mm,
+ coordinate label back = black,
+ coordinate label text = white,
annotation font = \normalfont\small,
arrow distance = 1.5mm,
border thickness = 0.6pt,
@@ -159,12 +170,26 @@
text = \imagelabeltext,
font = \imagelabelfont,
},
+ coordinate label style/.style = {
+ rectangle,
+ minimum width = 3mm,
+ minimum height = 3mm,
+ fill = \coordinatelabelback,
+ text = \coordinatelabeltext,
+ font = \coordinatelabelfont,
+ },
image label/.style args = {#1 at #2}{
insert path = {
(image.#2) node[outer sep = \imagelabelsep,
anchor=#2, image label style] {#1}
}
},
+ coordinate label/.style args = {#1 at (#2)}{
+ insert path = {
+ node[outer sep = \coordinatelabelsep,
+ anchor=center, coordinate label style] at (#2) {#1}
+ }
+ },
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-imagelabels.tlpobj new/tlpkg/tlpobj/tikz-imagelabels.tlpobj
--- old/tlpkg/tlpobj/tikz-imagelabels.tlpobj 2019-02-28 04:08:40.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-imagelabels.tlpobj 2019-06-28 01:53:55.000000000 +0200
@@ -1,6 +1,6 @@
name tikz-imagelabels
category Package
-revision 49864
+revision 51490
shortdesc Put labels on images using TikZ
relocated 1
longdesc This package allows to add label texts to an existing image
@@ -11,7 +11,7 @@
catalogue-contact-bugs https://github.com/tcpluess/tikz-imagelabels/issues
catalogue-contact-repository https://github.com/tcpluess/tikz-imagelabels
catalogue-ctan /graphics/pgf/contrib/tikz-imagelabels
-catalogue-date 2019-02-21 05:19:21 +0100
+catalogue-date 2019-06-27 14:24:00 +0200
catalogue-license lppl1.3
catalogue-topics graphics pgf-tikz graphics-incl graphics-text
-catalogue-version 0.1
+catalogue-version 0.2
++++++ tikz-kalender.doc.tar.xz ++++++
Binary files old/doc/latex/tikz-kalender/tikz-kalender-example1.pdf and new/doc/latex/tikz-kalender/tikz-kalender-example1.pdf differ
Binary files old/doc/latex/tikz-kalender/tikz-kalender-example2.pdf and new/doc/latex/tikz-kalender/tikz-kalender-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-kalender.doc.tlpobj new/tlpkg/tlpobj/tikz-kalender.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-kalender.doc.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-kalender.doc.tlpobj 2019-11-23 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-kalender.doc
category Package
-revision 49456
+revision 52890
shortdesc doc files of tikz-kalender
relocated 1
docfiles size=37
++++++ tikz-kalender.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-kalender/tikz-kalender-translation.clo new/tex/latex/tikz-kalender/tikz-kalender-translation.clo
--- old/tex/latex/tikz-kalender/tikz-kalender-translation.clo 2017-05-17 23:52:21.000000000 +0200
+++ new/tex/latex/tikz-kalender/tikz-kalender-translation.clo 2019-06-06 23:48:30.000000000 +0200
@@ -1,7 +1,16 @@
-\ProvidesFile{tikz-kalender-translation.clo}[2017/05/08 v1.0b
+\ProvidesFile{tikz-kalender-translation.clo}[2019/06/05 v1.0c
Calendar translations (RN)]
-% shorter strings
+% shorter strings than the default definitions
+
+\deftranslation[to=English]{Mon}{Mo}% Monday
+\deftranslation[to=English]{Tue}{Tu}% Tuesday
+\deftranslation[to=English]{Wed}{We}% Wednesday
+\deftranslation[to=English]{Thu}{Th}% Thursday
+\deftranslation[to=English]{Fri}{Fr}% Friday
+\deftranslation[to=English]{Sat}{Sa}% Saturday
+\deftranslation[to=English]{Sun}{Su}% Sunday
+
\deftranslation[to=Polish]{Mon}{Po}% PoniedziaÅek
\deftranslation[to=Polish]{Tue}{Wt}% Wtorek
\deftranslation[to=Polish]{Wed}{\'{S}r}% Åroda
@@ -10,14 +19,4 @@
\deftranslation[to=Polish]{Sat}{So}% Sobota
\deftranslation[to=Polish]{Sun}{Ni}% Niedziela
-\deftranslation[to=English]{Mon}{Mo}
-\deftranslation[to=English]{Tue}{Tu}
-\deftranslation[to=English]{Wed}{We}
-\deftranslation[to=English]{Thu}{Th}
-\deftranslation[to=English]{Fri}{Fr}
-\deftranslation[to=English]{Sat}{Sa}
-\deftranslation[to=English]{Sun}{Su}
-
\endinput
-%%
-%% End of file `tikz-kalender-translation.clo'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-kalender/tikz-kalender.cls new/tex/latex/tikz-kalender/tikz-kalender.cls
--- old/tex/latex/tikz-kalender/tikz-kalender.cls 2018-12-19 23:11:39.000000000 +0100
+++ new/tex/latex/tikz-kalender/tikz-kalender.cls 2019-11-22 23:18:59.000000000 +0100
@@ -7,7 +7,7 @@
\setcounter{errorcontextlines}{100}
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
-\ProvidesClass{tikz-kalender}[2018/12/18 v0.4d Calendar class (RN)]
+\ProvidesClass{tikz-kalender}[2019/11/22 v0.4f Calendar class (RN)]
\DeclareOption*{\OptionNotUsed}
\ProcessOptions\relax
@@ -98,8 +98,6 @@
\newcommand*\setup[1]{\pgfqkeys{/RN}{#1}}
-\PassOptionsToPackage{english}{babel}
-\PassOptionsToPackage{english}{translator}
\PassOptionsToPackage{a4paper}{geometry}
\PassOptionsToPackage{svgnames}{xcolor}
@@ -136,6 +134,10 @@
\@ifpackageloaded{inputenc}{}{\RequirePackage[utf8]{inputenc}}%
\fi
\RequirePackage{babel,translator,tikz}
+ \@ifpackagelater{pgf}{2019/05/10}{}{%
+ \def\pgfutil@translate#1{\translate{#1}}%
+ % Correct the wrong definition in `pgfutil-latex.def'
+ }%
\input{tikz-kalender-translation.clo}
\usetikzlibrary{calendar}
}
@@ -247,6 +249,11 @@
}
\newcommand*\event{%
+ \ClassError{tikz-kalender}{%
+ Macro \string\event\space is only allowed inside of .events files}{}%
+}
+
+\newcommand*\RN@event{%
\@ifstar{\@tempswatrue\RN@event@i}{\@tempswafalse\RN@event@i}%
}
\newcommand*\RN@event@i[2]{%
@@ -344,12 +351,14 @@
\pgfcalendarifdate{\RN@year-01-01}{Tuesday,Wednesday,Thursday}{%
\setcounter{weeknumber}{1}}{\setcounter{weeknumber}{0}}%
\begingroup%
+ \let\event=\RN@event
\let\year=\RN@year
\def\RN@event@ii##1##2[##3]{}% 1st loop: only the periods
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
\expandafter\docsvlist\expandafter{\RN@events@files}%
\endgroup
\begingroup
+ \let\event=\RN@event
\let\year=\RN@year
\def\RN@period@i##1##2[##3]{}% 2nd loop: only the events
\def\do##1{\InputIfFileExists{##1.events}{}{}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-kalender.tlpobj new/tlpkg/tlpobj/tikz-kalender.tlpobj
--- old/tlpkg/tlpobj/tikz-kalender.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-kalender.tlpobj 2019-11-23 01:54:40.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-kalender
category Package
-revision 49456
+revision 52890
shortdesc A LaTeX based calendar using TikZ
relocated 1
longdesc For usage see the example files tikz-kalender-example1.tex,
@@ -16,7 +16,7 @@
catalogue-contact-bugs https://github.com/rolfn/kalenderRN/issues
catalogue-contact-repository https://github.com/rolfn/kalenderRN
catalogue-ctan /graphics/pgf/contrib/tikz-kalender
-catalogue-date 2018-12-19 13:44:06 +0100
+catalogue-date 2019-11-22 11:08:49 +0100
catalogue-license cc-by-sa-1
catalogue-topics calendar class pgf-tikz
-catalogue-version 0.4d
+catalogue-version 0.4f
++++++ tikz-network.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-network/README.md new/doc/latex/tikz-network/README.md
--- old/doc/latex/tikz-network/README.md 2018-07-30 23:13:38.000000000 +0200
+++ new/doc/latex/tikz-network/README.md 2019-08-15 22:22:22.000000000 +0200
@@ -56,7 +56,7 @@
## License
-Copyright (c) 2018 [Juergen Hackl](mailto:hackl.j@gmx.at)
+Copyright (c) 2019 [Juergen Hackl](mailto:hackl.j@gmx.at)
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
Binary files old/doc/latex/tikz-network/tikz-network.pdf and new/doc/latex/tikz-network/tikz-network.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikz-network/tikz-network.tex new/doc/latex/tikz-network/tikz-network.tex
--- old/doc/latex/tikz-network/tikz-network.tex 2018-07-30 23:13:38.000000000 +0200
+++ new/doc/latex/tikz-network/tikz-network.tex 2019-08-15 22:22:22.000000000 +0200
@@ -2,9 +2,9 @@
% File : tikz-network.tex -- The manual for the package tikz-network
% Author : Juergen Hackl <hackl.j(a)gmx.at>
% Creation : 2018-07-30
-% Time-stamp: <Mon 2018-07-30 11:28 juergen>
-%
-% Copyright (c) 2018 Juergen Hackl <hackl.j(a)gmx.at>
+% Time-stamp: <Thu 2019-08-15 11:22 juergen>
+%e
+% Copyright (c) 2019 Juergen Hackl <hackl.j(a)gmx.at>
%
% 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
@@ -28,7 +28,7 @@
% Book metadata
\title{tikz-network\\manual}
\author[J\"urgen Hackl]{J\"urgen Hackl}
-\publisher{Version 1.0}
+\publisher{Version 1.1}
%%
% If they're installed, use Bergamo and Chantilly from www.fontsite.com.
@@ -83,6 +83,10 @@
\usepackage{xspace}
%%
+% needed for its \numberwithin command
+\usepackage{amsmath}
+
+%%
% Some shortcuts for Tufte's book titles. The lowercase commands will
% produce the initials of the book title in italics. The all-caps commands
% will print out the full title of the book in italics.
@@ -173,15 +177,30 @@
\newcommand{\docfilehook}[2]{\texttt{#1}\index{file hooks!#2}\index{#1@\texttt{#1}}}
\newcommand{\doccounter}[1]{\texttt{#1}\index{#1 counter@\texttt{#1} counter}}
+%%
+% Example environment
-\newenvironment{docspec}{\begin{shaded}}{\vspace{-5mm}\end{shaded}}% command specification environment
+% Create counter
+\newcounter{doccount}
+\newenvironment{docspec}{%
+ \bigskip\noindent% create a vertical offset to previous material
+ \refstepcounter{doccount}% increment the environment's counter
+ \llap{\parbox{1.5cm}{\hfill\small\thedoccount}\hspace{2mm}}\vspace{-9mm}
+ \begin{shaded}
+ }
+ {\vspace{-5mm}\end{shaded}}% command specification environment
+\numberwithin{doccount}{chapter}
% Numerate the sections
\setcounter{secnumdepth}{2}
\setcounter{tocdepth}{3}
+\newenvironment{docspeca}{\begin{shaded}}
+ {\vspace{-5mm}\end{shaded}}% command specification environment
+
+
\usepackage{etoolbox}
@@ -1103,7 +1122,7 @@
The font size of the \docopt{label} can be modified with the option \docopt{fontsize}. Here common \LaTeX~ font size commands\footnote{e.g. \doccmd{tiny}, \doccmd{scriptsize}, \doccmd{footnotesize}, \doccmd{small}, \dots.} can be used to change the size of the label.
-\begin{marginfigure}[6mm]
+\begin{marginfigure}[25mm]
\centering
\begin{tikzpicture}
\Vertex{A} \Vertex[x=2]{B} \Vertex[x=2,y=-1]{C}
@@ -1440,7 +1459,9 @@
In order to display RGB colors for the line color of the edge, the option \docopt{RGB} has to be entered. In combination with this option, the \docopt{color} hast to be a list with the \docarg{RGB
values}, separated by <<,>> and within $\{~\}$.\footnote{e.g. the RGB code for white: $\{255,255,255\}$}
-\begin{marginfigure}%[28mm]
+\newpage
+
+\begin{marginfigure}[10mm]
\centering
\begin{tikzpicture}
\Vertex{A} \Vertex[x=2]{B} \Vertex[x=2,y=-1]{C}
@@ -1976,7 +1997,7 @@
\centering
\begin{tikzpicture}
\Vertices[IdAsLabel]{data/vertices.csv}
- \node at (2,1)[font=\scriptsize]{C};
+ %\node at (2,1)[font=\scriptsize]{C};
\end{tikzpicture}
\end{marginfigure}
@@ -3198,7 +3219,7 @@
\end{tikzpicture}
\end{marginfigure}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
#!/usr/bin/python -tt
# -*- coding: utf-8 -*-
@@ -3217,11 +3238,11 @@
from network2tikz import plot
plot((nodes,edges),'network.tex',**style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
(see above) gives
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz-network}
@@ -3239,7 +3260,7 @@
\end{tikzpicture}
\end{document}
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Tweaking the plot is straightforward and can be done as part of your LaTeX workflow.
@@ -3248,11 +3269,11 @@
\texttt{network2tikz} is available from the \href{https://pypi.org/project/network2tikz/}{Python Package Index}, so simply type
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
pip install -U network2tikz
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
to install/update. If your are intersted in the development version of the module check out the \href{https://github.com/hackl/network2tikz}{github repository}.
@@ -3262,48 +3283,57 @@
\item Generate, manipulation, and study of the structure, dynamics, and functions of your complex networks as usual, with your preferred python module.
\item Instead of the default plot functions (e.g. \texttt{igraph.plot()} or \texttt{networkx.draw()}) invoke \texttt{network2tikz} by
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mytikz.tex')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to store your network visualisation as the TikZ file \texttt{mytikz.tex}. Load the module with:
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
from network2tikz import plot
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\textbf{Advanced usage:}
Of course, you always can improve your plot by manipulating the generated LaTeX file, but why not do it directly in Python? To do so, all visualization options available in \pkg are also implemented in \texttt{network2tikz}. The appearance of the plot can be modified by keyword arguments.\footnote{For a detailed explanation, please see Section \ref{sec:plot_function}.}
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
my_style = {}
plot(G,'mytikz.tex',**my_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The arguments follow the options described above in the manual.
Additionally, if you are more interested in the final output and not only the \texttt{.tex} file, used
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mypdf.pdf')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to save your plot as a pdf, or
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
+
to create a temporal plot and directly show the result, i.e. similar to the matplotlib function \texttt{show()}. Finally, you can also create a node and edge list, which can be read and easily modified (in a post-processing step) as showd above.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
plot(G,'mycsv.csv')
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\item Compile the figure or add the contents of \texttt{mytikz.tex} into your LaTeX source code. With the option \docopt{standalone}=\docarg{false} only the \tikzsym figure will be saved, which can then be easily included in your \LaTeX~ document via \doccmd{input}\{\texttt{/path/to/mytikz.tex}\}.
@@ -3315,7 +3345,8 @@
Create network object and add some edges.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
#!/usr/bin/python -tt
# -*- coding: utf-8 -*-
@@ -3326,11 +3357,11 @@
net = igraph.Graph([(0,1), (0,2), (2,3), (3,4), (4,2), (2,5), (5,0), (6,3),
(5,6), (6,6)],directed=True)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Adding node and edge properties.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
net.vs["name"] = ["Alice", "Bob", "Claire", "Dennis", "Esther", "Frank", "George"]
net.vs["age"] = [25, 31, 18, 47, 22, 23, 50]
@@ -3338,7 +3369,7 @@
net.es["is_formal"] = [False, False, True, True, True, False, True, False,
False, False]
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Already now the network can be plotted.
\begin{marginfigure}[5mm]
@@ -3365,15 +3396,15 @@
\end{tikzpicture}
\end{marginfigure}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
Per default, the node positions are assigned uniform random. In order to create a layout, the layout methods of the network packages can be used. Or the position of the nodes can be directly assigned, in form of a dictionary, where the key is the node id and the value is a tuple of the node position in $x$ and $y$.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
layout = {0: (4.3191, -3.5352), 1: (0.5292, -0.5292),
2: (8.6559, -3.8008), 3: (12.4117, -7.5239),
@@ -3381,7 +3412,7 @@
6: (9.7608, -12.7)}
plot(net,layout=layout)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3412,11 +3443,11 @@
We can simply re-using the previous layout object here, but we also specified that we need a bigger plot ($8 \times 8$ cm) and a larger margin around the graph to fit the self loop and potential labels (1 cm).\footnote{Per default, all size values are based on cm, and all line widths are defined in pt units. With the general option \docopt{units} this can be changed, see Section \ref{sec:plot_function}.}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net, layout=layout, canvas=(8,8), margin=1)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3444,7 +3475,7 @@
In to keep the properties of the visual representation of your network separate from the network itself. You can simply set up a Python dictionary containing the keyword arguments you would pass to \texttt{plot} and then use the double asterisk (\texttt{**}) operator to pass your specific styling attributes to \texttt{plot}:
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
color_dict = {'m': 'blue', 'f': 'red'}
visual_style = {}
@@ -3468,7 +3499,7 @@
# Plot command
plot(net,**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\begin{marginfigure}[5mm]
\centering
@@ -3498,17 +3529,17 @@
Beside showing the network, we can also generate the latex source file, which can be used and modified later on. This is done by adding the output file name with the ending \texttt{'.tex'}.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net,'network.tex',**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
produces
\begin{fullwidth}
\begin{minipage}{17cm}
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
\documentclass{standalone}
\usepackage{tikz-network}
@@ -3535,21 +3566,22 @@
\end{tikzpicture}
\end{document}
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\end{minipage}
\end{fullwidth}
Instead of the tex file, a node and edge list can be generates, which can also be used with the library.
-\begin{docspec}
+\begin{docspeca}
\begin{lstlisting}
plot(net,'network.csv',**visual_style)
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The node list \texttt{network\_nodes.csv}.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
id,x,y,size,color,opacity,label,position
a,2.868,5.518,0.5,red,0.7,Alice,below
@@ -3560,10 +3592,11 @@
f,3.698,2.808,0.5,blue,0.7,Frank,below
g,5.551,1.000,0.5,blue,0.7,George,below
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
The edge list \texttt{network\_edges.csv}.
-\begin{docspec}
+
+\begin{docspeca}
\begin{lstlisting}
u,v,lw,bend,Direct
a,b,1.0,-8.531,true
@@ -3577,7 +3610,7 @@
g,g,1.0,-8.531,true
g,d,1.0,-8.531,true
\end{lstlisting}
-\end{docspec}
+\end{docspeca}
\subsection{The plot function in detail}
\label{sec:plot_function}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-network.doc.tlpobj new/tlpkg/tlpobj/tikz-network.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-network.doc.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-network.doc.tlpobj 2019-08-16 01:54:37.000000000 +0200
@@ -1,9 +1,9 @@
name tikz-network.doc
category Package
-revision 48314
+revision 51884
shortdesc doc files of tikz-network
relocated 1
-docfiles size=278
+docfiles size=287
RELOC/doc/latex/tikz-network/README.md
RELOC/doc/latex/tikz-network/data/edges.csv
RELOC/doc/latex/tikz-network/data/front.pdf
++++++ tikz-network.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikz-network/tikz-network.sty new/tex/latex/tikz-network/tikz-network.sty
--- old/tex/latex/tikz-network/tikz-network.sty 2018-07-30 23:13:38.000000000 +0200
+++ new/tex/latex/tikz-network/tikz-network.sty 2019-08-15 22:22:22.000000000 +0200
@@ -2,10 +2,10 @@
% File : tikz-network.sty -- Library for plotting networks in TikZ
% Author : Juergen Hackl <hackl.j(a)gmx.at>
% Creation : 2017-02-28
-% Time-stamp: <Mon 2018-07-30 11:26 juergen>
-% Version : 1.0 (2018-07-30)
+% Time-stamp: <Thu 2019-08-15 10:57 juergen>
+% Version : 1.1 (2019-08-15)
%
-% Copyright (c) 2018 Juergen Hackl <hackl.j(a)gmx.at>
+% Copyright (c) 2019 Juergen Hackl <hackl.j(a)gmx.at>
%
% 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
@@ -22,7 +22,7 @@
% ============================================================================
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tikz-network}[2018/07/30 tikz-network v1.0]
+\ProvidesPackage{tikz-network}[2019/08/15 tikz-network v1.1]
%=============================================================================
% Used packages
@@ -33,6 +33,7 @@
\RequirePackage{tikz}
\RequirePackage{datatool}
\RequirePackage{graphicx}
+\RequirePackage{trimspaces}
\usetikzlibrary{arrows}
\usetikzlibrary{positioning}
\usetikzlibrary{3d}
@@ -797,6 +798,8 @@
\edef\vertex@rgbValues{}%
% Go through each row element
\DTLforeachkeyinrow{\thisValue}{
+ % Remove leading and trailing spaces
+ \trim@spaces@in\dtlkey
\DTLifeq{\dtlkey}{id}{
% Assign vertex id to storage variable
\edef\vertex@id{\thisValue}%
@@ -970,8 +973,10 @@
{1\DefaultUnit}, position = {}, loopposition = {0}, loopshape = {90},
distance = {.5}, path = {}, fontcolor = {}, fontsize = {}, fontscale ={},}
\edef\edge@rgbValues{}%
- % Go through each row element
- \DTLforeachkeyinrow{\thisValue}{
+ % Go through each row element
+ \DTLforeachkeyinrow{\thisValue}{
+ % Remove leading and trailing spaces
+ \trim@spaces@in\dtlkey
\DTLifeq{\dtlkey}{u}{
% Assign edge id to storage variable
\edef\edge@u{\thisValue}%
@@ -1038,6 +1043,9 @@
\Edge[Network](\edge@u)(\edge@v)
}{
\ifthenelse{\not\equal{\cmdNW@edges@vertices}{}}{
+ % Generate pseudo vertices
+ \Vertices[Pseudo,NoLabel]{\cmdNW@edges@vertices}
+ % Delete existing vertices data base
\DTLifdbexists{vertices}{
\DTLgdeletedb{vertices}
}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-network.tlpobj new/tlpkg/tlpobj/tikz-network.tlpobj
--- old/tlpkg/tlpobj/tikz-network.tlpobj 2019-02-28 04:08:41.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-network.tlpobj 2019-08-16 01:54:38.000000000 +0200
@@ -1,19 +1,18 @@
name tikz-network
category Package
-revision 48314
+revision 51884
shortdesc Draw networks with TikZ
relocated 1
longdesc This package allows the creation of images of complex networks
longdesc that are seamlessly integrated into the underlying LaTeX files.
-runfiles size=13
+longdesc The package requires datatool, etex, graphicx, tikz,
+longdesc trimspaces, xifthen, and xkeyval.
+runfiles size=14
RELOC/tex/latex/tikz-network/tikz-network.sty
-catalogue-contact-announce https://github.com/hackl/tikz-network
catalogue-contact-bugs https://github.com/hackl/tikz-network/issues
-catalogue-contact-home https://github.com/hackl/tikz-network
catalogue-contact-repository https://github.com/hackl/tikz-network
-catalogue-contact-support https://github.com/hackl/tikz-network/issues
catalogue-ctan /graphics/pgf/contrib/tikz-network
-catalogue-date 2018-08-04 05:30:36 +0200
+catalogue-date 2019-08-15 18:40:01 +0200
catalogue-license gpl3+
-catalogue-topics pgf-tikz diagram
-catalogue-version 1.0
+catalogue-topics graphics pgf-tikz diagram
+catalogue-version 1.1
++++++ tikz-relay.doc.tar.xz ++++++
++++ 3310 lines of diff (skipped)
++++++ tikzcodeblocks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzcodeblocks/README.md new/doc/latex/tikzcodeblocks/README.md
--- old/doc/latex/tikzcodeblocks/README.md 2018-04-03 23:30:09.000000000 +0200
+++ new/doc/latex/tikzcodeblocks/README.md 2020-04-13 00:31:41.000000000 +0200
@@ -5,7 +5,7 @@
|------------|------------------------------------------------------------|
|author: |Adrian Salamon |
|email: |adriansalamon(a)gmail.com |
-|date: |2018-04-03 |
+|date: |2020-04-06 |
|licence: |LaTeX Project Public License 1.3c |
## What is tikzcodeblocks?
@@ -28,4 +28,4 @@
### Planed features
-- better multi-language / english support
\ No newline at end of file
+- better multi-language / english support
Binary files old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.pdf and new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex
--- old/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex 2018-04-03 23:30:09.000000000 +0200
+++ new/doc/latex/tikzcodeblocks/tikzcodeblocks-documentation.tex 2020-04-13 00:31:41.000000000 +0200
@@ -95,6 +95,7 @@
\vhEntry{0.1 }{2017-07-06}{A. Salamon}{published}
\vhEntry{0.11}{2017-07-18}{A. Salamon}{update: shapes, translations and fix typos}
\vhEntry{0.12}{2018-04-03}{A. Salamon}{update: LED colors}
+ \vhEntry{0.13}{2020-04-06}{A.~Salamon, A.~Wagner }{bug-fix: wrongly shifed nodes}
\end{versionhistory}
%
\begin{itemize}[leftmargin=*,noitemsep]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj new/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj
--- old/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj 2019-02-28 04:08:44.000000000 +0100
+++ new/tlpkg/tlpobj/tikzcodeblocks.doc.tlpobj 2020-04-16 01:57:26.000000000 +0200
@@ -1,9 +1,9 @@
name tikzcodeblocks.doc
category Package
-revision 47265
+revision 54758
shortdesc doc files of tikzcodeblocks
relocated 1
-docfiles size=135
+docfiles size=136
RELOC/doc/latex/tikzcodeblocks/README.md
RELOC/doc/latex/tikzcodeblocks/examples/bsp-einruecken.tikz
RELOC/doc/latex/tikzcodeblocks/examples/bsp-english.tikz
++++++ tikzcodeblocks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzcodeblocks/tikzcodeblocks.sty new/tex/latex/tikzcodeblocks/tikzcodeblocks.sty
--- old/tex/latex/tikzcodeblocks/tikzcodeblocks.sty 2018-04-03 23:30:09.000000000 +0200
+++ new/tex/latex/tikzcodeblocks/tikzcodeblocks.sty 2020-04-13 00:31:41.000000000 +0200
@@ -320,23 +320,23 @@
%
% https://tex.stackexchange.com/questions/223910/reference-a-nodes-color-by-u…
% get color of 'this' element
-every text node part/.add code={}{
- \globalcolorstrue
- \ifx\tikz@fillcolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.fill}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.fill}{\tikz@fillcolor}
- \fi
- \ifx\tikz@strokecolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.draw}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.draw}{\tikz@strokecolor}
- \fi
- \ifx\tikz@textcolor\pgfutil@empty
- \pgfutil@colorlet{\tikz@fig@name.text}{.}
- \else
- \pgfutil@colorlet{\tikz@fig@name.text}{\tikz@textcolor}
- \fi
+every text node part/.add code={}{%
+\globalcolorstrue%
+\ifx\tikz@fillcolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.fill}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.fill}{\tikz@fillcolor}%
+\fi%
+\ifx\tikz@strokecolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.draw}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.draw}{\tikz@strokecolor}%
+\fi%
+\ifx\tikz@textcolor\pgfutil@empty%
+\pgfutil@colorlet{\tikz@fig@name.text}{.}%
+\else%
+\pgfutil@colorlet{\tikz@fig@name.text}{\tikz@textcolor}%
+\fi%
},
} %end tikzset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzcodeblocks.tlpobj new/tlpkg/tlpobj/tikzcodeblocks.tlpobj
--- old/tlpkg/tlpobj/tikzcodeblocks.tlpobj 2019-02-28 04:08:44.000000000 +0100
+++ new/tlpkg/tlpobj/tikzcodeblocks.tlpobj 2020-04-16 01:57:26.000000000 +0200
@@ -1,6 +1,6 @@
name tikzcodeblocks
category Package
-revision 47265
+revision 54758
shortdesc Helps to draw codeblocks like scratch, NEPO and PXT in TikZ
relocated 1
longdesc tikzcodeblocks is a LaTeX package for typesetting blockwise
@@ -9,7 +9,6 @@
RELOC/tex/latex/tikzcodeblocks/tikzcodeblocks.sty
catalogue-also scratch
catalogue-ctan /graphics/pgf/contrib/tikzcodeblocks
-catalogue-date 2018-04-03 13:13:53 +0200
catalogue-license lppl1.3c
catalogue-topics pgf-tikz
-catalogue-version 0.12
+catalogue-version 0.13
++++++ tikzducks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzducks/README.md new/doc/latex/tikzducks/README.md
--- old/doc/latex/tikzducks/README.md 2019-04-07 23:21:00.000000000 +0200
+++ new/doc/latex/tikzducks/README.md 2020-01-03 23:15:44.000000000 +0100
@@ -1,29 +1,11 @@
-# Tikzducks
+# TikZducks
-This is a little LaTeX package for ducks to be used in TikZ pictures. The project is a continuation of https://tex.stackexchange.com/a/347458/36296
+This is a little LaTeX package for ducks to be used in TikZ pictures. The project is a continuation of the TeX.Stackexchange.com answer [How can we draw a duck](https://tex.stackexchange.com/a/347458/36296)
This project is licensed under the LaTeX Project Public License v1.3c or later, see http://www.latex-project.org/lppl.txt
-The project repository, including a bug tracker, can be found at https://github.com/samcarter/tikzducks/issues
-
-![This repository has an official duck seal of approval](https://i.stack.imgur.com/mSAtL.png)
-
## A few examples:
-![tikz ducks](https://user-images.githubusercontent.com/8226363/33049537-e71e9dd0-…
-
-## Video showcases
-
-There are several videos featuring the TikZducks, kindly contributed by Ulrike and Gert Fischer, Carla Maggi, Paulo Cereda and Prof. van Duck - many thanks to you all!
-
-[![The great TikZducks Christmas Extravaganza 2017](https://user-images.githubusercontent.com/8226363/43651585-1281b074-9…
-[![International Pizza Day](https://user-images.githubusercontent.com/8226363/43651587-12c92daa-97…
-[![Happy Groundhog Day](https://user-images.githubusercontent.com/8226363/43651589-12e84334-97…
-[![Aquarela with TikZducks](https://user-images.githubusercontent.com/8226363/43651586-12a6c…
-[![Saint Crispin's Day](https://user-images.githubusercontent.com/43832342/47496794-37d18600-d…
-[![James Bond](https://user-images.githubusercontent.com/43832342/47496795-37d18600-…
-[![The great TikZlings Christmas Extravaganza 2018](https://user-images.githubusercontent.com/43832342/49704004-3cd27500-…
-
-
+![tikz ducks](https://user-images.githubusercontent.com/43832342/71718547-d160d400…
-The source code for the "The great TikZducks Christmas Extravaganza 2017" is available in https://github.com/cereda/duck-extravaganza, for "The great TikZlings Christmas Extravaganza 2018" it can be found at https://github.com/samcarter/Extravanganza2018 .
+More examples of TikZducks can be seen at https://github.com/samcarter/tikzducks/
\ No newline at end of file
Binary files old/doc/latex/tikzducks/tikzducks-doc.pdf and new/doc/latex/tikzducks/tikzducks-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzducks/tikzducks-doc.tex new/doc/latex/tikzducks/tikzducks-doc.tex
--- old/doc/latex/tikzducks/tikzducks-doc.tex 2019-04-07 23:21:00.000000000 +0200
+++ new/doc/latex/tikzducks/tikzducks-doc.tex 2020-01-03 23:15:44.000000000 +0100
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\documentclass[parskip=half]{scrartcl}
@@ -24,7 +21,7 @@
\usepackage{tikzducks}
\usetikzlibrary{ducks}
\usepackage[most]{tcolorbox}
-\usepackage[paper=a4paper,margin=3cm]{geometry}
+\usepackage[paper=a4paper,margin=3cm,foot=2cm]{geometry}
\usepackage{url}
\usepackage{xspace}
\usepackage{scrlayer-scrpage}
@@ -56,7 +53,7 @@
commentstyle={\color{green!50!black}\slshape},
columns=fullflexible,
emphstyle=\color{orange!70!black},
- emph=[1]{water,body,head,eye,pupil,bill,grumpy,tshirt,jacket,tie,cape,shorthair,longhair,crazyhair,recedinghair,eyebrow,beard,glasses,sunglasses,alien,hat,cap,santa,chef,cheese,graduate,tassel,beret,crown,unicorn,icecream,flavoura,flavourb,flavourc,book,bookcolour,signpost,signcolour,signback,magichat,magicstars,magicwand,witch,cricket,rollingpin,lightsaber,torch,cake,pizza,hockey,baguette,wing,football,mask,bunny,inear,necklace,milkshake,wine,peakedcap,prison,tophat,speech,bubblecolour,think,buttons,sheep,squareglasses,tail,basket,easter,egga,eggb,eggc,mohican,mullet,horsetail,darthvader,crozier,queencrown,kingcrown,wing,laughing,parrot,stethoscope,niuqelrah,harlequin,neckerchief,woggle,snowduck,invisible,strawhat,ribbon,vampire,parting,crystalball,helmet,shovel,pickaxe,bowtie,lapel,umbrella,umbrellaclosed,handbag,cocktail,viking,devil},
+ emph=[1]{water,body,head,eye,pupil,bill,grumpy,tshirt,jacket,tie,cape,shorthair,longhair,crazyhair,recedinghair,eyebrow,beard,glasses,sunglasses,alien,hat,cap,santa,chef,cheese,graduate,tassel,beret,crown,unicorn,icecream,flavoura,flavourb,flavourc,book,bookcolour,signpost,signcolour,signback,magichat,magicstars,magicwand,witch,cricket,rollingpin,lightsaber,torch,cake,pizza,hockey,baguette,wing,football,mask,bunny,inear,necklace,milkshake,wine,peakedcap,prison,tophat,speech,bubblecolour,think,buttons,sheep,squareglasses,tail,basket,easter,egga,eggb,eggc,mohican,mullet,horsetail,darthvader,crozier,queencrown,kingcrown,wing,laughing,parrot,stethoscope,niuqelrah,harlequin,neckerchief,woggle,snowduck,invisible,strawhat,ribbon,vampire,parting,crystalball,helmet,shovel,pickaxe,bowtie,lapel,umbrella,umbrellaclosed,handbag,cocktail,viking,devil,aodai,conicalhat,overleaf},
texcsstyle=*\color{duckblue}\bfseries,
keywordstyle=\color{red!60!black}\bfseries,
morekeywords={tikzpicture,picture,scope,patterns,calc,pgfinterruptboundingbox},
@@ -86,7 +83,7 @@
\pgfkeys{/duck/|stripes|/.style={stripes={#1}}}
\pgfmathsetseed{2}
-\setlength{\footheight}{45pt}
+\setlength{\footheight}{41pt}
\newlength{\duckoffset}
\cfoot{%
@@ -119,7 +116,7 @@
\url{https://github.com/samcarter/tikzducks}\\
\url{https://www.ctan.org/pkg/tikzducks}
}{samcarter}}
-\date{Version 1.1 -- \today}
+\date{Version v1.3 \textendash{} 2020/01/03}
\begin{document}
\maketitle
@@ -156,7 +153,9 @@
%
\href{https://tex.stackexchange.com/users/148434/mihikma}{Mihikma} created the duck's beard,
%
-\href{https://github.com/yudai-nkt}{Yudai Nakata} helped with problems of \lstinline|\pdfrandomseed|
+\href{https://github.com/yudai-nkt}{Yudai Nakata} helped with problems of \lstinline|\pdfrandomseed|,
+%
+@marmot for his seemingly infinite knowledge of \TikZ which he shared with the world on TeX.SE
%
and last but not least my thanks go to \href{https://tex.stackexchange.com/users/5763/martin-schr%c3%b6der}{Martin Schr\"oder} for his feedback to the code review.
@@ -167,10 +166,10 @@
The \tikzducks package loads \TikZ, which in turn loads the \lstinline|xcolor| package (amongst others). If you require one of these packages to be loaded with some option, please consider loading it yourself before the \tikzducks package or use, e.g.
-\begin{lstlisting}[aboveskip=0em,morekeywords={xcolor,svgnames}]
+\begin{lstlisting}[morekeywords={xcolor,svgnames}]
\PassOptionsToPackage{svgnames}{xcolor}
\end{lstlisting}
-It also uses the \lstinline|\usetikzlibrary{patterns}| and \lstinline|\usetikzlibrary{calc}|. Furthermore the packages \lstinline|ifpdf| and \lstinline|ifluatex| are necassary starting with version 0.5 of this package.
+It also uses the \lstinline|\usetikzlibrary{patterns}| and \lstinline|\usetikzlibrary{calc}|.
\subsection{License}
@@ -246,6 +245,16 @@
\end{tikzpicture}
\end{tcolorbox}
+For everybody suffering from anatidaephobia, there is also a special option to not draw the duck:
+\begin{tcblisting}{title={Invisible duck}}
+\begin{tikzpicture}
+ \duck[invisible]
+\end{tikzpicture}
+\end{tcblisting}
+
+This can also be useful to recycle some of the accessories presented in \ref{sec:accessories}.
+
+\clearpage
For the \TeX{} purists, there is also a picture mode variant:
{
@@ -257,7 +266,6 @@
\end{tcblisting}
}
-\clearpage
\subsection{Body parts}
The various parts of the duck can also be coloured independently, i.e.\ \lstinline|body|, \lstinline|head| or \lstinline|bill|:
@@ -300,42 +308,50 @@
\end{tikzpicture}
\end{tcblisting}
-For everybody suffering from anatidaephobia, there is also a special option to not draw the duck:
-\begin{tcblisting}{title={Invisible duck}}
-\begin{tikzpicture}
- \duck[invisible]
-\end{tikzpicture}
-\end{tcblisting}
-This can also be useful to recycle some of the accessories presented in \ref{sec:accessories}.
-
-\clearpage
\subsection{Hair styles}
Some duck also like to have nice hair cuts, several different hair styles are available:
-\begin{tcblisting}{title={Hairy duck},righthand width=9cm}
+
+\begin{tcblisting}{title={Long hair duck}}
\begin{tikzpicture}
\duck[longhair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Short hair duck}}
\begin{tikzpicture}
\duck[shorthair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Parting hair duck}}
+\begin{tikzpicture}
+ \duck[parting]
+\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Crazy hair duck}}
\begin{tikzpicture}
\duck[crazyhair]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Receding hair duck}}
\begin{tikzpicture}
\duck[recedinghair]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Mohican duck}}
\begin{tikzpicture}
\duck[mohican]
\end{tikzpicture}
-\begin{tikzpicture}
- \duck[mullet]
-\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Mullet duck}}
\begin{tikzpicture}
- \duck[parting]
+ \duck[mullet]
\end{tikzpicture}
\end{tcblisting}
@@ -378,37 +394,52 @@
\subsection{Clothing}
-A respectable duck needs a suitable wardrobe. It can choose from a \lstinline|tshirt|, a \lstinline|jacket|, a \lstinline|tie| or a \lstinline|bowtie|. In it's infinite wardrobe these items are available in all colours definable in the current colour model.
+A respectable duck needs a suitable wardrobe. It can choose from several different garments. In it's infinite wardrobe these items are available in all colours definable in the current colour model.
-\begin{tcblisting}{title={Dressed duck}}
+\begin{tcblisting}{title={T-shirt duck}}
\begin{tikzpicture}
- \duck[tshirt]
+ \duck[tshirt=red]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Jacket duck}}
\begin{tikzpicture}
- \duck[jacket]
+ \duck[jacket=blue]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Tie duck}}
\begin{tikzpicture}
- \duck[tie]
+ \duck[tshirt,
+ jacket=gray,
+ tie]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Bowtie duck}}
\begin{tikzpicture}
- \duck[bowtie]
+ \duck[tshirt,
+ jacket=gray,
+ bowtie]
\end{tikzpicture}
+\end{tcblisting}
+\begin{tcblisting}{title={Ão dà i duck}}
\begin{tikzpicture}
- \duck[cape]
+ \duck[tshirt=cyan,
+ aodai=blue!50!black
+ ]
\end{tikzpicture}
+\end{tcblisting}
+
+\begin{tcblisting}{title={Cape duck}}
\begin{tikzpicture}
- \duck[tshirt=lightgray,
- jacket=blue!50!black,
- tie=blue!80!black,
- shorthair]
+ \duck[cape]
\end{tikzpicture}
\end{tcblisting}
For more ways to customise the clothing also have a look at the \hyperref[sec:footballducks]{football ducks in Section \ref{sec:footballducks}}.
-\clearpage
\subsection{Accessories}
\label{sec:accessories}
@@ -450,6 +481,12 @@
\end{tikzpicture}
\end{tcblisting}
+\begin{tcblisting}{title={Conical hat duck}}
+\begin{tikzpicture}
+ \duck[conicalhat=brown]
+\end{tikzpicture}
+\end{tcblisting}
+
\begin{tcblisting}{title={Santa Duck}}
\begin{tikzpicture}
\duck[santa=red!80!black,
@@ -846,6 +883,14 @@
\end{tikzpicture}
\end{tcblisting}
+\addtocounter{footnote}{1}
+\begin{tcblisting}{title={Overleaf Duck$^{\thefootnote}$}}
+\begin{tikzpicture}
+ \duck[overleaf]
+\end{tikzpicture}
+\end{tcblisting}
+\footnotetext[\thefootnote]{added to celebrate that \tikzducks are now also available on overleaf, see \url{https://www.overleaf.com/blog/tex-live-upgrade-september-2019}}
+
\clearpage
\section{Random ducks}
With all these available accessories it might be hard to decide which one to choose, but don't worry the \tikzducks provide a solution for this dilemma, the random duck, or short \lstinline|\randuck|, which automatically creates a duck with a randomly chosen accessories and something on top of the head (hair, a hat, ears, alien antenna ...)
@@ -920,7 +965,6 @@
\end{tikzpicture}
\end{tcblisting}
}
-An example making use this option are the \hyperref[starducks]{``Live long and prosper'' ducks}.
To distinguish coordinates from multiple ducks in the same \lstinline|tikzpicture|, one can name the ducks using the option \lstinline[emph={name}]|name|. If this option is used, the coordinates are prefixed with the respective name and a dash: \lstinline|<name>-<coordinate>|.
@@ -1095,336 +1139,13 @@
\end{tikzpicture}
\end{tcblisting}
-In case your favourite team is missing from the above examples, feel free to create an example and share it with the community in \href{https://tex.stackexchange.com/q/387047/36296}{The Duck Pond}.
-
-\clearpage
-\section{Showcase}
-
-\addtocounter{footnote}{1}
-In the following a few examples of possible duck customisations, some of which will require additional packages (which are stated as a comment at the start of the code). For more examples (or to show your own creations) please visit \href{https://tex.stackexchange.com/q/387047/36296}{The Duck Pond} or have a look at \href{https://vimeo.com/246256860}{The Great Christmas Extravaganza}$^{\thefootnote}$\footnotetext[\thefootnote]{the source code is available at \url{https://github.com/cereda/duck-extravaganza}}.
-
-\begin{tcblisting}{title={\texttt{samcarter} duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!brown!50!white,
- longhair=red!50!brown,
- jacket=blue!50!black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Paulo duck}}
-\begin{tikzpicture}
- \duck[cap,cricket]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Party duck}}
-\begin{tikzpicture}
- \duck[cake=violet,
- magichat=violet,
- magicstars=white!85!yellow]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Brazil duck}}
-\begin{tikzpicture}
- \definecolor{brazilgreen}{RGB}{0,155,58}%
- \definecolor{brazilyellow}{RGB}{254,223,0}%
- \definecolor{brazilblue}{RGB}{0,39,118}%
- \duck[body=brazilyellow,
- shorthair=brazilgreen]
- \path[preaction={fill, brazilblue},pattern=fivepointed stars, pattern color=white]
- \duckpathjacket;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Duck in black}}
-\begin{tikzpicture}
- \duck[grumpy, body=yellow!50!brown!50!white, tshirt=white, jacket=black, tie=black, hat=black, sunglasses=black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Prof.\ van Duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!brown!40!white,
- crazyhair=gray!50!white,
- eyebrow,
- glasses=brown!70!black,
- book=\scalebox{0.2}{$E=mc^2$},
- bookcolour=red!20!brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Knuth duck}}
-\begin{tikzpicture}
- \duck[body=yellow!50!red!20!white,
- recedinghair=gray!50!white,
- eyebrow,
- tshirt=white!93!black,
- jacket=red!50!black,
- glasses=brown!70!lightgray,
- book=\scalebox{0.5}{\TeX},
- bookcolour=black!20!brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={May the Quack be with you}}
-\begin{tikzpicture}
- \colorlet{skin}{white!45!gray!80!green}
- \duck[lightsaber, body=skin, bill=gray!80!green,
- tshirt=brown!50!black, jacket=brown!30!gray]
- \fill[skin,rounded corners=3] (0.44,1.70) -- (0.25,2) -- (0.6,1.95);
- \fill[skin,rounded corners=3] (1.34,1.60) -- (1.53,1.9) -- (1.16,1.85);
-\end{tikzpicture}
+\section{Examples}
-\begin{tikzpicture}
- \duck[grumpy,lightsaber=red,cape=black!85!white,
- body=black!70!white,darthvader=black!85!white]
-\end{tikzpicture}
+To see more examples of what can be done with the \tikzducks, you are invited to visit \url{https://github.com/samcarter/tikzducks}.
-\begin{tikzpicture}
- \fill[brown!70!black] (0.5,1.65) circle (0.25);
- \duck[jacket=white!95!brown, body=brown!50!white,
- shorthair=brown!70!black, lightsaber=cyan]
- \fill[brown!70!black] (1.3,1.6) circle (0.25);
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Ghost duck}}
-\colorlet{ghost}{white!98!gray}%
-\begin{tikzpicture}
-\duck[body=ghost,bill=ghost,prison=gray]
-\fill[ghost,rotate=-17](-0.1,0.7) rectangle (0.15,1.3);
-\fill[ghost,rotate=17] (1.6,0.7) rectangle (1.81,1.3);
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={67P/Churyumov-Gerasimenko duck$^{\thefootnote}$}}
-\begin{tikzpicture}[path image/.style={path picture={\foreach \j in {0,...,2}{\node at (0,\j) {\foreach \i in {1,...,5}{\includegraphics[height=1cm]{#1}}};}}}]
-\path (0.1,0.1) rectangle (2.1,2.12);
-\begin{pgfinterruptboundingbox}
-\path[path image=crinklepaper]
- (0.90,1.50) ellipse (0.50 and 0.625);
-\path[path image=crinklepaper] \duckpathbody;
-\fill[gray!80!white] \duckpathbill;
-\fill[white!70!gray, rotate=-20]
- (0.23,1.7675) ellipse (0.0893 and 0.125)
- (-0.06,1.74) ellipse (0.0786 and 0.1143);
-\fill[black, rotate=-20]
- (0.26,1.7575) ellipse (0.0357 and 0.0714)
- (-0.03,1.73) ellipse (0.0286 and 0.0643);
-\end{pgfinterruptboundingbox}
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{If you try this at home, replace the \texttt{crinklepaper} with an image of the comet's surface, e.g. \url{https://arxiv.org/abs/1707.02945}}
-
-\begin{tcblisting}{title={With my username I had to...}}
-%\usepackage{marvosym}
-\definecolor{sgskin}{RGB}{222,197,159}%
-\definecolor{sgblond}{RGB}{238,203,96}%
-\colorlet{sggreen}{olive!50!black}
-\colorlet{sgbill}{sgskin!85!black}
-\colorlet{sgshirt}{sggreen!50!black}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,cap=sggreen]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,shorthair=sgblond]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=sgskin,bill=sgbill,tshirt=sgshirt,jacket=sggreen,parting=brown!70!black,glasses=brown!30!gray, book={\AA}, bookcolour=brown!50!black]
-\end{tikzpicture}
-
-\begin{tikzpicture}
- \duck[body=brown!80!black,bill=brown!65!black,tshirt=sgshirt,jacket=sggreen,grumpy]
- \fill[sgblond, rotate=-10] (0.45,2.0) ellipse (0.12 and 0.05);
- \node[rotate=170] at (0.8,1.89) {\scalebox{0.35}{\Leo}};
-\end{tikzpicture}
-\end{tcblisting}
-
-
-\begin{tcblisting}{title={Live long and prosper},label=starducks}
-%\usepackage{fontawesome}
-\definecolor{unigold}{RGB}{203,157,52}%
-\definecolor{uniblue}{RGB}{46,114,167}%
-\definecolor{unired}{RGB}{177,49,34}%
-
-\definecolor{skink}{RGB}{245,206,193}%
-\definecolor{skins}{RGB}{255,222,151}%
-\definecolor{skinu}{RGB}{146,113,96}%
-
-\newcommand*{\insignia}{\node[rotate=15] at (wing) {\color{yellow!80!brown}\faLocationArrow};}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=unigold, body=skink, shorthair=brown!80!black, bill=skink!60!gray]
-\insignia
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=uniblue, body=skins, mullet=black!60!brown, bill=skins!60!gray]
-\fill[skins,rotate=175, xshift=-46, yshift=-74] (0.45,1.20)--(0.50,0.80)--(0.65,1.20);
-\fill[black!60!brown, rounded corners=1, rotate=70] (1.85,0.13) rectangle (1.91,-0.05);
-\fill[black!60!brown, rounded corners=1, rotate=90] (1.7,-0.75) rectangle (1.76,-0.97);
-\insignia
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[tshirt=black!60!gray, jacket=unired, body=skinu, longhair=black!60!brown, bill=skinu!70!black]
-\insignia
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={French duck}}
-\begin{tikzpicture}
-\duck[body=yellow!60!red!30!white,tshirt=white!90!yellow,|stripes|={\stripes[color=blue!70!black,rotate=-87,width=0.07,distance=0.12]},beret=blue!30!black,baguette=brown]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Bee duck}}
-\begin{tikzpicture}
- \duck[|stripes|={\stripes[distance=0.4,width=0.2,rotate=0,initialx=0.15]},alien=black,laughing]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Jailbird duck}}
-\begin{tikzpicture}
-\duck[peakedcap=gray!40!black,tshirt=white,stripes={
-\stripes[rotate=100,color=gray!40!black]},prison=gray]
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Super duck brothers}}
-\newcommand{\superstripes}{\stripes[color=blue!80!black,width=3,height=1.0,rotate=5] \stripes[color=blue!80!black,width=0.1,rotate=0,distance=0.7,initialx=-1.1,height=2]}
-\begin{tikzpicture}
-\duck[tshirt=red!80!black,peakedcap=red!80!black,|stripes|={\superstripes}]
-\fill[white] (0.8,2) circle (0.13);
-\node[red!80!black,rotate=-25] at (0.8,2) {\scalebox{0.6}{\textsf{M}}};
-\end{tikzpicture}
-\begin{tikzpicture}
-\duck[tshirt=green!70!black,peakedcap=green!70!black, |stripes|={\superstripes}]
-\fill[white] (0.8,2) circle (0.13);
-\node[green!70!black,rotate=-25] at (0.8,2) {\scalebox{0.6}{\textsf{L}}};
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Princess duck}}
-\definecolor{pskin}{RGB}{255,200,184}%
-\definecolor{phair}{RGB}{249,249,139}%
-\begin{tikzpicture}
-\duck[body=pskin!80!white,longhair=phair,tshirt=magenta!60!white,jacket=magenta!40!white,necklace=white!85!yellow]
-\path (0.7,2) rectangle (1.4,2.55);
-\fill[yellow!80!orange,rotate=-10,xshift=-11,yshift=5] \duckpathcrown;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={ZZZoro duck}}
-\begin{tikzpicture}
-\duck[cape=black,hat=black,mask=black]
-\node[rotate=-5] at (0.4,0.7) {\tiny\fontfamily{pzc}\selectfont \textbackslash ZZZ};
-\fill[black,rotate=24] (0.1,0.21) rectangle (1.1,0.23) (1.2,0.22) ellipse (0.15 and 0.03) (1.08,0.22) ellipse (0.03 and 0.15);
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Farm animals}}
-\definecolor{fskin}{RGB}{161,140,126}%
-\definecolor{fbill}{RGB}{238,212,191}%
-\definecolor{fhair}{RGB}{89,72,72}%
-\begin{tikzpicture}
-\duck[body=fskin,bill=fbill,shorthair=fhair,bunny,inear=fbill]
-\node[fskin,rotate=45,scale=3] at (1.7,1.55) {\textsf{s}};
-\fill[fhair,rotate=45] (2.4,0.13) ellipse (0.15 and 0.07);
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, bunny, longhair=white!60!brown]
-\fill[white!60!brown] (tail) circle (0.2);
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=red!20!white,bill=red!30!white,shorthair=red!30!white,bunny=red!30!white,inear=red!30!white]
-\node[red!20!white,rotate=25,scale=3] at (1.7,1.51) {\textsf{s}};
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\duck[body=white!80!brown, bill=white!60!brown, sheep]
-\end{tikzpicture}
-
-\begin{tikzpicture}
-\begin{scope}[yshift=-6]
-\clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
-\fill[brown,rotate=-5](0.28,2.26)ellipse (0.3 and 0.4);
-\end{scope}
-\duck[body=brown,mohican=brown!50!black,horsetail]
-\begin{scope}[yshift=-5,xshift=1]
-\clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
-\fill[brown,rotate=-5](1.06,2.2) ellipse (0.3 and 0.4);
-\end{scope}
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Arara duck$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[parrot,bill=gray!80!black]
-\shade[left color=cyan!90!blue,right color=blue!70!black] \duckpathwing;
-\shade[bottom color=yellow!70!brown, top color=green!40!teal] \duckpathcrazyhair;
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{In honour of the cool TeX automation tool arara, \url{https://github.com/cereda/arara}}
-
-\begin{tcblisting}{title={Duck Queen}}
-\definecolor{qskin}{RGB}{225,219,206}%
-\definecolor{qbill}{RGB}{170,123,154}%
-\definecolor{qdress}{RGB}{184,209,206}%
-\definecolor{qcrown}{RGB}{90,76,183}%
-\begin{tikzpicture}
-\duck[body=qskin,bill=qbill,jacket=qdress,tshirt=teal!30!qdress,shorthair=gray!60!white,necklace=gray!10!white,handbag=teal!30!qdress]
-\fill[gray!60!white,rotate=-30] (0.27,1.23) rectangle (0.37,0.65);
-\fill[qcrown,scale=0.23,rotate=-20,yshift=82,xshift=38] \duckpathqueencrown;
-\fill[qcrown,yshift=3] \duckpathkingcrown;
-\end{tikzpicture}
-\end{tcblisting}
-
-\begin{tcblisting}{title={Duck, MD}}
-\begin{tikzpicture}
-\duck[parting=brown!70!black, squareglasses,
- tshirt=teal!50!white, jacket=white,
- buttons=gray!50!white, stethoscope]
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Duck scout with ``šátek'' and ``turbánek''$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[head=yellow!60!brown!50!white,
- tshirt=brown!80!gray!40!white,
- cap=orange!50!yellow,
- neckerchief=orange!50!yellow,
- woggle=brown, bookcolour=brown!80!black,
- book={\tiny\sffamily\scalebox{0.3}{\parbox{1.1cm}{\centering Scouting\\for\\Ducklings}}}]
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{This is a very special duck, because yo' won the scout duck in the contest \href{https://tex.meta.stackexchange.com/q/7493/36296}{When will @egreg reach 654321}. In Czech, the neckerchief is called ``šátek'' and the woggle ``turbánek'', which means ``little turban''.}
-
-\begin{tcblisting}{title={My name is Duck, James Duck}}
-\begin{tikzpicture}
-\duck[tshirt,lapel,jacket=gray!50!black,cocktail,
- buttons,bowtie,parting=brown!50!black]
-\end{tikzpicture}
-\end{tcblisting}
-
-\addtocounter{footnote}{1}
-\begin{tcblisting}{title={Mary Duckings$^{\thefootnote}$}}
-\begin{tikzpicture}
-\duck[tshirt,bowtie=red!70!black,jacket=blue!50!black,umbrellaclosed=cyan!50!green,longhair=brown!60!black,hat=black]
-\end{tikzpicture}
-\end{tcblisting}
-\footnotetext[\thefootnote]{following an idea from Paulo}
+If you have created a duck you would like to share with the community, I would be happy to add it to this collection, just make a pull request or open an issue in the bug tracking system.
\clearpage
\printindex
-\end{document}
\ No newline at end of file
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzducks.doc.tlpobj new/tlpkg/tlpobj/tikzducks.doc.tlpobj
--- old/tlpkg/tlpobj/tikzducks.doc.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzducks.doc.tlpobj 2020-01-05 01:55:17.000000000 +0100
@@ -1,9 +1,9 @@
name tikzducks.doc
category Package
-revision 50840
+revision 53312
shortdesc doc files of tikzducks
relocated 1
-docfiles size=152
+docfiles size=119
RELOC/doc/latex/tikzducks/README.md
RELOC/doc/latex/tikzducks/tikzducks-doc.pdf
RELOC/doc/latex/tikzducks/tikzducks-doc.tex
++++++ tikzducks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzducks/tikzducks.sty new/tex/latex/tikzducks/tikzducks.sty
--- old/tex/latex/tikzducks/tikzducks.sty 2019-04-07 23:21:00.000000000 +0200
+++ new/tex/latex/tikzducks/tikzducks.sty 2020-01-03 23:15:44.000000000 +0100
@@ -11,20 +11,13 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ProvidesPackage{tikzducks}
- [2019/04/07 v1.1 Draw rubber ducks in TikZ]
+\ProvidesPackage{tikzducks}[2020/01/03 version v1.3 Draw rubber ducks in TikZ]
\RequirePackage{tikz}
\usetikzlibrary{patterns} % for the wizard hat
\usetikzlibrary{calc} % for the sports jerseys
-\RequirePackage{ifluatex}
-\RequirePackage{ifxetex}
-
%\pgfdeclarelayer{backgroundlayer}
%\pgfdeclarelayer{bodylayer}
%\pgfdeclarelayer{clothinglayer}
@@ -33,6 +26,8 @@
%
%\pgfsetlayers{backgroundlayer,bodylayer,clothinglayer,hairlayer,hatlayer,main}
+\definecolor{duck@overleafcol}{RGB}{72,172,60}
+
\newcommand*{\duck}[1][]{%
\begin{scope}%
\tikzset{/duck/.cd,#1}%
@@ -59,6 +54,7 @@
\newif\ifduck@mullet
\newif\ifduck@parting
% clothing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\ifduck@clothing
\newif\ifduck@tshirt
\newif\ifduck@jacket
\newif\ifduck@tie
@@ -66,6 +62,7 @@
\newif\ifduck@stripes
\newif\ifduck@bowtie
\newif\ifduck@lapel
+\newif\ifduck@aodai
% Headgear %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifduck@alien
\newif\ifduck@hat
@@ -89,6 +86,7 @@
\newif\ifduck@helmet
\newif\ifduck@viking
\newif\ifduck@devil
+\newif\ifduck@conicalhat
% Accessories %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newif\ifduck@glasses
\newif\ifduck@sunglasses
@@ -133,6 +131,7 @@
\newif\ifduck@umbrellaclosed
\newif\ifduck@handbag
\newif\ifduck@cocktail
+\newif\ifduck@overleaf
\tikzset{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -174,19 +173,23 @@
% clothing
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- tshirt/.code = \duck@tshirttrue
+ tshirt/.code = \duck@tshirttrue
+ \duck@clothingtrue
\def\duck@tshirt{#1},
tshirt/.default = white,
- jacket/.code = \duck@jackettrue
+ jacket/.code = \duck@jackettrue
+ \duck@clothingtrue
\def\duck@jacket{#1},
jacket/.default = blue,
tie/.code = \duck@tietrue
\def\duck@tie{#1},
tie/.default = blue,
- cape/.code = \duck@capetrue
+ cape/.code = \duck@capetrue
+ \duck@clothingtrue
\def\duck@cape{#1},
cape/.default = red,
stripes/.code = \duck@stripestrue
+ \duck@clothingtrue
\def\duck@stripes{#1},
stripes/.default = \stripes ,
bowtie/.code = \duck@bowtietrue
@@ -196,6 +199,11 @@
lapel/.code = \duck@lapeltrue
\def\duck@lapel{#1},
lapel/.default = black,
+ aodai/.code = \duck@aodaitrue
+ \duck@clothingtrue
+ \def\duck@aodai{#1},
+ ao dai/.forward to = /duck/aodai,
+ aodai/.default = blue!50!black,
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% hair styles
@@ -324,6 +332,10 @@
\duck@deviltrue
\def\duck@devil{brown!20!white},
viking/.default = gray,
+ conicalhat/.code = \duck@conicalhattrue
+ \def\duck@conicalhat{#1},
+ conical hat/.forward to = /duck/conicalhat,
+ conicalhat/.default = brown!90!orange!90!white,
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Accessories
@@ -503,6 +515,12 @@
\def\duck@handbag{#1},
handbag/.default = red!70!black,
cocktail/.code = \duck@cocktailtrue,
+ overleaf/.code = \duck@overleaftrue
+ \def\duck@body{duck@overleafcol}
+ \duck@graduatetrue
+ \def\duck@graduate{black}
+ \duck@squareglassestrue
+ \def\duck@squareglasses{black}
}
\def\duck@draw{
@@ -553,21 +571,26 @@
%
% water %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@water
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (0.88 and 0.35) (1.00,0.40) ellipse (0.75 and 0.25);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.05 and 0.50) (1.00,0.40) ellipse (0.95 and 0.42);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.23 and 0.63) (1.00,0.40) ellipse (1.17 and 0.57);
- \fill[\duck@water, even odd rule] (1.00,0.40) ellipse (1.42 and 0.77) (1.00,0.40) ellipse (1.38 and 0.73);
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=0.88, y radius=0.35] (1.00,0.40) ellipse[x radius=0.75, y radius=0.25];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.05, y radius=0.50] (1.00,0.40) ellipse[x radius=0.95, y radius=0.42];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.23, y radius=0.63] (1.00,0.40) ellipse[x radius=1.17, y radius=0.57];
+ \fill[\duck@water, even odd rule] (1.00,0.40) ellipse[x radius=1.42, y radius=0.77] (1.00,0.40) ellipse[x radius=1.38, y radius=0.73];
\fi
%
% sheep %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@sheep
- \fill[\duck@sheep] (0.65,1.95) circle (0.15) (0.5,1.75) circle (0.15) (0.46,1.51) circle (0.15) (0.37,1.) circle (0.15) (0.23,0.8) circle (0.15) (0.2,0.6) circle (0.15) (0.25,0.45) circle (0.15) (0.35,0.30) circle (0.15) (0.55,0.25) circle (0.15) (0.75,0.2) circle (0.15) (0.95,0.16) circle (0.15) (1.15,0.2) circle (0.15) (1.35,0.23) circle (0.15) (1.55,0.3) circle (0.15) (1.75,0.38) circle (0.15) (1.95,0.5) circle (0.15) (2.05,0.65) circle (0.15) (2.1,0.85) circle (0.15) (2.05,1.0) circle (0.15) (2.0,1.15) circle (0.15) (1.85,1.35) circle (0.15) (1.6,1.25) circle (0.15) (1.35,1.25) circle (0.15) (1.3,1.5) circle (0.15) (1.3,1.7) circle (0.15) (1.2,1.9) circle (0.15) (0.85,2.05) circle (0.15) (1.05,2.0) circle (0.15);
+ \fill[\duck@sheep] (0.65,1.95) circle[radius=0.15] (0.50,1.75) circle[radius=0.15] (0.46,1.51) circle[radius=0.15] (0.37,1.00) circle[radius=0.15] (0.23,0.80) circle[radius=0.15] (0.20,0.60) circle[radius=0.15] (0.25,0.45) circle[radius=0.15] (0.35,0.30) circle[radius=0.15] (0.55,0.25) circle[radius=0.15] (0.75,0.20) circle[radius=0.15] (0.95,0.16) circle[radius=0.15] (1.15,0.20) circle[radius=0.15] (1.35,0.23) circle[radius=0.15] (1.55,0.30) circle[radius=0.15] (1.75,0.38) circle[radius=0.15] (1.95,0.50) circle[radius=0.15] (2.05,0.65) circle[radius=0.15] (2.10,0.85) circle[radius=0.15] (2.05,1.00) circle[radius=0.15] (2.00,1.15) circle[radius=0.15] (1.85,1.35) circle[radius=0.15] (1.60,1.25) circle[radius=0.15] (1.35,1.25) circle[radius=0.15] (1.30,1.50) circle[radius=0.15] (1.30,1.70) circle[radius=0.15] (1.20,1.90) circle[radius=0.15] (0.85,2.05) circle[radius=0.15] (1.05,2.00) circle[radius=0.15];
\fi
%
% devil (back horn) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@devil
\fill[\duck@devil] (0.7723,2.3756) .. controls (0.6369,2.1184) and (0.7916,2.0228) .. (0.8360,1.9897) .. controls (0.8744,1.9675) and (0.8774,1.9511) .. (0.8853,1.9173) .. controls (0.8853,1.8595) and (0.8407,1.8127) .. (0.7856,1.8127) .. controls (0.7535,1.8178) and (0.7240,1.8231) .. (0.6965,1.8545) .. controls (0.6965,1.8545) and (0.4451,2.2259) .. (0.7723,2.3756) -- cycle;
\fi
+% Conical Hat (background) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \fill[\duck@conicalhat!50!black,rotate=-21] (0.265,1.915) ellipse[x radius=0.79, y radius=0.1];
+ \fill[\duck@conicalhat!30!black] (0.5501,0.9739) -- (0.2002,1.9676) -- (0.2946,2.0008) -- (0.6445,1.0072) -- cycle;
+\fi
%
%\end{pgfonlayer}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -587,18 +610,20 @@
% head %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifdefined\duck@head\else\let\duck@head=\duck@body\fi
\fill[\duck@head]
- (0.90,1.50) ellipse (0.50 and 0.625);
+ (0.90,1.50) ellipse[x radius=0.50, y radius=0.625];
%
% bill %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@grumpy
\fill[\duck@bill] \duckpathgrumpybill;
\else
\ifduck@laughing
- \fill[\duck@bill!80!black] (0.40,1.20) .. controls (0.54,1.36) and (0.65,1.31) .. (0.91,1.37) .. controls (0.45,1.06) and (0.36,1.18) .. (0.40,1.20) -- cycle;
- \fill[\duck@bill]
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@bill!80!black] (0.40,1.20) .. controls (0.54,1.36) and (0.65,1.31) .. (0.91,1.37) .. controls (0.45,1.06) and (0.36,1.18) .. (0.40,1.20) -- cycle;
+ \fill[\duck@bill]
(0.41,1.47) .. controls (0.64,1.53) and (0.54,1.30) ..
(0.91,1.37) .. controls (-0.02,1.10) and (0.28,1.37) ..
(0.41,1.47) -- cycle;
+ \end{pgfinterruptboundingbox}
\else
\ifduck@parrot
\fill[\duck@bill!80!black]
@@ -615,22 +640,22 @@
% has to be behind the eyes
\ifduck@mask
\begin{scope}
- \clip (0.90,1.50) ellipse (0.50 and 0.625);
+ \clip (0.90,1.50) ellipse[x radius=0.50, y radius=0.625];
\fill[\duck@mask,rotate=-15] (-0.1,1.59) rectangle (1.3,1.88);
\end{scope}
\fi%
%
% right eye %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\fill[\duck@eye, rotate=-20]
- (0.23,1.7675) ellipse (0.0893 and 0.125);
+ (0.23,1.7675) ellipse[x radius=0.0893, y radius=0.125];
\fill[\duck@pupil, rotate=-20]
- (0.26,1.7575) ellipse (0.0357 and 0.0714);
+ (0.26,1.7575) ellipse[x radius=0.0357, y radius=0.0714];
%
% left eye %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\fill[\duck@eye, rotate=-20]
- (-0.06,1.74) ellipse (0.0786 and 0.1143);
+ (-0.06,1.74) ellipse[x radius=0.0786, y radius=0.1143];
\fill[\duck@pupil, rotate=-20]
- (-0.03,1.73) ellipse (0.0286 and 0.0643);
+ (-0.03,1.73) ellipse[x radius=0.0286, y radius=0.0643];
%
\fi % from no duck
%\end{pgfonlayer}
@@ -640,6 +665,15 @@
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%\begin{pgfonlayer}{clothinglayer}
+%
+% Strap of the conical hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \ifduck@clothing
+ \fill[\duck@conicalhat!30!black] (1.5943,1.5059) .. controls (1.4384,1.3576) and (1.2780,1.2120) .. (1.0987,1.0923) -- (1.0617,0.9549) .. controls (1.2151,1.0361) and (1.3476,1.1504) .. (1.4785,1.2630) .. controls (1.5417,1.3187) and (1.6038,1.3757) .. (1.6644,1.4344) -- cycle;
+ \else
+ \fill[\duck@conicalhat!30!black] (1.5943,1.5059) .. controls (1.4384,1.3576) and (1.2780,1.2120) .. (1.0987,1.0923) .. controls (0.9540,0.9995) and (0.7864,0.9875) .. (0.6358,1.0398) .. controls (0.6727,0.9043) and (0.9752,0.9113) .. (1.0617,0.9549) .. controls (1.2151,1.0361) and (1.3476,1.1504) .. (1.4785,1.2630) .. controls (1.5417,1.3187) and (1.6038,1.3757) .. (1.6644,1.4344) -- cycle;
+ \fi
+\fi
%
% tshirt %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@tshirt
@@ -665,6 +699,13 @@
\fill[\duck@bowtie] (0.4382, 1.1105) .. controls (0.3984, 1.0671) and (0.3911, 0.9535) .. (0.4116, 0.9176) .. controls (0.4958, 0.9064) and (0.565, 0.9487) .. (0.565, 0.9487) -- (0.6448, 0.9398) .. controls (0.6448, 0.9398) and (0.6777, 0.8844) .. (0.804, 0.8689) .. controls (0.8323, 0.9056) and (0.8422, 1.0026) .. (0.8284, 1.0551) .. controls (0.7881, 1.0942) and (0.6537, 1.0285) .. (0.6537, 1.0285) -- (0.5739, 1.0374) .. controls (0.5739, 1.0374) and (0.5436, 1.0956) .. (0.4382, 1.1105) -- cycle;
\fi
%
+% Ão dà i %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@aodai
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@aodai] (1.819,1.419) .. controls (2.871,0.120) and (0.711,-0.145) .. (0.296,0.251) .. controls (-0.118,0.647) and (0.232,1.073) .. (0.440,1.128) -- (0.567,0.927) .. controls (0.567,0.927) and (0.543,0.906) .. (0.509,0.882) -- (0.481,0.929) -- (0.458,0.915) -- (0.487,0.868) .. controls (0.473,0.859) and (0.457,0.850) .. (0.441,0.842) -- (0.422,0.894) -- (0.397,0.885) -- (0.417,0.831) .. controls (0.404,0.826) and (0.391,0.821) .. (0.378,0.818) -- (0.364,0.869) -- (0.338,0.862) -- (0.351,0.815) .. controls (0.334,0.814) and (0.318,0.817) .. (0.304,0.825) .. controls (0.303,0.774) and (0.329,0.759) .. (0.365,0.763) -- (0.376,0.722) -- (0.402,0.729) -- (0.391,0.768) .. controls (0.405,0.772) and (0.420,0.778) .. (0.435,0.784) -- (0.447,0.750) -- (0.472,0.759) -- (0.459,0.796) .. controls (0.477,0.805) and (0.496,0.815) .. (0.512,0.825) -- (0.533,0.791) -- (0.556,0.805) -- (0.535,0.840) .. controls (0.567,0.860) and (0.590,0.877) .. (0.590,0.877) .. controls (1.011,1.168) and (0.887,0.936) .. (1.819,1.419) -- cycle;
+ \end{pgfinterruptboundingbox}
+\fi
+%
% lapel %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@lapel
\fill[\duck@lapel] (0.490,1.145) .. controls (0.3984,1.13) and (0.3515,1.08) .. (0.3515,1.08) -- (0.4265,1.0192) -- (0.35,0.98) -- (0.513,0.700) -- (1.0089,0.9162) -- (0.9547,0.9868) -- (1.1194,0.9782) -- (1.0822,1.135) .. controls (0.9616,1.1) and (0.8648,1.0300) .. (0.513,0.700) -- cycle;
@@ -684,7 +725,7 @@
%
% necklace (not really clothing, but needs to be below the hair) %%%%%
\ifduck@necklace
- \fill[\duck@necklace] (0.5000,1.112) circle (0.032) (0.5100,1.050) circle (0.032) (0.5200,0.990) circle (0.032) (0.5400,0.931) circle (0.032) (0.5825,0.885) circle (0.032) (0.6450,0.885) circle (0.032) (0.7000,0.910) circle (0.032) (0.7500,0.945) circle (0.032) (0.8000,0.980) circle (0.032) (0.8500,1.020) circle (0.032) (0.9000,1.050) circle (0.032) (0.9500,1.080) circle (0.032) (1.0000,1.110) circle (0.032) (1.0550,1.130) circle (0.032) (1.1100,1.150) circle (0.032) (1.1650,1.165) circle (0.032) (1.2200,1.180) circle (0.032) (1.2750,1.195) circle (0.032) (1.3300,1.210) circle (0.032);
+ \fill[\duck@necklace] (0.5000,1.112) circle[radius=0.032] (0.5100,1.050) circle[radius=0.032] (0.5200,0.990) circle[radius=0.032] (0.5400,0.931) circle[radius=0.032] (0.5825,0.885) circle[radius=0.032] (0.6450,0.885) circle[radius=0.032] (0.7000,0.910) circle[radius=0.032] (0.7500,0.945) circle[radius=0.032] (0.8000,0.980) circle[radius=0.032] (0.8500,1.020) circle[radius=0.032] (0.9000,1.050) circle[radius=0.032] (0.9500,1.080) circle[radius=0.032] (1.0000,1.110) circle[radius=0.032] (1.0550,1.130) circle[radius=0.032] (1.1100,1.150) circle[radius=0.032] (1.1650,1.165) circle[radius=0.032] (1.2200,1.180) circle[radius=0.032] (1.2750,1.195) circle[radius=0.032] (1.3300,1.210) circle[radius=0.032];
\fi
%
% Scout neckerchief %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -697,9 +738,9 @@
% buttons (same argument as for the necklace)
\ifduck@buttons
\ifduck@jacket
- \fill[\duck@buttons] (0.49,0.6) circle (0.05) (0.46,0.45) circle (0.05) (0.45,0.3) circle (0.05);
+ \fill[\duck@buttons] (0.49,0.6) circle[radius=0.05] (0.46,0.45) circle[radius=0.05] (0.45,0.3) circle[radius=0.05];
\else
- \fill[\duck@buttons] (0.53,0.75) circle (0.05) (0.5,0.6) circle (0.05) (0.47,0.45) circle (0.05);
+ \fill[\duck@buttons] (0.53,0.75) circle[radius=0.05] (0.5,0.6) circle[radius=0.05] (0.47,0.45) circle[radius=0.05];
\fi
\fi
%
@@ -783,7 +824,7 @@
\ifdefined\duck@hair\let\duck@beard=\duck@hair\fi
\fi%
\ifduck@beard
- \fill[\duck@beard] (1.3,1.3) circle (0.12) (1.2,1.15) circle (0.12) (0.5,1.05) circle (0.1) (0.525,0.90) circle (0.12) (0.525,0.75) circle (0.12) (0.65,0.65) circle (0.14) (0.75,0.75) circle (0.12) (0.85,0.85) circle (0.12) (0.95,0.95) circle (0.12) (1.05,1.05) circle (0.12) (1.15,1.25) circle (0.12) (1,1.20) circle (0.12) (0.85,1.20) circle (0.12) (0.75,1.15) circle (0.12) (0.65,1.10) circle (0.12) (0.58,1.07) circle (0.12) (0.44,1.46) circle (0.06) (0.52,1.45) circle (0.06) (0.6, 1.41) circle (0.06) (0.68,1.36) circle (0.06) (0.76,1.34) circle (0.06) (0.86,1.26) circle (0.12) (0.38,1.44) circle (0.03) (1,1.28) circle (0.12);
+ \fill[\duck@beard] (1.3,1.3) circle[radius=0.12] (1.2,1.15) circle[radius=0.12] (0.5,1.05) circle[radius=0.1] (0.525,0.90) circle[radius=0.12] (0.525,0.75) circle[radius=0.12] (0.65,0.65) circle[radius=0.14] (0.75,0.75) circle[radius=0.12] (0.85,0.85) circle[radius=0.12] (0.95,0.95) circle[radius=0.12] (1.05,1.05) circle[radius=0.12] (1.15,1.25) circle[radius=0.12] (1,1.20) circle[radius=0.12] (0.85,1.20) circle[radius=0.12] (0.75,1.15) circle[radius=0.12] (0.65,1.10) circle[radius=0.12] (0.58,1.07) circle[radius=0.12] (0.44,1.46) circle[radius=0.06] (0.52,1.45) circle[radius=0.06] (0.6, 1.41) circle[radius=0.06] (0.68,1.36) circle[radius=0.06] (0.76,1.34) circle[radius=0.06] (0.86,1.26) circle[radius=0.12] (0.38,1.44) circle[radius=0.03] (1,1.28) circle[radius=0.12];
\fill[\duck@beard] (1.3,1.3) -- (0.5,1.05) -- (0.65,0.65) -- cycle;
\fi%
%
@@ -799,27 +840,27 @@
\ifduck@alien
\fill[\duck@alien,rotate=-25] (0.09,2.1) rectangle (0.16,2.6);
\fill[\duck@alien,rotate=5] (0.79,1.86) rectangle (0.86,2.25);
- \fill[\duck@alien] (1.20,2.30) circle (0.07);
- \fill[\duck@alien] (0.62,2.35) circle (0.07);
+ \fill[\duck@alien] (1.20,2.30) circle[radius=0.07];
+ \fill[\duck@alien] (0.62,2.35) circle[radius=0.07];
\fi
%
% hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@hat
\ifdefined\duck@hair % with hair
- \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse (0.7 and 0.1);
+ \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse[x radius=0.7, y radius=0.1];
\fill[\duck@hat,rotate=-15] (0.0,2.1) rectangle (0.88,2.4);
- \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse (0.44 and 0.08);
+ \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse[x radius=0.44, y radius=0.08];
\else % without hair
- \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse (0.6 and 0.1);
+ \fill[\duck@hat,rotate=-15] (0.44,2.1) ellipse[x radius=0.6, y radius=0.1];
\fill[\duck@hat,rotate=-15] (0.07,2.1) rectangle (0.81,2.4);
- \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse (0.37 and 0.08);
+ \fill[\duck@hat,rotate=-15] (0.44,2.4) ellipse[x radius=0.37, y radius=0.08];
\fi
\fi
%
% cap %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cap
\fill[\duck@cap, start angle=0, end angle=150, radius=0.5] (1.4,1.75) arc;
- \fill[\duck@cap,rotate=-15] (0.3,2.05) ellipse (0.6 and 0.15);
+ \fill[\duck@cap,rotate=-15] (0.3,2.05) ellipse[x radius=0.6, y radius=0.15];
\fi
%
% Santa %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -835,33 +876,33 @@
(1.456,1.759) .. controls (1.534,1.637) and (1.480,1.545) ..
(1.400,1.566) .. controls (1.265,1.714) and (0.577,2.267) ..
(0.44,1.733) -- cycle;
- \fill[white!80!brown] (1.6,1.0) circle (0.17);
+ \fill[white!80!brown] (1.6,1.0) circle[radius=0.17];
\fi
%
% Chef hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@chef
- \fill[\duck@chef,rotate=-15] (0.44,2.1) ellipse (0.37 and 0.08);
+ \fill[\duck@chef,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.08];
\fill[\duck@chef,rotate=-15] (0.07,2.1) rectangle (0.81,2.55);
- \fill[\duck@chef] (1.01,2.47) circle (0.17);
- \fill[\duck@chef] (1.24,2.35) circle (0.15);
- \fill[\duck@chef] (0.77,2.40) circle (0.12);
- \fill[\duck@chef] (1.39,2.20) circle (0.12);
+ \fill[\duck@chef] (1.01,2.47) circle[radius=0.17];
+ \fill[\duck@chef] (1.24,2.35) circle[radius=0.15];
+ \fill[\duck@chef] (0.77,2.40) circle[radius=0.12];
+ \fill[\duck@chef] (1.39,2.20) circle[radius=0.12];
\fi
%
% graduate hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@graduate
- \fill[\duck@graduate,rotate=-15] (0.44,2.1) ellipse (0.37 and 0.1);
+ \fill[\duck@graduate,rotate=-15] (0.44,2.1) ellipse[x radius=0.37, y radius=0.1];
\fill[\duck@graduate,rotate=-15] (0.07,2.1) rectangle (0.81,2.3);
\fill[\duck@graduate] (0.3,2.25) -- (1.05,2.35) -- (1.7,1.95) -- (0.92,1.85) -- cycle;
\fill[\duck@tassel,rounded corners=\scalingfactor*1] (1.12,1.89) -- (1.01,2.1) -- (1.09,2.11) -- (1.2,1.9) -- (1.2,1.3) -- (1.12,1.3) -- cycle;
- \fill[\duck@tassel] (1.16,1.3) ellipse (0.06 and 0.12);
+ \fill[\duck@tassel] (1.16,1.3) ellipse[x radius=0.06, y radius=0.12];
\fi
%
% beret %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@beret
- \fill[\duck@beret,rotate=-25] (0.13,2.15) ellipse (0.5 and 0.17);
- \fill[\duck@beret,rotate=-25] (0.13,2.25) ellipse (0.55 and 0.17);
- \fill[\duck@beret,rotate=-25] (0.13,2.4) circle (0.08);
+ \fill[\duck@beret,rotate=-25] (0.13,2.15) ellipse[x radius=0.5, y radius=0.17];
+ \fill[\duck@beret,rotate=-25] (0.13,2.25) ellipse[x radius=0.55, y radius=0.17];
+ \fill[\duck@beret,rotate=-25] (0.13,2.4) circle[radius=0.08];
\fi
%
% unicorn %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -879,7 +920,7 @@
%
% witch %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@witch
- \fill[\duck@witch,rotate=-15] (0.44,2.13) ellipse (0.75 and 0.17);
+ \fill[\duck@witch,rotate=-15] (0.44,2.13) ellipse[x radius=0.75, y radius=0.17];
\fill[\duck@witch,rotate=-15] (0.05,2.2)--(0.45,3.2)--(0.82,2.2);
\fi
%
@@ -906,29 +947,29 @@
\path (0.55,1.9) rectangle (1.2,2.55);
\begin{pgfinterruptboundingbox}
\begin{scope}
- \clip[rotate=-5] (0.68,2.38) ellipse (0.3 and 0.4);
- \fill[\duck@bunny,rotate=-5] (1.06,2.2) ellipse (0.3 and 0.4) (0.28,2.26) ellipse (0.3 and 0.4);
+ \clip[rotate=-5] (0.68,2.38) ellipse[x radius=0.3, y radius=0.4];
+ \fill[\duck@bunny,rotate=-5] (1.06,2.2) ellipse[x radius=0.3, y radius=0.4] (0.28,2.26) ellipse[x radius=0.3, y radius=0.4];
\end{scope}
\begin{scope}
- \clip[rotate=-5] (0.68,2.38) ellipse (0.25 and 0.35);
- \fill[\duck@inear,rotate=-5] (1.06,2.2) ellipse (0.25 and 0.35) (0.28,2.26) ellipse (0.25 and 0.35);
+ \clip[rotate=-5] (0.68,2.38) ellipse[x radius=0.25, y radius=0.35];
+ \fill[\duck@inear,rotate=-5] (1.06,2.2) ellipse[x radius=0.25, y radius=0.35] (0.28,2.26) ellipse[x radius=0.25, y radius=0.35];
\end{scope}
\end{pgfinterruptboundingbox}
\fi
%
% peaked cap %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@peakedcap
- \fill[\duck@peakedcap,rotate=-15] (0.35,2.05) ellipse (0.5 and 0.15);
- \fill[\duck@peakedcap,rotate=-25] (0.13,2.15) ellipse (0.5 and 0.17);
- \fill[\duck@peakedcap,rotate=-35] (-0.25,2.2) ellipse (0.55 and 0.17);
+ \fill[\duck@peakedcap,rotate=-15] (0.35,2.05) ellipse[x radius=0.5, y radius=0.15];
+ \fill[\duck@peakedcap,rotate=-25] (0.13,2.15) ellipse[x radius=0.5, y radius=0.17];
+ \fill[\duck@peakedcap,rotate=-35] (-0.25,2.2) ellipse[x radius=0.55, y radius=0.17];
\fi
%
% tophat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@tophat
- \fill[\duck@tophat,rotate=-15] (0.44,2.1) ellipse (0.48 and 0.1);
+ \fill[\duck@tophat,rotate=-15] (0.44,2.1) ellipse[x radius=0.48, y radius=0.1];
\fill[\duck@tophat,rotate=-15] (0.12,2.1) -- (0.75,2.1) -- (0.81,2.55) -- (0.07,2.55) -- cycle;
- \fill[\duck@tophat,rotate=-15] (0.44,2.55) ellipse (0.37 and 0.08);
+ \fill[\duck@tophat,rotate=-15] (0.44,2.55) ellipse[x radius=0.37, y radius=0.08];
\fi
%
% darth vader %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -946,33 +987,33 @@
\fill[\duck@harlequin] (0.6006,1.9719) .. controls (0.7432,1.8954) and (0.9320,1.8698) .. (0.9320,1.8698) -- (1.0404,2.3839) .. controls (0.9223,2.8873) and (0.1755,2.5634) .. (0.3019,2.2958) .. controls (0.5807,2.5024) and (0.7251,2.3376) .. (0.6006,1.9719) -- cycle;
\fill[\duck@niuqelrah] (1.2853,1.8902) .. controls (1.1177,1.8507) and (0.9278,1.8703) .. (0.9278,1.8703) -- (1.0404,2.3839) .. controls (1.3637,2.8347) and (1.9373,2.3532) .. (1.7049,2.1284) .. controls (1.5267,2.3895) and (1.3204,2.2666) .. (1.2853,1.8902) -- cycle;
\end{pgfinterruptboundingbox}
- \fill[\duck@harlequin] (1.7,2.07) circle (0.1);
- \fill[\duck@niuqelrah] (0.3,2.23) circle (0.1);
+ \fill[\duck@harlequin] (1.7,2.07) circle[radius=0.1];
+ \fill[\duck@niuqelrah] (0.3,2.23) circle[radius=0.1];
\fi
%
% Straw hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@strawhat
- \fill[\duck@strawhat,rotate=-15] (0.44,2.0) ellipse (0.75 and 0.1);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.0) ellipse[x radius=0.75, y radius=0.1];
\fill[\duck@strawhat,rotate=-15] (0.1,2.05) rectangle (0.78,2.5);
- \fill[\duck@strawhat,rotate=-15] (0.44,2.5) ellipse (0.34 and 0.08);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.5) ellipse[x radius=0.34, y radius=0.08];
\fill[\duck@strawhat,rotate=-15] (-0.3,2.02) -- (1.18,2.02) -- (0.78,2.2) -- (0.1,2.2) -- cycle;
- \fill[\duck@ribbon,rotate=-15] (0.44,2.2) ellipse (0.34 and 0.08);
+ \fill[\duck@ribbon,rotate=-15] (0.44,2.2) ellipse[x radius=0.34, y radius=0.08];
\fill[\duck@ribbon,rotate=-15] (0.1,2.2) rectangle (0.78,2.3);
- \fill[\duck@strawhat,rotate=-15] (0.44,2.3) ellipse (0.34 and 0.08);
+ \fill[\duck@strawhat,rotate=-15] (0.44,2.3) ellipse[x radius=0.34, y radius=0.08];
\fi
%
% helmet %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@helmet
\fill[\duck@helmet] (1.4331,1.5155) .. controls (1.4365,1.7226) and (1.3866,2.0493) .. (1.0429,2.1279) .. controls (0.7050,2.2052) and (0.4794,1.9294) .. (0.4481,1.8183) .. controls (0.6062,1.8381) and (1.1506,1.7480) .. (1.4331,1.5155) -- cycle;
\fill[\duck@helmet!70!black] (1.0282,2.1360) .. controls (0.9395,2.1312) and (0.8696,2.0652) .. (0.8152,2.0010) .. controls (0.7824,1.9609) and (0.7546,1.9169) .. (0.7309,1.8709) .. controls (0.6510,1.8859) and (0.5703,1.8971) .. (0.4892,1.9024) .. controls (0.4595,1.8831) and (0.4114,1.7962) .. (0.4743,1.7961) .. controls (0.5446,1.7868) and (0.6149,1.7767) .. (0.6845,1.7629) .. controls (0.6647,1.7052) and (0.6469,1.6454) .. (0.6401,1.5851) -- (0.6583,1.5355) -- (0.7069,1.5673) .. controls (0.7193,1.6285) and (0.7363,1.6889) .. (0.7590,1.7471) .. controls (0.9991,1.6922) and (1.2114,1.6182) .. (1.4111,1.4722) .. controls (1.4369,1.4960) and (1.4536,1.5229) .. (1.4475,1.5553) .. controls (1.4417,1.5927) and (1.4030,1.6066) .. (1.3766,1.6276) .. controls (1.2054,1.7408) and (1.0085,1.8089) .. (0.8095,1.8546) .. controls (0.8733,1.9674) and (0.9684,2.0703) .. (1.0932,2.1138) .. controls (1.0751,2.1288) and (1.0515,2.1362) .. (1.0282,2.1360) -- cycle;
- \fill[\duck@helmet!50!white] (0.502,1.845) circle (0.015) (0.586,1.835) circle (0.015) (0.684,1.822) circle (0.015) (0.791,1.799) circle (0.015) (0.899,1.770) circle (0.015) (1.003,1.741) circle (0.015) (1.099,1.706) circle (0.015) (1.185,1.673) circle (0.015) (1.276,1.629) circle (0.015) (1.360,1.581) circle (0.015) (0.676,1.606) circle (0.015) (0.695,1.666) circle (0.015) (0.714,1.729) circle (0.015) (0.784,1.889) circle (0.015) (0.835,1.968) circle (0.015) (0.896,2.034) circle (0.015) (0.957,2.081) circle (0.015) (1.020,2.115) circle (0.015) (1.422,1.535) circle (0.015) (0.502,1.845) circle (0.015);
+ \fill[\duck@helmet!50!white] (0.502,1.845) circle[radius=0.015] (0.586,1.835) circle[radius=0.015] (0.684,1.822) circle[radius=0.015] (0.791,1.799) circle[radius=0.015] (0.899,1.770) circle[radius=0.015] (1.003,1.741) circle[radius=0.015] (1.099,1.706) circle[radius=0.015] (1.185,1.673) circle[radius=0.015] (1.276,1.629) circle[radius=0.015] (1.360,1.581) circle[radius=0.015] (0.676,1.606) circle[radius=0.015] (0.695,1.666) circle[radius=0.015] (0.714,1.729) circle[radius=0.015] (0.784,1.889) circle[radius=0.015] (0.835,1.968) circle[radius=0.015] (0.896,2.034) circle[radius=0.015] (0.957,2.081) circle[radius=0.015] (1.020,2.115) circle[radius=0.015] (1.422,1.535) circle[radius=0.015] (0.502,1.845) circle[radius=0.015];
\fi
%
% Viking %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@viking
\fill[\duck@viking] (1.4331,1.5155) .. controls (1.4365,1.7226) and (1.3866,2.0493) .. (1.0429,2.1279) .. controls (0.7050,2.2052) and (0.4794,1.9294) .. (0.4481,1.8183) .. controls (0.6062,1.8381) and (1.1506,1.7480) .. (1.4331,1.5155) -- cycle;
\fill[\duck@viking!70!black] (1.0282,2.1360) .. controls (0.9395,2.1312) and (0.8696,2.0652) .. (0.8152,2.0010) .. controls (0.7824,1.9609) and (0.7546,1.9169) .. (0.7309,1.8709) .. controls (0.6510,1.8859) and (0.5703,1.8971) .. (0.4892,1.9024) .. controls (0.4595,1.8831) and (0.4114,1.7962) .. (0.4743,1.7961) .. controls (0.5446,1.7868) and (0.6149,1.7767) .. (0.6845,1.7629) .. controls (0.6845,1.7629) and (0.6845,1.7629) .. (0.7590,1.7471) .. controls (0.9991,1.6922) and (1.2114,1.6182) .. (1.4111,1.4722) .. controls (1.4369,1.4960) and (1.4536,1.5229) .. (1.4475,1.5553) .. controls (1.4417,1.5927) and (1.4030,1.6066) .. (1.3766,1.6276) .. controls (1.2054,1.7408) and (1.0085,1.8089) .. (0.8095,1.8546) .. controls (0.8733,1.9674) and (0.9684,2.0703) .. (1.0932,2.1138) .. controls (1.0751,2.1288) and (1.0515,2.1362) .. (1.0282,2.1360) -- cycle;
- \fill[\duck@viking!50!white] (0.502,1.845) circle (0.015) (0.586,1.835) circle (0.015) (0.684,1.822) circle (0.015) (0.791,1.799) circle (0.015) (0.899,1.770) circle (0.015) (1.003,1.741) circle (0.015) (1.099,1.706) circle (0.015) (1.185,1.673) circle (0.015) (1.276,1.629) circle (0.015) (1.360,1.581) circle (0.015) (0.784,1.889) circle (0.015) (0.835,1.968) circle (0.015) (0.896,2.034) circle (0.015) (0.957,2.081) circle (0.015) (1.020,2.115) circle (0.015) (1.422,1.535) circle (0.015);
+ \fill[\duck@viking!50!white] (0.502,1.845) circle[radius=0.015] (0.586,1.835) circle[radius=0.015] (0.684,1.822) circle[radius=0.015] (0.791,1.799) circle[radius=0.015] (0.899,1.770) circle[radius=0.015] (1.003,1.741) circle[radius=0.015] (1.099,1.706) circle[radius=0.015] (1.185,1.673) circle[radius=0.015] (1.276,1.629) circle[radius=0.015] (1.360,1.581) circle[radius=0.015] (0.784,1.889) circle[radius=0.015] (0.835,1.968) circle[radius=0.015] (0.896,2.034) circle[radius=0.015] (0.957,2.081) circle[radius=0.015] (1.020,2.115) circle[radius=0.015] (1.422,1.535) circle[radius=0.015];
\fi
%
% devil (front horn) %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -980,6 +1021,14 @@
\fill[\duck@devil] (1.2185,2.3521) .. controls (1.3540,2.0950) and (1.1993,1.9994) .. (1.1548,1.9663) .. controls (1.1165,1.9441) and (1.1134,1.9277) .. (1.1056,1.8938) .. controls (1.1056,1.8361) and (1.1502,1.7893) .. (1.2052,1.7893) .. controls (1.2373,1.7944) and (1.2669,1.7996) .. (1.2944,1.8311) .. controls (1.2944,1.8311) and (1.5458,2.2025) .. (1.2185,2.3521) -- cycle;
\fi
%
+% Conical Hat %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifduck@conicalhat
+ \path (0.19,1.4) rectangle (1.68,2.32);
+ \begin{pgfinterruptboundingbox}
+ \fill[\duck@conicalhat] (1.6722,1.4137) .. controls (1.6722,1.4337) and (1.3592,1.6230) .. (0.9513,1.7735) .. controls (0.5433,1.9239) and (0.1948,1.9784) .. (0.1948,1.9754) .. controls (0.2049,2.0230) and (1.1428,2.36) .. (1.1428,2.3) .. controls (1.1428,2.35) and (1.6821,1.4784) .. (1.6722,1.4137) -- cycle;
+ \end{pgfinterruptboundingbox}
+\fi
+%
%\end{pgfonlayer}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -991,16 +1040,16 @@
\ifduck@sunglasses
\fill[\duck@sunglasses,rotate=-17] (0.42,1.8) rectangle (0.8,1.84);
\fill[\duck@sunglasses,rotate=-17] (0.12,1.8) rectangle (0.22,1.84);
- \fill[\duck@sunglasses,rotate=-20] (0.23,1.7675) circle (0.14);
- \fill[\duck@sunglasses,rotate=-20] (-0.06,1.74) circle (0.13);
+ \fill[\duck@sunglasses,rotate=-20] (0.23,1.7675) circle[radius=0.14];
+ \fill[\duck@sunglasses,rotate=-20] (-0.06,1.74) circle[radius=0.13];
\fi
%
% glasses %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@glasses
\fill[\duck@glasses,rotate=-17] (0.42,1.8) rectangle (0.8,1.84);
\fill[\duck@glasses,rotate=-17] (0.12,1.8) rectangle (0.22,1.84);
- \fill[\duck@glasses,rotate=-20,even odd rule] (0.23,1.7675) circle (0.14) (0.23,1.7675) circle (0.11);
- \fill[\duck@glasses,rotate=-20,even odd rule] (-0.06,1.74) circle (0.13) (-0.06,1.74) circle (0.095);
+ \fill[\duck@glasses,rotate=-20,even odd rule] (0.23,1.7675) circle[radius=0.14] (0.23,1.7675) circle[radius=0.11];
+ \fill[\duck@glasses,rotate=-20,even odd rule] (-0.06,1.74) circle[radius=0.13] (-0.06,1.74) circle[radius=0.095];
\fi
%
% square glasses
@@ -1014,9 +1063,9 @@
% icecream %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@icecream
\fill[\duck@cone,rotate=-20] (0.35,1.20)--(0.50,0.60)--(0.75,1.20);
- \fill[\duck@flavoura] (0.85,1.03) circle (0.12);
- \fill[\duck@flavourb] (1.05,0.95) circle (0.12);
- \fill[\duck@flavourc] (0.95,1.1) circle (0.12);
+ \fill[\duck@flavoura] (0.85,1.03) circle[radius=0.12];
+ \fill[\duck@flavourb] (1.05,0.95) circle[radius=0.12];
+ \fill[\duck@flavourc] (0.95,1.1) circle[radius=0.12];
\fi
%
% book %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1036,15 +1085,15 @@
%
% speech bubble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@speech
- \fill[\duck@bubblecolour] (-0.5,1.8) ellipse (0.7 and 0.3);
+ \fill[\duck@bubblecolour] (-0.5,1.8) ellipse[x radius=0.7, y radius=0.3];
\fill[\duck@bubblecolour] (-0.2,1.54) -- (0.2,1.35) -- (0.0,1.6) -- cycle;
\node at (-0.5,1.8) {\duck@speech};
\fi
%
% think bubble %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@think
- \fill[\duck@bubblecolour] (2,2.4) ellipse (0.7 and 0.35);
- \fill[\duck@bubblecolour] (1.55,2.35) circle (0.25) (2.0,2.15) circle (0.25) (2.4,2.25) circle (0.25) (1.6,2.55) circle (0.25) (2.0,2.6) circle (0.25) (2.35,2.5) circle (0.25) (1.65,1.95) circle (0.1) (1.55,1.80) circle (0.06) (1.47,1.70) circle (0.03);
+ \fill[\duck@bubblecolour] (2,2.4) ellipse[x radius=0.7, y radius=0.35];
+ \fill[\duck@bubblecolour] (1.55,2.35) circle[radius=0.25] (2.0,2.15) circle[radius=0.25] (2.4,2.25) circle[radius=0.25] (1.6,2.55) circle[radius=0.25] (2.0,2.6) circle[radius=0.25] (2.35,2.5) circle[radius=0.25] (1.65,1.95) circle[radius=0.1] (1.55,1.80) circle[radius=0.06] (1.47,1.70) circle[radius=0.03];
\node at (2,2.4) {\duck@think};
\fi
%
@@ -1074,50 +1123,49 @@
%
% cake %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cake
- \fill[\duck@cake] (1.00,0.50) ellipse (0.4 and 0.2);
+ \fill[\duck@cake] (1.00,0.50) ellipse[x radius=0.4, y radius=0.2];
\fill[\duck@cake] (0.6,0.5) rectangle (1.4,0.7);
- \fill[\duck@cake] (1.00,0.70) ellipse (0.4 and 0.2);
+ \fill[\duck@cake] (1.00,0.70) ellipse[x radius=0.4, y radius=0.2];
\fill[\duck@cake!50!white] (0.75,0.75) rectangle (0.8,0.95);
\fill[\duck@cake!50!white] (1.2,0.75) rectangle (1.25,0.95);
\fill[\duck@cake!50!white] (0.975,0.65) rectangle (1.025,0.85);
- \fill[white!85!yellow] (1.0,0.93) ellipse (0.03 and 0.06);
- \fill[white!85!yellow] (1.225,1.03) ellipse (0.03 and 0.06);
- \fill[white!85!yellow] (0.775,1.03) ellipse (0.03 and 0.06);
+ \fill[white!85!yellow] (1.0,0.93) ellipse[x radius=0.03, y radius=0.06];
+ \fill[white!85!yellow] (1.225,1.03) ellipse[x radius=0.03, y radius=0.06];
+ \fill[white!85!yellow] (0.775,1.03) ellipse[x radius=0.03, y radius=0.06];
\fi
%
% pizza %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@pizza
- \fill[brown] (1.00,0.60) ellipse (0.4 and 0.2);
- \fill[red!70!black] (1.00,0.60) ellipse (0.34 and 0.16);
- \fill[white!85!yellow] (1.15,0.65) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (0.81,0.57) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (0.95,0.68) ellipse (0.065 and 0.04);
- \fill[white!85!yellow] (1.02,0.54) ellipse (0.065 and 0.04);
- \fill[green!40!brown] (1.09,0.54) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse (0.07 and 0.02);
- \fill[green!40!brown] (1.00,0.60) ellipse (0.03 and 0.06);
+ \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2];
+ \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16];
+ \fill[white!85!yellow] (1.15,0.65) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (0.81,0.57) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (0.95,0.68) ellipse[x radius=0.065, y radius=0.04];
+ \fill[white!85!yellow] (1.02,0.54) ellipse[x radius=0.065, y radius=0.04];
+ \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06];
\fi
+%
% no pizza %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@davidlikespineapplepizza
- \fill[brown] (1.00,0.60) ellipse (0.4 and 0.2);
- \fill[red!70!black] (1.00,0.60) ellipse (0.34 and 0.16);
- \fill[yellow!70!brown] (1.15,0.65) ellipse (0.08 and 0.06);
- \fill[red!70!black] (1.15,0.65) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (0.81,0.57) ellipse (0.08 and 0.06);
- \fill[red!70!black] (0.81,0.57) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (0.95,0.68) ellipse (0.08 and 0.06);
- \fill[red!70!black] (0.95,0.68) ellipse (0.04 and 0.03);
- \fill[yellow!70!brown] (1.02,0.54) ellipse (0.08 and 0.06);
- \fill[red!70!black] (1.02,0.54) ellipse (0.04 and 0.03);
- \fill[green!40!brown] (1.09,0.54) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse (0.07 and 0.02);
- \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse (0.07 and 0.02);
- \fill[green!40!brown] (1.00,0.60) ellipse (0.03 and 0.06);
+ \fill[brown] (1.00,0.60) ellipse[x radius=0.4, y radius=0.2];
+ \fill[red!70!black] (1.00,0.60) ellipse[x radius=0.34, y radius=0.16];
+ \fill[yellow!70!brown] (1.15,0.65) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (1.15,0.65) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (0.81,0.57) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (0.81,0.57) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (0.95,0.68) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (0.95,0.68) ellipse[x radius=0.04, y radius=0.03];
+ \fill[yellow!70!brown] (1.02,0.54) ellipse[x radius=0.08, y radius=0.06];
+ \fill[red!70!black] (1.02,0.54) ellipse[x radius=0.04, y radius=0.03];
+ \fill[green!40!brown] (1.09,0.54) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=20] (1.0,0.34) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown,rotate=-20] (0.9,1.05) ellipse[x radius=0.07, y radius=0.02];
+ \fill[green!40!brown] (1.00,0.60) ellipse[x radius=0.03, y radius=0.06];
\fi
%
-%
-%
% Hockey stick %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@hockey
\fill[\duck@hockey, rounded corners=\scalingfactor*1, rotate=-30] (0.5,0.6) rectangle (0.6,2.1);
@@ -1127,59 +1175,59 @@
% baguette %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@baguette
\fill[\duck@baguette!70!white, rounded corners=\scalingfactor*4, rotate=-30] (0.4,0.72) rectangle (0.7,2.0);
- \fill[\duck@baguette!80!black, rotate=5] (1.44,1.1) ellipse (0.1 and 0.03) (1.30,0.9) ellipse (0.1 and 0.03) (1.16,0.7) ellipse (0.1 and 0.03) (1.02,0.5) ellipse (0.1 and 0.03);
+ \fill[\duck@baguette!80!black, rotate=5] (1.44,1.1) ellipse[x radius=0.1, y radius=0.03] (1.30,0.9) ellipse[x radius=0.1, y radius=0.03] (1.16,0.7) ellipse[x radius=0.1, y radius=0.03] (1.02,0.5) ellipse[x radius=0.1, y radius=0.03];
\fi
%
% football %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@football
- \fill[\duck@football] (1.2,0.33) circle (0.32);
+ \fill[\duck@football] (1.2,0.33) circle[radius=0.32];
\begin{scope}
- \clip (1.2,0.33) circle (0.32);
+ \clip (1.2,0.33) circle[radius=0.32];
\fill[black] (1.06,0.30) -- (1.01,0.17) -- (1.14,0.08) -- (1.26,0.14) -- (1.20,0.28) -- cycle (1.37,0.14) -- (1.46,0.27) -- (1.59,0.27) -- (1.41,0.04) -- cycle (1.28,0.38) -- (1.22,0.52) -- (1.33,0.61) -- (1.45,0.51) -- (1.43,0.37) -- cycle (0.87,0.44) -- (1.02,0.40) -- (1.10,0.53) -- (1.07,0.62) -- (0.94,0.57) -- cycle;
\end{scope}
\fi
%
% milkshake %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@milkshake
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.94) ellipse (0.18 and 0.4);
- \fill[\duck@milkshake, rotate=-10] (0.8,0.94) ellipse (0.15 and 0.36);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.94) ellipse[x radius=0.18, y radius=0.4];
+ \fill[\duck@milkshake, rotate=-10] (0.8,0.94) ellipse[x radius=0.15, y radius=0.36];
\end{scope}
- \fill[white!85!yellow] (0.83,0.92) circle (0.05) (0.88,0.9) circle (0.05) (0.93,0.92) circle (0.05) (0.99,0.91) circle (0.05) (1.06,0.86) circle (0.05) (1.13,0.87) circle (0.05) (0.85,0.99) circle (0.05) (0.9,0.98) circle (0.07) (1.0,0.98) circle (0.07) (1.1,0.95) circle (0.07);
- \fill[red!90!black] (1.0,1.1) circle (0.05);
- \fill[white!85!yellow] (0.94,1.05) circle (0.05) (1.03,1.03) circle (0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
+ \fill[white!85!yellow] (0.83,0.92) circle[radius=0.05] (0.88,0.9) circle[radius=0.05] (0.93,0.92) circle[radius=0.05] (0.99,0.91) circle[radius=0.05] (1.06,0.86) circle[radius=0.05] (1.13,0.87) circle[radius=0.05] (0.85,0.99) circle[radius=0.05] (0.9,0.98) circle[radius=0.07] (1.0,0.98) circle[radius=0.07] (1.1,0.95) circle[radius=0.07];
+ \fill[red!90!black] (1.0,1.1) circle[radius=0.05];
+ \fill[white!85!yellow] (0.94,1.05) circle[radius=0.05] (1.03,1.03) circle[radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
\fill[red!90!black,rotate=20] (1.2,0.58) rectangle (1.22,0.85);
\fi
%
% wine %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@wine
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse (0.03 and 0.2);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse[x radius=0.03, y radius=0.2];
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,1.03);
- \fill[cyan!10!white, rotate=-10] (0.8,1.1) ellipse (0.18 and 0.4);
+ \fill[cyan!10!white, rotate=-10] (0.8,1.1) ellipse[x radius=0.18, y radius=0.4];
\end{scope}
\begin{scope}
\clip[rotate=-10] (0.58,0.5) rectangle (1.02,0.87);
- \fill[\duck@wine, rotate=-10] (0.8,1.1) ellipse (0.15 and 0.36);
+ \fill[\duck@wine, rotate=-10] (0.8,1.1) ellipse[x radius=0.15, y radius=0.36];
\end{scope}
\fi
%
% prison duck %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@prison
- \fill[\duck@prison] (1.5,0.25) circle (0.3);
- \fill[\duck@prison, even odd rule] (1.2,0.1) ellipse (0.10 and 0.07) (1.2,0.1) ellipse (0.06 and 0.04) (1.05,-0.05) ellipse (0.10 and 0.07) (1.05,-0.05) ellipse (0.06 and 0.04) (0.87,-0.2) ellipse (0.10 and 0.07) (0.87,-0.2) ellipse (0.06 and 0.04);
- \fill[\duck@prison, even odd rule] (0.72,-0.2) ellipse (0.10 and 0.07) (0.72,-0.2) ellipse (0.06 and 0.04);
- \fill[\duck@prison,even odd rule,rotate=70](0.4,-1.05) ellipse (0.1 and 0.07) (0.4,-1.05) ellipse (0.06 and 0.04) (0.2,-0.95) ellipse (0.1 and 0.07) (0.2,-0.95) ellipse (0.06 and 0.04) (0.22,-0.58) ellipse (0.1 and 0.07) (0.22,-0.58) ellipse (0.06 and 0.04);
- \fill[\duck@prison,even odd rule,rotate=110](-0.33,-0.55) ellipse (0.1 and 0.07) (-0.33,-0.55) ellipse (0.06 and 0.04);
+ \fill[\duck@prison] (1.5,0.25) circle[radius=0.3];
+ \fill[\duck@prison, even odd rule] (1.2,0.1) ellipse[x radius=0.10, y radius=0.07] (1.2,0.1) ellipse[x radius=0.06, y radius=0.04] (1.05,-0.05) ellipse[x radius=0.10, y radius=0.07] (1.05,-0.05) ellipse[x radius=0.06, y radius=0.04] (0.87,-0.2) ellipse[x radius=0.10, y radius=0.07] (0.87,-0.2) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison, even odd rule] (0.72,-0.2) ellipse[x radius=0.10, y radius=0.07] (0.72,-0.2) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison,even odd rule,rotate=70] (0.4,-1.05) ellipse[x radius=0.1, y radius=0.07] (0.4,-1.05) ellipse[x radius=0.06, y radius=0.04] (0.2,-0.95) ellipse[x radius=0.1, y radius=0.07] (0.2,-0.95) ellipse[x radius=0.06, y radius=0.04] (0.22,-0.58) ellipse[x radius=0.1, y radius=0.07] (0.22,-0.58) ellipse[x radius=0.06, y radius=0.04];
+ \fill[\duck@prison,even odd rule,rotate=110](-0.33,-0.55) ellipse[x radius=0.1, y radius=0.07] (-0.33,-0.55) ellipse[x radius=0.06, y radius=0.04];
\begin{scope}
\clip[rotate=-12] (0.45,0.15) rectangle (0.63,0.25);
- \fill[\duck@prison,even odd rule,rotate=110](-0.07,-0.6) ellipse (0.1 and 0.07) (-0.07,-0.6) ellipse (0.06 and 0.04);
+ \fill[\duck@prison,even odd rule,rotate=110](-0.07,-0.6) ellipse[x radius=0.1, y radius=0.07] (-0.07,-0.6) ellipse[x radius=0.06, y radius=0.04];
\end{scope}
\fi
%
@@ -1191,14 +1239,14 @@
\fill[\duck@torch,rounded corners=\scalingfactor*1]
(1.1,0.96) -- (0.77,0.25) -- (0.83,0.25) -- (1.3,0.86) -- cycle;
\fill[\duck@torch,rotate=-28]
- (0.62,1.32) ellipse (0.2 and 0.08);
+ (0.62,1.32) ellipse[x radius=0.2, y radius=0.08];
\fi%
%
% sheep %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@sheep
\begin{scope}
- \clip[rotate=-5] (1.2,1.7) ellipse (0.3 and 0.4);
- \fill[\duck@bill,rotate=-5] (0.8,1.5) ellipse (0.3 and 0.4);
+ \clip[rotate=-5] (1.2,1.7) ellipse[x radius=0.3, y radius=0.4];
+ \fill[\duck@bill,rotate=-5] (0.8,1.5) ellipse[x radius=0.3, y radius=0.4];
\end{scope}
\fi
%
@@ -1206,17 +1254,17 @@
\ifduck@basket
\fill[\duck@basket, start angle=180, end angle=360, x radius=0.35, y radius=0.35] (0.65,0.61) arc -- cycle;
\fill[\duck@basket, start angle=180, end angle=0, even odd rule] [x radius=0.35, y radius=0.5] (0.65,0.6) arc -- cycle [x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle;
- \fill[\duck@basket, even odd rule] (1,0.6) ellipse (0.35 and 0.1) (1,0.6) ellipse (0.3 and 0.07);
- \fill[\duck@basket!75!black] (1,0.6) ellipse (0.3 and 0.07);
+ \fill[\duck@basket, even odd rule] (1,0.6) ellipse[x radius=0.35, y radius=0.1] (1,0.6) ellipse[x radius=0.3, y radius=0.07];
+ \fill[\duck@basket!75!black] (1,0.6) ellipse[x radius=0.3, y radius=0.07];
\fi%
%
% easter basket %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@easter
\begin{scope}
\clip [start angle=180, end angle=0, x radius=0.3, y radius=0.45] (0.7,0.6) arc -- cycle [start angle=180, end angle=360, x radius=0.3, y radius=0.07] (0.7,0.6) arc -- cycle;
- \fill[\duck@eggb, rotate=-5] (0.95,0.72) ellipse (0.09 and 0.13);
- \fill[\duck@egga, rotate=10] (0.94,0.42) ellipse (0.09 and 0.13);
- \fill[\duck@eggc, rotate=-30] (0.7,1.08) ellipse (0.09 and 0.13);
+ \fill[\duck@eggb, rotate=-5] (0.95,0.72) ellipse[x radius=0.09, y radius=0.13];
+ \fill[\duck@egga, rotate=10] (0.94,0.42) ellipse[x radius=0.09, y radius=0.13];
+ \fill[\duck@eggc, rotate=-30] (0.7,1.08) ellipse[x radius=0.09, y radius=0.13];
\end{scope}
\fi%
%
@@ -1236,7 +1284,7 @@
\ifduck@crozier
\begin{scope}
\clip [rotate=-20] (0.6,2.3) rectangle (1.1,1.999);
- \fill[even odd rule,\duck@crozier] (1.5,1.6) circle (0.2) (1.5,1.6) circle (0.1);
+ \fill[even odd rule,\duck@crozier] (1.5,1.6) circle[radius=0.2] (1.5,1.6) circle[radius=0.1];
\end{scope}
\fill[\duck@crozier,rotate=-20] (0.663,0.5) rectangle (0.763,2.0);
\fi
@@ -1244,7 +1292,7 @@
% stethoscope %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@stethoscope
\fill[\duck@stethoscope,rounded corners=\scalingfactor*0.5,rotate=-18] (0.08,0.7) rectangle (0.13,1.24);
- \fill[\duck@stethoscope] (0.35,0.7) circle (0.1);
+ \fill[\duck@stethoscope] (0.35,0.7) circle[radius=0.1];
\begin{scope}
\fill[\duck@stethoscope,rounded corners=\scalingfactor*0.5,rotate=-30] (0.53,1.3) rectangle (0.58,1.72);
\clip[rotate=-30] (0.36,0.89) -- (0.36,1.36) -- (0.79,1.36) -- (0.79,0.89) -- (0.65,0.89) -- (0.65,0.96) -- (0.5,0.96) -- (0.5,0.89) -- cycle ;
@@ -1271,7 +1319,7 @@
%
% crystal ball %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@crystalball
- \shade[ball color=\duck(a)crystalball,opacity=0.7] (0.93,0.5) circle (0.33);
+ \shade[ball color=\duck(a)crystalball,opacity=0.7] (0.93,0.5) circle[radius=0.33];
\fi
%
% Cheese %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1279,7 +1327,7 @@
\begin{scope}[xshift=26,yshift=-2]
\fill[\duck@cheese] (-0.3200,0.8058) -- (0.0608,0.7220) -- (0.0608,0.6366) -- (-0.3200,0.5410) -- (0.2143,0.4236) .. controls (0.3395,0.4810) and (0.4241,0.5627) .. (0.4117,0.6253) -- (0.4117,0.7634) .. controls (0.4261,0.8618) and (0.2607,0.8954) .. (0.1907,0.8962) -- cycle;
\fill[\duck@cheese!35!white] (-0.3200,0.8057) -- (-0.3200,0.5410) -- (0.2143,0.4236) -- (0.2143,0.7381) -- cycle;
- \fill[\duck@cheese] (-0.23,0.71) circle (0.04) (0.0,0.55) circle (0.04) (-0.23,0.58) circle (0.02) (-0.15,0.6) circle (0.02) (-0.1,0.7) circle (0.02) (0.1,0.65) circle (0.02) (0,0.65) circle (0.02) (0.1,0.5) circle (0.02) (0.07,0.55) circle (0.01) (0.12,0.6) circle (0.01) (-0.08,0.54) circle (0.01);
+ \fill[\duck@cheese] (-0.23,0.71) circle[radius=0.04] (0.0,0.55) circle[radius=0.04] (-0.23,0.58) circle[radius=0.02] (-0.15,0.6) circle[radius=0.02] (-0.1,0.7) circle[radius=0.02] (0.1,0.65) circle[radius=0.02] (0,0.65) circle[radius=0.02] (0.1,0.5) circle[radius=0.02] (0.07,0.55) circle[radius=0.01] (0.12,0.6) circle[radius=0.01] (-0.08,0.54) circle[radius=0.01];
\end{scope}
\fi
%
@@ -1318,13 +1366,18 @@
%
% cocktail %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\ifduck@cocktail
- \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse (0.17 and 0.05);
- \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse (0.12 and 0.03);
- \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse (0.03 and 0.2);
+ \fill[cyan!10!white, rotate=-10] (0.8,0.50) ellipse[x radius=0.17, y radius=0.05];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.55) ellipse[x radius=0.12, y radius=0.03];
+ \fill[cyan!10!white, rotate=-10] (0.8,0.7) ellipse[x radius=0.03, y radius=0.2];
\fill[cyan!10!white] (0.92,0.6) -- (0.75,0.9) -- (1.18,0.83) -- cycle;
\fill[gray!60!white] (0.928,0.64) -- (0.85,0.77) -- (1.08,0.77) -- cycle;
- \fill[green!40!brown!60!white] (0.94,0.71) circle (0.04);
- \fill[red!80!black] (0.94,0.72) circle (0.01);
+ \fill[green!40!brown!60!white] (0.94,0.71) circle[radius=0.04];
+ \fill[red!80!black] (0.94,0.72) circle[radius=0.01];
+\fi
+%
+% overleaf duck
+\ifduck@overleaf
+ \fill[white] \duckpathoverleaf;
\fi
%
% wing %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1343,15 +1396,15 @@
% Random ducks
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\ifluatex
- \let\pdfrandomseed\randomseed
-\fi
-
-\ifxetex
- \pgfmathsetseed{\time}
+\ifdefined\pdfrandomseed % pdflatex
\else
- \pgfmathsetseed{\number\pdfrandomseed}
+ \ifdefined\randomseed
+ \let\pdfrandomseed\randomseed % post TL19 xelatex and lualatex
+ \else
+ \let\pdfrandomseed\time % pre TL19 xelatex
+ \fi
\fi
+\pgfmathsetseed{\number\pdfrandomseed}
\pgfmathdeclarerandomlist{head}{{shorthair}{longhair}{crazyhair}{mohican}{mullet}{beard}{alien}{hat}{cap}{santa}{chef}{graduate}{beret}{magichat}{witch}{crown}{bunny}{peakedcap}{tophat}{queencrown}{kingcrown}{harlequin}{strawhat}{parting}}
\pgfmathdeclarerandomlist{accessories}{{glasses}{sunglasses}{icecream}{book}{signpost}{magicwand}{cricket}{rollingpin}{lightsaber}{cake}{pizza}{hockey}{baguette}{football}{mask}{necklace}{milkshake}{wine}{prison}{cape}{torch}{crozier}{easter}{stethoscope}{neckerchief}{cheese}{shovel}{pickaxe}{crystalball}}
@@ -1593,6 +1646,10 @@
(1.4338,1.0258) -- cycle
}
+\newcommand{\duckpathoverleaf}{%
+ (1.2699,0.6095) .. controls (1.2710,0.5992) and (1.2752,0.5910) .. (1.2822,0.5852) .. controls (1.2892,0.5793) and (1.2983,0.5763) .. (1.3095,0.5763) .. controls (1.3165,0.5762) and (1.3233,0.5778) .. (1.3295,0.5809) .. controls (1.3353,0.5840) and (1.3401,0.5885) .. (1.3436,0.5940) -- (1.3792,0.5940) .. controls (1.3731,0.5785) and (1.3640,0.5664) .. (1.3521,0.5578) .. controls (1.3398,0.5492) and (1.3252,0.5447) .. (1.3103,0.5449) .. controls (1.3002,0.5448) and (1.2902,0.5467) .. (1.2808,0.5505) .. controls (1.2718,0.5544) and (1.2636,0.5601) .. (1.2567,0.5672) .. controls (1.2500,0.5742) and (1.2446,0.5825) .. (1.2410,0.5915) .. controls (1.2372,0.6005) and (1.2353,0.6101) .. (1.2353,0.6198) .. controls (1.2352,0.6294) and (1.2370,0.6389) .. (1.2404,0.6479) .. controls (1.2438,0.6567) and (1.2489,0.6647) .. (1.2554,0.6715) .. controls (1.2625,0.6790) and (1.2709,0.6850) .. (1.2802,0.6892) .. controls (1.2891,0.6933) and (1.2988,0.6954) .. (1.3086,0.6955) .. controls (1.3207,0.6955) and (1.3325,0.6926) .. (1.3432,0.6871) .. controls (1.3540,0.6813) and (1.3633,0.6732) .. (1.3705,0.6634) .. controls (1.3751,0.6571) and (1.3786,0.6501) .. (1.3807,0.6427) .. controls (1.3831,0.6341) and (1.3842,0.6253) .. (1.3841,0.6164) .. controls (1.3840,0.6139) and (1.3839,0.6119) .. (1.3837,0.6092) .. controls (1.3458,0.6093) and (1.3079,0.6094) .. (1.2699,0.6095) -- cycle(1.3486,0.6358) .. controls (1.3458,0.6453) and (1.3410,0.6525) .. (1.3343,0.6575) .. controls (1.3276,0.6625) and (1.3192,0.6650) .. (1.3090,0.6650) .. controls (1.3004,0.6651) and (1.2920,0.6622) .. (1.2852,0.6570) .. controls (1.2783,0.6517) and (1.2733,0.6443) .. (1.2711,0.6359) .. controls (1.2969,0.6359) and (1.3228,0.6358) .. (1.3486,0.6358) -- cycle(1.5160,0.5487) -- (1.5160,0.5662) .. controls (1.5122,0.5593) and (1.5064,0.5538) .. (1.4992,0.5505) .. controls (1.4920,0.5471) and (1.4828,0.5455) .. (1.4715,0.5455) .. controls (1.4505,0.5455) and (1.4329,0.5527) .. (1.4187,0.5670) .. controls (1.4046,0.5814) and (1.3976,0.5993) .. (1.3975,0.6206) .. controls (1.3975,0.6303) and (1.3993,0.6401) .. (1.4029,0.6492) .. controls (1.4063,0.6580) and (1.4114,0.6661) .. (1.4180,0.6729) .. controls (1.4246,0.6801) and (1.4327,0.6857) .. (1.4416,0.6895) .. controls (1.4509,0.6932) and (1.4608,0.6950) .. (1.4708,0.6949) .. controls (1.4800,0.6951) and (1.4891,0.6933) .. (1.4976,0.6896) .. controls (1.5050,0.6862) and (1.5112,0.6807) .. (1.5156,0.6739) -- (1.5156,0.6911) -- (1.5480,0.6911) -- (1.5480,0.5485) -- (1.5160,0.5485) -- (1.5160,0.5487) -- cycle(1.4436,0.5910) .. controls (1.4513,0.5831) and (1.4619,0.5787) .. (1.4729,0.5789) .. controls (1.4833,0.5789) and (1.4926,0.5829) .. (1.5006,0.5911) .. controls (1.5083,0.5986) and (1.5126,0.6088) .. (1.5126,0.6196) .. controls (1.5127,0.6307) and (1.5084,0.6414) .. (1.5006,0.6494) .. controls (1.4926,0.6577) and (1.4833,0.6619) .. (1.4727,0.6619) .. controls (1.4618,0.6621) and (1.4514,0.6577) .. (1.4439,0.6499) .. controls (1.4361,0.6423) and (1.4318,0.6318) .. (1.4317,0.6205) .. controls (1.4315,0.6092) and (1.4355,0.5991) .. (1.4436,0.5910) -- cycle(1.6366,0.6913) -- (1.6366,0.6617) -- (1.6127,0.6617) -- (1.6127,0.5487) -- (1.5806,0.5487) -- (1.5806,0.6617) -- (1.5637,0.6617) -- (1.5637,0.6913) -- (1.5796,0.6913) -- (1.5796,0.6952) .. controls (1.5796,0.7102) and (1.5838,0.7214) .. (1.5922,0.7288) .. controls (1.6005,0.7362) and (1.6131,0.7399) .. (1.6300,0.7399) .. controls (1.6324,0.7398) and (1.6347,0.7396) .. (1.6370,0.7395) -- (1.6370,0.7097) -- (1.6347,0.7097) .. controls (1.6272,0.7097) and (1.6218,0.7084) .. (1.6186,0.7059) .. controls (1.6154,0.7034) and (1.6138,0.6993) .. (1.6138,0.6936) -- (1.6138,0.6910) .. controls (1.6214,0.6913) and (1.6290,0.6912) .. (1.6366,0.6913) -- cycle(1.1906,0.5487) -- (1.2231,0.5487) -- (1.2231,0.7374) -- (1.1906,0.7374) -- cycle(0.9820,0.6095) .. controls (0.9831,0.5992) and (0.9872,0.5910) .. (0.9943,0.5852) .. controls (1.0013,0.5793) and (1.0104,0.5763) .. (1.0216,0.5763) .. controls (1.0285,0.5762) and (1.0354,0.5778) .. (1.0416,0.5809) .. controls (1.0474,0.5839) and (1.0522,0.5885) .. (1.0556,0.5940) -- (1.0914,0.5940) .. controls (1.0854,0.5785) and (1.0763,0.5664) .. (1.0643,0.5578) .. controls (1.0522,0.5492) and (1.0382,0.5449) .. (1.0225,0.5449) .. controls (1.0124,0.5448) and (1.0024,0.5467) .. (0.9931,0.5505) .. controls (0.9840,0.5544) and (0.9758,0.5601) .. (0.9690,0.5672) .. controls (0.9622,0.5742) and (0.9569,0.5825) .. (0.9532,0.5915) .. controls (0.9495,0.6005) and (0.9475,0.6101) .. (0.9475,0.6198) .. controls (0.9475,0.6294) and (0.9492,0.6389) .. (0.9527,0.6479) .. controls (0.9560,0.6567) and (0.9611,0.6647) .. (0.9677,0.6715) .. controls (0.9747,0.6790) and (0.9830,0.6850) .. (0.9924,0.6892) .. controls (1.0012,0.6933) and (1.0109,0.6955) .. (1.0207,0.6955) .. controls (1.0327,0.6955) and (1.0446,0.6927) .. (1.0552,0.6871) .. controls (1.0660,0.6813) and (1.0753,0.6732) .. (1.0826,0.6634) .. controls (1.0871,0.6571) and (1.0906,0.6501) .. (1.0926,0.6427) .. controls (1.0949,0.6341) and (1.0960,0.6253) .. (1.0959,0.6164) .. controls (1.0959,0.6139) and (1.0957,0.6119) .. (1.0956,0.6092) .. controls (1.0577,0.6100) and (1.0199,0.6095) .. (0.9820,0.6095) -- cycle(1.0606,0.6358) .. controls (1.0578,0.6453) and (1.0531,0.6526) .. (1.0463,0.6575) .. controls (1.0397,0.6625) and (1.0312,0.6650) .. (1.0210,0.6650) .. controls (1.0124,0.6651) and (1.0041,0.6622) .. (0.9973,0.6570) .. controls (0.9903,0.6517) and (0.9853,0.6443) .. (0.9830,0.6359) .. controls (1.0089,0.6359) and (1.0348,0.6358) .. (1.0606,0.6358) -- cycle(1.1761,0.6624) .. controls (1.1632,0.6614) and (1.1542,0.6580) .. (1.1492,0.6523) .. controls (1.1441,0.6465) and (1.1415,0.6363) .. (1.1415,0.6214) -- (1.1415,0.5487) -- (1.1083,0.5487) -- (1.1083,0.6913) -- (1.1394,0.6913) -- (1.1394,0.6748) .. controls (1.1438,0.6808) and (1.1494,0.6856) .. (1.1559,0.6891) .. controls (1.1621,0.6923) and (1.1690,0.6938) .. (1.1760,0.6937) .. controls (1.1760,0.6833) and (1.1761,0.6728) .. (1.1761,0.6624) -- cycle(0.8646,0.8092) .. controls (0.8244,0.8248) and (0.6787,0.8306) .. (0.6784,0.7437) .. controls (0.6359,0.7165) and (0.6078,0.6721) .. (0.6078,0.6246) .. controls (0.6077,0.5410) and (0.7016,0.4916) .. (0.7705,0.5391) .. controls (0.8394,0.5866) and (0.8268,0.6919) .. (0.7486,0.7217) .. controls (0.7411,0.7246) and (0.7248,0.7297) .. (0.7117,0.7286) .. controls (0.6931,0.7168) and (0.6704,0.6924) .. (0.6597,0.6682) .. controls (0.6918,0.7064) and (0.7528,0.6983) .. (0.7737,0.6530) .. controls (0.7947,0.6076) and (0.7614,0.5559) .. (0.7115,0.5562) .. controls (0.6914,0.5562) and (0.6724,0.5649) .. (0.6594,0.5802) .. controls (0.6410,0.6019) and (0.6363,0.6254) .. (0.6400,0.6484) .. controls (0.6532,0.7289) and (0.7487,0.7748) .. (0.8197,0.7924) .. controls (0.7966,0.7801) and (0.7548,0.7600) .. (0.7255,0.7380) .. controls (0.8108,0.7051) and (0.8246,0.7770) .. (0.8646,0.8092) -- cycle(0.8731,0.5487) -- (0.8189,0.6913) -- (0.8542,0.6913) -- (0.8874,0.5965) -- (0.9217,0.6913) -- (0.9561,0.6913) -- (0.8991,0.5487) -- cycle
+}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
% Picture mode ducks
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzducks/tikzlibraryducks.code.tex new/tex/latex/tikzducks/tikzlibraryducks.code.tex
--- old/tex/latex/tikzducks/tikzlibraryducks.code.tex 2019-04-07 23:21:00.000000000 +0200
+++ new/tex/latex/tikzducks/tikzlibraryducks.code.tex 2020-01-03 23:15:44.000000000 +0100
@@ -10,9 +10,6 @@
% Released under the LaTeX Project Public License v1.3c or later
% See http://www.latex-project.org/lppl.txt
%
-% Version 1.1
-% April 7, 2019
-%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\usepackage{tikzducks}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzducks.tlpobj new/tlpkg/tlpobj/tikzducks.tlpobj
--- old/tlpkg/tlpobj/tikzducks.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzducks.tlpobj 2020-01-05 01:55:18.000000000 +0100
@@ -1,12 +1,12 @@
name tikzducks
category Package
-revision 50840
+revision 53312
shortdesc A little fun package for using rubber ducks in TikZ
relocated 1
longdesc The package is a LaTeX package for ducks to be used in TikZ
longdesc pictures. This project is a continuation of an answer at
longdesc StackExchange How we can draw a duck?
-runfiles size=22
+runfiles size=26
RELOC/tex/latex/tikzducks/tikzducks.sty
RELOC/tex/latex/tikzducks/tikzlibraryducks.code.tex
catalogue-also tikzlings tikzmarmots
@@ -14,7 +14,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzducks
catalogue-contact-support https://github.com/samcarter/tikzducks/issues
catalogue-ctan /graphics/pgf/contrib/tikzducks
-catalogue-date 2019-04-07 09:38:44 +0200
catalogue-license lppl1.3c
-catalogue-topics pgf-tikz
-catalogue-version 1.1
+catalogue-topics amusements graphics pgf-tikz
+catalogue-version 1.3
++++++ tikzlings.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzlings.doc.tlpobj new/tlpkg/tlpobj/tikzlings.doc.tlpobj
--- old/tlpkg/tlpobj/tikzlings.doc.tlpobj 2019-04-08 01:40:10.000000000 +0200
+++ new/tlpkg/tlpobj/tikzlings.doc.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzlings.doc
category Package
-revision 50841
+revision 54080
shortdesc doc files of tikzlings
relocated 1
docfiles size=125
++++++ tikzlings.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzlings.tlpobj new/tlpkg/tlpobj/tikzlings.tlpobj
--- old/tlpkg/tlpobj/tikzlings.tlpobj 2019-04-08 01:40:11.000000000 +0200
+++ new/tlpkg/tlpobj/tikzlings.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzlings
category Package
-revision 50841
+revision 54080
shortdesc A collection of cute little animals and similar creatures
relocated 1
longdesc A collection of LaTeX packages for drawing cute little animals
@@ -31,7 +31,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzlings
catalogue-contact-support https://github.com/samcarter/tikzlings/issues
catalogue-ctan /graphics/pgf/contrib/tikzlings
-catalogue-date 2019-04-07 10:07:47 +0200
catalogue-license lppl1.3c
-catalogue-topics graphics pgf-tikz
+catalogue-topics amusements graphics pgf-tikz
catalogue-version 0.2
++++++ tikzmark.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tikzmark/README.txt new/doc/latex/tikzmark/README.txt
--- old/doc/latex/tikzmark/README.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tikzmark/README.txt 2019-05-08 23:16:33.000000000 +0200
@@ -0,0 +1,10 @@
+----------------------------------------------------------------
+tikzmark --- remembering absolute positioning with TikZ
+E-mail: loopspace(a)mathforge.org
+Released under the LaTeX Project Public License v1.3c or later
+See http://www.latex-project.org/lppl.txt
+----------------------------------------------------------------
+
+The tikzmark package defines a command to "remember" a position
+on a page for later (or earlier) use, primarily (but not
+exclusively) with TikZ.
Binary files old/doc/latex/tikzmark/tikzmark.pdf and new/doc/latex/tikzmark/tikzmark.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmark.doc.tlpobj new/tlpkg/tlpobj/tikzmark.doc.tlpobj
--- old/tlpkg/tlpobj/tikzmark.doc.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmark.doc.tlpobj 2019-10-06 01:54:25.000000000 +0200
@@ -1,8 +1,9 @@
name tikzmark.doc
category Package
-revision 48929
+revision 52293
shortdesc doc files of tikzmark
relocated 1
-docfiles size=112
+docfiles size=105
RELOC/doc/latex/tikzmark/README
+ RELOC/doc/latex/tikzmark/README.txt
RELOC/doc/latex/tikzmark/tikzmark.pdf
++++++ tikzmark.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex new/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
--- old/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2018-10-18 22:26:16.000000000 +0200
+++ new/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex 2019-10-05 22:49:26.000000000 +0200
@@ -61,6 +61,36 @@
next page/ignore/.style={%
next page vector={\pgfqpoint{0pt}{0pt}}%
},
+ if tikzmark on current page/.code n args={3}{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \pgfkeysalso{#3}%
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \pgfkeysalso{#3}%
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \pgfkeysalso{#2}%
+ \else
+ \pgfkeysalso{#3}%
+ \fi
+ }%
+ }%
+ },
+ if tikzmark on page/.code n args={4}{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \pgfkeysalso{#4}%
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}@label\endcsname}{%
+ \pgfkeysalso{#4}%
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \pgfkeysalso{#3}%
+ \else
+ \pgfkeysalso{#4}%
+ \fi
+ }%
+ }%
+ },
tikzmark prefix/.initial=,%
tikzmark suffix/.initial=,%
}
@@ -77,6 +107,10 @@
\def\savepicturepage#1#2{%
\expandafter\gdef\csname save@pg@#1\endcsname{#2}%
}
+\def\tikzmarkalias#1#2{%
+ \pgf@node@gnamelet{save@pt@#1}{save@pt@#2}%
+ \pgf@node@gnamelet{save@pt@#1@offset}{save@pt@#2@offset}%
+}
\def\tmk@labeldef#1,#2\@nil{%
\edef\tmk@label{\tikzmark@pp@name{#1}}%
\def\tmk@def{#2}%
@@ -109,22 +143,23 @@
\@ifundefined{save@pg@\csname save@pt@\tmk@label\endcsname}{}{%
\@ifundefined{save@pg@\pgfpictureid}{}{%
\pgfkeysvalueof{/tikz/next page vector}%
- \advance \pgf@xa by %
- \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname\pgf@x\relax
- \advance \pgf@ya by %
- \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname\pgf@y\relax
- \advance \pgf@xa by %
- -\csname save@pg@\pgfpictureid\endcsname\pgf@x\relax
- \advance \pgf@ya by %
- -\csname save@pg@\pgfpictureid\endcsname\pgf@y\relax
+ \edef\tmk@pg{\the\numexpr \csname save@pg@\csname save@pt@\tmk@label\endcsname\endcsname - \csname save@pg@\pgfpictureid\endcsname\relax}%
+ \ifnum \tmk@pg > 0 \relax
+ \advance \pgf@xa by \pgf@x\relax
+ \advance \pgf@ya by \pgf@y\relax
+ \fi
+ \ifnum \tmk@pg < 0 \relax
+ \advance \pgf@xa by -\pgf@x\relax
+ \advance \pgf@ya by -\pgf@y\relax
+ \fi
}%
}%
\pgf@x=\pgf@xa
\pgf@y=\pgf@ya
\pgftransforminvert
\pgf@pos@transform{\pgf@x}{\pgf@y}%
- }%
- }
+ }%
+}
\newcommand\tikzmark@outside[2][]{%
\tikz[remember picture with id=#2]{#1}%
}
@@ -138,8 +173,13 @@
\ifx\pgfpictureid\@undefined
\let\tikzmark@next=\tikzmark@outside
\else
+ \relax
+ \ifx\scope\tikz@origscope\relax
+ \let\tikzmark@next=\tikzmark@outside
+ \else
\let\tikzmark@next=\tikzmark@inside
\fi
+ \fi
\tikzmark@next%
}
\newcommand\pgfmark[1]{%
@@ -171,19 +211,58 @@
tikzmark suffix=-\the\beamer@slideinframe
}
}{}
+\newif\iftikzmark@
\newcommand\iftikzmark[3]{%
\@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
#3%
}{%
#2%
}%
+}%
+\newcommand\iftikzmarkexists[1]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false%
+ }{%
+ \tikzmark@true%
}%
-\newcommand\subnode[3][]{%
+ \iftikzmark@
+}%
+\newcommand\iftikzmarkonpage[2]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \tikzmark@false
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=#2\relax%
+ \tikzmark@true
+ \else
+ \tikzmark@false
+ \fi
+ }%
+ }%
+ \iftikzmark@
+}
+\newcommand\iftikzmarkoncurrentpage[1]{%
+ \@ifundefined{save@pt@\tikzmark@pp@name{#1}}{%
+ \tikzmark@false
+ }{%
+ \@ifundefined{save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname}{%
+ \tikzmark@false
+ }{%
+ \ifnum\csname save@pg@\csname save@pt@\tikzmark@pp@name{#1}\endcsname\endcsname=\the\value{page}\relax%
+ \tikzmark@true
+ \else
+ \tikzmark@false
+ \fi
+ }%
+ }%
+ \iftikzmark@
+}
+\def\subnode@#1#2#3{%
\begingroup
\pgfmark{#2}%
\setbox\pgfnodeparttextbox=\hbox\bgroup #3\egroup
- \def\tikz@shape{rectangle}%
- \def\tikz@anchor{center}%
\def\tikz@fig@name{#2}%
\tikzset{every subnode/.try,#1}%
\pgfpointorigin
@@ -193,46 +272,89 @@
\advance\pgf@y by -.5\dp\pgfnodeparttextbox
\pgftransformshift{}%
\setbox\@tempboxa=\hbox\bgroup
- \pgfutil@ifundefined{pgf@sh@s@\tikz@shape}%
- {\PackageError{pgf}{Unknown shape ``\tikz@shape''}{}}%
{%
- {%
- \let\pgf@sh@savedmacros=\pgfutil@empty% MW
- \let\pgf@sh@savedpoints=\pgfutil@empty%
- \def\pgf@sm@shape@name{\tikz@shape}% CJ % TT added prefix!
- \csname pgf@sh@s@\tikz@shape\endcsname%
- \pgf@sh@savedpoints%
- \pgf@sh@savedmacros% MW
- \pgftransformshift{%
- \pgf@sh@reanchor{\tikz@shape}{\tikz@anchor}%
- \pgf@x=-\pgf@x%
- \pgf@y=-\pgf@y%
- }%
- \expandafter\pgfsavepgf@process\csname pgf@sh@sa@\tikz@fig@name\endcsname{%
- \pgf@sh@reanchor{\tikz@shape}{\tikz@anchor}% FIXME : this is double work!
- }%
- % Save the saved points and the transformation matrix
- \edef\pgf@node@name{\tikz@fig@name}%
- \ifx\pgf@node@name\pgfutil@empty%
- \else%
- \expandafter\xdef\csname pgf@sh@ns@\pgf@node@name\endcsname{\tikz@shape}%
- \edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
- \expandafter\pgf@sh@@temp\expandafter{%
- \pgf@sh@savedpoints}%
- \edef\pgf@sh@@temp{%
- \noexpand\gdef\expandafter\noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
- \expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
- \pgfgettransform\pgf@temp
- \expandafter\xdef\csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
- \expandafter\xdef\csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
- \fi%
+ \let\pgf@sh@savedmacros=\pgfutil@empty% MW
+ \let\pgf@sh@savedpoints=\pgfutil@empty%
+ \def\pgf@sm@shape@name{rectangle}% CJ % TT added prefix!
+ \pgf@sh@s@rectangle%
+ \pgf@sh@savedpoints%
+ \pgf@sh@savedmacros% MW
+ \pgftransformshift{%
+ \pgf@sh@reanchor{rectangle}{center}%
+ \pgf@x=-\pgf@x%
+ \pgf@y=-\pgf@y%
+ }%
+ \expandafter\pgfsavepgf@process\csname pgf@sh@sa@\tikz@fig@name\endcsname{%
+ \pgf@sh@reanchor{rectangle}{center}% FIXME : this is double work!
}%
+ % Save the saved points and the transformation matrix
+ \edef\pgf@node@name{\tikz@fig@name}%
+ \ifx\pgf@node@name\pgfutil@empty%
+ \else%
+ \expandafter\xdef\csname pgf@sh@ns@\pgf@node@name\endcsname{rectangle}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf@sh@np@\pgf@node@name\endcsname}%
+ \expandafter\pgf@sh@@temp\expandafter{%
+ \pgf@sh@savedpoints}%
+ \edef\pgf@sh@@temp{%
+ \noexpand\gdef\expandafter\noexpand\csname pgf@sh@ma@\pgf@node@name\endcsname}% MW
+ \expandafter\pgf@sh@@temp\expandafter{\pgf@sh@savedmacros}% MW
+ \pgfgettransform\pgf@temp
+ \expandafter\xdef\csname pgf@sh@nt@\pgf@node@name\endcsname{\pgf@temp}%
+ \expandafter\xdef\csname pgf@sh@pi@\pgf@node@name\endcsname{\pgfpictureid}%
+ \fi%
}%
\egroup
\box\pgfnodeparttextbox
\endgroup
}
+
+\newcommand\subnode[3][]{%
+ \ifmmode
+ \mathchoice{%
+ \subnode@{#1}{#2-d}{\(\displaystyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-t}{\(\textstyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-s}{\(\scriptstyle #3\)}%
+ }{%
+ \subnode@{#1}{#2-ss}{\(\scriptscriptstyle #3\)}%
+ }%
+ \let\pgf@nodecallback\pgfutil@gobble
+ \def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
+ \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+ \edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-2\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
+ \expandafter\ifx\csname\tzmk@pic\endcsname\relax
+ \pgfutil@ifundefined{pgf@sh@ns@#2}{%
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ }{}%
+ \else
+ \pgfnodealias{#2}{#2-d}%
+ \tikzmarkalias{#2}{#2-d}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-s}%
+ \tikzmarkalias{#2}{#2-s}%
+ \fi
+ \else
+ \pgfnodealias{#2}{#2-ss}%
+ \tikzmarkalias{#2}{#2-ss}%
+ \fi
+ \else
+ \subnode@{#1}{#2}{#3}%
+ \fi
+}
+
\def\tikzmarknode@#1#2#3{%
\tikz[%
remember picture,
@@ -243,6 +365,7 @@
\node[
anchor=base,
inner sep=0pt,
+ minimum width=0pt,
name={#2},
node contents={#3},
every tikzmarknode/.try,
@@ -263,7 +386,7 @@
}%
\let\pgf@nodecallback\pgfutil@gobble
\def\tzmk@prfx{pgf@sys@pdf@mark@pos@pgfid}%
- \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}
+ \edef\tzmk@pic{\tzmk@prfx\the\pgf@picture@serial@count}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-1\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
@@ -271,18 +394,25 @@
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
\edef\tzmk@pic{\tzmk@prfx\the\numexpr\the\pgf@picture@serial@count-3\relax}%
\expandafter\ifx\csname\tzmk@pic\endcsname\relax
- \pgfnodealias{#2}{#2-t}% %% Fallback
+ \pgfutil@ifundefined{pgf@sh@ns@#2}{%
+ \pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
+ }{}%
\else
\pgfnodealias{#2}{#2-d}%
+ \tikzmarkalias{#2}{#2-d}%
\fi
\else
\pgfnodealias{#2}{#2-t}%
+ \tikzmarkalias{#2}{#2-t}%
\fi
\else
\pgfnodealias{#2}{#2-s}%
+ \tikzmarkalias{#2}{#2-s}%
\fi
\else
\pgfnodealias{#2}{#2-ss}%
+ \tikzmarkalias{#2}{#2-ss}%
\fi
\else
\tikzmarknode@{#1}{#2}{#3}%
@@ -324,6 +454,10 @@
\tl_new:N \l__sn_group_tl
\clist_new:N \l__sn_nodes_clist
\bool_new:N \l__sn_file_bool
+\bool_new:N \g__sn_preamble_bool
+\bool_set_true:N \g__sn_preamble_bool
+\msg_new:nnn {tikzmark} {no file} {File~ "#1"~ doesn't~ exist.}
+\msg_new:nnn {tikzmark} {loading nodes} {Loading~ nodes~ from~ "#1".}
\dim_new:N \l__sn_x_dim
\dim_new:N \l__sn_y_dim
\dim_new:N \l__sn_xa_dim
@@ -335,7 +469,7 @@
\iow_new:N \g__sn_stream
\bool_new:N \g__sn_stream_bool
\tl_new:N \g__sn_filename_tl
-\tl_set:Nx \g__sn_filename_tl {\c_sys_jobname_str}
+\tl_gset:Nx \g__sn_filename_tl {\c_sys_jobname_str}
\cs_new_nopar:Npn \sn_open_stream:
{
@@ -445,13 +579,18 @@
}
\cs_new_nopar:Npn \restore_nodes_from_file:n #1
{
- \file_if_exist:nT {#1.nodes}
+ \file_if_exist:nTF {#1.nodes}
{
+ \msg_log:nnn {tikzmark} {loading nodes} {#1}
\ExplSyntaxOn
\file_input:n {#1.nodes}
\ExplSyntaxOff
}
+ {
+ \msg_warning:nnn {tikzmark} {no file} {#1}
+ }
}
+\AtBeginDocument{\bool_gset_false:N \g__sn_preamble_bool}
\cs_new_nopar:Npn \compose_transformations:Nnn #1#2#3
{
@@ -568,16 +707,23 @@
}
},
restore~ nodes~ from~ file/.code={
- \tikz_fig_must_be_named:
- \pgfkeysalso{append~ after~ command={
- \pgfextra{
- \scope
- \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
- \endscope
+ \bool_if:NTF \g__sn_preamble_bool
+ {
+ \restore_nodes_from_file:n {#1}
+ }
+ {
+ \tikz_fig_must_be_named:
+ \pgfkeysalso{append~ after~ command={
+ \pgfextra{
+ \scope
+ \split_argument:NNn \tikzset \restore_nodes_from_file:n {#1}
+ \endscope
+ }
}
}
}
},
+ restore~ nodes~ from~ file/.default = \g__sn_filename_tl,
restore~ nodes~ from~ list/.code={
\tikz_fig_must_be_named:
\pgfkeysalso{append~ after~ command={
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmark.tlpobj new/tlpkg/tlpobj/tikzmark.tlpobj
--- old/tlpkg/tlpobj/tikzmark.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmark.tlpobj 2019-10-06 01:54:25.000000000 +0200
@@ -1,18 +1,19 @@
name tikzmark
category Package
-revision 48929
+revision 52293
shortdesc Use TikZ's method of remembering a position on a page
relocated 1
longdesc The tikzmark package defines a command to "remember" a position
longdesc on a page for later (or earlier) use, primarily (but not
longdesc exclusively) with TikZ.
-runfiles size=6
+runfiles size=7
RELOC/tex/latex/tikzmark/tikzlibrarytikzmark.code.tex
RELOC/tex/latex/tikzmark/tikzmarklibrarylistings.code.tex
+catalogue-contact-bugs https://github.com/loopspace/tikzmark/issues
catalogue-contact-home https://github.com/loopspace/tikzmark
catalogue-contact-repository https://github.com/loopspace/tikzmark
catalogue-ctan /graphics/pgf/contrib/tikzmark
-catalogue-date 2018-10-18 13:12:22 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-10-04 23:28:37 +0200
+catalogue-license lppl1.3c
catalogue-topics pgf-tikz graphics-supp
-catalogue-version 1.6
+catalogue-version 1.8
++++++ tikzmarmots.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmarmots.doc.tlpobj new/tlpkg/tlpobj/tikzmarmots.doc.tlpobj
--- old/tlpkg/tlpobj/tikzmarmots.doc.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmarmots.doc.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzmarmots.doc
category Package
-revision 49114
+revision 54080
shortdesc doc files of tikzmarmots
relocated 1
docfiles size=65
++++++ tikzmarmots.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikzmarmots.tlpobj new/tlpkg/tlpobj/tikzmarmots.tlpobj
--- old/tlpkg/tlpobj/tikzmarmots.tlpobj 2019-02-28 04:08:45.000000000 +0100
+++ new/tlpkg/tlpobj/tikzmarmots.tlpobj 2020-03-04 23:53:59.000000000 +0100
@@ -1,6 +1,6 @@
name tikzmarmots
category Package
-revision 49114
+revision 54080
shortdesc Drawing little marmots in TikZ
relocated 1
longdesc This is a LaTeX package for marmots to be used in TikZ
@@ -15,7 +15,6 @@
catalogue-contact-repository https://github.com/samcarter/tikzmarmots
catalogue-contact-support https://github.com/samcarter/tikzmarmots/issues
catalogue-ctan /graphics/pgf/contrib/tikzmarmots
-catalogue-date 2018-11-09 18:39:11 +0100
catalogue-license lppl1.3c
-catalogue-topics pgf-tikz
+catalogue-topics amusements graphics pgf-tikz
catalogue-version 1.0
++++++ titlesec.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/CHANGES new/doc/latex/titlesec/CHANGES
--- old/doc/latex/titlesec/CHANGES 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/CHANGES 1970-01-01 01:00:00.000000000 +0100
@@ -1,267 +0,0 @@
-Titlesec changes
-
-History of v1.0
-~~~~~~~~~~~~~~~
-1998/02/25 Added nops option
-1998/02/28 Added \@mkboth stuff in \setmarks
-1998/03/01 Changed test in \ttl@secnum
-1998/03/03 Corrected some \fil... commands
-1998/03/03 Replaced the faulty \@hangfrom by new commands
-1998/03/03 Some \def replaced by \newcommand
-1998/03/04 .dtx/.ins scheme finally rejected. Useless
- for users, obtrusive for `readers' and proned
- to errors
-1998/03/04 Tidied up documentation
-1998/03/06 \wordsep renamed and documented
-1998/03/06 Added dummy asignation in \ttl@chap.
-1998/03/06 Removed \ttl@xsect and merged into \tl@sect
-1998/03/06 Added \ProvidesPackage
-
-History of v1.1
-~~~~~~~~~~~~~~~~
-1998/03/25 \chapter corrected, as well as the size options
-1998/03/26 Added compact option
-1998/03/26 Added flushleft, flushright and center options
-1998/04/08 Changed all instances of \noindent by \parindent\z@
-1998/04/14 Added \filinner, \filouter
-1998/04/14 Added drop shape
-1998/05/01 Added rightmargin shape (and margin renamed to
- leftmargin)
-1998/05/03 Added \setheadindent
-
-History of v1.2 (unreleased)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-1998/06/01 Compatibility with AMS classes
-1998/06/08 On-demand loading of shapes
-1998/06/11 Frame shape. Some \fil... command
- modified to work in the label of this
- chapter shape.
-1998/07/03 Bottomtitle option (at last...)
-1998/07/14 ...margin styles bug fixed using a method
- similar to bottomtitle.
-1998/07/29 \titleline
-
-====================
-
-History of v2.0
-~~~~~~~~~~~~~~~~
-
-1998/08/05 to
-1998/08/29 Fully reimplemented
-
-History of v2.1
-~~~~~~~~~~~~~~~~
-1999/01/05 We define in this file the three basic shapes.
- Additional ones remain defined in external files.
- Unified the shapes for sections and chapters.
-1999/01/05 \ttl@shape merged into \ttl@format@iii.
-1999/01/05 \titlerule
-1999/01/07 \ttl@defkeys splitted from \ttl@keys
-1999/01/10 Added the \part stuff, including a definition of \@openright
-1999/01/11 Removed unnecessary \ttl@numsecfalse in \ttl@sect@i.
-1999/01/14 Optimized \titlerule
-1999/01/27 Changed \titleline to correct the spacing at the
- top page and to fix a bug which changed the mode
- to horizontal, thus introducing unwanted space
- (\makebox -> \@makebox).
-1999/02/02 \ttl@secnum renamed to \ttl@write and introduced the
- \ttl@savewrite mechanism to sincronize the toc/marks
- with the title in case there is a \newpage in <after>.
-1999/02/03 wrap shape
-1999/02/03 Added a \kern\z@ for not to avoid hyphenation
- of the last word. Not strictly necessary, but
- it is more LaTeX-like.
-1999/02/05 \partmark defined (and in \setmarks, too).
-1999/02/08 \ttl@row@i simplified.
-1999/02/08 \ttl@savefn mechanism.
-1999/02/10 Removed extra \leavevmode in display
-1999/02/13 Now \titleline doesn't add the width. It's set.
-1999/02/17 The part mark is catched, even if unused.
-1999/02/17 old/newparttoc added.
-1999/02/18 Changed many TeX assignments to the LaTeX
- counterpart.
-1999/02/19 Introduced \ttl@startargs.
-
-History of v2.1.1
-~~~~~~~~~~~~~~~~~
-1999/08/04 Moved misplaced lines in \ttl@makeboth
-
-History of v2.2 (unreleased)
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-1999/11/03 We load titleps if pagestyles are required, but
- some old definitions are restored.
-1999/11/06 Improved outermarks test in \ttl@sect@i. Formerly
- the section number could be printed if a page ended
- with an unnumebered section followed by a numbered one.
-1999/11/06 \ttl@startargs now adds (and passes) automatically the
- section name. Involved macros modified accordingly.
-1999/11/06 Replaced explicit part names by the parameter in
- \ttl@part@i. The same for chapter.
-1999/11/21 \ttl@try's are not given explicitly, but built by
- \ttl@setkeys. Intruduced the \ttl@key@... and
- \ttl@extra@... commands.
-1999/11/23 Minor problems with keys fixed.
-1999/12/10 Added the nobottomtitles* option and \ttl@addstretch.
-2000/01/07 First steps towards the calcwidth feature (basic code).
-2000/01/08 (Continued.) \titleline* for rules of width \titlewidth.
- Option calcwidth implemented.
-2000/01/12 Finished with changes in wrap.tss (no longer
- "experimental" :-) )
-
-History of v2.3
-~~~~~~~~~~~~~~~
-2000/01/19 All keys are grouped in a single file tttkeys. Removed
- page.tsk and deleted the corresponding code in the sty.
-2000/01/19 Classes begun.
-2000/01/19 The level numbers are stored in \ttll@ macros, and not
- passed as arguments.
-2000/01/21 Introduced the new mark scheme. It's mostly compatible
- with the old one, but a compatibility mode seems
- imposible (it was introduced in a preliminary test
- but eventually removed).
-2000/01/23 loadonly package option.
-2000/02/01 Classes finished. Many things had to be rewritten.
-2000/02/02 Made partially compatible with hyperref (dvips).
-2000/02/08 \ttl@savewrite moved from shapes to classes. But
- explicit page breaks expand it, too, to avoid wrong
- toc entries.
-2000/02/18 A new box named \ttl@box stores the title in runin
- leftmargin etc shapes, to increase reliability.
-
-(2.3.1 -- 2.3.3 No changes on this file)
-
-History of v2.3.4
-~~~~~~~~~~~~~~~~~
-2000/05/12 nonindentfirst redefine \titlespacing instead of
- \@afterindent... so that they don't interfere with
- the first entry in tocs.
-2000/05/17 The marks in \ttl@select are protected to prevent
- endless loop if the title is expanded, say, by
- \MakeUppercase.
-
-History of v2.3.5
-~~~~~~~~~~~~~~~~~
-2000/05/21 Restores missing test for secnumdepth in \ttl@mkchap,
- and instead of setting \ttl@toclevel in ttlps now is
- done in \secdef. Except inside the macros, \ttl@toclevel
- is false, so that an explicit \...mark works.
-2000/06/04 \partmark defined with \providecommand
-2000/06/14 A patch mechanism added, for small bug fixes.
-
-History of v2.4
-~~~~~~~~~~~~~~~~
-2001/01/18 Minor changes in code. Essentialy an incremental
- update.
-2001/01/22 \titleformat has a new "easy" starred variant.
-
-History of v2.5
-~~~~~~~~~~~~~~~
-2002/01/02 New macros for \ttl@assign. Now * length allow
- non integer values.
-2002/03/22 Added \ttl@calc and \ttl@calcneg to make titlesec
- calc-savvy.
- - Merged bug fixes of .new into this file.
- - Bugs in frame fixed -- gap in lines, misplaced
- label, wrong margins (sometimes),
- - \leftskip, \rightskip and \linewidth (re)set in
- margin shapes.
- - Removed obsolete flush... options.
- - indentafter and noindentafter, new names for
- indentfirst and nonindentfirst.
- - A new level (\titleclass) without its "location"
- now raises a meaningful error.
- - Bug in top-level \titleclass fixed.
-2002/03/23 Tests for undefined and unformatted sectioning levels,
- and horizontal material in <format>.
- - Missing \if@openright inside \if@twoside in
- page class added.
- - Removed extra (but inoffensive) \expandafter
- in \ttl@class@iii.
-2002/03/27 Added \titlewidthfirst and ...last
- - "Not definable" gives a more meaningful message in
- the context of the package.
-
-History of v.2.6
-~~~~~~~~~~~~~~~~
-2004/08/30 Corrected typo in margin \hsiz -> \hsize.
-2004/10/17 Added a couple of missing \noexpand's in drop.
-2004/12/01 Removed the error about the mode in block because this
- style is general purpose.
-2005/01/16 Missing braces around #2 in the last else part of
- \ttl@headinline added
- - Replaced explicit \makeatother's by a saved value as
- the macros can be used in a class/package file.
-2005/01/18 newlinetospace mechanism
- - // does not break pages; option pageatnewline to
- restore the LaTeX behaviour.
-2005/01/19 \...break in top shape.
- - Renumbered several scratch registers to follow the
- TeXbook (p. 346), with \ttl@box in a few cases. In
- wrap \titlewidthfirst and \titlewidthlast made global.
- - Float heads and foots have now a further argument for
- additional stuff (eg, to remove rules). Option is now
- psfloats while floatps enters in compatibility mode.
- - \ttl@savetitle in all classes. Option toctitles.
-2005/01/21 Changed pageatnewline to make it compatible with
- titletoc, with \ttl@changecentercr.
-2005/01/22 \...tolist in top class.
-
-History of v.2.7
-~~~~~~~~~~~~~~~~
-2007-03-27 Added the `explicit' option.
- - Added \titlepagestyle.
-2007-03-29 Fixed wrong number for chapter in log
- - Patch file named .270 instead of .new
-2007-05-09 Added <after> to leftmargin, so that you can add stuff
- at the beginning of the paragraph, eg, the sec number.
-2007-07-07 Removed the patch mechanism.
-2007-08-07 `explicit' improved.
-
-History of v.2.8
-~~~~~~~~~~~~~~~~
-2007-08-12 \titlepagestyle already used by KOMA-Script. Renamed
- to \assignpagestyle.
-
-History of v.2.9
-~~~~~~~~~~~~~~~~
-2010-05-04 Add \nobreak in \ttl@addcontentsline, to prevent the title
- going to footnotes (!) in runin style in some (rare) cases.
-2010-05-06 Option uppercase (and \ttl@case).
-2011-02-25 \iftitlemeasuring test
-2011-07-14 Fixed \assignpagestyle
-2011-07-15 Introduced the \scantokens mechanism to make sure section
- names are 'letters' and not 'others'
-2011-07-18 Removed \if@nobreak test in wrap/drop, which added a line
- to the title after another section (why?)
-
-History of v.2.9.1
-~~~~~~~~~~~~~~~~~~
-2011-08-28 Removed a spurious > in wrap.tss
-
-History of v.2.9.2
-~~~~~~~~~~~~~~~~~~
-2011-11-11 Fixed a typo in ttlps.def (\MessageBreag)
-
-History of v.2.10.0
-~~~~~~~~~~~~~~~~~~~~
-
-2011-12-15 Split titlesp
-
-History of v.2.10.1
-~~~~~~~~~~~~~~~~~~~~
-
-2015-02-27 Fix: An explict \newpage in 'after' wrote the toc entry twice
-2015-03-09 Fix (partial): A list containing just a sectioning command
- raised an error
-
-History of v.2.10.2
-~~~~~~~~~~~~~~~~~~~~
-
-2015-03-21 Fix: With 2.10.1 labels vanished in hang shape (due to a
- misplaced \noindent)
-
-History of titleps v.1.1.1
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-2016-03-15 New macro \setmarkboth for compatibility
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/CHANGES.old new/doc/latex/titlesec/CHANGES.old
--- old/doc/latex/titlesec/CHANGES.old 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/titlesec/CHANGES.old 2019-07-18 22:34:43.000000000 +0200
@@ -0,0 +1,341 @@
+## TITLESEC
+
+History of v1.0
+~~~~~~~~~~~~~~~
+1998/02/25 Added nops option
+1998/02/28 Added \@mkboth stuff in \setmarks
+1998/03/01 Changed test in \ttl@secnum
+1998/03/03 Corrected some \fil... commands
+1998/03/03 Replaced the faulty \@hangfrom by new commands
+1998/03/03 Some \def replaced by \newcommand
+1998/03/04 .dtx/.ins scheme finally rejected. Useless
+ for users, obtrusive for `readers' and proned
+ to errors
+1998/03/04 Tidied up documentation
+1998/03/06 \wordsep renamed and documented
+1998/03/06 Added dummy asignation in \ttl@chap.
+1998/03/06 Removed \ttl@xsect and merged into \tl@sect
+1998/03/06 Added \ProvidesPackage
+
+History of v1.1
+~~~~~~~~~~~~~~~~
+1998/03/25 \chapter corrected, as well as the size options
+1998/03/26 Added compact option
+1998/03/26 Added flushleft, flushright and center options
+1998/04/08 Changed all instances of \noindent by \parindent\z@
+1998/04/14 Added \filinner, \filouter
+1998/04/14 Added drop shape
+1998/05/01 Added rightmargin shape (and margin renamed to
+ leftmargin)
+1998/05/03 Added \setheadindent
+
+History of v1.2 (unreleased)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+1998/06/01 Compatibility with AMS classes
+1998/06/08 On-demand loading of shapes
+1998/06/11 Frame shape. Some \fil... command
+ modified to work in the label of this
+ chapter shape.
+1998/07/03 Bottomtitle option (at last...)
+1998/07/14 ...margin styles bug fixed using a method
+ similar to bottomtitle.
+1998/07/29 \titleline
+
+====================
+
+History of v2.0
+~~~~~~~~~~~~~~~~
+
+1998/08/05 to
+1998/08/29 Fully reimplemented
+
+History of v2.1
+~~~~~~~~~~~~~~~~
+1999/01/05 We define in this file the three basic shapes.
+ Additional ones remain defined in external files.
+ Unified the shapes for sections and chapters.
+1999/01/05 \ttl@shape merged into \ttl@format@iii.
+1999/01/05 \titlerule
+1999/01/07 \ttl@defkeys splitted from \ttl@keys
+1999/01/10 Added the \part stuff, including a definition of \@openright
+1999/01/11 Removed unnecessary \ttl@numsecfalse in \ttl@sect@i.
+1999/01/14 Optimized \titlerule
+1999/01/27 Changed \titleline to correct the spacing at the
+ top page and to fix a bug which changed the mode
+ to horizontal, thus introducing unwanted space
+ (\makebox -> \@makebox).
+1999/02/02 \ttl@secnum renamed to \ttl@write and introduced the
+ \ttl@savewrite mechanism to sincronize the toc/marks
+ with the title in case there is a \newpage in <after>.
+1999/02/03 wrap shape
+1999/02/03 Added a \kern\z@ for not to avoid hyphenation
+ of the last word. Not strictly necessary, but
+ it is more LaTeX-like.
+1999/02/05 \partmark defined (and in \setmarks, too).
+1999/02/08 \ttl@row@i simplified.
+1999/02/08 \ttl@savefn mechanism.
+1999/02/10 Removed extra \leavevmode in display
+1999/02/13 Now \titleline doesn't add the width. It's set.
+1999/02/17 The part mark is catched, even if unused.
+1999/02/17 old/newparttoc added.
+1999/02/18 Changed many TeX assignments to the LaTeX
+ counterpart.
+1999/02/19 Introduced \ttl@startargs.
+
+History of v2.1.1
+~~~~~~~~~~~~~~~~~
+1999/08/04 Moved misplaced lines in \ttl@makeboth
+
+History of v2.2 (unreleased)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+1999/11/03 We load titleps if pagestyles are required, but
+ some old definitions are restored.
+1999/11/06 Improved outermarks test in \ttl@sect@i. Formerly
+ the section number could be printed if a page ended
+ with an unnumebered section followed by a numbered one.
+1999/11/06 \ttl@startargs now adds (and passes) automatically the
+ section name. Involved macros modified accordingly.
+1999/11/06 Replaced explicit part names by the parameter in
+ \ttl@part@i. The same for chapter.
+1999/11/21 \ttl@try's are not given explicitly, but built by
+ \ttl@setkeys. Intruduced the \ttl@key@... and
+ \ttl@extra@... commands.
+1999/11/23 Minor problems with keys fixed.
+1999/12/10 Added the nobottomtitles* option and \ttl@addstretch.
+2000/01/07 First steps towards the calcwidth feature (basic code).
+2000/01/08 (Continued.) \titleline* for rules of width \titlewidth.
+ Option calcwidth implemented.
+2000/01/12 Finished with changes in wrap.tss (no longer
+ "experimental" :-) )
+
+History of v2.3
+~~~~~~~~~~~~~~~
+2000/01/19 All keys are grouped in a single file tttkeys. Removed
+ page.tsk and deleted the corresponding code in the sty.
+2000/01/19 Classes begun.
+2000/01/19 The level numbers are stored in \ttll@ macros, and not
+ passed as arguments.
+2000/01/21 Introduced the new mark scheme. It's mostly compatible
+ with the old one, but a compatibility mode seems
+ imposible (it was introduced in a preliminary test
+ but eventually removed).
+2000/01/23 loadonly package option.
+2000/02/01 Classes finished. Many things had to be rewritten.
+2000/02/02 Made partially compatible with hyperref (dvips).
+2000/02/08 \ttl@savewrite moved from shapes to classes. But
+ explicit page breaks expand it, too, to avoid wrong
+ toc entries.
+2000/02/18 A new box named \ttl@box stores the title in runin
+ leftmargin etc shapes, to increase reliability.
+
+(2.3.1 -- 2.3.3 No changes on this file)
+
+History of v2.3.4
+~~~~~~~~~~~~~~~~~
+2000/05/12 nonindentfirst redefine \titlespacing instead of
+ \@afterindent... so that they don't interfere with
+ the first entry in tocs.
+2000/05/17 The marks in \ttl@select are protected to prevent
+ endless loop if the title is expanded, say, by
+ \MakeUppercase.
+
+History of v2.3.5
+~~~~~~~~~~~~~~~~~
+2000/05/21 Restores missing test for secnumdepth in \ttl@mkchap,
+ and instead of setting \ttl@toclevel in ttlps now is
+ done in \secdef. Except inside the macros, \ttl@toclevel
+ is false, so that an explicit \...mark works.
+2000/06/04 \partmark defined with \providecommand
+2000/06/14 A patch mechanism added, for small bug fixes.
+
+History of v2.4
+~~~~~~~~~~~~~~~~
+2001/01/18 Minor changes in code. Essentialy an incremental
+ update.
+2001/01/22 \titleformat has a new "easy" starred variant.
+
+History of v2.5
+~~~~~~~~~~~~~~~
+2002/01/02 New macros for \ttl@assign. Now * length allow
+ non integer values.
+2002/03/22 Added \ttl@calc and \ttl@calcneg to make titlesec
+ calc-savvy.
+ - Merged bug fixes of .new into this file.
+ - Bugs in frame fixed -- gap in lines, misplaced
+ label, wrong margins (sometimes),
+ - \leftskip, \rightskip and \linewidth (re)set in
+ margin shapes.
+ - Removed obsolete flush... options.
+ - indentafter and noindentafter, new names for
+ indentfirst and nonindentfirst.
+ - A new level (\titleclass) without its "location"
+ now raises a meaningful error.
+ - Bug in top-level \titleclass fixed.
+2002/03/23 Tests for undefined and unformatted sectioning levels,
+ and horizontal material in <format>.
+ - Missing \if@openright inside \if@twoside in
+ page class added.
+ - Removed extra (but inoffensive) \expandafter
+ in \ttl@class@iii.
+2002/03/27 Added \titlewidthfirst and ...last
+ - "Not definable" gives a more meaningful message in
+ the context of the package.
+
+History of v.2.6
+~~~~~~~~~~~~~~~~
+2004/08/30 Corrected typo in margin \hsiz -> \hsize.
+2004/10/17 Added a couple of missing \noexpand's in drop.
+2004/12/01 Removed the error about the mode in block because this
+ style is general purpose.
+2005/01/16 Missing braces around #2 in the last else part of
+ \ttl@headinline added
+ - Replaced explicit \makeatother's by a saved value as
+ the macros can be used in a class/package file.
+2005/01/18 newlinetospace mechanism
+ - // does not break pages; option pageatnewline to
+ restore the LaTeX behaviour.
+2005/01/19 \...break in top shape.
+ - Renumbered several scratch registers to follow the
+ TeXbook (p. 346), with \ttl@box in a few cases. In
+ wrap \titlewidthfirst and \titlewidthlast made global.
+ - Float heads and foots have now a further argument for
+ additional stuff (eg, to remove rules). Option is now
+ psfloats while floatps enters in compatibility mode.
+ - \ttl@savetitle in all classes. Option toctitles.
+2005/01/21 Changed pageatnewline to make it compatible with
+ titletoc, with \ttl@changecentercr.
+2005/01/22 \...tolist in top class.
+
+History of v.2.7
+~~~~~~~~~~~~~~~~
+2007-03-27 Added the `explicit' option.
+ - Added \titlepagestyle.
+2007-03-29 Fixed wrong number for chapter in log
+ - Patch file named .270 instead of .new
+2007-05-09 Added <after> to leftmargin, so that you can add stuff
+ at the beginning of the paragraph, eg, the sec number.
+2007-07-07 Removed the patch mechanism.
+2007-08-07 `explicit' improved.
+
+History of v.2.8
+~~~~~~~~~~~~~~~~
+2007-08-12 \titlepagestyle already used by KOMA-Script. Renamed
+ to \assignpagestyle.
+
+History of v.2.9
+~~~~~~~~~~~~~~~~
+2010-05-04 Add \nobreak in \ttl@addcontentsline, to prevent the title
+ going to footnotes (!) in runin style in some (rare) cases.
+2010-05-06 Option uppercase (and \ttl@case).
+2011-02-25 \iftitlemeasuring test
+2011-07-14 Fixed \assignpagestyle
+2011-07-15 Introduced the \scantokens mechanism to make sure section
+ names are 'letters' and not 'others'
+2011-07-18 Removed \if@nobreak test in wrap/drop, which added a line
+ to the title after another section (why?)
+
+History of v.2.9.1
+~~~~~~~~~~~~~~~~~~
+2011-08-28 Removed a spurious > in wrap.tss
+
+History of v.2.9.2
+~~~~~~~~~~~~~~~~~~
+2011-11-11 Fixed a typo in ttlps.def (\MessageBreag)
+
+History of v.2.10.0
+~~~~~~~~~~~~~~~~~~~~
+
+2011-12-15 Split titlesp
+
+History of v.2.10.1
+~~~~~~~~~~~~~~~~~~~~
+
+2015-02-27 Fix: An explict \newpage in 'after' wrote the toc entry twice
+2015-03-09 Fix (partial): A list containing just a sectioning command
+ raised an error
+
+History of v.2.10.2
+~~~~~~~~~~~~~~~~~~~~
+
+2015-03-21 Fix: With 2.10.1 labels vanished in hang shape (due to a
+ misplaced \noindent)
+
+## TITLEPS
+
+History of v.1.1.1
+~~~~~~~~~~~~~~~~~~
+2016-03-15 New macro \setmarkboth for compatibility
+
+## TITLETOC
+
+History of v1.1
+~~~~~~~~~~~~~~~
+99/04/22: A bug fix. Some missing global assignments in \ttl@tocentry
+ were missing, and page numbers messed up with
+ \titlecontents*
+
+History of v1.2
+~~~~~~~~~~~~~~~~
+1999/10/20: Added \contentsafter. \ttl@tocentry modified to accept
+ the new command for grouping in a paragraph entries of
+ different levels.
+1999/10/27: Instead of defining the level numbers explicitly, that's
+ done with \ttl@setlevels and \ttl@levels.
+1999/10/27: Added the basic code for multiple indexes.
+1999/10/29: Added the toctop test to the \ttl@savel@... commands.
+1999/12/28: Simplified \ttl@savel@... with \ttl@lselect.
+2000/01/12: \contentsafter rejected. An aditional optional parameter
+ is used instead. (Too) many thing had to be rewritten.
+2000/01/27: Removed \ttl@setlevels. Any change of levels are
+ best done with titlesec.
+2000/02/14: Moved misplaced \vskip in ttl@tocentry.
+2000/02/16: A few changes in the "block" separators.
+2000/02/16: Fixed bug in \ttl@margin. For the right margin the
+ correction was used instead of the margin.
+
+History of v1.2.1
+~~~~~~~~~~~~~~~~~
+2000/04/25: Dirty trick to make sure that \ttl@finish is the very
+ last thing in lists of floats (lof, lot, etc.).
+2000/05/14: Missing \global before \ttl@labelfalse added.
+
+History of 1.2.2
+~~~~~~~~~~~~~~~~
+2000/06/05: The optional argument no longer mandatory, but
+ still reporting an error if the length is missing.
+ Minor internal changes, and a patch mechanism added.
+
+History of 1.3
+~~~~~~~~~~~~~~
+2001/01/12: Minor changes and some missing \globals added for
+ partial tocs to work inside a group.
+2001/01/21: Added \dottedcontents.
+
+History of 1.4
+~~~~~~~~~~~~~~
+2002/03/27: titletoc.new merged into this file
+2002/03/27: \ttl@finish written by the last \newpage.
+2002/03/27: \ttl@lsection broke paragraphs always. Now
+ only if the sublevel is typeset.
+2002/03/27: \ttl@finish -> \contentsfinish
+
+History of 1.5
+~~~~~~~~~~~~~~
+2003/06/14: \contentspush didn't work because of the change of
+(.new) \leftskip was done inside a group before the
+ corresponding \par
+2003/06/14: Added an useful error if a partial TOC is not
+(.new) defined.
+2005/01/17: New options rubber/rigidseps, to remove if desired
+ the small vertical "plus" between entries.
+2005/01/20: Begin work on partial lists.
+2005/01/21: \ttl@outblock and \ttl@outnoblock just to avoid a
+ huge definition and to ease patching.
+2005/01/22: Work on partial lists finished (but to be resumed).
+
+History of 1.6
+~~~~~~~~~~~~~~
+2007/05/04: Added the patch 2005/05/03 which fixed a wrong
+ result with \included (F. Mittelbach)
+2007/07/14: Removed the patch mechanism.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/README new/doc/latex/titlesec/README
--- old/doc/latex/titlesec/README 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,74 +0,0 @@
-This directory holds 3 packages for sectioning titles -- when used as
-such (titlesec), in headers and footers (titleps) and in tables of
-contents (titletoc). They can be used separately, but you will get
-most of them when used together.
-
-Titlesec
-~~~~~~~~
-Sectioning titles, including margin and `wrap' titles, different
-format in odd and even pages, rules above and below the title,
-adding new sectioning levels, measuring the width of the title, etc.
-
-Titletoc
-~~~~~~~~
-TOC entries, with the possibility of changing the format in the middle
-of a document, grouping the entries in a single paragraph, pretty
-free-forms entries, partial tocs, etc. It's described in titlesec.pdf
-(or .tex).
-
-Titleps
-~~~~~~~
-Page styles with working top marks, access to top, first and bot marks
-in a single header/footer, rules, headers/footers for specific floats
-(kinda \thispagestyle), multiple sets of marks, etc. An one-stage
-mechanims is used, without intermediate \leftmark's or \rightmark's.
-
-What's new (2.9. 2.10)
-~~~~~~~~~~~~~~~~
-
-- Fixed \assignpagestyle, which did not work except in a
-few cases.
-- Fixed an incompatibility with hyperref (wrong appendix
-name).
-- Added \iftitlemeasuring
-- Added package option uppercase
-- Fixed a bug when reckoning the number of lines in wrap/drop.
-
-2.9.1: Fixed a typo (a spurious > in wrap.tss).
-2.9.2: Fixed another typo (\MessageBreag in ttlps.def)
-2.10.0: New features in titleps also available in titlesec
-
-Installation
-~~~~~~~~~~~~
-No .ins/.dtx preinstalation is required. Move the files to a place
-where LaTeX can find them and typeset titlesec.tex. All of files in
-this directory are necessary for titlesec.sty to work, except the
-manual titlesec.tex (and this 'readme' file). The manual requires
-titlesec.sty and titletoc.sty, and hence all the .tss and .def
-files as well.
-
-Formerly there were files with extension .new (titlesec.new and
-titletoc.new) used to patch the packages, but if present should be
-removed (they will be ignored, however).
-
-Web site, manual in PDF format and info
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-Further details are available on
-
- http://www.texnia.com/titlesec.html
-
-Contact
-~~~~~~~
-Please, for suggestions, bug reports, etc., go to
-More
- http://www.texnia.com/contact.html
-
-Known problems
-~~~~~~~~~~
-Some language styles (for babel) add the indentation
-after a section in a so radical way that titlesec (which
-uses the internal LaTeX macros) cannot supress it again.
-For example, spanish (fixed in version 5.0) and frenchb.
-
-2016/03/21
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/README.md new/doc/latex/titlesec/README.md
--- old/doc/latex/titlesec/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/titlesec/README.md 2019-10-16 22:56:43.000000000 +0200
@@ -0,0 +1,68 @@
+## Titlesec, Titletoc, Titleps
+
+This directory holds 3 packages for sectioning titles -- when used as
+such (titlesec), in headers and footers (titleps) and in tables of
+contents (titletoc). They can be used separately, but you will get
+most of them when used together.
+
+### Titlesec
+
+Sectioning titles, including margin and `wrap` titles, different
+format in odd and even pages, rules above and below the title,
+adding new sectioning levels, measuring the width of the title, etc.
+
+### Titletoc
+
+TOC entries, with the possibility of changing the format in the middle
+of a document, grouping the entries in a single paragraph, pretty
+free-forms entries, partial tocs, etc. It's described in
+`titlesec.pdf`.
+
+### Titleps
+
+Page styles with working top marks, access to top, first and bot marks
+in a single header/footer, rules, headers/footers for specific floats
+(kinda `\thispagestyle`), multiple sets of marks, etc. An one-stage
+mechanims is used, without intermediate `\leftmark`s or `\rightmark`s.
+
+### Latest changes
+
+```
+2.13 2019-10-16
+ - \markboth (which has been redefined in the LaTeX kernel) works
+ again.
+
+2.12 2019-09-09
+ - Fix - Partial TOCs were severely broken.
+ - Fix - An undefined section doesn't raise an error any more.
+
+2.11 2019-07-16
+ - New license: MIT.
+ - Option nostruts, to remove struts inserted by titlesec.
+ - Reorganized code: only sty files, removed def and tss ones
+ (although the mechanism for tss still works).
+ - Fix - Wrong hyperlinks in table of contents with the starred
+ versions, because of a change of behavior of hyperref (it
+ patches the behaviour of an internal macro in hyperref).
+ - Fix - Wrong spacing with titleps and displayed text after a
+ section.
+ - Fix - Newly defined floats raised an error with titletoc.
+```
+
+### Installation
+
+No .ins/.dtx preinstalation is required. Move the files to a place
+where LaTeX can find them and typeset titlesec.tex. All of files in
+this directory are necessary for titlesec.sty to work, except the
+manual titlesec.tex (and this 'readme' file). The manual requires
+titlesec.sty and titletoc.sty.
+
+Further details are available on
+
+ http://www.texnia.com/titlesec.html
+
+### Contact
+
+Please, for suggestions, bug reports, etc., go to
+More
+ http://www.texnia.com/contact.html
Binary files old/doc/latex/titlesec/titleps.pdf and new/doc/latex/titlesec/titleps.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/titleps.tex new/doc/latex/titlesec/titleps.tex
--- old/doc/latex/titlesec/titleps.tex 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/titleps.tex 2019-10-16 22:56:43.000000000 +0200
@@ -1,27 +1,14 @@
-% +--------------------------------------------------+
-% | Typeset this file to get the documentation. |
-% +--------------------------------------------------+
%
-% Copyright (c) 1998-2016 by Javier Bezos.
-% All Rights Reserved.
+% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
%
-% This file is part of the titlesec distribution release 2.10.2
-% -----------------------------------------------------------
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/titlesec
%
-% It 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 2003/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{1.1.1}
-\def\docdate{2016-03-15}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
@@ -621,7 +608,7 @@
\verb|\sectionmark{}|), as well as to synchronize the language by
hand.
-In many cases, the following short marks mechanism will be enough.
+In many cases, the following ``short'' marks mechanism will be enough.
With it, you simply say with \verb|\newshormark| the name of a command
to be used in heads or foots, and then emit the mark at appropiated
places (short marks for variables are not available). An example
@@ -823,3 +810,26 @@
\end{document}
+MIT License
+-----------
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+
Binary files old/doc/latex/titlesec/titlesec.pdf and new/doc/latex/titlesec/titlesec.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/titlesec/titlesec.tex new/doc/latex/titlesec/titlesec.tex
--- old/doc/latex/titlesec/titlesec.tex 2016-03-24 23:28:44.000000000 +0100
+++ new/doc/latex/titlesec/titlesec.tex 2019-10-16 22:56:43.000000000 +0200
@@ -1,33 +1,21 @@
-% +--------------------------------------------------+
-% | Typeset this file to get the documentation. |
-% +--------------------------------------------------+
%
-% Copyright (c) 1998-2016 by Javier Bezos.
-% All Rights Reserved.
+% Copyright (C) 1998-2019 Javier Bezos http://www.texnia.com
%
-% This file is part of the titlesec distribution release 2.10.2
-% -----------------------------------------------------------
+% This file may be distributed and/or modified under the conditions of
+% the MIT License. A version can be found at the end of this file.
+%
+% Repository: https://github.com/jbezos/titlesec
%
-% It 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 2003/12/01 or later.
-%
-% This work has the LPPL maintenance status "maintained".
-%
-% The Current Maintainer of this work is Javier Bezos.
-\def\fileversion{2.10.2}
-\def\docdate{2016-03-21}
+\def\fileversion{2.13}
+\def\docdate{2019/10/16}
\documentclass[a4paper]{ltxguide}
\usepackage[sf,bf,compact,topmarks,calcwidth,pagestyles]{titlesec}
-\usepackage{titletoc}
+\usepackage{titletoc,color}
\def\gobble#1{}
\def\cs#1{\expandafter\gobble\string\\#1}
+\definecolor{notes}{rgb}{.75, .3, .3}%
\makeatletter
\newenvironment{desc}
{\if@nobreak
@@ -36,18 +24,21 @@
\fi
\decl}
{\enddecl}
+\def\@begintheorem#1#2{%
+ \list{}{}%
+ \global\advance\@listdepth\m@ne
+ \item[{\sffamily\bfseries\color{notes}\MakeUppercase{#1}}]}%
+\newtheorem{warning}{Warning}
+\newtheorem{note}{Note}
+\newtheorem{example}{Example}
\makeatother
-\usepackage{textcomp,pslatex}
+\usepackage{textcomp}
\usepackage[linktocpage]{hyperref}
\title{The \textsf{titlesec}, \textsf{titleps} and \textsf{titletoc}
Packages\footnote{The \textsf{titlesec} package is currently at
-version 2.10.2. \copyright{} 1998--2016 Javier Bezos.
-The \textsf{titletoc} package is currently at
-version 1.6. The \textsf{titleps} package is currently at version
-1.1.1 \copyright{} 1999--2016 Javier Bezos. All Rights
-Reserved.}}
+version 2.13. \copyright{} 1998--2019 Javier Bezos.}}
\author{Javier Bezos\footnote{For bug reports, comments and
suggestions go to \href{http://www.tex-tipografia.com/contact.html}%
@@ -69,7 +60,7 @@
\newpagestyle{myps}[\small\sffamily\slshape]{
\headrule
\sethead{Titlesec}{\sectiontitle}{\usepage}}
-
+
\pagestyle{myps}
\newcommand{\examplesep}{%
@@ -104,6 +95,14 @@
\maketitle
\tableofcontents
+
+\begin{note}
+ Please, report any issues you find on
+ \texttt{https://github.com/jbezos/titlesec/issues}, which is better
+ than just complaining on an e-mail list or a web forum. Forking
+ and pull requests are welcome.
+\end{note}
+
\section{Introduction}
This package is essentially a replacement---partial or total---for the
@@ -157,7 +156,6 @@
non-standard way, it remains untouched by the simple settings and
should be changed with the help of the ``Advanced Interface.''
-
\section{Quick Reference}
%~~~~~~~~~~~~~~~~~~~~~~
@@ -334,7 +332,7 @@
there is no section label at that level, but this is not recommended
because by doing so the number is not suppressed in the table of
contents and running heads.
-
+
\item |<sep>| is the horizontal separation between label and title
body and must be a length (it must not be empty). This space is
vertical in |display| shape; in |frame| it is the distance from text
@@ -342,20 +340,26 @@
of sectioning commands. If you are using |picture| and the like, set
this parameter to 0 pt.
-\item |<before-code>| is code preceding the title body. The very last
-command can take an argument, which is the title
-text.\footnote{Remember font size can be changed safely between
-paragraphs only, and changes in the text should be made local with
-a group; otherwise the leading might be wrong---too large or too small.}
-However, with the package option \texttt{explicit} the title must
-be given explicitly with |#1| (see below).
+\item |<before-code>| is code preceding the title body. The very last
+command can take an argument, which is the title
+text.\footnote{Remember font size can be changed safely between
+paragraphs only, and changes in the text should be made local with a
+group; otherwise the leading might be wrong---too large or too small.}
+However, with the package option \texttt{explicit} the title must be
+given explicitly with |#1| (see below). Penalties in this argument may
+lead to unexpected results.
\item |<after-code>| is code following the title body. The typeset
-material is in vertical mode with |hang|, |block| and |display|;
-in horizontal mode with |runin| and |leftmargin| (\fbox{2.7} with the latter,
-at the beginning of the paragraph). Otherwise is ignored.
+material is in vertical mode with |hang|, |block| and |display|; in
+horizontal mode with |runin| and |leftmargin| (\fbox{2.7} with the
+latter, at the beginning of the paragraph). Otherwise is ignored.
+Penalties in this argument may lead to unexpected results.
\end{itemize}
+Penalties, marks and the like must be properly synchronized with page
+breaks. So, |<before-code>| and |<after-code>| are \textit{not} the
+proper places for penalties. See |\sectionbreak| below.
+
\begin{desc}
|\chaptertitlename|
\end{desc}
@@ -457,7 +461,6 @@
\footnote{Formerly |indentfirst| and |nonindentfirst|, now
deprecated.}
-
\begin{desc}
|rigidchapters rubberchapters| \quad (Package options)
\end{desc}
@@ -514,6 +517,18 @@
titles, use the package option \verb|pageatnewline|, which is provided
for backward compatibility.
+\begin{desc}
+|\nostruts|\\
+|nostruts| \quad (Package option)
+\end{desc}
+
+\fbox{2.11} The styles defined by \textsf{titlesec} insert some struts
+at certain places to make sure the vertical space is the same with
+relation with the baseline. This is not always the desired behavior, so
+the package options |nostruts| is provided. An alternative is the macro
+|\nostruts| when defining a section (note this macros is defined only
+within a title).
+
\subsection{Rules}
The package includes some tools for helping in adding rules and other
@@ -674,6 +689,10 @@
changed to \verb|top| (in this example, parts will continue with the
\verb|openright| setting).
+Note these macros apply the penalties at the right place. In other
+words, penalties in |<before-code>| and |<after-code>| can lead to
+unexpected (and even weird) results.
+
\begin{desc}
|\chaptertolists|
\end{desc}
@@ -828,17 +847,24 @@
to the surrounding text, title classes allow to change the generic
behaviour of them. With the help of classes you may insert, say, a
new |subchapter| level between |chapter| and |section|, or creating a
-scheme of your own. \emph{Making a consistent scheme and defining all
-of related stuff like counters, macros, format, spacing and, if there
-is a TOC, TOC format is left to the responsibility of the user.} There
-are three classes: |page| is like the book |\part|, in a single page,
-|top| is like |\chapter|, which begins a page and places the title at
-the top, and |straight| is intended for titles in the middle of
-text.\footnote{There is an further class named |part| to emulate the
-article |\cs{part}|, but you should not use it at all. Use the
-|straight| class instead. Remember some features rely in these
-classes and \textsf{titlesec} does not change by default the
-definition of \texttt{\string\part} and \texttt{\string\chapter}.}
+scheme of your own.
+
+There are three classes: |page| is like the book |\part|, in a single
+page, |top| is like |\chapter|, which begins a page and places the
+title at the top, and |straight| is intended for titles in the middle
+of text.\footnote{There is an further class named |part| to emulate the
+article |\cs{part}|, but you should not use it at all. Use the
+|straight| class instead. Remember some features rely in these classes
+and \textsf{titlesec} does not change by default the definition of
+\texttt{\string\part} and \texttt{\string\chapter}.}
+
+\begin{warning}
+ Making a consistent scheme and defining all of
+ related stuff like counters, macros, format, and spacing is left to the
+ responsibility of the user. If there is a TOC, also the TOC format,
+ which might require redefining the corresponding macros to change the
+ hardcoded value (either by hand or with \textsf{titletoc}).
+\end{warning}
\begin{desc}
|\titleclass{<name>}{<class>}|\\
@@ -890,11 +916,10 @@
\end{desc}
Here, the |<name>| title is considered the top level, with number
-|<start-level-num>| (typically 0 or $-$1). It should be used only
-when creating sectioning commands from scratch with the help of
-|loadonly|, and there must be exactly one (no more, no less)
-declaration of this kind. After it, the rest of levels are added as
-explained above.
+|<start-level-num>| (typically 0 or $-$1). It should be used only when
+creating sectioning commands from scratch with the help of |loadonly|,
+and there must be exactly one (no more, no less) declaration of this
+kind. After it, the rest of levels are added as explained above.
\section{Additional Notes}
%~~~~~~~~~~~~~~~~~~~~~~~~
@@ -1230,10 +1255,10 @@
\item |<left>| even if bracketed is currently mandatory and it
sets the left margin from the left page margin.
-
+
\item |<label width>| is the width of the space created for the label,
as described above.
-
+
\item |<leader width>| is the width of the box containing the char to
be used as filler, as described below.
\end{itemize}
@@ -1490,7 +1515,7 @@
those macros will not be used very often.
\begin{desc}
-|\printcontents[<name>]{<prefix>}{<start-level>}{<toc-code>}|
+|\printcontents[<name>]{<prefix>}{<start-level>}[<toc-depth>]{<toc-code>}|
\end{desc}
Print the current partial toc of |<name>| kind. The format
@@ -1500,25 +1525,29 @@
|lsection| is defined, then this definition will be used; otherwise,
the format is that of |section|. The |<start-level>| parameter sets the
top level of the tocs---for a part toc it would be |0| (chapter), for a
-chapter toc |1| (section), and so on. Finally, |<toc-code>| is
+chapter toc |1| (section), and so on. The |<toc-code>| is
local code for the current toc; it may be used to change the
-|tocdepth| value or |\contentsmargin|, for instance.
+|\contentsmargin|, for instance. \textbf{New 2.11} Finally,
+|<toc-depth>| sets the |tocdepth| locally (in former versions it was
+suggested setting this value with |\setcounter| in the last argument,
+but that was wrong, because this command set counters globally).
A simple usage might look like (provided you are using
\textsf{titlesec} as well):
\begin{verbatim}
\titleformat{\chapter}[display]
{...}{...}{...} % Your definitions come here
- [\vspace*{4pc}%
+ [{\vspace*{4pc}%
\startcontents
- \printcontents{l}{1}{\setcounter{tocdepth}{2}}]
-
+ \printcontents{l}{1}[2]{}}]
+
\titlecontents*{lsection}[0pt]
{\small\itshape}{}{}
{}[ \textbullet\ ][.]
\end{verbatim}
The included entries are those in levels 1 to 2 inclusive (i.e., 1
-and 2).
+and 2). Note the whole optional argument is enclosed in braces, because
+there is an internal \texttt{[]}.
\subsection[Partial lists]{Partial lists \normalfont\normalsize\fbox{2.6}}
@@ -1529,7 +1558,7 @@
|\startlist[<name>]{<list>}|\\
|\stoplist[<name>]{<list>}|\\
|\resumelist[<name>]{<list>}|\\
-|\printlist[<name>]{<list>}{<prefix>}{<toc-code>}|
+|\printlist[<name>]{<list>}{<prefix>}[<toc-depth>]{<toc-code>}|
\end{desc}
Here |<list>| is either |lof| or |lot|. Note as well |\printlist|
@@ -1577,7 +1606,7 @@
{} % That is, without page number
[\addvspace{.5pc}]
\end{verbatim}
-
+
The chapter title is centered with the chapter label on top
of it. There is no page number.
@@ -1702,7 +1731,7 @@
\titleformat{\section}[block]
{\normalfont\sffamily}
{\thesection}{.5em}{\titlerule\\[.8ex]\bfseries}
-
+
\section[Appendix]{Another Ruled Title}
\begin{verbatim}
@@ -1778,7 +1807,7 @@
{}{0pt}{}
\titlespacing{\section}
{\parindent}{*2}{\wordsep}
-
+
\section*{This part is the title itself}
and this part is the section body\ldots
@@ -1920,7 +1949,7 @@
\vspace{1pc}%
\Huge}
\end{verbatim}
-
+
\examplesep
\def\thesection{\Roman{section}}
@@ -1980,14 +2009,14 @@
% 5+1=6, ie, the negative left margin in section
\widenhead{6pc}{0pc}
-
+
\renewpagestyle{plain}{}
\newpagestyle{special}[\small\sffamily]{
\headrule
\sethead[\usepage][\textsl{\chaptertitle}][]
{}{\textsl{\chaptertitle}}{\usepage}}
-
+
\newpagestyle{main}[\small\sffamily]{
\headrule
\sethead[\usepage][\textsl{\thechapter. \chaptertitle}][]
@@ -2048,7 +2077,7 @@
\begin{verbatim}
\usepackage[dvips]{color}
\usepackage[rigidchapters,explicit]{titlesec}
-
+
\DeclareFixedFont{\chapterfont}{T1}{phv}{bx}{n}{11cm}
\titlespacing{\chapter}{0pt}{0pt}{210pt}
@@ -2074,3 +2103,24 @@
\end{document}
+MIT License
+-----------
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
+IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
+CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
+SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/titlesec.doc.tlpobj new/tlpkg/tlpobj/titlesec.doc.tlpobj
--- old/tlpkg/tlpobj/titlesec.doc.tlpobj 2019-02-28 04:08:54.000000000 +0100
+++ new/tlpkg/tlpobj/titlesec.doc.tlpobj 2019-10-17 01:54:43.000000000 +0200
@@ -1,11 +1,11 @@
name titlesec.doc
category Package
-revision 40129
+revision 52413
shortdesc doc files of titlesec
relocated 1
-docfiles size=108
- RELOC/doc/latex/titlesec/CHANGES
- RELOC/doc/latex/titlesec/README
+docfiles size=184
+ RELOC/doc/latex/titlesec/CHANGES.old
+ RELOC/doc/latex/titlesec/README.md
RELOC/doc/latex/titlesec/titleps.pdf
RELOC/doc/latex/titlesec/titleps.tex
RELOC/doc/latex/titlesec/titlesec.pdf
++++++ titlesec.tar.xz ++++++
++++ 3135 lines of diff (skipped)
++++++ tkz-base.doc.tar.xz ++++++
++++ 5264 lines of diff (skipped)
++++++ tkz-base.tar.xz ++++++
++++ 5211 lines of diff (skipped)
++++++ tkz-doc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/README new/doc/latex/tkz-doc/README
--- old/doc/latex/tkz-doc/README 2011-06-06 19:17:31.000000000 +0200
+++ new/doc/latex/tkz-doc/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,2 +0,0 @@
-Class and package for the documentation of all tkz-* packages.
- %%% H I G H L Y E X P E R I M E N T A L %%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/README.md new/doc/latex/tkz-doc/README.md
--- old/doc/latex/tkz-doc/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/README.md 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,46 @@
+# tkz-doc â Class and package for the documentation of all tkz-* packages.
+
+Release 1.43c 2020/04/10
+
+## Note
+
+This package is highly experimental and subject to change without notice.
+
+## Licence
+
+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
+[LaTeX Project Public License](https://www.latex-project.org/lppl/)
+and version 1.3 or later is part of all distributions of LaTeX
+version 2005/12/01 or later.
+This work has the LPPL maintenance status âmaintainedâ.
+The Current Maintainer of this work is Alain Matthes.
+
+## Installation
+
+The package `tkz-doc` is present in `TeXLive` and `MiKTeX`, use the
+package manager to install.
+
+For manual installation all files must be moved into the different directories in your
+installation `TDS` tree or in your `TEXMFHOME`:
+
+```
+ doc/README.md -> TDS:doc/latex/tkz-doc/README.md
+ latex/*.* -> TDS:tex/latex/tkz-doc/*.*
+```
+
+## How to use it
+
+1. If you want to compile the documentation of a `tkz-*` package, you need to use the lualatex engine.
+
+## History
+
+- v 1.43 Correction of bug about the color. Remove the library `babel` of `TikZ`
+- v 1.42 I added in the version 1.4, an option called `cadre`. If you want to draw the frame of the cover, you need to use this option. In this case, you need to
+install the font `orna4`. By default, no frame.
+
+## Author
+
+Alain Matthes, 5 rue de Valence, Paris 75005, al (dot) ma (at) mac (dot) com
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/couverture.tex new/doc/latex/tkz-doc/latex/couverture.tex
--- old/doc/latex/tkz-doc/latex/couverture.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/couverture.tex 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,98 @@
+% encoding: utf8
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status âmaintainedâ.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+%<--------- Couverture des documentations --------------------------------
+\def\fileversion{1.43c}
+\def\filedate{2020/04/10}
+\typeout{2020/04/10 1.43c couverture.tex}
+%<------------------ Make Title ------------------------------------------
+
+\renewcommand\maketitle{%
+\null
+\AddToShipoutPicture*{%
+\setlength\unitlength{1mm}
+\put(0,0){%
+ \makebox(0,0)[lb]{%
+ \color{myblue!10}\rule{\paperwidth}{\paperheight}%
+ }%
+ }%
+\put(0,0){%
+ \makebox(0,0)[lb]{%
+ \color{myblue}\rule{40mm}{\paperheight}%
+ }%
+ }%
+\put(20,270){% 270 en portrait 180
+ \rotatebox{90}{%
+ \makebox(0,0)[r]{%
+ \fontsize{30}{30}\color{myblue!50!white}%
+ \bfseries
+ \selectfont{\@title\ \tkzversionofpack}\hfill%
+ }%
+ }%
+ }%
+\put(60,60){%
+\begin{pgfpicture}
+\pgfsys(a)transformxyscale{.5}{.5}
+\pgfmathdeclarerandomlist{color}{{myblue}{DarkBlue}{SteelBlue}{blue}{MidnightBlue}}
+ \foreach \a in {1,...,5}{%
+ \pgfmathrandominteger{\x}{1}{300}%
+ \pgfmathrandominteger{\y}{1}{200}%
+ \pgfmathrandominteger{\r}{20}{100}%
+ \pgfmathrandominteger{\s}{5}{95}%
+ \pgfmathrandominteger{\o}{50}{80}%
+ \pgfmathrandomitem{\c}{color}%
+ \pgfdeclareradialshading{ballshading}{%
+ \pgfpoint{-10bp}{10bp}}%
+ {%
+ color(0bp)=(\c!15!white);
+ color(9bp)=(\c!75!white);
+ color(18bp)=(\c!70!black);
+ color(25bp)=(\c!50!black);
+ color(50bp)=(black)%
+ }%
+ \pgfsetfillopacity{\o/100}%
+ \pgfpathcircle{\pgfpoint{+\x pt}{+\y pt}}{+\r pt}
+ \pgfshadepath{ballshading}{\s}%
+ \pgfusepath{}%
+ }%
+ \end{pgfpicture}}
+
+\put(60,250){% 60,250 en portait 120,180
+ \makebox(0,0)[l]{%
+ \begin{tikzpicture}
+ \nodeshadowedone(2,-1.25){\fontsize{60}{60}
+ \selectfont{\tkznamecollection}}
+ \end{tikzpicture}
+ }%
+ }%
+\put(120,40){%
+ \makebox(0,0)[l]{%
+ \fontsize{17}{21}
+ \textcolor{sectioncolor}{\selectfont{\tkzauthorofpack}}%
+ }%
+ }%
+\put(120,20){%
+ \makebox(0,0)[l]{%
+ \textcolor{sectioncolor}{\url{\tkzurlauthorcom}}%
+ }%
+ }%
+\put(120,30){%
+ \makebox(0,0)[l]{%
+ \textcolor{sectioncolor}{\today \ \ Documentation V.\tkzversionofdoc}}%
+ }%
+ }%
+\setcounter{footnote}{0}%
+}%
+%<----------------------- End Couverture ---------------------------->
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkz-doc.cfg new/doc/latex/tkz-doc/latex/tkz-doc.cfg
--- old/doc/latex/tkz-doc/latex/tkz-doc.cfg 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkz-doc.cfg 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,88 @@
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status âmaintainedâ.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+% original tkz-doc.cfg
+%
+% If you modify this original file, YOUR CHANGES WILL BE LOST when it is
+% updated. Instead, put your changes in the entire copy of tkz-base.cfg
+% and save the file in a directory part of your TEXINPUTS environment
+% variable.
+%===============================================================================
+
+\def\fileversion{1.43c}
+\def\filedate{22020/04/10}
+\typeout{2020/04/10 1.43c tkz-doc.cfg}
+
+% ============= colors =========================================================
+
+% \definecolor [âštypeâ©]{âšnameâ©}{âšmodel-listâ©}{âšspec-listâ©}
+% \providecolor [âštypeâ©]{âšnameâ©}{âšmodel-listâ©}{âšspec-listâ©}
+% \colorlet [âštypeâ©]{âšnameâ©}[âšnum modelâ©]{âšcolorâ©}
+\definecolor{myblue}{RGB}{020,120,180}
+\definecolor{fondpaille}{cmyk}{0,0,0.1,0}
+\definecolor{bistre}{rgb}{.75,.50,.30}
+\definecolor{textcolor}{RGB}{0, 0, 0}
+\providecolor{bistre}{rgb}{.75,.50,.30}
+\definecolor{mygray}{gray}{0.1}
+
+\colorlet{sectioncolor}{MidnightBlue}
+\colorlet{titlecolorbox}{gray!10}
+\colorlet{pdflinkcolor}{myblue}
+\colorlet{pdfurlcolor}{MidnightBlue}
+\colorlet{pdffilecolor}{Peach}
+\colorlet{stringcolor}{myblue!40!black!100}
+\colorlet{commencolor}{blue!0!black!100}
+
+\colorlet{graphicbackground}{white}
+\colorlet{codebackground}{lightgray!30}
+\colorlet{codeonlybackground}{lightgray!30}
+\colorlet{numbackground}{white}
+\colorlet{textcodecolor}{darkgray}
+\colorlet{numcolor}{black}
+
+\definecolor{Salmon}{RGB}{178,51,51}
+\definecolor{BrickRed}{RGB}{233,49,16}
+\definecolor{TealBlue}{RGB}{16,83,165}
+\definecolor{ForestGreen}{RGB}{10,112,43}
+\definecolor{Tangerine}{RGB}{244,176,108}
+\definecolor{DarkBrown}{RGB}{130,65,0}
+\definecolor{blueGrey}{rgb}{0.4,0.48,0.53}
+\def\tkzred{\color{red}}
+\def\tkzblue{\color{blue}}
+%--------------- mots importants et macros ---------------------------------
+\newcommand*{\BS}{\texttt{\char92}}
+\newcommand*{\tkz}{T{\em k}Z}
+\newcommand*{\PGF}{\tkzname{PGF}}
+\newcommand*{\TIKZ}{Ti\textsl{k}Z}
+\newcommand*{\pdf}{\textsc{pdf}}
+\newcommand*{\pgfname}{\textsc{pgf}}
+\newcommand*{\tikzname}{Ti{\em k}Z}
+\newcommand*{\tkzdft}[1]{{\texttt{#1}}}
+\newcommand*{\tkzAttention}[3]{\ \\\llap{\textcolor{#3}{#1\hskip #2}}}
+\newcommand*{\tkzHand}{\ \\\llap{\textcolor{red}{\lefthand\hskip1em}}}
+\newcommand*{\tkzBomb}{\ \\\llap{\textcolor{red}{\bomb\hskip1em}}}
+\newcommand*{\tkzTwoBomb}{\ \\\llap{\textcolor{red}{\bomb\ \bomb\hskip1em}}}
+\newcommand*{\tkzname}[1]{\textbf{\texttt{\textcolor{black}{#1}}}}
+\newcommand*{\tkzimp}[1]{\textbf{#1}}
+\newcommand*{\tkzHandBomb}{\ \\\llap{\textcolor{red}{\lefthand\ \bomb\hskip1em}}}
+\providecommand\LaTeX{L\kern-.36em\raise.3ex\hbox{\sc a}\kern-.15em\TeX}
+\providecommand\LATEX{\LaTeX}
+\renewcommand\TeX{T\kern-.1667em\lower.5ex\hbox{E}\kern-.125emX\spacefactor1000}
+\providecommand\TEX{\TeX}
+%-------------------------------------------------------------------------------
+\def\tkz@background@color{white}
+\def\tkz@text@color{black}
+\global\edef\tkz@suc@bkc{\tkz@background@color}
+\global\edef\tkz@suc@txt{\tkz@text@color}
+%-------------------------------------------------------------------------------
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkz-doc.cls new/doc/latex/tkz-doc/latex/tkz-doc.cls
--- old/doc/latex/tkz-doc/latex/tkz-doc.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkz-doc.cls 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,307 @@
+% tkz-doc.cls
+% encoding: utf8
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+% This work has the LPPL maintenance status âmaintainedâ.
+% The Current Maintainer of this work is Alain Matthes.
+% tkz-doc class for use with the tkz documentation
+% ( AlterMundus Collection ).
+%
+%% Objet : Classe LaTeX et Styles pour créer des documentations.
+%<-------------- Définitions relatives au package --------------------------->
+\newcommand*{\PackageName}{tkz-doc}
+\newcommand*{\PackageVersion}{1.43c}
+\newcommand*{\filedate}{2020/04/10}
+
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{scrartcl}}
+
+%<---------------------- Identification Part -------------------------------->
+\NeedsTeXFormat{LaTeX2e}[1995/12/01]
+\ProvidesClass{\PackageName}[%
+ \filedate\space Version:\space\PackageVersion\space %
+ tkz documentation class based on scrartcl]
+\newif\if@tkzcadre
+\@tkzcadrefalse
+\DeclareOption{cadre}{\@tkzcadretrue}
+\ProcessOptions\relax
+\LoadClass[titlepage,a4paper]{scrartcl}
+%<----------------- loading some packages ---------------------------------->
+% dvipsnames loads a set of 68 cmyk colors as defined in the dvips driver.
+% svgnames loads a set of 151 rgb color names
+% obsolete usenames
+\PassOptionsToPackage{dvipsnames,svgnames}{xcolor}
+%<-------------------------------------------------------------------------->-
+\KOMAoptions{twoside=false}
+%<-------------------------------------------------------------------------->-
+\RequirePackage{framed,eso-pic}
+\RequirePackage[bottom,stable,ragged]{footmisc}
+\RequirePackage[automark,markcase=ignoreuppercase]{scrlayer-scrpage}
+%<------------- define important words ---------------------------------->
+\InputIfFileExists{tkz-doc.cfg}{\typeout{Local configuration file tkz-doc.cfg found and used}}{\typeout{tkz-doc.cfg not found}}
+ %<-------------------------------------------------------------------------->-
+\pagestyle{scrheadings}
+\clearscrheadings
+\clearscrplain
+\ohead{\textcolor{sectioncolor}{\pagemark}}
+\ihead{\textcolor{sectioncolor}{\headmark}}
+\rofoot{\textcolor{sectioncolor}{\tkznamecollection}}
+\lofoot{\textcolor{sectioncolor}{\tkznameofpack}}
+
+\automark[subsection]{section}
+\KOMAoptions{headsepline=.4pt}
+\addtokomafont{headsepline}{\color{sectioncolor}}
+
+\KOMAoptions{footsepline=.4pt}
+\addtokomafont{footsepline}{\color{sectioncolor}}
+
+\setheadwidth[0pt]{text}
+\setfootwidth[0pt]{text}
+\renewcommand{\footnoterule}{\vspace*{-3pt}{%
+ \color{sectioncolor}\hrule width 2in height 0.4pt}\vspace*{2.6pt}}
+\deffootnote{1.5em}{1em}{\makebox[1.5em][l]{\thefootnotemark}}
+\addtolength{\skip\footins}{\baselineskip}%
+%<------------------â En-tête et pied de page ------------------------------
+\pagenumbering{arabic}
+\newcommand\SectionFontStyle{\ttfamily}
+\setkomafont{sectioning}{\bfseries\SectionFontStyle}
+\setkomafont{pagenumber}{\bfseries\SectionFontStyle}
+\setkomafont{pagehead}{\small\ttfamily}
+\setkomafont{pagefoot}{\small\ttfamily}
+\setkomafont{descriptionlabel}{\itshape}
+\addtokomafont{sectioning}{\color{sectioncolor}}
+\renewcommand*{\raggedsection}{\raggedright}
+%<---------------------------------------------------------------------------
+\newcounter{cnt}\setcounter{cnt}{1}
+\setcounter{secnumdepth}{3}%
+\setcounter{tocdepth}{3}
+%<------------------ Ãxécution et chargement -----------------------------
+\RequirePackage{tikz}
+\usetikzlibrary{decorations.shapes,
+ decorations.text,
+ decorations.pathreplacing,
+ decorations.pathmorphing,
+ decorations.markings,
+ shadows}
+\RequirePackage{tabularx,ragged2e}
+\RequirePackage[bottom,stable,ragged]{footmisc}
+\raggedbottom
+\newbox\tkzbox
+%<--------------- some macros --------------------------------------------
+\def\nodeshadowedone(#1,#2)#3{%
+\node[myblue,above,inner sep=0pt]{\global\setbox\tkzbox=\hbox{#3}\copy\tkzbox};
+\node[above,yscale=#2,inner sep=0pt,xslant=#1,myblue!60]{\box\tkzbox};
+}%
+ % some of the macros below are absolete
+\def\nameoffile#1{\gdef\@nameoffile{#1}}
+\def\@nameoffile{\@latex@warning@no@line{No \noexpand\nameoffile given}}
+\long\def\defoffile#1{\protected@xdef\@defoffile{\@defoffile{#1}}}
+\let\@defoffile\@empty
+%<-------------------------------------------------------------------------
+\newcommand*{\addbs}[1]{\texttt{\textbackslash#1}}
+\newcommand*{\@CellCode}[1]{}
+\newcommand*{\thead}{\noalign{\iffalse}\fi\@thead}
+\newcommand*{\@thead}[1][\em\ttfamily]{\gdef\@CellCode{#1}\iffalse{\fi}}
+\newcommand*{\tbody}{\noalign{\gdef\@CellCode{}}}
+\newcolumntype{I}{>{\@CellCode}}
+%<-------------------------- NewMacroBox ----------------------------------->
+\newcommand*{\ActivBoxName}{}
+\newenvironment{NewMacroBox}[2]{%
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+\def\FrameCommand{\color{MidnightBlue}{\vrule width 1pt\hspace{3pt}}}%
+\MakeFramed{\advance\hsize-\width}%
+\noindent
+\makebox[0pt][l]{%
+ \hspace{-4pt}%
+ \setlength{\fboxrule}{1pt}%
+ \setlength{\fboxsep}{3pt}%
+ \fcolorbox{sectioncolor}{titlecolorbox}{%
+ \rule{6pt}{0pt}%
+ \makebox[\width+6pt][l]{\tkzcname{#1#2}}%
+ }%
+}\\*[.5\baselineskip]%
+\noindent
+% \ignorespaces\tkzcname{#1#3}
+\Imacro{#1}%
+}%
+{%
+\par\noindent%
+\makebox[0pt][l]{%
+\hspace{-6pt}%
+\rule{6pt}{1pt}%
+\rule{\textwidth}{1pt}%
+\hspace{-1pt}%
+\rule{1pt}{10pt}%
+}%
+\endMakeFramed
+\noindent
+\ignorespacesafterend
+\par\medskip
+}%
+%<----------------- end NewMacroBox ----------------------------------------->
+
+%<----------------------------- NewEnvBox ----------------------------------->
+\let\fram@d=\MakeFramed \let\endfram@d=\endMakeFramed
+
+\newenvironment{NewEnvBox}[1]{%
+\parindent=0pt
+\renewcommand*{\ActivBoxName}{#1}
+%\gdef\tkzEnvMacro{#1}
+\def\FrameCommand{\color{sectioncolor}{\vrule width 1pt\hspace{3pt}}}%
+\MakeFramed{\advance\hsize-\width}%
+\noindent
+\makebox[0pt][l]{%
+\hspace{-4pt}%
+\setlength{\fboxrule}{1pt}%
+\setlength{\fboxsep}{3pt}%
+\fcolorbox{sectioncolor}{titlecolorbox}{%
+\rule{6pt}{0pt}%
+\makebox[\width+6pt][l]{%
+ \tkzcname{\textcolor{sectioncolor}{begin}\{\ActivBoxName\}}{\oarg{options}}%
+ \hspace*{.25cm}\meta{environment contents}\hspace*{.25cm}%
+ \tkzcname{\textcolor{sectioncolor}{end}\{\ActivBoxName\}}}%
+}%
+}\\*[.5\baselineskip]%
+\noindent
+% \ignorespaces\tkzcname{#1#3}
+\Ienv{#1}
+\color{MidnightBlue}}{%
+\par\noindent%
+\makebox[0pt][l]{%
+\hspace{-6pt}%
+\rule{6pt}{1pt}%
+\rule{\textwidth}{1pt}%
+\hspace{-1pt}%
+\rule{1pt}{10pt}%
+}%
+\endMakeFramed
+\noindent
+\ignorespacesafterend
+\par\medskip
+}
+%<------------------- end NewEnvBox ----------------------------------------->
+%<----------------------------- def macro arg opt---------------------------->
+\def\cmd#1{\cs{\expandafter\cmd@to@cs\string#1}}
+\def\cmd@to@cs#1#2{\char\number`#2\relax}
+\DeclareRobustCommand\cs[1]{\texttt{\char`\\#1}}
+\providecommand\marg[1]{{\ttfamily\char`\{}\opt{\meta{#1}}{\ttfamily\char`\}}}
+\providecommand\oarg[1]{{\ttfamily[}\opt{\meta{#1}}{\ttfamily]}}
+\providecommand\parg[1]{{\ttfamily(}\opt{\meta{#1}}{\ttfamily)}}
+\newcommand\opt[1]{{\color{myblue}#1}}
+\newcommand\ooarg[1]{{\ttfamily[}\meta{#1}{\ttfamily]}}
+\newcommand*{\var}[1]{\{\opt{\meta{#1}}\}}
+\newcommand*{\varp}[1]{\big(\opt{\meta{#1}}\big)}
+\newcommand*{\vara}[1]{\{#1\}}
+% -- Macros pour indexation -------------------------------------------------
+\newcommand*{\tkzNamePack}[1]{\NamePack{#1}}
+\newcommand*{\tkzNameMacro}[1]{\tkzcname{#1}\Imacro{#1}}
+\newcommand*{\tkzNameEnv}[1]{\tkzname{#1}\Ienv{#1}}
+\newcommand*{\Ilib}[1]{\index{Library_1@\texttt{Library}!\texttt{#1}}}
+\newcommand*{\Ienv}[1]{\index{Environment_1@\texttt{Environment}!\texttt{#1}}}
+\newcommand*{\IargEnv}[2]{\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IargNameEnv}[2]{\texttt{#2}\index{#1_2@\texttt{#1: arguments}!\texttt{#2}}}
+\newcommand*{\IoptEnv}[2]{\index{#1_3@\texttt{#1: options}!\texttt{#2}}}
+\newcommand*{\IoptNameEnv}[2]{\texttt{#2}\index{#1_3@\texttt{#1: options}!\texttt{#2}}}
+\newcommand*{\Imacro}[1]{\index{#1_1@\texttt{\textbackslash#1}}}%n
+\newcommand*{\Iarg}[2]{\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
+\newcommand*{\IargName}[2]{\texttt{#2}\index{#1_2@\texttt{\textbackslash#1: arguments}!\texttt{#2}}}
+\newcommand*{\IoptName}[2]{\texttt{#2}\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
+\newcommand*{\Iopt}[2]{\index{#1_3@\texttt{\textbackslash#1: options}!\texttt{#2}}}
+\newcommand*{\Istyle}[2]{\index{#1_3@\texttt{\textbackslash#1: styles}!\texttt{#2}}}
+\newcommand*{\IstyleEnv}[2]{\index{#1_3@\texttt{#1: styles}!\texttt{#2}}}
+\newcommand*{\Iaccent}[2]{\index{#1@\texttt{#2}}}
+\newcommand*{\NameLib}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Ti\emph{k}Z Library !#1@\texttt{#1}}}
+\newcommand*{\NameSys}[1]{\texttt{#1}\index{Operating System !#1@\texttt{#1}}}
+\newcommand*{\NameDist}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{TeX Distributions !#1@\texttt{#1}}}
+\newcommand*{\NameFonct}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Functions !#1@\texttt{#1}}}
+\newcommand*{\NamePack}[1]{\texttt{\textcolor{MidnightBlue}{#1}}\index{Package !#1@\texttt{#1}}}
+\newcommand*{\TOenvline}[3]{\IoptNameEnv{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TOline}[3]{\IoptName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TAline}[3]{\IargName{\ActivBoxName}{#1}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\TMline}[3]{\tkzcname{#1}\index{#1_1@\texttt{\textbackslash#1}}&\tkzdft{#2}&\ttfamily #3\\}
+\newcommand*{\tkzcname}[1]{\Imacro{#1}\textbf{\texttt{\textcolor{MidnightBlue}{%
+ \textbackslash#1}}}}
+\newcommand*{\tkzhname}[1]{\textbf{\texttt{\textcolor{MidnightBlue}{%
+ \textbackslash#1}}}}
+
+\DeclareRobustCommand\meta[1]{%
+\ensuremath\langle
+ \ifmmode \expandafter \nfss@text \fi
+ {%
+ \meta@font@select
+ \edef\meta@hyphen@restore
+ {\hyphenchar\the\font\the\hyphenchar\font}%
+ \hyphenchar\font\m@ne
+ \language\l@nohyphenation
+ \/#1\/%
+ \meta@hyphen@restore
+ }\ensuremath\rangle
+}
+\def\meta@font@select{}
+
+\renewcommand*{\idx@heading}{%
+ \idx@@heading{\indexname}%
+}
+\renewenvironment{theindex}{%
+ \@restonecoltrue
+ \columnseprule \z@
+ \columnsep 35\p@
+ \idx@heading%
+ \index@preamble\par\nobreak
+ \thispagestyle{\indexpagestyle}\parindent\z@
+ \setlength{\parskip}{\z@ \@plus .3\p@}%
+ \setlength{\parfillskip}{\z@ \@plus 1fil}%
+ \let\item\@idxitem
+}{%
+ \if@restonecol\onecolumn\else\clearpage\fi
+}
+%<----------- set colors of the document --------------------------
+\pgfkeys{/tkzsetupcolor/.cd,
+ background/.code = {\global\edef\tkz@suc@bkc{#1}},
+ text/.code = {\global\edef\tkz@suc@txt{#1}}}
+\def\tkzSetUpColors{\pgfutil@ifnextchar[{\tkz@SetUpColors}{%
+ \tkz@SetUpColors[]}}
+\def\tkz@SetUpColors[#1]{%
+\begingroup
+ \pgfkeys{tkzsetupcolor/.cd,
+ background = \tkz@background@color,
+ text = \tkz@text@color}
+ \pgfqkeys{/tkzsetupcolor}{#1}
+ \pagecolor{\tkz@suc@bkc}
+ \color{\tkz@suc@txt}
+\endgroup}
+
+%<---------------------------------------------------------------------
+\input{couverture}
+%<--------- presentation premiÚre page --------------------------------->
+\newcommand\presentation{%
+ \thispagestyle{empty}%
+ \par\vspace*{3 cm}
+ \begin{center}
+ {\textcolor{myblue}{\Huge \@nameoffile}}
+ \end{center}
+ \par\vspace*{3 cm}
+ \noindent
+ \newlength{\tkz@lx}\settowidth{\tkz@lx}{\huge \tkznamecollection}%
+ \advance\tkz@lx3em\quad
+ \href{\tkzurlauthor}{%
+ \rotatebox{90}{\hspace*{1.5em}{%
+ \textcolor{sectioncolor}{\Huge \tkznamecollection}}}}
+ \textcolor{sectioncolor}{\rule{2pt}{\tkz@lx}}\quad%
+ \begin{minipage}[b]{.90\textwidth}
+ {%
+ \noindent\hfill
+ \raggedleft\Large
+ \href{mailto:al.ma@mac.com}{\textcolor{sectioncolor}{\tkzauthorofpack}}\par
+ }%
+ {\@defoffile}
+ \par
+ \end{minipage}
+}
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tkz-doc/latex/tkzexample.sty new/doc/latex/tkz-doc/latex/tkzexample.sty
--- old/doc/latex/tkz-doc/latex/tkzexample.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tkz-doc/latex/tkzexample.sty 2020-04-12 00:34:53.000000000 +0200
@@ -0,0 +1,502 @@
+% Documentation of tkz-euclide
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status âmaintainedâ.
+%
+% The Current Maintainer of this work is Alain Matthes.
+
+%
+% The author of the original code
+% of the environment 'codeexample' is Till Tantau
+% from the file pgfmanual-en-macros.tex
+% (Copyright 2006 by Till Tantau)
+% See the file doc/generic/pgf/licenses/LICENSE for more details.
+% H I G H L Y E X P E R I M E N T A L
+%<--------------------------------------------------------------------------->
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{tkzexample}[2020/04/10 v1.43c (code and graphic)]
+\RequirePackage{calc,mdframed,fancyvrb}
+\newif\iftkzcodesaved
+\DeclareOption{saved}{\tkzcodesavedtrue}
+\ProcessOptions\relax
+%<--------------------------------------------------------------------------->
+\colorlet{graphicbackground}{white}
+\colorlet{codebackground}{white}
+\colorlet{codeonlybackground}{white}
+\colorlet{numbackground}{white}
+\colorlet{textcodecolor}{black}
+\colorlet{numcolor}{gray}
+%<--------------------------------------------------------------------------->
+\def\code@style{\small\ttfamily}
+\makeatletter
+\newcounter{code@cnt}%
+
+\ifx\scantokens\@undefined
+ \PackageError{tkzexample}{You need to use extended latex
+ (elatex) or (pdfelatex) to use this package}{}
+\fi
+
+% Define \find@tkzexample such that it doesn't destroy catcodes:
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@tkzexample#1\end{tkzexample}[|endoftkzexample[#1]]
+|endgroup
+
+\begingroup
+\catcode`|=0
+\catcode`[= 1
+\catcode`]=2
+\catcode`\{=12
+\catcode `\}=12
+\catcode`\\=12 |gdef|find@tkzltxexample#1\end{tkzltxexample}[|endoftkzltxexample[#1]]
+|endgroup
+
+% define \returntospace.
+%
+% It should define NEWLINE as {}, spaces and tabs as \space.
+\begingroup
+\catcode`\^=7
+\catcode`\^^M=13
+\catcode`\^^I=13
+\catcode`\ =13%
+\gdef\returntospace{\catcode`\ =13\def {\space}\catcode`\^^I=13\def^^I{\space}\catcode`\^^M=13\def^^M{}}%
+\endgroup
+
+\begingroup
+\catcode`\%=13
+\catcode`\^^M=13
+\gdef\commenthandler{\catcode`\%=13\def%{\@gobble@till@return}}
+\gdef\@gobble@till@return#1^^M{}
+\gdef\@gobble@till@return@ignore#1^^M{\ignorespaces}
+\gdef\typesetcomment{\catcode`\%=13\def%{\@typeset@till@return}}
+\gdef\@typeset@till@return#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}}\par}
+\gdef\typesetcommentnum{\catcode`\%=13\def%{\@typeset@till@return@num}}
+\gdef\@typeset@till@return@num#1^^M{{\def%{\char`\%}\textsl{\char`\%#1}} \@@par}
+\endgroup
+
+\let\tkz@frameset\colorbox
+\let\tkz@frameltxset\colorbox
+\newwrite\fileexample
+\newdimen\tkzexamplewidth
+\newdimen\tkz@hsep
+\tkz@hsep=0pt
+\newif\ifcode@execute
+\newif\ifcode@saved\code@savedfalse
+\newif\ifnum@show \num@showfalse
+\newif\ifcode@overhang
+\newbox\tkzexamplebox
+\newif\ifcode@vbox \code@vboxfalse
+
+\pgfqkeys{/tkzexample}{%
+ execute code/.is if = code@execute,
+ show num/.is if = num@show,
+ overhang/.is if = code@overhang,
+ code only/.code = {\code@executefalse},
+ width/.code = {\setlength\tkzexamplewidth{#1}},
+ code/.code = {\colorlet{codebackground}{#1}},
+ graphic/.code = {\colorlet{graphicbackground}{#1}},
+ overhang/.code = {\code@overhangtrue},
+ num/.code = {\num@showtrue\setcounter{code@cnt}{1}},
+ numcolor/.code = {\colorlet{numcolor}{#1}},
+ numbkgcolor/.code = {\colorlet{numbackground}{#1}},
+ global num/.code = {\num@showtrue},
+ code style/.code = {\def\code@style{#1}},
+ normal/.code = {\def\code@size{\normalsize}},
+ small/.code = {\def\code@size{\small}},
+ very small/.code = {\def\code@size{\footnotesize}},
+ right margin/.code = {\def\tkz@rightmargin{#1}},
+ left margin/.code = {\def\tkz@leftmargin{#1}},
+ inner left margin/.code = {\def\tkz@innerleftmargin{#1}},
+ inner right margin/.code = {\def\tkz@innerrightmargin{#1}},
+ inner top margin/.code = {\def\tkz@innertopmargin{#1}},
+ inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}},
+ line frame width/.code = {\def\tkz@linewidth{#1}},
+ frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}},
+ frame tex/.code = {\def\tkz@frameltxset{\fcolorbox{#1}}},
+ above skip/.code = {\def\tkz@above{#1}},
+ below skip/.code = {\def\tkz@below{#1}},
+ hsep/.code = {\setlength\tkz@hsep{#1}},
+ pre/.code = {\def\code@pre{#1}},
+ post/.code = {\def\code@post{#1}},
+ latex/.code = {\setlength\tkzexamplewidth{#1}%
+ \def\code@preadd{\begin{minipage}{#1}}%
+ \def\code@postadd{\end{minipage}}},
+ vbox/.code = {\code@vboxtrue
+ \def\code@preadd{\noindent
+ \vbox\bgroup
+ \setlength{\hsize}{\linewidth-6pt}%
+ }%
+ \def\code@postadd{\egroup}},
+ every tkzexample/.style={width=6cm},
+}%
+\def\code@size{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@preadd{}%
+\def\code@postadd{}%
+\def\tkz@above{\par}%
+\def\tkz@below{\par}%
+
+% execution du code
+\def\tkz@result{%
+ \begin{minipage}[t]{\wd\tkzexamplebox}%
+ \hrule width0pt
+ \code@size
+ \box\tkzexamplebox
+ \leavevmode
+ \end{minipage}%
+}%
+
+\newcommand\tkz@code[1]{%
+\begin{minipage}[t]{\code@width}{%
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width\z@
+\vskip-.25em
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+ \typesetcommentnum
+ \def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}}%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+ }%
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}%
+ }%
+\else
+ \typesetcomment
+ \def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+ }%
+\fi
+\obeylines
+\ifcode@saved\input{#1}\else#1\fi%
+}% end of content for the minipage
+\end{minipage}%
+}%
+
+\newcommand\tkz@codesplit[1]{%
+\begin{mdframed}[linewidth = \tkz@linewidth,
+ leftmargin = \tkz@leftmargin,
+ rightmargin = \tkz@rightmargin,
+ backgroundcolor = codeonlybackground,
+ innerleftmargin = \tkz@innerleftmargin,
+ innertopmargin = \tkz@innertopmargin]
+\begingroup
+\color{textcodecolor}%
+\parskip=\z@
+\hrule width0pt
+\let\do\@makeother
+\dospecials
+\frenchspacing
+\code@style\code@size
+\obeylines
+\@vobeyspaces
+\@tempswafalse
+\ifnum@show
+\typesetcommentnum
+\def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty
+ \everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}}%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi
+ \fi
+}%
+\everypar{\setlength\fboxsep{1pt}%
+ \noindent\parskip=0pt%
+ \llap{\colorbox{numbackground}{\textcolor{numcolor}{%
+ \footnotesize\number\value{code@cnt}}}\enspace}%
+ \stepcounter{code@cnt}%
+ }%
+\else
+\typesetcomment%
+\def\par{%
+ \if@tempswa
+ \leavevmode\null\@@par\penalty\interlinepenalty%
+ \else
+ \@tempswatrue
+ \ifhmode\@@par\penalty\interlinepenalty\fi%
+ \fi
+}%
+\fi
+\obeylines
+\ifcode@saved\input{#1}\else #1\fi
+\endgroup
+\end{mdframed}%
+}%
+
+
+\def\tkzref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}%
+\def\tkzFileSavedPrefix{tkzFile}%
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkzref}%
+
+\iftkzcodesaved
+\def\tkzexample[#1]{%
+\code@executetrue
+\normalsize
+\pgfkeys{/tkzexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt}
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\bgroup
+\VerbatimEnvironment
+\killienc\begin{VerbatimOut}{\tkz@File@Saved@Name.tex}}%
+\def\endtkzexample{\end{VerbatimOut}%
+\egroup
+\ifcode@execute
+\setbox\tkzexamplebox=\hbox{\input{\tkz@File@Saved@Name.tex}}%
+\ifdim\wd\tkzexamplebox>\tkzexamplewidth%
+ \gdef\code@mid{\parskip2pt\par}%
+% \hrule
+ %\def\code@mid{\hfill}%
+ \gdef\code@width{\linewidth}%
+\else
+ \ifdim\tkz@hsep=0pt
+ \gdef\code@mid{\hfill}%
+ \else
+ \gdef\code@mid{\hskip\tkz@hsep}%
+ \fi
+ \gdef\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+ \fi
+ \par\noindent
+ \code@savedtrue
+ \ifcode@overhang
+ \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+ \else
+ \tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \fi
+ \else% pas de code pas clair
+ \gdef\code@mid{\hfill}%
+ \gdef\code@width{\linewidth}%
+ \gdef\code@end{}%
+ \fi% fin pas de code
+ \code@mid
+ \ifcode@overhang\tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \else
+ \tkz@frameset{codebackground}{\tkz@code{\tkz@File@Saved@Name.tex}}%
+ \fi
+\tkz@below
+}%
+\else% end of code saved code et result ?
+\def\tkzexample[#1]{%
+\begingroup
+\code@executetrue
+\pgfkeys{/tkzexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt,}
+\pgfqkeys{/tkzexample}{every tkzexample,#1}%
+\parindent0pt
+\begingroup
+%\tkz@above
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\find@tkzexample}% #1 est tout ce qui se trouve dans l'environnement
+\def\endoftkzexample#1{%
+\endgroup
+\ifcode@execute % et \fcode@save ??
+ \setbox\tkzexamplebox=\hbox{%
+ {\commenthandler
+ \protected@xdef\code@temp{#1}}%
+ \catcode`\^^M=9 %
+ {\ignorespaces\code@preadd\code@pre
+ \expandafter\scantokens\expandafter{\code@temp\ignorespaces}%
+ \code@post\code@postadd\ignorespaces}%
+ }%
+ \ifdim\wd\tkzexamplebox>\tkzexamplewidth
+ \def\code@mid{\par}%
+ \def\code@width{\linewidth-6pt}%
+ \else
+ \ifdim\tkz@hsep=0pt
+ \def\code@mid{\hfill}%
+ \else
+ \def\code@mid{\hskip\tkz@hsep}%
+ \fi%
+ \def\code@width{\linewidth-1.5em-\tkz@hsep-\tkzexamplewidth}%
+ \fi%
+ \par\noindent
+ \ifcode@overhang
+ \tkz@frameset{codebackground}{\tkz@code{#1}}%
+ \else
+ \tkz@frameltxset{graphicbackground}{\tkz@result}%
+ \fi
+\else% pas de code execute
+ \def\code@mid{}%
+ \def\code@width{\linewidth-6pt}%
+ \def\code@end{}%
+ \fi% fin pas de code
+ \code@mid%
+ \ifcode@overhang%
+ \ifcode@execute\tkz@frameltxset{graphicbackground}{\tkz@result}\fi
+ \else%
+\ifcode@execute\tkz@frameset{codebackground}{\tkz@code{#1}}\else
+ \par\vskip1em
+ \tkz@codesplit{#1}
+ %\tkz@frameset{codebackground}{\tkz@code{#1}}%
+\fi
+ \fi
+ \tkz@below
+ \end{tkzexample}%
+}%
+\def\endtkzexample{\endgroup}%
+\fi
+%<--------------------------------------------------------------------------->
+\pgfqkeys{/tkzltxexample}{%
+ width/.code = {\setlength\tkzltxexamplewidth{#1}},
+ code/.code = {\colorlet{codeonlybackground}{#1}},
+ show num/.is if = num@show,
+ num/.code = {\num@showtrue\setcounter{code@cnt}{1}},
+ global num/.code = {\num@showtrue},
+ numcolor/.code = {\colorlet{numcolor}{#1}},
+ numbkgcolor/.code = {\colorlet{numbackground}{#1}},
+ normal/.code = {\def\code@size{\normalsize}},
+ small/.code = {\def\code@size{\small}},
+ very small/.code = {\def\code@size{\footnotesize}},
+ right margin/.code = {\def\tkz@rightmargin{#1}},
+ left margin/.code = {\def\tkz@leftmargin{#1}},
+ inner left margin/.code = {\def\tkz@innerleftmargin{#1}},
+ inner right margin/.code = {\def\tkz@innerrightmargin{#1}},
+ inner top margin/.code = {\def\tkz@innertopmargin{#1}},
+ inner bottom margin/.code = {\def\tkz@innerbottommargin{#1}},
+ line frame width/.code = {\def\tkz@linewidth{#1}},
+ hsep/.code = {\def\tkz@hsep{#1}},
+ typeset listing/.code = {#1},
+ frame code/.code = {\def\tkz@frameset{\fcolorbox{#1}}},
+ ignorespaces/.code = {\let\@gobble@till@return =%
+ \@gobble@till@return@ignore},
+ leave comments/.code = {\def\code@catcode@hook{\catcode`\%=12}%
+ \let\commenthandler=\relax%
+ \let\typesetcomment=\relax},
+ every tkzltxexample/.style = {width=8cm},
+ vbox/.code = {\def\code@preadd{\noindent
+ \vbox\bgroup\setlength{\hsize}{\linewidth}}%
+ \def\code@postadd{\egroup}}%
+}
+\def\code@size{}%
+% \def\code@pre{}
+\def\code@post{}%
+\def\code@pre{}%
+\def\code@post{}%
+\def\code@catcode@hook{}%
+
+\newdimen\tkzltxexamplewidth
+\newbox\tkzltxexamplebox
+
+\def\tkzltxexample[#1]{%
+\begingroup
+\pgfkeys{/tkzltxexample/.cd,
+ right margin = 0pt,
+ left margin = 0pt,
+ line frame width = 0,
+ inner left margin = 0 pt,
+ inner right margin = 0 pt,
+ inner top margin = 6 pt,
+ inner bottom margin = 0 pt,}
+\pgfqkeys{/tkzltxexample}{every tkzltxexample,#1}%
+\parindent0pt
+\begingroup%
+\let\do\@makeother
+\dospecials
+\obeylines
+\@vobeyspaces
+\catcode`\%=13 %
+\catcode`\^^M=13 %
+\code@catcode@hook%
+\relax%
+\find@tkzltxexample}
+\def\endoftkzltxexample#1{%
+\endgroup%
+\def\code@end{}%
+\par\vskip1em
+\tkz@codesplit{#1}%
+\par
+\code@post
+\end{tkzltxexample}%
+}%
+
+\def\endtkzltxexample{\endgroup}
+
+
+
+\newcommand\killienc{}
+\@tempcnta128
+\@whilenum\@tempcnta<\@cclvi\do{%
+ \edef\killienc{\killienc\catcode\the\@tempcnta=12}%
+ \advance\@tempcnta\@ne}
+
+\def\tkz@ref{\arabic{section}-\arabic{subsection}-\arabic{subsubsection}}
+\def\tkz@File@Saved@Name{\tkzFileSavedPrefix-\tkz@ref}
+\pgfkeys{
+/tkzsavedcode/.cd,
+ prefix/.code = {\def\tkzFileSavedPrefix{#1}}}
+
+\newcommand{\tkzSavedCode}[1][]{%
+\pgfkeys{%
+tkzsavedcode/.cd,
+ prefix = tkzFile}
+\pgfqkeys{/tkzsavedcode}{#1}
+\renewenvironment{tkzexample}[1][]{%
+\killienc\VerbatimOut{\tkz@File@Saved@Name.tex}}{%
+\endVerbatimOut}}
+
+% \renewenvironment{tkzexample}[1][]{%
+% \killienc \VerbatimOut{tkzeuc-\tkzref.tex}%
+% }{%
+% \endVerbatimOut
+% }
+% \fi
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-doc.doc.tlpobj new/tlpkg/tlpobj/tkz-doc.doc.tlpobj
--- old/tlpkg/tlpobj/tkz-doc.doc.tlpobj 2019-02-28 04:08:57.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-doc.doc.tlpobj 2020-04-16 01:57:27.000000000 +0200
@@ -1,7 +1,11 @@
name tkz-doc.doc
category Package
-revision 48709
+revision 54758
shortdesc doc files of tkz-doc
relocated 1
-docfiles size=1
- RELOC/doc/latex/tkz-doc/README
+docfiles size=10
+ RELOC/doc/latex/tkz-doc/README.md
+ RELOC/doc/latex/tkz-doc/latex/couverture.tex
+ RELOC/doc/latex/tkz-doc/latex/tkz-doc.cfg
+ RELOC/doc/latex/tkz-doc/latex/tkz-doc.cls
+ RELOC/doc/latex/tkz-doc/latex/tkzexample.sty
++++++ tkz-euclide.doc.tar.xz ++++++
++++ 20551 lines of diff (skipped)
++++++ tkz-euclide.tar.xz ++++++
++++ 8556 lines of diff (skipped)
++++++ tkz-fct.doc.tar.xz ++++++
++++ 8549 lines of diff (skipped)
++++++ tkz-fct.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tkz-fct/tkz-fct.sty new/tex/latex/tkz-fct/tkz-fct.sty
--- old/tex/latex/tkz-fct/tkz-fct.sty 2011-06-06 19:18:15.000000000 +0200
+++ new/tex/latex/tkz-fct/tkz-fct.sty 2020-04-12 23:33:18.000000000 +0200
@@ -1,27 +1,22 @@
-% Copyright 2011 by Alain Matthes
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License and/or
-% 2. under the GNU Public License.
-%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % tkz-fct.sty encodage : utf8 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % Créé par Alain Matthes le 16-01-2011 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Objet : fonctions numériques en 2D with gnuplot
+% Copyright (C) 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+% This work has the LPPL maintenance status `maintained'.
+% The Current Maintainer of this work is Alain Matthes
+% Objet : fonctions numériques en 2D with gnuplot
% constants from tkz-base
% \tkz@init@xstep
% \tkz@init@ystep
+\typeout{2020/04/11 1.3c function tkz-fct}
%<--------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-fct}[2011/06/01 1.16 c function ]
+\ProvidesPackage{tkz-fct}[2020/04/11 1.3c function ]
\newcount\tkz@tkzf@fct
\edef\tkzTWOPTCode{\the\catcode`\:}
\tkz@tkzf@fct=0 %
@@ -29,7 +24,7 @@
%<--------------------------------------------------------------------------->
% Initialisation
%<--------------------------------------------------------------------------->
-\RequirePackage{tkz-base}
+\RequirePackage{tkz-base,fp}
% % Code from Christian Tellechea 2009 % modified by AM
% modified \FP@pow from fp.sty
\def\FP@pow#1#2#3{%
@@ -82,26 +77,28 @@
\newif\iftkz@draw
\newif\iftkz@fp
\def\tkz@dmin{-5}\def\tkz@dmax{5}
-\pgfkeys{%
-/tkzfct/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-fp/.is if = tkz@fp,
-fp/.default = false,
-/tkzfct/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+\global\let\tkz@tmp@xa\tkz@init@xmin% modif 2016
+\global\let\tkz@tmp@xb\tkz@init@xmax% modif 2016
+\global\let\tkz@tmp@ya\tkz@init@ymin% modif 2016
+\global\let\tkz@tmp@yb\tkz@init@ymax% modif 2016
+\catcode`\:=12
+\pgfkeys{/(a)tkzfct/.cd,
+ domain/.code args = {#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ domain = \tkz@tmp@xa:\tkz@tmp@xb,
+ samples/.store in = \tkz@fct@samples,
+ id/.store in = \tkz@fct@id,
+ fp/.is if = tkz@fp,
+ fp/.default = false,
+ samples = 200,
+ fp = true,
+ id = tkzfct,
+ /(a)tkzfct/.search also = {/tikz},
+}%
\def\tkzFct{\pgfutil@ifnextchar[{\tkzActivOff\tkz@fct}{\tkz@fct[]}}
\def\tkz@fct[#1]#2{%
-\pgfkeys{/tkzfct/.cd,
-domain = \@xa:\@xb,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}%
+\pgfqkeys{/@tkzfct}{#1}%
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -116,12 +113,14 @@
\def\x{(x*\tkz@init@xstep)}%
\expandafter\edef\csname tkzFctgnu\@alph\tkz@tkzf@fct \endcsname{#2}%
\expandafter\edef\csname tkzFctgnuLast\endcsname{#2}
-\begin{scope}[samples = \tkz@fct@samples,#1]
- \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
- \draw[xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm,/tkzfct/.cd]%
- plot[id=\tkz@fct@id,domain= \tkz@ba:\tkz@bb]%
- function{(#2)/\tkz@init@ystep};%
-\end{scope}
+% %%%%%%%
+\begin{scope}
+ \clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
+ \draw[#1, xshift = -\tkz@x@delta cm,yshift = -\tkz@y@delta cm]%
+ plot[ samples = \tkz@fct@samples,id=\tkz@fct@id,
+ domain= \tkz@ba:\tkz@bb] function{(#2)/\tkz@init@ystep};%
+\end{scope}
+% %%%%%%%
\let\tkz@tmp@xstep\tkz@init@xstep
\def\tkz@init@xstep{1}
\iftkz@fp%
@@ -140,27 +139,25 @@
%<--------------------------------------------------------------------------->
% point d'une courbe (new method)
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkzfctpt/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-ref/.code = \global\def\tkz@fct@ref{#1}}
+\pgfkeys{/tkzfctpt/.cd,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ with/.store in = \tkz@fct@used,
+ ref/.store in = \tkz@fct@ref,
+ draw = false,
+ with = {},
+ ref = {}
+ }
\def\tkzDefPointByFct{\pgfutil@ifnextchar[{\tkz@fctpoint}{\tkz@fctpoint[]}}
\def\tkz@fctpoint[#1](#2){%
-\pgfkeys{/tkzfctpt/.cd,
- draw = false,
- with = {},
- ref = {}}
\pgfqkeys{/tkzfctpt}{#1}
-
- \FPeval\x{(#2)}%
+ \FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@fx{\tkzFctLast}
\else
\edef\tkz@fct{\csname tkzFct\tkz@fct@used\endcsname}
- \FPeval\tkz@fx{\tkz@fct}
+ \FPeval\tkz@fx{\tkz@fct}
\fi
\tkzDefPoint(\x,\tkz@fx){tkzPointResult}%
\iftkz@draw
@@ -174,28 +171,24 @@
%<--------------------------------------------------------------------------->
% tangente \tkzDrawTangentLine
%<--------------------------------------------------------------------------->
-\pgfkeys{%
-/tkztan/.cd,
-draw/.is if = tkz@draw,
-draw/.default = true,
-with/.code = \global\def\tkz@fct@used{#1},
-kr/.code = {\edef\tkz@tan@kr{#1}},
-kl/.code = {\edef\tkz@tan@kl{#1}},
-/tkztan/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}
+\pgfkeys{/(a)tkztan/.cd,
+ with/.store in = \tkz@fct@used,
+ kr/.store in = \tkz@tan@kr,
+ kl/.store in = \tkz@tan@kl,
+ draw/.is if = tkz@draw,
+ draw/.default = true,
+ draw = false,
+ with = {},
+ kr = 1,
+ kl = 1,
+ /(a)tkztan/.search also = {/tikz},
}%
%<--------------------------------------------------------------------------->
\def\tkzDrawTangentLine{\pgfutil@ifnextchar[{\tkz@DrawTangentLine}{%
\tkz@DrawTangentLine[]}}
\def\tkz@DrawTangentLine[#1](#2){%
\begingroup
-\pgfkeys{/tkztan/.cd,
- draw = false,
- with = {},
- kr = 1,
- kl = 1}
-\pgfqkeys{/tkztan}{#1}
+\pgfqkeys{/@tkztan}{#1}
\FPeval\x{(#2)}%
\ifx\tkzutil@empty\tkz@fct@used
\FPeval\tkz@img{\tkzFctLast}
@@ -219,7 +212,7 @@
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
\fi
% demi tgt --> gauche
@@ -230,7 +223,7 @@
\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
\protected@edef\tkz@temp{%
-\noexpand\draw[/tkztan/tan style,/tkztan/.cd,#1]}\tkz@temp%
+\noexpand\draw[/tkztan/tan style,/@tkztan/.cd,#1]}\tkz@temp%
(tkzPointResult)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
\fi
\iftkz@draw
@@ -239,29 +232,26 @@
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzArea
+% tkzArea
%<--------------------------------------------------------------------------->
\pgfkeys{%
/tkzarea/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzarea/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
+ domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ color = \tkz@otherlinecolor,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /tkzarea/.search also = {/tikz}
+ }
\def\tkzArea{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@aire}{\tkz@aire[]}}
\def\tkz@aire[#1]{%
-\begingroup
-\pgfkeys{%
-/tkzarea/.cd,
-domain = -5:5,
-color = \tkz@otherlinecolor,
-samples = 200,
-id = tkzfonct,
-opacity = .5}
+\begingroup
\pgfqkeys{/tkzarea}{#1}
\iftkz@init@NO
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
@@ -287,39 +277,38 @@
\endgroup
}
\let\tkzDrawArea\tkzArea
+
%<--------------------------------------------------------------------------->
% tkzAreafg
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzareafg/.cd,
-domain/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-between/.code args={#1 and #2}{\def\tkz@below{#1}
- \def\tkz@above{#2}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-id/.code = {\edef\tkz@fct@id{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-samples/.code = {\edef\tkz@fct@samples{#1}},
-/tkzareafg/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}}
-\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
+\pgfkeys{/(a)tkzareafg/.cd,
+ domain/.code args ={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ between/.code args ={#1 and #2}{\def\tkzfct@below{#1}
+ \def\tkzfct@above{#2}},
+ opacity/.store in = \tkz@fct@opacity,
+ id/.store in = \tkz@fct@id,
+ color/.store in = \tkz@fct@color,
+ samples/.store in = \tkz@fct@samples,
+ domain = -5:5,
+ between = a and b,
+ color = lightgray,
+ samples = 200,
+ id = tkzfonct,
+ opacity = .5,
+ /(a)tkzareafg/.search also = {/tikz}
+ }
+
+\def\tkzAreafg{\pgfutil@ifnextchar[{\tkz@airefg}{\tkz@airefg[]}}
\def\tkz@airefg[#1]{%
\begingroup
-\pgfkeys{/tkzareafg/.cd,
-domain = -5:5,
-between = a and b,
-color = lightgray,
-samples = 200,
-id = tkzfonct,
-opacity = .5
-}
-\pgfqkeys{/tkzareafg}{#1}
-\def\tkz@fctsup{\csname tkzFctgnu\tkz@below\endcsname}
-\def\tkz@fctinf{\csname tkzFctgnu\tkz@above\endcsname}
+\pgfqkeys{/@tkzareafg}{#1}
+\def\tkz@fctsup{\csname tkzFctgnu\tkzfct@below\endcsname}
+\def\tkz@fctinf{\csname tkzFctgnu\tkzfct@above\endcsname}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@xstep}%
-\else
+\else
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
@@ -329,34 +318,33 @@
\FPdiv\tkz@bb{\tkz@max}{\tkz@init@xstep}
\begin{scope}[domain = \tkz@ba:\tkz@bb,
samples = \tkz@fct@samples,
- id = \tkz@fct@id]
+ id = \tkz@fct@id]
\clip (\tkz@ba,\tkz@ya)--plot function{(\tkz@fctsup)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@ya);%
\clip (\tkz@ba,\tkz@yb)--plot function{(\tkz@fctinf)/\tkz@init@ystep}%
--(\tkz@bb,\tkz@yb);
\fill [color = \tkz@fct@color,
fill opacity = \tkz@fct@opacity,
- /tkzareafg/.cd,
+ /(a)tkzareafg/.cd,
#1]%
(\tkz@ba,\tkz@ya) rectangle (\tkz@bb,\tkz@yb);
\end{scope}
\endgroup
-}
-\let\tkzDrawAreafg\tkzAreafg
-\def\tkz@pamin{-5}\def\tkz@pamax{5}
+}
+\let\tkzDrawAreafg\tkzAreafg
+\def\tkz@pamin{-5}\def\tkz@pamax{5}
%<--------------------------------------------------------------------------->
-% tkzFctPar
+% tkzFctPar
%<--------------------------------------------------------------------------->
-\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
+\def\tkzFctPar{\pgfutil@ifnextchar[{\catcode`\:=12 \tkz@fctp}{\tkz@fctp[]}}
\def\tkz@fctp[#1]#2#3{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pamin:\tkz@pamax,
-samples = 200,
-fp = true,
-id = tkzfct}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/(a)tkzfct/.cd,
+ domain = \tkz@pamin:\tkz@pamax,
+ samples = 200,
+ fp = true,
+ id = tkzfct}
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -369,29 +357,29 @@
\clip (\tkz@xa,\tkz@ya) rectangle (\tkz@xb,\tkz@yb);
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /(a)tkzfct/.cd, #1]%
plot [parametric,domain = \tkz@min:\tkz@max,%
id = tkzparfct]%
function {(#2)/\tkz@init@xstep,(#3)/\tkz@init@ystep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzFctPolar
+% tkzFctPolar
%<--------------------------------------------------------------------------->
-\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
+\def\tkz@pomin{0}\def\tkz@pomax{2*pi}
\def\tkzFctPolar{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
+ \catcode`\:=12 \tkz@FctPolar}{\tkz@FctPolar[]}}
\def\tkz@FctPolar[#1]#2{%
\begingroup
-\pgfkeys{%
-/tkzfct/.cd,
-domain = \tkz@pomin:\tkz@pomax,
-fp = true,
-samples = 200,
-id = tkzfctpolar}
-\pgfqkeys{/tkzfct}{#1}
+\pgfkeys{/(a)tkzfct/.cd,
+ domain = \tkz@pomin:\tkz@pomax,
+ fp = true,
+ samples = 200,
+ id = tkzfctpolar
+ }
+\pgfqkeys{/@tkzfct}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -399,40 +387,40 @@
\FPset{\tkz@x@delta}{0}
\FPset{\tkz@y@delta}{0}%
\fi%
-
+
\begin{scope}
\tkzActivOff
\draw [xshift = -\tkz@x@delta cm,%
yshift = -\tkz@y@delta cm,
- /tkzfct/.cd, #1]%
+ /(a)tkzfct/.cd, #1]%
plot [raw gnuplot,id = tkzpolarfct]%
function { set polar;set samples \tkz@fct@samples ; set trange [\tkz@min:\tkz@max]; plot (#2)/\tkz@init@xstep};
\tkzActivOn
\end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSum
+% tkzDrawRiemannSum
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /(a)tkzriemann/.search also = {/tikz},
+}
+\def\tkzDrawRiemannSum{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSum}{\tkz@DrawRiemannSum[]}}
\def\tkz@DrawRiemannSum[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+}
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -442,39 +430,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\FPadd\tkz@next{\x}{\tkz@delta}
- \draw[color=\tkz@fct@color,opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next , \tkz@fx/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[ color=\tkz@fct@color,
+ opacity=\tkz@fct@opacity,
+ /(a)tkzriemann/.cd,#1] (\x ,0 ) rectangle (\tkz@next,
+ \tkz@fx/\tkz@init@ystep );
+}
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumInf
+% tkzDrawRiemannSumInf
%<--------------------------------------------------------------------------->
-\pgfkeys{/tkzriemann/.cd,
-interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
- \FPeval\tkz@max{(#2)}},
-number/.code = {\edef\tkz@fct@nb{#1}},
-opacity/.code = {\edef\tkz@fct@opacity{#1}},
-color/.code = {\edef\tkz@fct@color{#1}},
-/tkzriemann/.unknown/.code = {\let\searchname=\pgfkeyscurrentname
- \pgfkeysalso{\searchname/.try=#1,
- /tikz/\searchname/.retry=#1}}} \def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval/.code args={#1:#2} {\FPeval\tkz@min{(#1)}
+ \FPeval\tkz@max{(#2)}},
+ number/.store in = \tkz@fct@nb,
+ opacity/.store in = \tkz@fct@opacity,
+ color/.store in = \tkz@fct@color,
+ /(a)tkzriemann/.search also = {/tikz},
+ }
+\def\tkzDrawRiemannSumInf{\pgfutil@ifnextchar[{%
+ \catcode`\:=12 \tkz@DrawRiemannSumInf}{\tkz@DrawRiemannSumInf[]}}
\def\tkz@DrawRiemannSumInf[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -484,42 +475,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
- \FPadd\tkz@next{\x}{\tkz@delta}
- \let\tkzFctTmp\tkzFcta
- \FPset\x{\tkz@next}
- \FPeval\tkz@fxnext{\tkzFcta}
-\ifdim \tkz@fx pt < \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \let\tkz@firstx\x
+ \FPadd\tkz@next{\x}{\tkz@delta}
+ \let\tkzFctTmp\tkzFcta
+ \FPset\x{\tkz@next}
+ \FPeval\tkz@fxnext{\tkzFcta}
+ \ifdim \tkz@fx pt < \tkz@fxnext pt\relax
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
-}
+}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumSup
+% tkzDrawRiemannSumSup
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumSup{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumSup}{\tkz@DrawRiemannSumSup[]}}
\def\tkz@DrawRiemannSumSup[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -529,42 +520,42 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\let\tkzFctTmp\tkzFcta
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\ifdim \tkz@fx pt > \tkz@fxnext pt\relax
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
-\else
-\draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
- \fi
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@firstimg/\tkz@init@ystep );
+\else
+\draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@fxnext/\tkz@init@ystep );
+ \fi
+ }
+ \end{scope}
\endgroup
}
%<--------------------------------------------------------------------------->
-% tkzDrawRiemannSumMid
+% tkzDrawRiemannSumMid
%<--------------------------------------------------------------------------->
\def\tkzDrawRiemannSumMid{\pgfutil@ifnextchar[{%
- \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
+ \catcode`\:=12 \tkz@DrawRiemannSumMid}{\tkz@DrawRiemannSumMid[]}}
\def\tkz@DrawRiemannSumMid[#1]{%
\begingroup
-\pgfkeys{%
-/tkzriemann/.cd,
-interval = 1:2,
-number = 10,
-opacity = 0.5,
-line width = 1pt}
-\pgfqkeys{/tkzriemann}{#1}
+\pgfkeys{/(a)tkzriemann/.cd,
+ interval = 1:2,
+ number = 10,
+ opacity = 0.5,
+ line width = 1pt
+ }
+\pgfqkeys{/@tkzriemann}{#1}
\iftkz@init@NO%
\FPdiv{\tkz@x@delta}{\tkz@init@xorigine}{\tkz@init@xstep}%
\FPdiv{\tkz@y@delta}{\tkz@init@yorigine}{\tkz@init@ystep}%
@@ -574,46 +565,43 @@
\fi%
\FPadd\tkz@intwd{\tkz@max}{-\tkz@min}
\FPdiv\tkz@delta{\tkz@intwd}{\tkz@fct@nb}
-\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
-
+\FPadd\tkz@fct@nb{\tkz@fct@nb}{-1}
+
\begin{scope}
\foreach \i in {0,1,...,\tkz@fct@nb}{%
\FPeval\x{(\tkz@min+i*\tkz@delta)}
\FPeval\tkz@fx{\tkzFcta}
\let\tkz@firstimg\tkz@fx
- \let\tkz@firstx\x
+ \let\tkz@firstx\x
\FPadd\tkz@next{\x}{\tkz@delta}
\FPset\x{\tkz@next}
\FPeval\tkz@fxnext{\tkzFcta}
\FPeval\tkz@midimg{(\tkz@firstimg+\tkz@fxnext)/2}
- \draw[opacity=\tkz@fct@opacity,/tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
- }
- \end{scope}
+ \draw[opacity=\tkz@fct@opacity,/@tkzriemann/.cd,#1] (\tkz@firstx ,0 ) rectangle (\tkz@next , \tkz@midimg/\tkz@init@ystep );
+ }
+ \end{scope}
\endgroup
-}
-
+}
+
%<--------------------------------------------------------------------------â>
% tkzXH F rien T et [ ou ]
%<--------------------------------------------------------------------------â>
\def\tkz@ComT{v} % need
-\pgfkeys{
- tkzxh/.cd,
- posgrad/.code = {\def\tkz@tkzXh@posgrad{#1}},
- left/.code = {\def\tkz@tkzXh@left{#1}},
- right/.code = {\def\tkz@tkzXh@right{#1}},
- color/.code = {\def\tkz@tkzXh@color{#1}},
- }
-\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
+\pgfkeys{/(a)tkzxh/.cd,
+ posgrad/.store in = \tkz@tkzXh@posgrad,
+ left/.store in = \tkz@tkzXh@left,
+ right/.store in = \tkz@tkzXh@right,
+ color/.store in = \tkz@tkzXh@color,
+ posgrad = {below=6 pt},
+ color = \tkz@mainlinecolor,
+ left = {},
+ right = {},
+ }
+\def\tkzXH{\pgfutil@ifnextchar[{\tkz@xh}{\tkz@xh[]}}
\def\tkz@xh[#1]#2{%
-\pgfkeys{/tkzxh/.cd,
- posgrad = {below=6 pt},
- color = \tkz@mainlinecolor,
- left = {},
- right = {}
-}
- \pgfqkeys{/tkzxh}{#1}
+ \pgfqkeys{/@tkzxh}{#1}
\begingroup
\foreach \xA/\RA/\sA/\xB/\RB/\sB in {#2}{%
\tkzDefPoint(\xA,0){deb}\tkzDefPoint(\xB,0){fin}
@@ -627,7 +615,7 @@
\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp at (deb){%
\tkz@showgrad{\xA}$\numprint{\tkz@result}$};\fi
-\ifx\RB\tkz@ComT
+\ifx\RB\tkz@ComT
\protected@edef\tkz@temp{\noexpand\node[\tkz@tkzXh@posgrad]}\tkz@temp%
at (fin){%
\tkz@showgrad{\xB}$\numprint{\tkz@result}$};\fi
@@ -640,64 +628,65 @@
}%
\endgroup
}%
-%<--------------------------------------------------------------------------->
-% tangente obsolete
-%<--------------------------------------------------------------------------->
-\def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
-
-\def\tkz@Tan[#1]#2(#3)#{
-\pgfkeys{/tkztan/.cd,
-draw = false,
-with={},
-kr = 1,
-kl = 1}
-\pgfqkeys{/tkztan}{#1}
- \global\edef\tkz@opttan{#1}
- \FPeval\x{(#3)}%
- \FPeval\tkz@img{#2}
- \let\tkz@yy #2%
- \let\tkz@xx\x%
- \let\tkz@old@img\tkz@img
- \tkz@@Tan
-}
-\def\tkz@@Tan#1{%
-\FPdiv{\tkz@old@x}{\x}{1}
-\let\tkz@nexpty\tkz@img
-\tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
-\FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
-\FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
-\FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
- % demi tgt--> droite
-\FPifzero{\tkz@tan@kr}%
-\else
-\FPadd{\x}{\tkz(a)xx}{0.000001}%
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
-\FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
-\protected@edef\tkz@temp{
- \noexpand\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
-\fi
-% demi tgt --> gauche
-\FPifzero{\tkz@tan@kl}%
- \else
-\FPadd{\x}{\tkz(a)xx}{-0.000001}
-\FPeval\tkz@img{\tkz@yy}%
-\FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
-\FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
- \protected@edef\tkz@temp{
- \noexpand
-\draw[tan style,/tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
- (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
- \fi
-}
+% %<--------------------------------------------------------------------------->
+% % tangente obsolete
+% %<--------------------------------------------------------------------------->
+% \def\tkzTan{\pgfutil@ifnextchar[{\tkz@Tan}{\tkz@Tan[]}}
+%
+% \def\tkz@Tan[#1]#2(#3)#{
+% \pgfkeys{/(a)tkztan/.cd,
+% draw = false,
+% with = {},
+% kr = 1,
+% kl = 1
+% }
+% \pgfqkeys{/@tkztan}{#1}
+% \global\edef\tkz@opttan{#1}
+% \FPeval\x{(#3)}%
+% \FPeval\tkz@img{#2}
+% \let\tkz@yy #2%
+% \let\tkz@xx\x%
+% \let\tkz@old@img\tkz@img
+% \tkz@@Tan
+% }
+% \def\tkz@@Tan#1{%
+% \FPdiv{\tkz@old@x}{\x}{1}
+% \let\tkz@nexpty\tkz@img
+% \tkz@ptStar[](\tkz@old@x,\tkz@nexpty){#1}
+% \FPdiv{\tkz@krx}{\tkz@tan@kr}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kry}{\tkz@tan@kr}{\tkz@init@ystep}
+% \FPdiv{\tkz@klx}{\tkz@tan@kl}{\tkz@tmp@xstep}
+% \FPdiv{\tkz@kly}{\tkz@tan@kl}{\tkz@init@ystep}
+% % demi tgt--> droite
+% \FPifzero{\tkz@tan@kr}%
+% \else
+% \FPadd{\x}{\tkz(a)xx}{0.000001}%
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}%
+% \FPmul{\tkz@slope}{\tkz@deltay}{1000000}%
+% \protected@edef\tkz@temp{
+% \noexpand\draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(\tkz@krx,-\tkz@kry*\tkz@slope);
+% \fi
+% % demi tgt --> gauche
+% \FPifzero{\tkz@tan@kl}%
+% \else
+% \FPadd{\x}{\tkz(a)xx}{-0.000001}
+% \FPeval\tkz@img{\tkz@yy}%
+% \FPadd{\tkz@deltay}{\tkz@old@img}{-\tkz@img}
+% \FPmul{\tkz@slope}{\tkz@deltay}{-1000000}
+% \protected@edef\tkz@temp{
+% \noexpand
+% \draw[tan style,/@tkztan/.cd,\tkz@opttan,-]}\tkz@temp%
+% (#1)--++(-\tkz@klx,\tkz@kly*\tkz@slope);
+% \fi
+% }
%<--------------------------------------------------------------------------->
% point d'une courbe obsolete
%<--------------------------------------------------------------------------->
-\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
+\def\tkzFctPt{\pgfutil@ifnextchar[{\tkz@fctpt}{\tkz@fctpt[]}}
\def\tkz@fctpt[#1]#2(#3)#{%
- \global\edef\tkz@optptfct{#1}
+ \global\edef\tkz@optptfct{#1}
\FPeval\x{(#3)}%
\FPeval\tkz@y{#2}
\tkz@defpoint
@@ -707,7 +696,7 @@
\protected@edef\tkz@temp{
\noexpand \tkzDrawPoint[\tkz@optptfct](#1)}\tkz@temp
\let\tkz@init@xstep\tkz@tmp@xstep
-}
+}
%<-------------------------- the end --------------------------------------->
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-fct.tlpobj new/tlpkg/tlpobj/tkz-fct.tlpobj
--- old/tlpkg/tlpobj/tkz-fct.tlpobj 2019-02-28 04:08:58.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-fct.tlpobj 2020-04-13 01:55:01.000000000 +0200
@@ -1,16 +1,16 @@
name tkz-fct
category Package
-revision 22831
+revision 54703
shortdesc Tools for drawing graphs of functions
relocated 1
longdesc The tkz-fct package is designed to give math teachers (and
longdesc students) easy access to programming graphs of functions with
longdesc TikZ and gnuplot.
-runfiles size=7
+runfiles size=6
RELOC/tex/latex/tkz-fct/tkz-fct.sty
catalogue-also pgf
+catalogue-contact-home http://altermundus.fr
catalogue-ctan /macros/latex/contrib/tkz/tkz-fct
-catalogue-date 2018-09-19 19:07:11 +0200
-catalogue-license lppl
-catalogue-topics graphics-plot
-catalogue-version 1.16c
+catalogue-license lppl1.3
+catalogue-topics graphics graphics-plot pgf-tikz
+catalogue-version 1.3c
++++++ tkz-orm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-orm.doc.tlpobj new/tlpkg/tlpobj/tkz-orm.doc.tlpobj
--- old/tlpkg/tlpobj/tkz-orm.doc.tlpobj 2019-02-28 04:08:59.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-orm.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tkz-orm.doc
category Package
-revision 39408
+revision 54512
shortdesc doc files of tkz-orm
relocated 1
docfiles size=120
++++++ tkz-orm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-orm.tlpobj new/tlpkg/tlpobj/tkz-orm.tlpobj
--- old/tlpkg/tlpobj/tkz-orm.tlpobj 2019-02-28 04:08:59.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-orm.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name tkz-orm
category Package
-revision 39408
+revision 54512
shortdesc Create Object-Role Model (ORM) diagrams
relocated 1
longdesc The package provides styles for drawing Object-Role Model (ORM)
@@ -9,7 +9,6 @@
RELOC/tex/latex/tkz-orm/tkz-orm.sty
catalogue-contact-home http://purl.org/net/tkz-orm
catalogue-ctan /graphics/pgf/contrib/tkz-orm
-catalogue-date 2017-04-18 05:31:40 +0200
-catalogue-license gpl2lppl1.3
+catalogue-license gpl2 lppl1.3
catalogue-topics diagram pgf-tikz
catalogue-version 0.1.4
++++++ tkz-tab.doc.tar.xz ++++++
++++ 7943 lines of diff (skipped)
++++++ tkz-tab.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tkz-tab/tkz-tab.sty new/tex/latex/tkz-tab/tkz-tab.sty
--- old/tex/latex/tkz-tab/tkz-tab.sty 2019-01-21 00:20:10.000000000 +0100
+++ new/tex/latex/tkz-tab/tkz-tab.sty 2020-04-12 00:30:16.000000000 +0200
@@ -1,41 +1,21 @@
-% Copyright (C) 2009 Alain Matthes
-%
-% This file may be distributed and/or modified
-%
-% 1. under the LaTeX Project Public License , either version 1.3
-% of this license or (at your option) any later version and/or
-% 2. under the GNU Public License.
-%
-% See the file doc/generic/pgf/licenses/LICENSE for more details.%
-% See http://www.latex-project.org/lppl.txt for details.
-%
-%
-% ``tkz-tab'' package for create tables of signs and variations.
-%
-%
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % tkz-tab.sty encodage : utf8 %
- % %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
- % %
- % Créé par Alain Matthes le 04-01-2007. %
- % CTAN version %
- %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
-%% Objet : Création de tableaux (signes et variations)
+% Copyright 2020 Alain Matthes
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX version 2005/12/01 or later.
+% This work has the LPPL maintenance status âmaintainedâ.
+% The Current Maintainer of this work is Alain Matthes.
+% Objet : Création de tableaux (signes et variations)
%<----------------------------------------------------------------------------->
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tkz-tab}[2019/01/19 v1.4e variations (ctan version) ]
+\ProvidesPackage{tkz-tab}[2020/04/08 v2.1c variations (ctan version)]
%<----------------------------------------------------------------------------->
-\ifx\e@alloc\@undefined
- \RequirePackage{etex}
-\fi
\RequirePackage{ifthen}
\RequirePackage{xkeyval}[2005/11/25]
-\RequirePackage{tikz}[2008/01/15]
+\RequirePackage{tikz}
\usetikzlibrary{arrows,patterns}
-
%<------------------------------ Initialisation ----------------------------->
%<------------------------------ Styles ----------------------------->
@@ -204,7 +184,7 @@
\tikzset{arrow style/.append style = {\cmdTAB@TTS@arrowcolor,
> = \cmdTAB@TTS@arrowstyle,
line width = \cmdTAB@TTS@arrowlinewidth}}
-\tikzset{node style/.append style = { fill = \cmdTAB@TTS@backgroundcolor}}
+\tikzset{node style/.append style = { fill = fondpaille}}
\tikzset{fondC/.style={fill = \cmdTAB@TTS@backgroundcolor}}
\tikzset{fondL/.style={fill = \cmdTAB@TTS@backgroundcolor}}
\tikzset{fondT/.style={fill = \cmdTAB@TTS@backgroundcolor}}
@@ -414,8 +394,9 @@
\define@boolkey[TAB]{TL}{help}[true]{}
\presetkeys[TAB]{TL}{help=false}{}
%<--------------------------------------------------------------------------->
-\newcommand*{\tkzTabLine}[2][]{%
-\setkeys[TAB]{TL}{#1}%
+\newcommand{\tkzTabLine}[2][]{%
+ \makeatletter
+ \setkeys[TAB]{TL}{#1}%
\setcounter{tkz@cnt@lg}{\thetkz@cnt@line}%
\stepcounter{tkz@cnt@line}%
\setcounter{tkz@cnt@lgnext}{\thetkz@cnt@line}%
@@ -424,16 +405,16 @@
\setcounter{tkz@cnt@impair}{1}%
\ifTAB@TL@help%
\foreach \x in {#2}
- {%
+ {
\ifthenelse{\isodd{\value{tkz@cnt@cl}}}{%
\path (N\thetkz@cnt@impair\thetkz@cnt@lg) --%
- node[draw,inner sep =1pt,midway,fill=yellow] {%
- \footnotesize Z\thetkz@cnt@impair\thetkz@cnt@lg}%
+ node[draw,inner sep =1pt,midway,fill=yellow]%
+ {\footnotesize Z\thetkz@cnt@impair\thetkz@cnt@lg}%
(N\thetkz@cnt@impair\thetkz@cnt@lgnext);
\stepcounter{tkz@cnt@impair}}{%
\path (M\thetkz@cnt@pair\thetkz@cnt@lg)--%
- node[draw,inner sep =1pt,midway,fill=yellow] {%
- \footnotesize S\thetkz@cnt@pair\thetkz@cnt@lg}%
+ node[draw,inner sep =1pt,midway,fill=yellow]%
+ {\footnotesize S\thetkz@cnt@pair\thetkz@cnt@lg}%
(M\thetkz@cnt@pair\thetkz@cnt@lgnext);
\stepcounter{tkz@cnt@pair}}%
\stepcounter{tkz@cnt@cl}%
@@ -492,6 +473,7 @@
\stepcounter{tkz@cnt@cl}%
}% end foreach
\fi
+ \makeatother
}%
%<--------------------------------------------------------------------------->
%<---------------------------- Variations ------------------------------->
@@ -499,6 +481,7 @@
%<----------------------- Macro pour tracer une flÚche ---------------------->
%<--------------------------------------------------------------------------->
\newcommand*{\tkzDrawArrow}{%
+\makeatletter
\ifthenelse{\equal{\thetkz@cnt@zone}{0}}{%
\setcounter{tkz@cnt@pred}{\thetkz@cnt@cl}
\addtocounter{tkz@cnt@pred}{-1}
@@ -517,6 +500,7 @@
}{%
\setcounter{tkz@cnt@zone}{0}%
}%
+\makeatother
}%
%<--------------------------------------------------------------------------->
\define@boolkey[TAB]{VA}{help}[true]{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tkz-tab.tlpobj new/tlpkg/tlpobj/tkz-tab.tlpobj
--- old/tlpkg/tlpobj/tkz-tab.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tkz-tab.tlpobj 2020-04-12 01:55:57.000000000 +0200
@@ -1,17 +1,19 @@
name tkz-tab
category Package
-revision 49775
+revision 54662
shortdesc Tables of signs and variations using PGF/TikZ
relocated 1
longdesc The package provides comprehensive facilities for preparing
longdesc lists of signs and variations, using PGF. The package
-longdesc documentation requires the tkz-doc bundle.
+longdesc documentation requires the tkz-doc bundle. This package has
+longdesc been taken temporarily out of circulation to give the author
+longdesc time to investigate some problems.
runfiles size=12
RELOC/tex/latex/tkz-tab/tkz-tab.sty
catalogue-also tableaux tableauvariations tablor tabvar
+catalogue-contact-home http://altermundus.fr
catalogue-contact-repository https://github.com/tkz-sty
catalogue-ctan /macros/latex/contrib/tkz/tkz-tab
-catalogue-date 2019-01-20 08:40:22 +0100
-catalogue-license lppl1.3gpl
-catalogue-topics maths-tabvar pgf-tikz
-catalogue-version 1.4e
+catalogue-license lppl1.3 gpl
+catalogue-topics maths maths-tabvar graphics pgf-tikz
+catalogue-version 2.1c
++++++ tlc-article.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/GettingStarted.tex new/doc/latex/tlc-article/GettingStarted.tex
--- old/doc/latex/tlc-article/GettingStarted.tex 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/GettingStarted.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,409 +0,0 @@
-\documentclass[12pt]{tlc-article}
-
-% ------------------------------------------------------------------------------
-% \makeatletter is used so we can reference commands and definitions defined by
-% tlc-article, which are all prefaced with tlc@.
-\makeatletter
-
-% ------------------------------------------------------------------------------
-
-\def\tlcProduct{tlc-article}
-
-\def\tlcA{\tlcDarkblue{\tlcProduct}}
-
-\def\tlcAL{\tlcDarkblue{\tlc@additionalLayout}}
-\def\tlcBL{\tlcDarkblue{tlcBeginLandscape}}
-\def\tlcDB{\tlcDarkblue{tlcDarkblue}}
-\def\tlcEL{\tlcDarkblue{tlcEndLandScape}}
-\def\tlcHF{\tlcDarkblue{\tlc@headerFooter}}
-\def\tlcLG{\tlcDarkblue{\tlc@logoFile}}
-\def\tlcNCT{newcolumn type: \tlcDarkblue{L, C} \& \tlcDarkblue{R}}
-\def\tlcTOC{\tlcDarkblue{tlcTitlePageAndTableOfContents}}
-\def\tlcVE{\tlcDarkblue{\tlc@versionFile}}
-
-\def\tlcVC{\tlcDarkblue{tlc@version}}
-\def\tlcDC{\tlcDarkblue{tlc@date}}
-\def\tlcSC{\tlcDarkblue{tlc@status}}
-\def\tlcIC{\tlcDarkblue{tlc@instatution}}
-\def\tlcPC{\tlcDarkblue{tlc@permission}}
-
-\def\kpse{\$(kpsewhich -var-value TEXMFLOCAL)}
-\def\texDist{\kpse}
-\def\tlcDist{/tex/latex/\tlcProduct}
-\def\tlcGlobalDist{\texDist\tlcDist}
-
-\def\tlcHome{\$HOME}
-\def\tlcMyDoc{\tlcHome/mydoc}
-
-\def\gitHub{GitHub.com}
-\def\gitHubUrl{http://\gitHub}
-
-\def\tlcRepo{git@\gitHub:Traap/\tlcProduct.git}
-
-\def\tlcPkgFile{data/required-packages.csv}
-\def\tlcNote{\tlcDarkblue{Note}}
-
-% ------------------------------------------------------------------------------
-
-\begin{document}
-
-% ------------------------------------------------------------------------------
-
-\tlcTitlePageAndTableOfContents
- {Getting Started}
- {Gary Allan Howard}
- {Getting Started guide covers how to install \tlcA\ both globally and
- locally, describes the general use case, how to customize your \tlcA\
- environment, describes the commands \tlcA\ implements, and reveals the
- packages \tlcA\ depends upon.}
-
-% ------------------------------------------------------------------------------
-
-\section{Installation}
-This section describes how to install \tlcA\ either globally to make it
-available to your \LaTeX\ environment or locally to the document you are
-authoring. And, this section identifies the prerequisites you must meet in
-order to clone a repository from GitHub.com and install software on your
-computer.
-
-\subsection{Prerequisites}
-The following prerequisites are needed.
-\begin{description}[style=nextline]
- \item[Administrative privilege] You will need administrative privileges to
- install \tlcA\ globally because `sudo' is used.
-
- \item[SSH key] You will need your private key to access \gitHub. Please refer
- to \url{http://help.github.com/articles/generating-an-ssh-key} for
- instructions on `Generating an SSH key'.
-
- \item[Enable your SSH key] The following instructions enable your SSH key so
- you to not have to enter the passphrase for each git command.
-
- \begin{enumerate}
- \item eval \$(ssh-agent -s)
- \item ssh-add ~/.ssh/your-private-key
- \item enter your passphrase
- \end{enumerate}
-
-\end{description}
-
-\subsection{Local installation}
-A local installation is done by installing \tlcA\ into
-/the/path/to/your/document. Assuming your document is located at \tlcMyDoc\ the
-following shell commands will make \tlcA\ available to your document.
-
-\begin{enumerate}
- \item cd \tlcHome
- \item git clone \tlcRepo\
- \item cd \tlcProduct\
- \item mkdir \tlcMyDoc
- \item cp -v \tlcProduct.cls \tlcMyDoc/.
-\end{enumerate}
-
-\clearpage
-\subsection{Global installation}
-A global installation is done by installing \tlcA\ into your /path/to/your/texmf
-directory. Assuming a TexLive installation exists at \texDist\ the following
-shell commands will make \tlcA\ available to your \LaTeX\ environment.
-
-\begin{enumerate}
- \item cd \tlcHome
- \item git clone \tlcRepo\
- \item cd \tlcProduct\
- \item sudo mkdir -p \tlcGlobalDist
- \item sudo mv -v \tlcProduct.cls \tlcGlobalDist/.
- \item sudo mktexlsr \texDist\
-\end{enumerate}
-
-\bigskip
-\tlcNote\ You may remove your local installation by removing \tlcA.
-
-% ------------------------------------------------------------------------------
-\clearpage
-\section{General Use Case}
-The goal of \tlcA\ is to simplify document layout. \tlcA\ orchestrates a
-logical arrangement for document header, footer, author, abstract, table of
-contents, and margins. The following sections outline the default
-implementation for each part \tlcA\ organizes.
-
-\tlcNote\ This document was typeset using the instructions provided throughout
-this section.
-
-\subsection{Document Layout}
-\begin{figure}[h]
- \centering
- \includegraphics{images/titlepage.png}
- \caption{Document Layout}
- \label{fig:layout}
-\end{figure}
-\subsection{documentclass \tlcA}
-\tlcA\ extends the article document class. \tlcA\ provide options directly to
-the article document class. As an example, the Author can specify the font as
-follows:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \documentclass[12pt]{tlc-article}
-\end{lstlisting}
-
-\subsection{Title, Author \& Abstract} \label{sec:TAA}
-\tlcA\ has a macro \tlcTOC\ that can be used to set the document title, document
-author, document abstract, and establish the Table of Contents. The sample
-below reveals how to use \tlcTOC.
-
-\begin{lstlisting}[basicstyle=\tiny]
- \tlcTitlePageAndTableOfContents
- {Document Title}
- {Document Article}
- {Document Abstract}
-\end{lstlisting}
-
-\subsection{Table of Contents}
-The Table of Contents immediately follows the document abstract on page 1, uses
-dark blue for content, dots separate table of contents sections and page number,
-and uses roman numerals.
-
-\subsection{Header \& Footer}
-fancyhdr is used to render the header and footer. The Author can override the
-\tlcA\ by providing an implementation in \tlcHF\, or augment \tlcA\
-application by providing \tlcVE. The sections below show the placement \tlcA\
-uses when writing objects, and where the objects are defined.
-
-\tlcNote\ \tlcA\ ignors \tlcVE\ when \tlcHF\ is defined.
-
-\subsubsection*{Header}
-
-\begin{description}
- \item[lhead] When \tlcLG\ is found, logo.
- \item[chead] Document Title
- \item[rhead] When \tlcVE\ is present, status, date, and version columns.
-\end{description}
-
-\subsubsection*{Footer}
-
-\begin{description}
- \item[lfoot] When \tlcVE\ is present, instatution column.
- \item[cfoot] When \tlcVE\ is present, permission column.
- \item[rfoot] Page 1 of N.
-\end{description}
-
-\subsubsection*{Rule width}
-A 0.1pt rule witdh is placed below the document header and above the document
-footer.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Customization}
-This section describes how \tlcA\ can be customized by using the file-hooks
-\tlcA\ check for. \tlcA\ default implementation will be used when the
-file-hooks are now found.
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcAL}
-\tlcA\ will use whatever \LaTeX\ definitions are found in \tlcAL\ when it
-exists. The file-check is shown
-below:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \IfFileExists{docstyle/additional-layout.tex}
- {\input{docstyle/additional-layout.tex}}
- {}
-\end{lstlisting}
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcHF}
-In the absence of \tlcAL\, \tlcA\ has a builtin header and footer strategy that
-is base on \textit{fancyhdr}, \textit{titling}, and \textit{lastpage} \LaTeX\
-packages. The default implementation is show below:
-
-\begin{lstlisting}[basicstyle=\tiny]
- \IfFileExists{\tlc@logoFile}
- { % Typeset the logo in the left side of the document header.
- \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}
- }
- {% Else: no operation because tlc@logoFile does not exist.
- }
- % Typeset the title in the center of the document header.
- \chead{\large{\thetitle}}
- % Typeset version information in the right side of the document header.
- \IfFileExists{\tlc@versionFile}
- {
- % document status, document date and document version.
- \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}
- % document owner. This maybe a person or company name.
- \lfoot{\tiny \tlc@instatution}
- % document license. This maybe a license or word like confidential.
- \cfoot{\tiny \tlc@permission}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
- \renewcommand{\headrulewidth}{0.1pt}
- % eliminate head height too small warning, which is occurring because
- % we are using multiple lines in our header.
- \setlength\headheight{52pt}
- % % footer applied to all pages.
- \rfoot{\tiny{page \thepage~of~\pageref{LastPage}}}
- \renewcommand{\footrulewidth}{0.1pt}
- % we want our header and footer to remain consistent with a table of
- % contents that span multiple pages.
- \AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}
-\end{lstlisting}
-
-The default implementation can be overridden by defining \tlcHF.
-
-\tlcNote\ When \tlcHF\ exists and is empty, your document will be typeset
-with the defaults from document-class \tlcDarkblue{article}.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\subsection{\tlcVE} \label{sec:version}
-\tlcA\ will populate the builtin header and footer with information extracted
-from \tlcVE\ when it is present. \tlcVE\ is a comma-separated-variable file
-that uses the pipe character as the field delimiter. \tlcVE\ uses the following
-column names:
-
-\begin{description}[style=nextline]
- \item[version] The version value is typeset in the rhead area. This field is
- used to convey the version the document was at the date it reached its
- current state.
-
- \item[date] The date value is typeset in the rhead area. This field is used
- to communicate when the document transitioned into its current state.
-
- \item[status] The status value is typeset in the rhead area. This field is
- used to convey the document state such as Approved, Draft, Effective, or
- Obsolete.
-
- \item[instatution] The institution value is typeset in the lfoot area. This
- field is used to tell the reader the author name or company name.
-
- \item[permission] The permission value is typeset in the cfoot area. This
- field is used to identify confidentiality or a particular license.
-
-\end{description}
-
-The extaction methods are shown below.
-\begin{lstlisting}[basicstyle=\tiny]
- % Extract document status, document date and document version from
- % \tlc@versionFile.
- % Argument:
- % 1 - the column name to extract from the data file.
- \newcommand{\tlcVersionPart}[1]{
- \csvreader[separator=pipe]
- {\tlc@versionFile}{
- 1=\version,
- 2=\date,
- 3=\status,
- 4=\instatution,
- 5=\permission
- }{#1}
- }%
-
- % Define extractions macros when \tlc@versionFile exists.
- \IfFileExists{\tlc@versionFile}
- {
- \def\tlc@version{\tlcVersionPart{\version}}
- \def\tlc@date{\tlcVersionPart{\date}}
- \def\tlc@status{\tlcVersionPart{\status}}
- \def\tlc@instatution{\tlcVersionPart{\version}}
- \def\tlc@permission{\tlcVersionPart{\version}}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
-\end{lstlisting}
-
-% ------------------------------------------------------------------------------
-
-\subsection{\tlcLG}
-\tlcA\ will typeset the lhead area with \tlcLG\ when it is present. Make sure
-your logo's height is not larger than 34pt to avoid `Package Fancyhdr Warning:
-\\headheight is to small' warning.
-
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Definitions \& Commands}
-\subsection{\tlcBL}
-Page layout is rotated 90\textdegree\ clockwise resulting in a landscape page
-orientation. Landscape orientation remains active until \tlcEL.
-
-\subsection{\tlcEL}
-Page layout is returned to portrate orientation when \tlcEL\ is reached.
-
-\subsection{\tlcDB}
-\tlcDB\ is used throughout this document to render text using rbg\{0,0,0.5\}.
-\tlcDB\ is safe to use within your document.
-
-\subsection{\tlcTOC}
-\tlcTOC\ creates the document layout showen in Figure \ref{fig:layout}. Section
-\ref{sec:TAA} shows an example implementation.
-
-\subsection{\tlcNCT}
-New \tlcNCT\ are Left, Center, and Right, respectively are
-designed to use with longtable. Data is wrapped within a table cell. The
-parameter defines the column width. As an example, L{2cm} yields a Left
-aligned, ragged right, wrapped text within a 2cm wide cell.
-
-\begin{lstlisting}[basicstyle=\tiny]
-\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
-\end{lstlisting}
-
-\subsection{\tlcAL}
-\tlcAL\ is an architectural hook the Author should use when it becomes necessary
-to use packages not provided by \tlcA\, and to design commands that are specific
-to your document.
-
-\subsection{\tlcHF}
-\tlcHF\ is an architectural hook the Author should use to completely override
-the document layout \tlcA\ implements.
-
-\subsection{\tlcVE}
-\tlcVE\ is by used \tlcA\ to populate the document header \& footer. Refer to
-section \ref{sec:version} for \tlcVE\ definitions. \tlcVE\ is not
-used by \tlcA\ when \tlcHF\ is define. However, you might want to use the
-version hook by defining \tlcVE\ and using the commands below to extract data
-from \tlcVE in your \tlcHF.
-\begin{enumerate}
- \item \tlcVC\
- \item \tlcDC\
- \item \tlcSC\
- \item \tlcIC\
- \item \tlcPC\
-\end{enumerate}
-
-\subsection{\tlcLG}
-\tlcLG\ is used to place your logo in the header created by \tlcA.
-% ------------------------------------------------------------------------------
-
-\clearpage
-\section{Required Packages}
-This section documents the dependencies of the required package tlc-article has.
-Package names are listed in alphabetical order. A complete description of each
-package is found at \url{http://www.ctan.org/}. At this writing, you can type in the
-package name and press the search button to learn more about each package.
-
-% Define the column names used by csvreader when reading \packageFile.
-\csvnames{tlcPkgNames}{
- 1=\name
- ,2=\description
-}
-
-% Define the table style used to report the required package names and
-% descriptions.
-\csvstyle{tlcPkgStyle}{
- longtable=|L{3cm}|L{12cm}|
- ,table head=\hline Name & Description\\\hline\hline\endhead
- ,late after line=\\\hline
- ,tlcPkgNames
-}
-
-% Render pckFile using pckStyle as a longtable.
-\csvreader[tlcPkgStyle, separator=pipe]{\tlcPkgFile}{}{\name & \description}
-% ------------------------------------------------------------------------------
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/GettingStarted.texx new/doc/latex/tlc-article/GettingStarted.texx
--- old/doc/latex/tlc-article/GettingStarted.texx 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/GettingStarted.texx 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-\input{GettingStarted.tex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/README.md new/doc/latex/tlc-article/README.md
--- old/doc/latex/tlc-article/README.md 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/README.md 2019-06-23 22:57:37.000000000 +0200
@@ -1,27 +1,26 @@
-#![](data/logo.png)
-The **tlc_article** repository uses a SCRUM framework adapted to standard GitHub
-tooling. **tlc_article** is integrated with Travis-ci.org for continuous
-integration and AllanConsulting.slack.com for centralized notification.
+[tlc-article](data/logo.png)
+
+---
+The goal of **tlc-article** is to simplify document layout. **tlc-article**
+orchestrates a logical arrangement for document header, footer, author,
+abstract, table of contents, and margins.
+[tlc-article.pdf](doc/tlc-article.pdf) is a document instantiated
+using **tlc-article.cls**.
## Installation are done Locally or Globally
### Local Installation
```bash
-$ cd $HOME
-$ git clone git@github.com:Traap/tlc-article.git
-$ cd tlc-article
-$ cp -v tlc-article.cls $HOME/mydoc
-$ cp -v tlc-article.cls $HOME/mydoc/.
+cd $HOME
+git clone git@github.com:Traap/tlc-article.git
+cd tlc-article
+cp -v tlc-article.cls $HOME/mydoc
+cp -v tlc-article.cls $HOME/mydoc/.
```
### Global Installation
```bash
-$ cd $HOME
-$ git clone git@github.com:Traap/tlc-article.git
-$ cd tlc-article
-$ sudo mkdir -p $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article
-$ sudo mv -v tlc-article.cls $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article/.
-$ sudo mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+cd $HOME
+git clone git@github.com:Traap/tlc-article.git
+cd tlc-article
+./bin/distribute tlc-article.cls
```
-# Project Management
-Please refer to my [Lightweight Project Mangement](https://github.com/Traap/lpm)
-for the project management strategy I use.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/bin/deploy new/doc/latex/tlc-article/bin/deploy
--- old/doc/latex/tlc-article/bin/deploy 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/bin/deploy 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,19 @@
+#!/bin/bash
+# Deploy a new LaTeX style or package.
+#
+# Usage:
+# deploy tlc-article.cls
+#
+# Note:
+# I use this script to test my deployment before publishing with CTAN.
+# ------------------------------------------------------------------------------
+main() {
+ mkdir -vp $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/${1%.}
+ cp -v $1 $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/${1%.}/.
+ mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+}
+
+# ------------------------------------------------------------------------------
+# Kick start start this script.
+# ------------------------------------------------------------------------------
+main $@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/additional-layout.tex new/doc/latex/tlc-article/data/additional-layout.tex
--- old/doc/latex/tlc-article/data/additional-layout.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/data/additional-layout.tex 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,65 @@
+% This use case demonstrates tlc-article being extended. All definitions are
+% process during preamble phase. In other words, before your \begin{document}
+% statement.
+
+% ------------------------------------------------------------------------------
+% \makeatletter is used so we can reference commands and definitions defined by
+% tlc-article, which are all prefaced with tlc@.
+\makeatletter
+
+% ------------------------------------------------------------------------------
+% tlc-article.tex (Getting Starting) definitions.
+
+\def\tlcProduct{tlc-article}%
+
+\def\tlcA{\tlcDarkblue{\tlcProduct}}%
+
+\def\tlcAL{\tlcDarkblue{\tlc@additionalLayout}}%
+\def\tlcBL{\tlcDarkblue{tlcBeginLandscape}}%
+\def\tlcDB{\tlcDarkblue{tlcDarkblue}}%
+\def\tlcEL{\tlcDarkblue{tlcEndLandScape}}%
+\def\tlcHF{\tlcDarkblue{\tlc@headerFooter}}%
+\def\tlcLG{\tlcDarkblue{\tlc@logoFile}}%
+\def\tlcNCT{newcolumn type: \tlcDarkblue{L, C} \& \tlcDarkblue{R}}%
+\def\tlcTOC{\tlcDarkblue{tlcTitlePageAndTableOfContents}}%
+\def\tlcVE{\tlcDarkblue{\tlc@versionFile}}%
+
+\def\tlcVC{\tlcDarkblue{tlc@version}}%
+\def\tlcDC{\tlcDarkblue{tlc@date}}%
+\def\tlcSC{\tlcDarkblue{tlc@status}}%
+\def\tlcIC{\tlcDarkblue{tlc@instatution}}%
+\def\tlcPC{\tlcDarkblue{tlc@permission}}%
+
+\def\kpse{\$(kpsewhich -var-value TEXMFLOCAL)}%
+\def\texDist{\kpse}%
+\def\tlcDist{/tex/latex/\tlcProduct}%
+\def\tlcGlobalDist{\texDist\tlcDist}%
+
+\def\tlcHome{\$HOME}%
+\def\tlcMyDoc{\tlcHome/mydoc}%
+
+\def\gitHub{GitHub.com}%
+\def\gitHubUrl{http://\gitHub}%
+
+\def\tlcRepo{git@\gitHub:Traap/\tlcProduct.git}%
+
+\def\tlcPkgFile{data/required-packages.csv}%
+\def\tlcNote{\tlcDarkblue{Note}}%
+
+% ------------------------------------------------------------------------------%
+% Define the column names used by csvreader when reading \packageFile.
+\csvnames{tlcPkgNames}{
+ 1=\name
+ ,2=\description
+}
+
+% Define the table style used to report the required package names and
+% descriptions.
+\csvstyle{tlcPkgStyle}{
+ longtable=|L{3cm}|L{12cm}|
+ ,table head=\hline Name & Description\\\hline\hline\endhead
+ ,late after line=\\\hline
+ ,tlcPkgNames
+}
+
+% ------------------------------------------------------------------------------%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/required-packages.csv new/doc/latex/tlc-article/data/required-packages.csv
--- old/doc/latex/tlc-article/data/required-packages.csv 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/data/required-packages.csv 2019-06-23 22:57:37.000000000 +0200
@@ -4,10 +4,17 @@
csvsimple | The package provides a simple \LaTeX\ interface for the processing of files with comma separated values (CSV); it relies on the key value syntax supported by pgfkeys to simplify usage.
enumitem | This package provides user control over the layout of the three basic list environments: enumerate, itemize and description.
fancyhdr | The package provides extensive facilities, both for constructing headers and footers, and for controlling their use (for example, at times when \LaTeX\ would automatically change the heading style in use).
+fontenc | The package allows the user to select font encodings, and for each encoding provides an interface to `font-encoding specific' commands for each font.
fontenc | The package alows the user to select font encodings, and for each encoding provides an interface to `font-encoding specific' commands for each font.
+geometry | The package provides an easy and flexible user interface to customize page layout, implementing auto-centering and auto-balancing mechanisms so that the users have only to give the least description for the page layout.
geometry | The package provides an easy and flexible user interface to customize page layout, implementing autocentering and auto-balancing mechanisms so that the users have only to give the least description for the page layout.
+glossaries | The glossaries package supports acronyms and multiple glossaries, and has provision for operation in several languages.
graphicx | The package builds upon the graphics package, providing a key-value interface for optional arguments to the `includegraphics' command. This interface provides facilities that go far beyond what the graphics package offers on its own.
hyperref | The hyperref package is used to handle cross-referencing commands in \LaTeX\ to produce hypertext links in the document.
+hyperref | The package is used to handle cross-referencing commands in \LaTeX\ to produce hypertext links in the document.
+inputenc | The package translates various standard and other input encodings into a \LaTeX\ internal language. The internal langage is expressed entierly in \TeX\'s base encoding (standard ASCII printable characters, carriage control tokes and \TeX\ control sequences, the later mostly defined by \LaTeX).
+inputenc | The package translates various standard and other input encodings into a \LaTeX\ internal language. The internal language is expressed entirely in \TeX\'s base encoding (standard ASCII printable characters, carriage control tokens and \TeX\ control sequences, the latter mostly defined by \LaTeX).
+jancyhdr | The package provides extensive facilities, both for constructing headers and footers, and for controlling their use (for example, at times when \LaTeX\ would automatically change the heading style in use).
lastpage | Reference the number of pages in your \LaTeX\ document through the introduction of a new label which can be referenced like `gpageref{LastPage}' to give a reference to the last page of a document.
listings | The package enables the user to typeset programs (programming code) within \LaTeX; the source code is read directly by \TeX\ -- no frontend processor is needed.
lmodern | Latin modern fonts
@@ -17,9 +24,11 @@
parskip | Simply changing `gparskip' and `parindent' leaves a layout that is untidy; this package (though it is no substitute for a properly-designed class) helps alleviate this untidiness.
pdflscape | The package adds PDF support to the landscape environment of package lscape, by setting the PDF /Rotate page attribute.
pdfpages | This package simplifies the inclusion of external multipage PDF documents in \LaTeX\ documents.
+pdf-pie | Ths package provides the means to draw pie (and variant charts) using PGF/TikZ.
spverbatim | The spverbatim package provides an `gspverb' macro that is analogous to 'verb' and an spverbatim environment that is analogous to verbatim with the difference being that `spverb' and spverbatim allow \LaTeX\ to break lines at space characters.
tabularx | The package defines an environment tabularx, an extension of tabular which has an additional column designator, X, which creates a paragraph-like column whose width automatically expands so that the declared width of the environment is filled.
textcomp | The package supports the Text Companion fonts, which provide many text symbols (such as baht, bullet, copyright, musicalnote, onequarter, section, and yen), in the TS1 encoding.
titling | The titling package provides control over the typesetting of the `gmaketitle' command and `thanks' commands, and makes the `title', `author' and `date' information permanently available.
tocloft | Provides control over the typography of the Table of Contents, List of Figures and List of Tables, and the ability to create new `List of ...'. The ToC `gparskip' may be changed.
+todonotes | The package lets the user mark things to do later, in a simple and visually appealing way. The package takes several options to enable customization / fine-tuning of the visual appearance.
xcolor | The package starts from the basic facilities of the color package, and provides easy driver-independent access to several kinds of color tints, shades, tones, and mixes of arbitrary colors.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/data/version.csv new/doc/latex/tlc-article/data/version.csv
--- old/doc/latex/tlc-article/data/version.csv 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/data/version.csv 2019-06-23 22:57:37.000000000 +0200
@@ -1,2 +1,2 @@
-version | date | status | institution | permission
-v1.0.10 | May 30th, 2018 | Released | Traap | BSD-3-Clause
+version | date | status | institution | permission
+v1.0.17 | June 20th, 2019 | Released | Traap | BSD-3-Clause
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/doc/sprint.md new/doc/latex/tlc-article/doc/sprint.md
--- old/doc/latex/tlc-article/doc/sprint.md 2018-05-31 23:51:17.000000000 +0200
+++ new/doc/latex/tlc-article/doc/sprint.md 1970-01-01 01:00:00.000000000 +0100
@@ -1,9 +0,0 @@
-| Fcevag | Fgneg | Raq | Cbvagf | Vffhrf |
-| ------ | ---------- | ---------- | ------: | ------: |
-| i1.0.6 | 2018-01-01 | 2018-03-18 | 1 | 1 |
-| i1.0.5 | 2018-01-01 | 2018-03-17 | 5 | 5 |
-| i1.0.4 | 2017-01-17 | 2017-02-02 | 11 | 6 |
-| i1.0.3 | 2017-01-14 | 2017-01-16 | 9 | 5 |
-| i1.0.2 | 2017-01-11 | 2017-01-13 | 5 | 3 |
-| i1.0.1 | 2017-01-08 | 2017-01-10 | 9 | 8 |
-| i1.0.0 | 2017-01-05 | 2017-01-07 | 10 | 5 |
Binary files old/doc/latex/tlc-article/doc/tlc-article.pdf and new/doc/latex/tlc-article/doc/tlc-article.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/tlc-article.tex new/doc/latex/tlc-article/tlc-article.tex
--- old/doc/latex/tlc-article/tlc-article.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/tlc-article.tex 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1,385 @@
+\documentclass[12pt]{tlc-article}
+
+% ------------------------------------------------------------------------------
+\begin{document}
+
+% ------------------------------------------------------------------------------
+\tlcTitlePageAndTableOfContents
+ {tlc-article}
+ {Gary Allan Howard}
+ {The \tlcA\ `Getting Started Guide' covers how to install \tlcA\ both globally
+ and locally, describes the general use case, how to customize your \tlcA\
+ environment, describes the commands \tlcA\ implements, and reveals the
+ packages \tlcA\ depends upon.}
+
+% ------------------------------------------------------------------------------
+\section{Installation}
+This section describes how to install \tlcA\ either globally to make it
+available to your \LaTeX\ environment or locally to the document you are
+authoring. And, this section identifies the prerequisites you must meet in
+order to clone a repository from GitHub.com and install software on your
+computer.
+
+% ------------------------------------------------------------------------------
+\subsection{Prerequisites}
+The following prerequisites are needed.
+\begin{description}[style=nextline]
+ \item[Administrative privilege] You will need administrative privileges to
+ install \tlcA\ globally because `sudo' is used.
+
+ \item[SSH key] You will need your private key to access \gitHub. Please refer
+ to \url{http://help.github.com/articles/generating-an-ssh-key} for
+ instructions on `Generating an SSH key'.
+
+ \item[Enable your SSH key] The following instructions enable your SSH key so
+ you to not have to enter the passphrase for each git command.
+\end{description}
+
+\begin{lstlisting}[language=bash]
+eval \$(ssh-agent -s)
+ssh-add ~/.ssh/your-private-key
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Local installation}
+A local installation is done by installing \tlcA\ into
+/the/path/to/your/document. Assuming your document is located at \tlcMyDoc\ the
+following shell commands will make \tlcA\ available to your document.
+
+\begin{lstlisting}[language=bash]
+cd $HOME
+git clone git@GitHub.com:Traap/tlc-article.git
+cd tlc-article
+mkdir $HOME/mydoc
+cp -v tlc-article.cls $HOME/mydoc/.
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{Global installation}
+A global installation is done by installing \tlcA\ into your /path/to/your/texmf
+directory. Assuming a TexLive installation exists at \texDist\ the following
+shell commands will make \tlcA\ available to your \LaTeX\ environment.
+
+\begin{lstlisting}[language=bash]
+cd $HOME
+git clone git@GitHub.com:Traap/tlc-article.git
+cd tlc-article
+sudo mkdir -p $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article
+sudo cp -v tlc-article.cls $(kpsewhich -var-value TEXMFLOCAL)/tex/latex/tlc-article/.
+sudo mktexlsr $(kpsewhich -var-value TEXMFLOCAL)
+\end{lstlisting}
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: You may remove your local installation by removing \tlcA.%
+}%
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{General Use Case}
+The goal of \tlcA\ is to simplify document layout. \tlcA\ orchestrates a
+logical arrangement for document header, footer, author, abstract, table of
+contents, and margins. The following sections outline the default
+implementation for each part \tlcA\ organizes.
+
+\tlcNote\ This document was typeset using the instructions provided throughout
+this section.
+
+\subsection{Document Layout}
+\begin{figure}[h]
+ \centering
+ \includegraphics{images/titlepage.png}
+ \caption{Document Layout}
+ \label{fig:layout}
+\end{figure}
+
+% ------------------------------------------------------------------------------
+\subsection{documentclass \tlcA}
+\tlcA\ extends the article document class. \tlcA\ provide options directly to
+the article document class. As an example, the Author can specify the font as
+follows:
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \documentclass[12pt]{tlc-article}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Title, Author \& Abstract} \label{sec:TAA}
+\tlcA\ has a macro \tlcTOC\ that can be used to set the document title, document
+author, document abstract, and establish the Table of Contents. The sample
+below reveals how to use \tlcTOC.
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \tlcTitlePageAndTableOfContents
+ {Document Title}
+ {Document Article}
+ {Document Abstract}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{Table of Contents}
+The Table of Contents immediately follows the document abstract on page 1, uses
+dark blue for content, dots separate table of contents sections and page number,
+and uses roman numerals.
+
+% ------------------------------------------------------------------------------
+\subsection{Header \& Footer}
+fancyhdr is used to render the header and footer. The Author can override the
+\tlcA\ by providing an implementation in \tlcHF\, or augment \tlcA\
+application by providing \tlcVE. The sections below show the placement \tlcA\
+uses when writing objects, and where the objects are defined.
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: \tlcA\ ignores \tlcVE\ when \tlcHF\ is defined.
+}%
+
+
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Header}
+\begin{description}
+ \item[lhead] When \tlcLG\ is found, logo.
+ \item[chead] Document Title
+ \item[rhead] When \tlcVE\ is present, status, date, and version columns.
+\end{description}
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Footer}
+\begin{description}
+ \item[lfoot] When \tlcVE\ is present, institution column.
+ \item[cfoot] When \tlcVE\ is present, permission column.
+ \item[rfoot] Page 1 of N.
+\end{description}
+
+% ------------------------------------------------------------------------------
+\subsubsection*{Rule width}
+A 0.1pt rule width is placed below the document header and above the document
+footer.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Customization}
+This section describes how \tlcA\ can be customized by using the file-hooks
+\tlcA\ check for. \tlcA\ default implementation will be used when the
+file-hooks are not found.
+
+\bigskip
+
+\todo[inline]{%
+ \tlcNote: \tlcA\ consumes \tlcAL\ \& \tlcHF\ during the preamble compilation
+ phase.
+}%
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcAL}
+\tlcA\ will use whatever \LaTeX\ definitions are found in \tlcAL\ when it
+exists. The file-check is shown
+below:
+
+\begin{lstlisting}[basicstyle=\tiny]
+ \IfFileExists{data/additional-layout.tex}
+ {\input{data/additional-layout.tex}}
+ {}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcHF}
+In the absence of \tlcAL\, \tlcA\ has a builtin header and footer strategy that
+is base on \textit{fancyhdr}, \textit{titling}, and \textit{lastpage} \LaTeX\
+packages. The default implementation is show below:
+
+\begin{lstlisting}[basicstyle=\tiny]
+\IfFileExists{\tlc@headerFooter}%
+{ % use the customer header and footer defined by \tlc@headerfooter
+ \input{\tlc@headerFooter}%
+}%
+{ % Else : header and footer applied to all pages.
+ \IfFileExists{\tlc@logoFile}%
+ { % Typeset the logo in the left side of the document header.
+ \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}%
+ }%
+ {% Else: no operation because tlc@logoFile does not exist.
+ }%
+ %
+ % Typeset the title in the center of the document header.
+ %
+ \chead{\large{\thetitle}}%
+ %
+ % Typeset version information in the right side of the document header.
+ %
+ \IfFileExists{\tlc@versionFile}%
+ {%
+ % document status, document date and document version.
+ \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}%
+ % document owner. This maybe a person or company name.
+ \lfoot{\tiny \tlc@institution}%
+ % document license. This maybe a license or word like confidential.
+ \cfoot{\tiny \tlc@permission}%
+ }%
+ {% Else: no operation because tlc@versionFile does not exist.
+ }%
+ \renewcommand{\headrulewidth}{0.1pt}%
+ % Eliminate head height too small warning, which is occurring because
+ % we are using multiple lines in our header.
+ \setlength\headheight{34.0pt}%
+ % footer applied to all pages.
+ \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}%
+ \renewcommand{\footrulewidth}{0.1pt}%
+}%
+\end{lstlisting}
+
+The default implementation can be overridden by defining \tlcHF.
+
+\tlcVspace
+
+\todo[inline]{%
+ \tlcNote: When \tlcHF\ exists and is empty, your document will be typeset with
+ the defaults from document-class \tlcDarkblue{article}.
+}%
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{\tlcVE} \label{sec:version}
+\tlcA\ will populate the builtin header and footer with information extracted
+from \tlcVE\ when it is present. \tlcVE\ is a comma-separated-variable file
+that uses the pipe character as the field delimiter. \tlcVE\ uses the following
+column names:
+
+\begin{description}[style=nextline]
+ \item[version] The version value is typeset in the rhead area. This field is
+ used to convey the version the document was at the date it reached its
+ current state.
+
+ \item[date] The date value is typeset in the rhead area. This field is used
+ to communicate when the document transitioned into its current state.
+
+ \item[status] The status value is typeset in the rhead area. This field is
+ used to convey the document state such as Approved, Draft, Effective, or
+ Obsolete.
+
+ \item[instatution] The institution value is typeset in the lfoot area. This
+ field is used to tell the reader the author name or company name.
+
+ \item[permission] The permission value is typeset in the cfoot area. This
+ field is used to identify confidentiality or a particular license.
+
+\end{description}
+
+The exaction methods are shown below.
+\begin{lstlisting}[basicstyle=\tiny]
+ % Extract document status, document date and document version from
+ % \tlc@versionFile.
+ % Argument:
+ % 1 - the column name to extract from the data file.
+ \newcommand{\tlcVersionPart}[1]{
+ \csvreader[separator=pipe]
+ {\tlc@versionFile}{
+ 1=\version,
+ 2=\date,
+ 3=\status,
+ 4=\instatution,
+ 5=\permission
+ }{#1}
+ }%
+
+ % Define extractions macros when \tlc@versionFile exists.
+ \IfFileExists{\tlc@versionFile}
+ {
+ \def\tlc@version{\tlcVersionPart{\version}}
+ \def\tlc@date{\tlcVersionPart{\date}}
+ \def\tlc@status{\tlcVersionPart{\status}}
+ \def\tlc@instatution{\tlcVersionPart{\version}}
+ \def\tlc@permission{\tlcVersionPart{\version}}
+ }
+ {% Else: no operation because tlc@versionFile does not exist.
+ }
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcLG}
+\tlcA\ will typeset the lhead area with \tlcLG\ when it is present. Make sure
+your logo's height is not larger than 34pt to avoid `Package Fancyhdr Warning:
+\\headheight is to small' warning.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Definitions \& Commands}
+\subsection{\tlcBL}
+Page layout is rotated 90\textdegree\ clockwise resulting in a landscape page
+orientation. Landscape orientation remains active until \tlcEL.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcEL}
+Page layout is returned to portrait orientation when \tlcEL\ is reached.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcDB}
+\tlcDB\ is used throughout this document to render text using rbg\{0,0,0.5\}.
+\tlcDB\ is safe to use within your document.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcTOC}
+\tlcTOC\ creates the document layout shown in Figure \ref{fig:layout}. Section
+\ref{sec:TAA} shows an example implementation.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcNCT}
+New \tlcNCT\ are Left, Center, and Right, respectively are
+designed to use with longtable. Data is wrapped within a table cell. The
+parameter defines the column width. As an example, L{2cm} yields a Left
+aligned, ragged right, wrapped text within a 2cm wide cell.
+
+\begin{lstlisting}[basicstyle=\tiny]
+\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
+\end{lstlisting}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcAL}
+\tlcAL\ is an architectural hook the Author should use when it becomes necessary
+to use packages not provided by \tlcA\, and to design commands that are specific
+to your document.
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcHF}
+\tlcHF\ is an architectural hook the Author should use to completely override
+the document layout \tlcA\ implements.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\subsection{\tlcVE}
+\tlcVE\ is by used \tlcA\ to populate the document header \& footer. Refer to
+section \ref{sec:version} for \tlcVE\ definitions. \tlcVE\ is not
+used by \tlcA\ when \tlcHF\ is define. However, you might want to use the
+version hook by defining \tlcVE\ and using the commands below to extract data
+from \tlcVE\ in your \tlcHF.
+\begin{enumerate}
+ \item \tlcVC\
+ \item \tlcDC\
+ \item \tlcSC\
+ \item \tlcIC\
+ \item \tlcPC\
+\end{enumerate}
+
+% ------------------------------------------------------------------------------
+\subsection{\tlcLG}
+\tlcA\ places \tlcLG\ in your header when defined.
+
+% ------------------------------------------------------------------------------
+\clearpage
+\section{Required Packages}
+This section documents the dependencies of the required package tlc-article has.
+Package names are listed in alphabetical order. A complete description of each
+package is found at \url{http://www.ctan.org/}. At this writing, you can type in
+the package name and press the search button to learn more about each package.
+
+% Render pckFile using pckStyle as a longtable.
+\csvreader[tlcPkgStyle, separator=pipe]{\tlcPkgFile}{}{\name & \description}
+% ------------------------------------------------------------------------------
+
+\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tlc-article/tlc-article.texx new/doc/latex/tlc-article/tlc-article.texx
--- old/doc/latex/tlc-article/tlc-article.texx 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tlc-article/tlc-article.texx 2019-06-23 22:57:37.000000000 +0200
@@ -0,0 +1 @@
+\input{tlc-article.tex}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tlc-article.doc.tlpobj new/tlpkg/tlpobj/tlc-article.doc.tlpobj
--- old/tlpkg/tlpobj/tlc-article.doc.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tlc-article.doc.tlpobj 2019-06-24 01:39:29.000000000 +0200
@@ -1,15 +1,17 @@
name tlc-article.doc
category Package
-revision 47891
+revision 51431
shortdesc doc files of tlc-article
relocated 1
-docfiles size=38
- RELOC/doc/latex/tlc-article/GettingStarted.tex
- RELOC/doc/latex/tlc-article/GettingStarted.texx
+docfiles size=121
RELOC/doc/latex/tlc-article/LICENSE
RELOC/doc/latex/tlc-article/README.md
+ RELOC/doc/latex/tlc-article/bin/deploy
+ RELOC/doc/latex/tlc-article/data/additional-layout.tex
RELOC/doc/latex/tlc-article/data/logo.png
RELOC/doc/latex/tlc-article/data/required-packages.csv
RELOC/doc/latex/tlc-article/data/version.csv
- RELOC/doc/latex/tlc-article/doc/sprint.md
+ RELOC/doc/latex/tlc-article/doc/tlc-article.pdf
RELOC/doc/latex/tlc-article/images/titlepage.png
+ RELOC/doc/latex/tlc-article/tlc-article.tex
+ RELOC/doc/latex/tlc-article/tlc-article.texx
++++++ tlc-article.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tlc-article/tlc-article.cls new/tex/latex/tlc-article/tlc-article.cls
--- old/tex/latex/tlc-article/tlc-article.cls 2018-05-31 23:51:17.000000000 +0200
+++ new/tex/latex/tlc-article/tlc-article.cls 2019-06-23 22:57:37.000000000 +0200
@@ -1,86 +1,100 @@
% ------------------------------------------------------------------------------
-% Class: tlc-article
+% Class:
+% tlc-article
%
-% Purpose: This LaTeX class provides an article implementation that standardizes
-% a document layout intended for formal documents.
+% Purpose:
+% This LaTeX class provides an article implementation that standardizes
+% a document layout intended for formal documents.
% ------------------------------------------------------------------------------
-\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{tlc-article}[2018/05/30 v1.0.10 Traap LaTeX Class Article]
+\NeedsTeXFormat{LaTeX2e}%
+\ProvidesClass{tlc-article}[2019/06/20 v1.0.17 Traap LaTeX Class Article]%
-\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
-\ProcessOptions
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}%
+\ProcessOptions%
-\LoadClass{article}
+\LoadClass{article}%
% ------------------------------------------------------------------------------
% Page layout
-\RequirePackage{parskip} % Blank line after section break.
-\RequirePackage[a4paper,top=1.0in,bottom=1.0in,left=1.0in,right=1.0in]{geometry}
-\RequirePackage{multicol}
-\setlength{\parskip}{0.5em}
-
-% ------------------------------------------------------------------------------
-% Fonts etc.
-\RequirePackage{lmodern}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{textcomp}
+% \RequirePackage{parskip}% Blank line after section break.
+\RequirePackage[a4paper,top=1.0in,bottom=1.0in,left=1.0in,right=1.0in]{geometry}%
+\RequirePackage{multicol}%
+% \setlength{\parskip}{0.5em}%
+
+% ------------------------------------------------------------------------------
+% Required parts to use glossaries must come first.
+\RequirePackage{lmodern}%
+\RequirePackage[T1]{fontenc}%
+\RequirePackage{textcomp}%
+\RequirePackage[utf8]{inputenc}%
+\RequirePackage[colorlinks]{hyperref}%
+\RequirePackage{bookmark}%
+% ------------------------------------------------------------------------------
+% Define glossaries.
+\RequirePackage[acronym, % create 'acronym' glossary type,
+ nopostdot, %
+ nonumberlist, %
+ style=altlist,% use altlist style
+ toc, % add the gloassary to the table of contents.
+ ]{glossaries}%
% ------------------------------------------------------------------------------
% Color, Graphics and links.
-\RequirePackage{graphicx}
-\RequirePackage[table]{xcolor}
-\definecolor{darkblue}{rgb}{0,0,0.5}
+\RequirePackage{graphicx}%
+\RequirePackage[table]{xcolor}%
+\definecolor{darkblue}{rgb}{0,0,0.5}%
% ------------------------------------------------------------------------------
% Listings and verbatim
-\RequirePackage{listings}
-\RequirePackage{spverbatim}
+\RequirePackage{listings}%
+\RequirePackage{spverbatim}%
% ------------------------------------------------------------------------------
% Arrays, list and tables
-\RequirePackage{array}
-\RequirePackage{csvsimple}
-\RequirePackage{enumitem}
-\RequirePackage{longtable}
-\RequirePackage{makecell}
-\RequirePackage{tabularx}
-\setlength{\parindent}{0pt}
+\RequirePackage{array}%
+\RequirePackage{csvsimple}%
+\RequirePackage{enumitem}%
+\RequirePackage{longtable}%
+\RequirePackage{makecell}%
+\RequirePackage{tabularx}%
+\setlength{\parindent}{0pt}%
% ------------------------------------------------------------------------------
% pdf
-\RequirePackage{pdflscape}
-\RequirePackage{pdfpages}
+\RequirePackage{pdflscape}%
+\RequirePackage{pdfpages}%
% ------------------------------------------------------------------------------
% Misc
-\RequirePackage[toc,page]{appendix}
+\RequirePackage[toc,page]{appendix}%
+\RequirePackage{todonotes}%
% ------------------------------------------------------------------------------
% This function is used to simplify making textcolor darkblue.
-\newcommand{\tlcDarkblue}[1]{\textcolor{darkblue}{#1}}
+\newcommand{\tlcDarkblue}[1]{\textcolor{darkblue}{#1}}%
% ------------------------------------------------------------------------------
% Define the optional input files.
-\def\tlc@location{data}
-\def\tlc@logoFile{\tlc@location/logo.png}
-\def\tlc@versionFile{\tlc@location/version.csv}
-\def\tlc@additionalLayout{\tlc@location/additional-layout.tex}
-\def\tlc@headerFooter{\tlc@location/header-footer.tex}
+\def\tlc@location{data}%
+\def\tlc@logoFile{\tlc@location/logo.png}%
+\def\tlc@versionFile{\tlc@location/version.csv}%
+\def\tlc@additionalLayout{\tlc@location/additional-layout.tex}%
+\def\tlc@headerFooter{\tlc@location/header-footer.tex}%
% New column types: L, C, and R are Left, Center, and Right, respectively are
% designed to use with longtable. Data is wrapped within a table cell. The
% parameter defines the column width. As an example, L{2cm} yields a Left
% aligned, ragged right, wrapped text within a 2cm wide cell.
-\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}
-\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}
+\newcolumntype{L}[1]{>{\raggedright\let\newline\\\arraybackslash}p{#1}}%
+\newcolumntype{C}[1]{>{\centering\let\newline\\\arraybackslash}p{#1}}%
+\newcolumntype{R}[1]{>{\raggedleft\let\newline\\\arraybackslash}p{#1}}%
% ------------------------------------------------------------------------------
% We define colors that we would like to use throughout our documents.
-\definecolor{codegreen}{rgb}{0,0.6,0}
-\definecolor{codegray}{rgb}{0.5,0.5,0.5}
-\definecolor{codepurple}{rgb}{0.58,0,0.82}
-\definecolor{backcolour}{rgb}{0.95,0.95,0.92}
+\definecolor{codegreen}{rgb}{0,0.6,0}%
+\definecolor{codegray}{rgb}{0.5,0.5,0.5}%
+\definecolor{codepurple}{rgb}{0.58,0,0.82}%
+\definecolor{backcolour}{rgb}{0.95,0.95,0.92}%
% ------------------------------------------------------------------------------
% tlcBeginLandscape and tlcEndLandscape are two new commands used to simplify
@@ -92,21 +106,21 @@
\newcommand{\tlcEndLandscape}{%
\restoregeometry%
\end{landscape}%
-}
+}%
% ------------------------------------------------------------------------------
% We want our table of contents to use dots as a leader.
-\RequirePackage{tocloft}
-\renewcommand\cftsecleader{\cftdotfill{\cftdotsep}}
+\RequirePackage{tocloft}%
+\renewcommand\cftsecleader{\cftdotfill{\cftdotsep}}%
% ------------------------------------------------------------------------------
% We want to allow the calling document to setup additional layout.
-\IfFileExists{\tlc@additionalLayout}
- {\input{\tlc@additionalLayout}}
- {}
+\IfFileExists{\tlc@additionalLayout}%
+ {\input{\tlc@additionalLayout}}%
+ {}%
% ------------------------------------------------------------------------------
-% Create a beautiful document header and document footer using the packages
+% Create a beautiful document header and document footer using the packages
% listed below.
\RequirePackage{fancyhdr} % Page layout in \LaTeX
\RequirePackage{titling} % Control over \maketitle & \thanks
@@ -118,122 +132,132 @@
% \tlc@versionFile.
% Argument:
% 1 - the column name to extract from the data file.
-\newcommand{\tlcVersionPart}[1]{
- \csvreader[separator=pipe]
- {\tlc@versionFile}{
- 1=\version,
- 2=\date,
- 3=\status,
- 4=\institution,
- 5=\permission
- }{#1}
+\newcommand{\tlcVersionPart}[1]{%
+ \csvreader[separator=pipe]%
+ {\tlc@versionFile}{%
+ 1=\version,%
+ 2=\date,%
+ 3=\status,%
+ 4=\institution,%
+ 5=\permission%
+ }{#1}%
}%
% ------------------------------------------------------------------------------
% Define extractions macros when \tlc@versionFile exists.
-\IfFileExists{\tlc@versionFile}
-{
- \def\tlc@version{\tlcVersionPart{\version}}
- \def\tlc@date{\tlcVersionPart{\date}}
- \def\tlc@status{\tlcVersionPart{\status}}
- \def\tlc@institution{\tlcVersionPart{\institution}}
- \def\tlc@permission{\tlcVersionPart{\permission}}
-}
-{% Else: no operation because tlc@versionFile does not exist.
-}
+\IfFileExists{\tlc@versionFile}%
+{%
+ \def\tlc@version{\tlcVersionPart{\version}}%
+ \def\tlc@date{\tlcVersionPart{\date}}%
+ \def\tlc@status{\tlcVersionPart{\status}}%
+ \def\tlc@institution{\tlcVersionPart{\institution}}%
+ \def\tlc@permission{\tlcVersionPart{\permission}}%
+}%
+{% Else: no operation because tlc@versionFile does not exist.
+}%
% ------------------------------------------------------------------------------
% We want to allow the calling document to override the headers and footers that
% we are defining.
-\IfFileExists{\tlc@headerFooter}
+\IfFileExists{\tlc@headerFooter}%
{ % use the customer header and footer defined by \tlc@headerfooter
- \input{\tlc@headerFooter}
-}
+ \input{\tlc@headerFooter}%
+}%
{ % Else : header and footer applied to all pages.
- \IfFileExists{\tlc@logoFile}
- { % Typeset the logo in the left side of the document header.
- \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}
- }
+ \IfFileExists{\tlc@logoFile}%
+ { % Typeset the logo in the left side of the document header.
+ \lhead{\includegraphics[width=3cm,height=1cm]{\tlc@logoFile}}%
+ }%
{% Else: no operation because tlc@logoFile does not exist.
- }
+ }%
+ %
% Typeset the title in the center of the document header.
- \chead{\large{\thetitle}}
- % Typeset version information in the right side of the document header.
- \IfFileExists{\tlc@versionFile}
- {
+ %
+ \chead{\large{\thetitle}}%
+ %
+ % Typeset version information in the right side of the document header.
+ %
+ \IfFileExists{\tlc@versionFile}%
+ {%
% document status, document date and document version.
- \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}
+ \rhead{\tiny \tlc@status \\ \tlc@date \\ \tlc@version}%
% document owner. This maybe a person or company name.
- \lfoot{\tiny \tlc@institution}
+ \lfoot{\tiny \tlc@institution}%
% document license. This maybe a license or word like confidential.
- \cfoot{\tiny \tlc@permission}
- }
- {% Else: no operation because tlc@versionFile does not exist.
- }
- \renewcommand{\headrulewidth}{0.1pt}
- % eliminate head height too small warning, which is occurring because
+ \cfoot{\tiny \tlc@permission}%
+ }%
+ {% Else: no operation because tlc@versionFile does not exist.
+ }%
+ \renewcommand{\headrulewidth}{0.1pt}%
+ %
+ % Eliminate head height too small warning, which is occurring because
% we are using multiple lines in our header.
- \setlength\headheight{34.0pt}
+ \setlength\headheight{34.0pt}%
% footer applied to all pages.
- \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}
- \renewcommand{\footrulewidth}{0.1pt}
- % we want our header and footer to remain consistent with a table of
- % contents that span multiple pages.
- \AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}
-}
+ \rfoot{\tiny{Page \thepage~of~\pageref{LastPage}}}%
+ \renewcommand{\footrulewidth}{0.1pt}%
+}%
+
+% ------------------------------------------------------------------------------
+% We want our header and footer to remain consistent with a table of
+% contents that span multiple pages.
+\AtBeginDocument{\addtocontents{toc}{\protect\thispagestyle{fancy}}}%
% ------------------------------------------------------------------------------
% We define colors that are used throughout the document.
-\RequirePackage[colorlinks]{hyperref}
-\definecolor{darkblue}{rgb}{0,0,0.5}
-\hypersetup{
- bookmarksopen = true,
- citebordercolor = white!100,
- citecolor = darkblue,
- filebordercolor = white!100,
- filecolor = darkblue ,
- linkbordercolor = white!100,
- linkcolor = darkblue,
- linktoc = all,
- menubordercolor = white!100,
- pdfauthor = {},
- pdfborder = {0 0 0 [0 0]},
- pdfkeywords = {},
- pdfstartview = FitH,
- pdfsubject = {},
- pdftitle = {},
- runbordercolor = white!100,
- urlbordercolor = white!100,
- urlcolor = darkblue
-}
-
-% ------------------------------------------------------------------------------
-% We define colors that are used when includeing code files (software).
-\lstdefinestyle{tlcStyle}{
- backgroundcolor=\color{backcolour},
- commentstyle=\color{codegreen},
- keywordstyle=\color{magenta},
- numberstyle=\tiny\color{codegray},
- stringstyle=\color{codepurple},
- basicstyle=\footnotesize,
- breakatwhitespace=false,
- breaklines=true,
- captionpos=b,
- keepspaces=true,
- numbers=left,
- numbersep=4pt,
- showspaces=false,
- showstringspaces=false,
- showtabs=false,
- tabsize=2
-}
-\lstset{style=tlcStyle}
+\definecolor{darkblue}{rgb}{0,0,0.5}%
+\hypersetup{%
+ bookmarksopen = true,%
+ citebordercolor = white!100,%
+ citecolor = darkblue,%
+ filebordercolor = white!100,%
+ filecolor = darkblue ,%
+ linkbordercolor = white!100,%
+ linkcolor = darkblue,%
+ linktoc = all,%
+ menubordercolor = white!100,%
+ pdfauthor = {},%
+ pdfborder = {0 0 0 [0 0]},%
+ pdfkeywords = {},%
+ pdfstartview = FitH,%
+ pdfsubject = {},%
+ pdftitle = {},%
+ runbordercolor = white!100,%
+ urlbordercolor = white!100,%
+ urlcolor = darkblue%
+}%
+
+% ------------------------------------------------------------------------------
+% We define colors that are used when includeing code files (software).
+\lstdefinestyle{tlcStyle}{%
+ backgroundcolor=\color{backcolour},%
+ commentstyle=\color{codegreen},%
+ keywordstyle=\color{magenta},%
+ numberstyle=\tiny\color{codegray},%
+ stringstyle=\color{codepurple},%
+ basicstyle=\footnotesize,%
+ breakatwhitespace=false,%
+ breaklines=true,%
+ captionpos=b,%
+ keepspaces=true,%
+ numbers=left,%
+ numbersep=4pt,%
+ showspaces=false,%
+ showstringspaces=false,%
+ showtabs=false,%
+ tabsize=2%
+}%
+\lstset{style=tlcStyle}%
% ------------------------------------------------------------------------------
% End Row : Generally applied to the end of a table row.
\newcommand{\ER}{\\ \hline}%
% ------------------------------------------------------------------------------
+% Default vertical space
+\newcommand{\tlcVspace}{\vspace{3mm}}%
+
+% ------------------------------------------------------------------------------
% Macro to include a file if it exists.
% 1 = the file path to input
\newcommand{\inputIfExists}[1]{\IfFileExists{#1}{\input{#1}}{}}%
@@ -256,7 +280,7 @@
% ------------------------------------------------------------------------------
% We define tlcDebug to aid our users when they are debugging their document.
-% tlcDebug should be placed at the end of your document to allow LaTeX to
+% tlcDebug should be placed at the end of your document to allow LaTeX to
% fully expand all macros and definitions.
\newcommand{\tlcIsDefined}[1]%
{\IfFileExists{#1}%
@@ -264,34 +288,34 @@
{\textcolor{red}{NOT DEFINED}}%
}%
\newcommand{\tlcDebug}{%
- \clearpage
- \section{tlc-article Debug}
- \subsection{tlc-article default files}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item[tlc@location:]\tlc@location
- \item[tlc@additionalLayout:]\tlc@additionalLayout
- \item[tlc@headerFooter:]\tlc@headerFooter
- \item[tlc@versionFile:]\tlc@versionFile
- \item[tlc@logoFile:]\tlc@logoFile
- \item[tlc@versionFile:]\tlc@versionFile
- \end{description}
+ \clearpage%
+ \section{tlc-article Debug}%
+ \subsection{tlc-article default files}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item[tlc@location:]\tlc@location%
+ \item[tlc@additionalLayout:]\tlc@additionalLayout%
+ \item[tlc@headerFooter:]\tlc@headerFooter%
+ \item[tlc@versionFile:]\tlc@versionFile%
+ \item[tlc@logoFile:]\tlc@logoFile%
+ \item[tlc@versionFile:]\tlc@versionFile%
+ \end{description}%
%
- \subsection{tlc-article file hooks}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item [tlc@additionalLayout:]\tlcIsDefined{\tlc@additionalLayout}
- \item [tlc@headerFooter:]\tlcIsDefined{\tlc@headerFooter}
- \item [tlc@logoFile:]\tlcIsDefined{\tlc@logoFile}
- \item [tlc@versionFile:]\tlcIsDefined{\tlc@versionFile}
- \end{description}
+ \subsection{tlc-article file hooks}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item [tlc@additionalLayout:]\tlcIsDefined{\tlc@additionalLayout}%
+ \item [tlc@headerFooter:]\tlcIsDefined{\tlc@headerFooter}%
+ \item [tlc@logoFile:]\tlcIsDefined{\tlc@logoFile}%
+ \item [tlc@versionFile:]\tlcIsDefined{\tlc@versionFile}%
+ \end{description}%
%
- \subsection{tlc-article header and footer hooks}
- \begin{description}[align=right,leftmargin=*,labelindent=5cm]
- \item[tlc@version:] \tlc@version
- \item[tlc@date:] \tlc@date
- \item[tlc@status:] \tlc@status
- \item[tlc@institution:] \tlc@institution
- \item[tlc@permission:] \tlc@permission
- \end{description}
+ \subsection{tlc-article header and footer hooks}%
+ \begin{description}[align=right,leftmargin=*,labelindent=5cm]%
+ \item[tlc@version:] \tlc@version%
+ \item[tlc@date:] \tlc@date%
+ \item[tlc@status:] \tlc@status%
+ \item[tlc@institution:] \tlc@institution%
+ \item[tlc@permission:] \tlc@permission%
+ \end{description}%
}%
% ------------------------------------------------------------------------------
-\endinput
+\endinput%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tlc-article.tlpobj new/tlpkg/tlpobj/tlc-article.tlpobj
--- old/tlpkg/tlpobj/tlc-article.tlpobj 2019-02-28 04:09:00.000000000 +0100
+++ new/tlpkg/tlpobj/tlc-article.tlpobj 2019-06-24 01:39:29.000000000 +0200
@@ -1,6 +1,6 @@
name tlc-article
category Package
-revision 47891
+revision 51431
shortdesc A LaTeX document class for formal documents
relocated 1
longdesc The package provides a LaTeX document class that orchestrates a
@@ -16,7 +16,7 @@
catalogue-contact-bugs https://github.com/Traap/tlc-article/issues
catalogue-contact-home https://github.com/Traap/tlc-article
catalogue-ctan /macros/latex/contrib/tlc-article
-catalogue-date 2018-06-05 05:23:42 +0200
+catalogue-date 2019-06-23 09:56:44 +0200
catalogue-license bsd3
catalogue-topics class article-like
-catalogue-version 1.0.10
+catalogue-version 1.0.17
++++++ tocdata.doc.tar.xz ++++++
Binary files old/doc/latex/tocdata/tocdata.pdf and new/doc/latex/tocdata/tocdata.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocdata.doc.tlpobj new/tlpkg/tlpobj/tocdata.doc.tlpobj
--- old/tlpkg/tlpobj/tocdata.doc.tlpobj 2019-03-24 02:24:34.000000000 +0100
+++ new/tlpkg/tlpobj/tocdata.doc.tlpobj 2019-07-17 01:53:11.000000000 +0200
@@ -1,6 +1,6 @@
name tocdata.doc
category Package
-revision 50536
+revision 51654
shortdesc doc files of tocdata
relocated 1
docfiles size=226
++++++ tocdata.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tocdata/tocdata.sty new/tex/latex/tocdata/tocdata.sty
--- old/tex/latex/tocdata/tocdata.sty 2019-03-22 21:50:30.000000000 +0100
+++ new/tex/latex/tocdata/tocdata.sty 2019-07-16 23:14:47.000000000 +0200
@@ -17,7 +17,7 @@
%% version 2005/12/01 or later.
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesPackage{tocdata}
- [2019/03/21 v2.02 Adds author/artist to TOC entries.]
+ [2019/07/06 v2.03 Adds author/artist to TOC entries.]
\RequirePackage{xparse}
@@ -33,6 +33,11 @@
Move \protect\usepackage{titletoc} after \protect\usepackage{tocdata}.%
}
}{}
+
+\@ifclassloaded{memoir}
+{}% memoir
+{% not memoir
+
\@ifpackageloaded{tocloft}{
\PackageError{tocdata}
{%
@@ -43,6 +48,8 @@
}
}{}
+}% not memoir
+
\AtBeginDocument{
\@ifpackageloaded{titletoc}{
\@ifpackageloaded{tocloft}{
@@ -67,11 +74,26 @@
\@bsphack\addtocontents{#1}{\protect\settocdata{#2}}\@esphack%
}
\newcommand{\tocdatafont}[1]{{\normalfont\textit{\small#1}}}
+\def\tocdataformat{\tocdatafont}
\newcommand{\TD@usetocdata}{%
- \tocdatafont{\TD@thistocdata}%
- \global\def\TD@thistocdata{}%
+ \ifdefvoid{\TD@thistocdata}{}{%
+ \tocdataformat{\TD@thistocdata}%
+ \global\def\TD@thistocdata{}%
+ }%
+}
+
+\let\TD@checktocdatafont\tocdatafont
+
+\AtBeginDocument{
+\ifdefequal\TD@checktocdatafont\tocdatafont{}{
+ \PackageWarningNoLine{tocdata}{%
+ You have redefined \protect\tocdatafont,\MessageBreak
+ which has been deprecated. Please redefine\MessageBreak
+ \protect\tocdataformat\space instead}
+}
}
+\newcommand*{\TD@patchstandardlatex}{
\xpatchcmd{\@dottedtocline}
{\hfill\nobreak}
{\hfill\TD@usetocdata\nobreak}
@@ -82,6 +104,8 @@
Authors may not appear in TOC, LOF}
}%
+\@ifclassloaded{memoir}{}{%
+\@ifpackageloaded{tocbasic}{}{%
\xpatchcmd{\l@part}
{\hfil}
{\hfil\TD@usetocdata}
@@ -91,10 +115,11 @@
Could not patch LaTeX core \protect\l(a)part.\MessageBreak
Authors may not appear in TOC parts}
}%
+}}
-\@ifundefined{chapter}
-{}
-{
+\@ifclassloaded{memoir}{}{%
+\@ifpackageloaded{tocbasic}{}{%
+\@ifundefined{chapter}{}{%
\xpatchcmd{\l@chapter}
{\hfil\nobreak}
{\hfil\TD@usetocdata\nobreak}
@@ -104,8 +129,9 @@
Could not patch LaTeX core \protect\l(a)chapter.\MessageBreak
Authors may not appear in TOC chapters}
}%
-}
+}}}
+\@ifclassloaded{article}{
\xpatchcmd{\l@section}
{\hfil\nobreak}
{\hfil\TD@usetocdata\nobreak}
@@ -115,6 +141,13 @@
Could not patch LaTeX core \protect\l(a)section.\MessageBreak
Authors may not appear in TOC sections}
}%
+}{}
+}% TD@patchstandardlatex
+\@ifpackageloaded{lwarp}{%
+ \ifbool{warpingprint}{\TD@patchstandardlatex}{}%
+}{%
+ \TD@patchstandardlatex%
+}
\AtBeginDocument{
\@ifpackageloaded{titletoc}{
@@ -147,6 +180,21 @@
}% end of \AtBeginDocument
\AtBeginDocument{
+\@ifclassloaded{memoir}
+{
+\appto{\cftpartleader}{\TD@usetocdata}
+\appto{\cftchapterleader}{\TD@usetocdata}
+\appto{\cftsectionleader}{\TD@usetocdata}
+\appto{\cftsubsectionleader}{\TD@usetocdata}
+\appto{\cftsubsubsectionleader}{\TD@usetocdata}
+\appto{\cftparagraphleader}{\TD@usetocdata}
+\appto{\cftsubparagraphleader}{\TD@usetocdata}
+\appto{\cftfigureleader}{\TD@usetocdata}
+\appto{\cfttableleader}{\TD@usetocdata}
+\appto{\cftsubfigureleader}{\TD@usetocdata}
+\appto{\cftsubtableleader}{\TD@usetocdata}
+}% memoir
+{% not memoir
\@ifpackageloaded{tocloft}
{
\appto{\cftpartleader}{\TD@usetocdata}
@@ -165,21 +213,150 @@
}% end of tocloft patches
{}% tocloft not loaded
+}% not memoir
}% \AtBeginDocument
-\newcommand{\TD@optionalname}[1]
+\AtBeginDocument{
+
+\@ifpackageloaded{tocbasic}{
+\renewcommand*{\scr@dte@tocline}[3]{%
+ \ifnum \@nameuse{#1tocdepth}>\c@tocdepth
+ \else
+ \tocbasic@DependOnPenaltyAndTOCLevel{#1}%
+ \addvspace{\@nameuse{scr@tso@#1@beforeskip}}\relax
+ {%
+ \leftskip \@nameuse{scr@tso@#1@indent}\relax
+ \rightskip \@tocrmarg
+ \parfillskip -\rightskip
+ \@nameuse{Ifscr@tso@#1@raggedpage}{%
+ \addtolength{\parfillskip}{\z@ \@plus 1fil}%
+ }{}%
+ \parindent \@nameuse{scr@tso@#1@indent}\relax
+ \@afterindenttrue
+ \interlinepenalty\@M
+ \expandafter\ifx\csname ragged#1entry\endcsname\raggedright
+ \addtolength\rightskip\@flushglue
+ \else
+ \def\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \else
+ \renewcommand\reserved@a{\raggedright}%
+ \expandafter\ifx\csname ragged#1entry\endcsname\reserved@a
+ \addtolength\rightskip\@flushglue
+ \fi
+ \fi
+ \fi
+ \leavevmode
+ \@tempdima \@nameuse{scr@tso@#1@numwidth}\relax
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{%
+ \scr@ifundefinedorrelax{scr@dte@#1@lastmaxnumwidth}{}{%
+ \ifdim \@nameuse{scr@dte@#1@lastmaxnumwidth}>\@tempdima
+ \@tempdima\@nameuse{scr@dte@#1@lastmaxnumwidth}\relax
+ \fi
+ }%
+ }{}%
+ \advance\leftskip \@tempdima
+ \null\nobreak\hskip -\leftskip
+ {%
+ \usetocbasicnumberline
+ \let\scr@dte@numberline@box\numberline@box
+ \def\numberline@box##1{%
+ \sbox\scr@dte@tocline@numbox{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \global\scr@dte@tocline@numberwidth
+ \dimexpr\wd\scr@dte@tocline@numbox+\@nameuse{scr@tso@#1@numsep}\relax
+ \relax
+ \ifdim \scr@dte@tocline@numberwidth
+ >\@nameuse{scr@dte@#1@maxnumwidth}\relax
+ \global\@nameuse{scr@dte@#1@maxnumwidth}\scr@dte@tocline@numberwidth
+ \fi
+ \@nameuse{Ifscr@tso@#1@dynnumwidth}{}{%
+ \ifdim \scr@dte@tocline@numberwidth
+ >\dimexpr \@nameuse{scr@tso@#1@numwidth}%
+ +\@nameuse{scr@tso@#1@numsep}\relax\relax
+ \PackageWarning{tocbasic%
+ }{%
+ number width of #1 toc entries should be
+ increased!\MessageBreak
+ Currently used number width =
+ \the\wd\scr@dte@tocline@numbox,\MessageBreak
+ Wanted number separation
+ \space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numsep}\relax,\MessageBreak
+ Reserved number width \space\space\space\space\space\space =
+ \the\dimexpr\@nameuse{scr@tso@#1@numwidth}\relax%
+ }%
+ \fi
+ }%
+ \scr@dte@numberline@box{\@nameuse{scr@tso@#1@numberformat}{##1}}%
+ \@nameuse{Ifscr@tso@#1@breakafternumber}{%
+ {\parfillskip\@flushglue\par}\nobreak\hskip-\leftskip
+ }{}%
+ }%
+ \@nameuse{scr@tso@#1@entryformat}{%
+ #2%
+ \nobreak
+ {%
+ \normalfont\normalsize\@nameuse{scr@tso@#1@linefill}%
+ \TD@usetocdata% lwarp
+ \nobreak
+ \@nameuse{scr@tso@#1@pagenumberbox}{%
+ \@nameuse{scr@tso@#1@pagenumberformat}{#3}%
+ }%
+ }%
+ \@par
+ }%
+ }%
+ }%
+ \tocbasic@SetPenaltyByTOCLevel{#1}%
+ \fi
+}
+
+}{}
+}
+\AtBeginDocument{
+\@ifpackageloaded{tocstyle}{
+\xpatchcmd\tocstyle@dottedtocline
+ {%
+ \ifx\tocstyle@feature@leaders\relax
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}%
+ \mkern \@dotsep mu$}\hfill
+ \else
+ \tocstyle@feature@leaders
+ \fi%
+ }
+ {%
+ \ifx\tocstyle@feature@leaders\relax
+ \leaders\hbox{$\m@th
+ \mkern \@dotsep mu\hbox{\tocstyle@feature@dothook .}%
+ \mkern \@dotsep mu$}\hfill
+ \else
+ \tocstyle@feature@leaders
+ \fi%
+ \TD@usetocdata%
+ }
+ {}%
+ {%
+ \PackageWarningNoLine{tocdata}{%
+ Could not patch tocstyle \protect\tocstyle(a)dottedtocline.\MessageBreak
+ Authors may not appear in TOC, LOF}
+ }%
+}{}
+}
+\newcommand{\TDoptionalnameprint}[1]
{%
\ifblank{#1}%
{}%
{#1~}%
}
-\newrobustcmd{\tocdatapartprint}[4]
+\newcommand{\tocdatapartprint}[4]
{%
- \par\unskip\noindent%
+ \par\noindent%
{%
\normalfont\normalsize%
\textit{%
\hspace*{4em}--- %
- \TD@optionalname{#1}\TD@optionalname{#2}#3#4%
+ \TDoptionalnameprint{#1}\TDoptionalnameprint{#2}#3#4%
}%
}%
}
@@ -190,24 +367,24 @@
}% end of chapters-only
\let\tocdatasectionprint\tocdatapartprint
\let\tocdatasubsectionprint\tocdatapartprint
-\newcommand{\TD@artistauthorprint}[5]{%
+\newcommand{\TDartistauthorprint}[5]{%
\begin{minipage}{\linewidth}%
\csuse{TD@#1align}%
\footnotesize\normalfont%
- \textsc{{\TD@optionalname{#2}\TD@optionalname{#3}#4#5}}%
+ \textsc{{\TDoptionalnameprint{#2}\TDoptionalnameprint{#3}#4#5}}%
\end{minipage}%
\par%
\addvspace{2ex}%
}
\newcommand{\tocdataartistprint}{%
\par\smallskip%
- \TD@artistauthorprint{artist}%
+ \TDartistauthorprint{artist}%
}
\newcommand{\tocdataauthorprint}{%
\par\smallskip%
- \TD@artistauthorprint{author}%
+ \TDartistauthorprint{author}%
}
-\newcommand{\TD@artistauthortextprint}[2]{%
+\newcommand{\TDartistauthortextprint}[2]{%
\addvspace{2ex}%
\begin{minipage}{\linewidth}%
\csuse{TD@#1textalign}%
@@ -219,12 +396,35 @@
\par%
\addvspace{2ex}%
}
-\newcommand{\tocdataartisttextprint}{\TD@artistauthortextprint{artist}}
-\newcommand{\tocdataauthortextprint}{\TD@artistauthortextprint{author}}
+\newcommand{\tocdataartisttextprint}{\TDartistauthortextprint{artist}}
+\newcommand{\tocdataauthortextprint}{\TDartistauthortextprint{author}}
+\@ifclassloaded{article}
+{
+ \newcommand*{\TD@starredsectionauthorprint}[5]{%
+ \unskip\medskip\csuse{tocdata#1print}{#2}{#3}{#4}{#5}\par%
+ \bigskip%
+ }
+}
+{
+ \newcommand*{\TD@starredsectionauthorprint}[5]{%
+ \ifstrequal{#1}{part}%
+ {%
+ \PackageWarning{tocdata}{%
+ The author's name will not be printed for\MessageBreak
+ the starred \protect\part%
+ }
+ }%
+ {%
+ \unskip\medskip\csuse{tocdata#1print}{#2}{#3}{#4}{#5}\par%
+ \bigskip%
+ }%
+ }
+}
\NewDocumentCommand{\TD@sectionauthor}{m s o m O{} m m O{}}{%
\IfBooleanTF{#2}%
{% star:
- \csuse{#1}*{#4\nopagebreak\csuse{tocdata#1print}{#5}{#6}{#7}{#8}}%
+ \csuse{#1}*{#4}%
+ \TD@starredsectionauthorprint{#1}{#5}{#6}{#7}{#8}%
}%
{% no star:
\tocdata{toc}{#6 #7}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocdata.tlpobj new/tlpkg/tlpobj/tocdata.tlpobj
--- old/tlpkg/tlpobj/tocdata.tlpobj 2019-03-24 02:24:35.000000000 +0100
+++ new/tlpkg/tlpobj/tocdata.tlpobj 2019-07-17 01:53:12.000000000 +0200
@@ -1,23 +1,26 @@
name tocdata
category Package
-revision 50536
+revision 51654
shortdesc Adds names to chapters, sections, figures in the TOC and LOF
relocated 1
-longdesc This package may be used to add a small amount of data to an
-longdesc entry in the table of contents or list of figures, between the
-longdesc section or caption name and the page number. The typical use
-longdesc would be to add the name of an author or artist of a chapter or
-longdesc section, such as in an anthology or a collection of papers.
-longdesc Additionally, user-level macros are provided which add the
-longdesc author's name to a chapter or section, along with an optional
-longdesc prefix and/or suffix, and add to a figure the artist's name,
-longdesc prefix, and suffix, plus optional additional text. Author and
-longdesc artist names are also added to the index. Additional user-level
-longdesc macros control formatting.
-runfiles size=3
+longdesc The tocdata package may be used to add a small amount of data
+longdesc to an entry in the table of contents or list of figures,
+longdesc between the section or caption name and the page number. The
+longdesc typical use would be to add the name of an author or artist of
+longdesc a chapter or section, such as in an anthology or a collection
+longdesc of papers. Additionally, user-level macros are provided which
+longdesc add the author's name to a chapter or section, along with an
+longdesc optional prefix and/or suffix, and add to a figure the artist's
+longdesc name, prefix, and suffix, plus optional additional text. Author
+longdesc and artist names are also added to the index. Additional
+longdesc user-level macros control formatting. tocdata works with the
+longdesc TOC/LOF formatting of the default LaTeX classes, memoir,
+longdesc koma-script, and with titletoc, tocloft, tocbasic, and
+longdesc tocstyle.
+runfiles size=4
RELOC/tex/latex/tocdata/tocdata.sty
catalogue-ctan /macros/latex/contrib/tocdata
-catalogue-date 2019-03-21 21:40:32 +0100
+catalogue-date 2019-07-16 13:23:38 +0200
catalogue-license lppl1.3
catalogue-topics toc-etc
-catalogue-version 2.02
+catalogue-version 2.03
++++++ tocloft.doc.tar.xz ++++++
Binary files old/doc/latex/tocloft/tocloft.pdf and new/doc/latex/tocloft/tocloft.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocloft.doc.tlpobj new/tlpkg/tlpobj/tocloft.doc.tlpobj
--- old/tlpkg/tlpobj/tocloft.doc.tlpobj 2019-02-28 04:09:42.000000000 +0100
+++ new/tlpkg/tlpobj/tocloft.doc.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,8 +1,8 @@
name tocloft.doc
category Package
-revision 45188
+revision 53364
shortdesc doc files of tocloft
relocated 1
-docfiles size=125
+docfiles size=126
RELOC/doc/latex/tocloft/README
RELOC/doc/latex/tocloft/tocloft.pdf
++++++ tocloft.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tocloft/tocloft.sty new/tex/latex/tocloft/tocloft.sty
--- old/tex/latex/tocloft/tocloft.sty 2017-09-01 03:34:10.000000000 +0200
+++ new/tex/latex/tocloft/tocloft.sty 2020-01-10 22:41:35.000000000 +0100
@@ -117,7 +117,16 @@
\setlength{\cftparskip}{0pt}
\AtBeginDocument{%
-\if@cftnctoc\else
+\if@cftnctoc
+ % ensure \cftparskip is still set properly
+ \let\OLD@starttoc\@starttoc
+ \renewcommand{\@starttoc}[1]{%
+ \begingroup
+ \parskip=\cftparskip
+ \OLD@starttoc{#1}%
+ \endgroup
+ }
+\else
\renewcommand{\tableofcontents}{%
\@cfttocstart
\par
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tocloft.tlpobj new/tlpkg/tlpobj/tocloft.tlpobj
--- old/tlpkg/tlpobj/tocloft.tlpobj 2019-02-28 04:09:42.000000000 +0100
+++ new/tlpkg/tlpobj/tocloft.tlpobj 2020-01-11 01:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name tocloft
category Package
-revision 45188
+revision 53364
shortdesc Control table of contents, figures, etc
relocated 1
longdesc Provides control over the typography of the Table of Contents,
@@ -10,9 +10,8 @@
RELOC/tex/latex/tocloft/tocloft.sty
catalogue-also tocbasic
catalogue-contact-bugs https://github.com/wspr/herries-press/issues
-catalogue-contact-repository https://github.com/wspr/herries-press
+catalogue-contact-repository https://github.com/wspr/herries-press/
catalogue-ctan /macros/latex/contrib/tocloft
-catalogue-date 2017-08-31 05:31:06 +0200
catalogue-license lppl1.3c
catalogue-topics toc-etc
-catalogue-version 2.3i
+catalogue-version 2.3j
++++++ todonotes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/todonotes.doc.tlpobj new/tlpkg/tlpobj/todonotes.doc.tlpobj
--- old/tlpkg/tlpobj/todonotes.doc.tlpobj 2019-02-28 04:09:43.000000000 +0100
+++ new/tlpkg/tlpobj/todonotes.doc.tlpobj 2019-11-07 18:46:51.000000000 +0100
@@ -1,6 +1,6 @@
name todonotes.doc
category Package
-revision 49820
+revision 52662
shortdesc doc files of todonotes
relocated 1
docfiles size=113
++++++ todonotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/todonotes.tlpobj new/tlpkg/tlpobj/todonotes.tlpobj
--- old/tlpkg/tlpobj/todonotes.tlpobj 2019-02-28 04:09:43.000000000 +0100
+++ new/tlpkg/tlpobj/todonotes.tlpobj 2019-11-07 18:46:51.000000000 +0100
@@ -1,11 +1,15 @@
name todonotes
category Package
-revision 49820
+revision 52662
shortdesc Marking things to do in a LaTeX document
relocated 1
longdesc The package lets the user mark things to do later, in a simple
longdesc and visually appealing way. The package takes several options
longdesc to enable customization/finetuning of the visual appearance.
+depend pgf
+depend tools
+depend xcolor
+depend xkeyval
runfiles size=5
RELOC/tex/latex/todonotes/todonotes.sty
catalogue-also todo
++++++ tools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/README.md new/doc/latex/tools/README.md
--- old/doc/latex/tools/README.md 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/README.md 2020-02-02 23:42:01.000000000 +0100
@@ -1,67 +1,30 @@
-## README for the `tools` bundle
+The LaTeX `tools` bundle
+========================
+Release 2020-02-02
-This bundle consists of LaTeX2e packages written and supported by
-members of the LaTeX3 Project Team.
+Overview
+--------
-The documented source code of each package is in a file with extension
-`.dtx`. Running LaTeX on the file `tools.ins` will produce all the
-package files, and some associated files.
+This bundle consists of packages providing a range of basic tools for
+LaTeX users. It is a required part of a LaTeX installation.
-So you should first process `tools.ins`:
+Installation
+------------
- latex tools.ins
+We no longer distribute installation instructions for the various TeX
+implementations. All modern TeX systems include `tools` as-standard, and end
+users should in general use the release versions supplied in this way.
-The files with extensions `.sty` and `.tex` (including a file whose
-name is just `.tex`) should then be moved to a directory on LaTeX's
-standard input path.
+Release distribution is carried out only through the CTAN archives.
-Documentation for the individual packages may then be obtained by
-running LaTeX on the `.dtx` files.
-
-For example:
-
- latex array.dtx
-
-will produce the file `array.pdf`, documenting the array package.
-
-
-The file `manifest.txt` contains a list of the main files in the
-distribution together with a one-or-two line summary of each package.
-
-
-### Copyright
-
-Copyright is maintained on each of these packages by the author(s)
-of the package.
-
-
-### Distribution Conditions
-
-All the files in this bundle may be distributed 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 list of all files belonging to the Tools Bundle is
-given in the file `manifest.txt`.
-
-Commercial users of the `multicol` package are asked to read the
-notice at the head of the file multicol.dtx.
-
-The use of these files is otherwise unrestricted.
-
-
-### 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.
+Reporting Bugs
+--------------
+If you wish to report a problem or bug in the `tools` 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
@@ -73,9 +36,19 @@
If the bug turns out to be with third-party software then please
contact the developer, and not us!
+License
+-------
+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.
-### Copyright
+Copyright
+---------
+
+Copyright is maintained on each of these packages by the author(s)
+of the package.
-This README file is copyright 1993-2017 The LaTeX3 Project.
+-----
+<p>Copyright (C) 1993-2020 The LaTeX Project <br />
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/README.txt new/doc/latex/tools/README.txt
--- old/doc/latex/tools/README.txt 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,97 +0,0 @@
-
-%
-% Copyright 1993-2017
-% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
-% This file is part of the Standard LaTeX `Tools Bundle'.
-% -------------------------------------------------------
-%
-% It 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 list of all files belonging to the LaTeX `Tools Bundle' is
-% given in the file `manifest.txt'.
-%
-
-
-README for the `tools' bundle
-=============================
-
-This `bundle' consists of LaTeX2e packages written and supported by
-members of the LaTeX3 Project Team.
-
-The documented source code of each package is in a file with extension
-`.dtx'. Running LaTeX on the file tools.ins will produce all the
-package files, and some associated files.
-
-So you should first process tools.ins:
-
- latex tools.ins
-
-The files with extensions `.sty' and `.tex' (including a file whose
-name is just `.tex') should then be moved to a directory on LaTeX's
-standard input path.
-
-See the Note at the end of this file if you have problems processing
-the tools.ins file.
-
-Documentation for the individual packages may then be obtained by
-running LaTeX on the `.dtx' files.
-
-For example:
-
- latex array.dtx
-
-will produce the file array.dvi, documenting the array package.
-
-
-The file manifest.txt contains a list of the main files in the
-distribution together with a one-or-two line summary of each package.
-
-
-Copyright
-=========
-Copyright is maintained on each of these packages by the author(s)
-of the package.
-
-
-Distribution Conditions
-=======================
-
-All the files in this bundle may be distributed under the conditions
-of the LaTeX Project Public License, either version 1.1 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.1 or later is part of all distributions of LaTeX
-version 1999/06/01 or later.
-
-The list of all files belonging to the `Tools Bundle' is
-given in the file `manifest.txt'.
-
-Commercial users of the multicol package are asked to read the
-notice at the head of the file multicol.dtx.
-
-The use of these files is otherwise unrestricted.
-
-
-Reporting Bugs
-==============
-
-If you wish to report a problem or bug in any of these packages, use
-the latexbug.tex program that comes with the standard LaTeX
-distribution. Please ensure that you enter `tools' category when
-prompted with a menu of categories, so that the message will be
-automatically forwarded to the appropriate part of our database.
-
-When reporting bugs, please produce a small test file that shows the
-problem, and ensure that you are using the current version of the
-package, and of the base LaTeX software.
-
-
Binary files old/doc/latex/tools/afterpage.pdf and new/doc/latex/tools/afterpage.pdf differ
Binary files old/doc/latex/tools/array.pdf and new/doc/latex/tools/array.pdf differ
Binary files old/doc/latex/tools/bm.pdf and new/doc/latex/tools/bm.pdf differ
Binary files old/doc/latex/tools/calc.pdf and new/doc/latex/tools/calc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/changes.txt new/doc/latex/tools/changes.txt
--- old/doc/latex/tools/changes.txt 2019-01-06 23:04:13.000000000 +0100
+++ new/doc/latex/tools/changes.txt 2020-02-02 23:42:01.000000000 +0100
@@ -6,6 +6,110 @@
=======================================================================
#########################
+# 2020-02-02 Release
+#########################
+
+2020-01-15 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * tabularx.dtx: Avoid .. at end of the Target width debug message.
+
+2020-01-07 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * longtable.dtx: additional \endgraf for
+ https://github.com/davidcarlisle/dpctex/issues/8
+
+2020-01-04 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * hhline.dtx: Allow and ignore spaces in the \hhline argument.
+
+2019-12-09 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * multicol.dtx:
+ Support up to 20 columns instead of 10; also ensure that
+ the insert boxes are not clobbered (gh/237)
+
+2019-10-15 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * multicol.dtx: Use \@maxdepth not \maxdepth (gh/190)
+
+#########################
+# 2019-11-10 PL 3 Release
+#########################
+
+2019-11-10 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * verbatim.dtx: support \vervisiblespace with luatex and xetex (gh/212)
+
+2019-11-08 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * (shellesc): restore the original catcode of _ to _ not to "
+
+#########################
+# 2019-11-08 Release
+#########################
+
+2019-11-08 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * (shellesc): restore the original catcode of _ to _ not to "
+
+#########################
+# 2019-10-01 PL 2 Release
+#########################
+
+2019-11-05 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * varioref.dtx (subsection{Defining the main macros}):
+ Support (mis)use of internal interface by fancyref (sx/515106)
+
+2019-10-17 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * shellesc.dtx: protect against active _ and "
+
+2019-10-13 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * shellesc.dtx: add logging in luatex and \ShellEscapeStatus (gh/195)
+
+#########################
+# 2019-10-01 Release
+#########################
+
+2019-09-09 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * varioref.dtx (subsection{Options}:
+ Option arabic added
+
+2019-08-31 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * array.dtx: Add a necessary \expandafter so that redefinitions
+ of primitive specifiers give a warning (github/148)
+
+2019-08-25 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * varioref.dtx: \labelformat and \Ref now available in the kernel
+ so removed from this package but only if running on new kernel
+
+ (subsection{Options}):
+ Provide options space and nospace
+
+ (subsection{Defining the main macros}):
+ Don't drop a preceding space completely but reinsert it later
+ after setting a label;
+ Command \vp@gerefstar, \vref@star and \Vref@star added to support
+ hyperref better
+
+ (subsubsection{Supporting ranges}):
+ Added \vpagerefcompare, \vpagrefnearby and \vpagerefcomparenearby
+
+2019-03-01 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * multicol.dtx (subsection{The output routines}):
+ Provide minrows counter for balancing.
+
+2019-02-06 David Carlisle <David.Carlisle(a)latex-project.org>
+
+ * longtable.dtx: Document the extra color groups
+
+#########################
# 2019-01-05 Release
#########################
@@ -22,7 +126,7 @@
2018-12-27 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
- * multicol.dtx (subsection{The output routines}]):
+ * multicol.dtx (subsection{The output routines}):
Removed dead code, the case where this can go wrong is too
obscure to worry about it (gh/101)
@@ -412,7 +516,7 @@
2005-11-26 Frank Mittelbach <latex-bugs(a)latex-project.org>
* varioref.dtx: Single hyphen rather than -- in range for spanish
- an galician.
+ and galician.
2005-11-10 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -454,7 +558,7 @@
* varioref.dtx: small change in italian.
small fix in german and ngerman (pr/3793)
-
+
2005-06-09 Frank Mittelbach <latex-bugs(a)latex-project.org>
* varioref.dtx: fixed bug in Dutch localization (pr/3791)
@@ -471,7 +575,7 @@
2005-04-09 Frank Mittelbach <latex-bugs(a)latex-project.org>
* varioref.dtx: Basque defaults added (by I\~naki Larra\~naga
- Murgoitio)
+ Murgoitio)
2004-12-07 Morten Hoegholm <latex-bugs(a)latex-project.org>
@@ -485,7 +589,7 @@
2004-07-03 Frank Mittelbach <latex-bugs(a)latex-project.org>
* multicol.dtx: fixing errors that happen only if multicol is
- compiled with a special combination of docstrip modules.
+ compiled with a special combination of docstrip modules.
2004-05-08 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -540,7 +644,7 @@
2003-03-29 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * varioref.dtx (subsection{Options}):
+ * varioref.dtx (subsection{Options}):
Afrikaans option contributed by Danie Els <dnjels(a)sun.ac.za>.
2003-03-18 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -549,19 +653,19 @@
2003-03-15 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx:
+ * multicol.dtx:
Further corrections to the micro-spacing around the boxes produced
by multicols, so that grid typesetting (given right values for
other parameters) becomes a possibility.
Also added option "grid" which currently does nothing except
producing a warning if the grid might got lost.
-
+
2003-02-17 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx:
+ * multicol.dtx:
Add a kern to cancel potential depth of previous line at the
beginning of a multicols and also suppsed \lineskip
-
+
\multicolovershoot set back to 0pt as a default 2pt was simply
wrong in some applications (pr/3465)
@@ -597,7 +701,7 @@
style (pr/3414)
* varioref.dtx: Use \vpageref inside \ref not \@vpageref
- to get spacing correct (pr/3403)
+ to get spacing correct (pr/3403)
2002-06-14 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -613,7 +717,7 @@
\renewcommand\reftextfaceafter {on page~\thevpagerefnum}
texts for "slovak" and "slovene" options added
-
+
2001-09-04 Frank Mittelbach <latex-bugs(a)latex-project.org>
* varioref.dtx: correct typo in name \vref -> \vr@f
@@ -624,7 +728,7 @@
2001-05-28 Chris Rowley <latex-bugs(a)latex-project.org>
- * dcolumn.dtx:
+ * dcolumn.dtx:
Documentation of centring improved (pr/3315)
@@ -685,13 +789,13 @@
2000-06-11 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx (subsection{The output routines}]): when
+ * multicol.dtx (subsection{The output routines}): when
doing boxed mode do not restrict height of columns to \@colroom
(pr/3212)
2000-05-05 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx (subsection{Starting and ): Detect and fix
+ * multicol.dtx (subsection{Starting and ): Detect and fix
problem if a multicols ends at the top of a page
2000-04-16 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -735,7 +839,7 @@
1999-07-19 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx:
+ * multicol.dtx:
Added some additional tracing code.
When balancing check that last column doesn't contain a forced
page break; if it does reject the solution.
@@ -758,7 +862,7 @@
1999-05-26 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx (subsection{Manual column breaking}):
+ * multicol.dtx (subsection{Manual column breaking}):
Added a \columnbreak command to allow manual column breaks.
1999-05-01 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -1433,7 +1537,7 @@
1994-10-15 Frank Mittelbach <latex-bugs(a)latex-project.org>
* array.dtx (subsection{Support for ...):
- Added \firsthline and \lasthline from Companion.
+ Added \firsthline and \lasthline from Companion.
1994-10-03 Frank Mittelbach <latex-bugs(a)latex-project.org>
@@ -1478,7 +1582,7 @@
1994-08-26 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx (subsection{The output routines}]):
+ * multicol.dtx (subsection{The output routines}):
Check explicitly for void boxes before assigning the current column
width to their width, because void boxes will not change.
Extract the kept marks before adding a penalty -10000 to the output box
@@ -1534,7 +1638,7 @@
1994-06-07 Frank Mittelbach <latex-bugs(a)latex-project.org>
- * multicol.dtx (section{New macros and hacks for version 1.2}]):
+ * multicol.dtx (section{New macros and hacks for version 1.2}):
Updated float commands to contain \color@endgroup etc. so
that they work together with the color.sty package.
(Found by SPQR)
Binary files old/doc/latex/tools/dcolumn.pdf and new/doc/latex/tools/dcolumn.pdf differ
Binary files old/doc/latex/tools/delarray.pdf and new/doc/latex/tools/delarray.pdf differ
Binary files old/doc/latex/tools/enumerate.pdf and new/doc/latex/tools/enumerate.pdf differ
Binary files old/doc/latex/tools/fileerr.pdf and new/doc/latex/tools/fileerr.pdf differ
Binary files old/doc/latex/tools/fontsmpl.pdf and new/doc/latex/tools/fontsmpl.pdf differ
Binary files old/doc/latex/tools/ftnright.pdf and new/doc/latex/tools/ftnright.pdf differ
Binary files old/doc/latex/tools/hhline.pdf and new/doc/latex/tools/hhline.pdf differ
Binary files old/doc/latex/tools/indentfirst.pdf and new/doc/latex/tools/indentfirst.pdf differ
Binary files old/doc/latex/tools/layout.pdf and new/doc/latex/tools/layout.pdf differ
Binary files old/doc/latex/tools/longtable.pdf and new/doc/latex/tools/longtable.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/manifest.txt new/doc/latex/tools/manifest.txt
--- old/doc/latex/tools/manifest.txt 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/manifest.txt 2020-02-02 23:42:01.000000000 +0100
@@ -2,22 +2,22 @@
%
% Copyright 1993-2016
% The LaTeX3 Project and any individual authors listed elsewhere
-% in this file.
-%
+% in this file.
+%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
-%
+%
% It 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
+% and version 1.3c or later is part of all distributions of LaTeX
% version 2005/12/01 or later.
-%
+%
% The list of all files belonging to the LaTeX `Tools Bundle' is
% given in the file `manifest.txt'.
-%
+%
% \fi
%
% CONTENTS OF THE TOOLS BUNDLE
@@ -36,7 +36,7 @@
Finer control over horizontal rules in tables. Requires array.
longtable.dtx
Multipage tables. (Does not require array, but uses the extended
- features if both are loaded.)
+ features if both are loaded.)
tabularx.dtx
Defines tabularx environment (similar to tabular*) but modifies
column widths, not inter-column space, to achieve a desired
@@ -49,14 +49,14 @@
Access bold math symbols.
calc.dtx
- Infix arithmetic expresions. Contributed to the distribution by
+ Infix arithmetic expresions. Contributed to the distribution by
Kresten Krab Thorup and Frank Jensen.
enumerate.dtx
Extended version of the enumerate environment.
fileerr.dtx
- Suite of small files which may be used to control TeX's
+ Suite of small files which may be used to control TeX's
missing file error loop.
fontsmpl.dtx
@@ -82,7 +82,7 @@
shellesc.dtx
Unified interface for accessing system commands.
-
+
showkeys.dtx
Draft mode showing the `keys' used by \label, \ref, \cite etc.
Binary files old/doc/latex/tools/multicol.pdf and new/doc/latex/tools/multicol.pdf differ
Binary files old/doc/latex/tools/rawfonts.pdf and new/doc/latex/tools/rawfonts.pdf differ
Binary files old/doc/latex/tools/shellesc.pdf and new/doc/latex/tools/shellesc.pdf differ
Binary files old/doc/latex/tools/showkeys.pdf and new/doc/latex/tools/showkeys.pdf differ
Binary files old/doc/latex/tools/somedefs.pdf and new/doc/latex/tools/somedefs.pdf differ
Binary files old/doc/latex/tools/tabularx.pdf and new/doc/latex/tools/tabularx.pdf differ
Binary files old/doc/latex/tools/theorem.pdf and new/doc/latex/tools/theorem.pdf differ
Binary files old/doc/latex/tools/tools-overview.pdf and new/doc/latex/tools/tools-overview.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tools/tools-overview.tex new/doc/latex/tools/tools-overview.tex
--- old/doc/latex/tools/tools-overview.tex 2018-04-06 23:33:45.000000000 +0200
+++ new/doc/latex/tools/tools-overview.tex 2020-02-02 23:42:01.000000000 +0100
@@ -1,8 +1,13 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesFile{tools-overview.tex}[2015/03/31 v1.0 Tools overview]
+% Copyright (C) 2006-2020
+%
+% The LaTeX3 Project and any individual authors listed elsewhere
+% in this file.
+%
% Copyright (c) 2006-2014 Heiko Oberdiek
-% (c) 2015-2016 The LaTeX3 Project
+% (c) 2015-2019 The LaTeX3 Project
%
% This file is part of the Standard LaTeX `Tools Bundle'.
% -------------------------------------------------------
Binary files old/doc/latex/tools/trace.pdf and new/doc/latex/tools/trace.pdf differ
Binary files old/doc/latex/tools/varioref.pdf and new/doc/latex/tools/varioref.pdf differ
Binary files old/doc/latex/tools/verbatim.pdf and new/doc/latex/tools/verbatim.pdf differ
Binary files old/doc/latex/tools/xr.pdf and new/doc/latex/tools/xr.pdf differ
Binary files old/doc/latex/tools/xspace.pdf and new/doc/latex/tools/xspace.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tools.doc.tlpobj new/tlpkg/tlpobj/tools.doc.tlpobj
--- old/tlpkg/tlpobj/tools.doc.tlpobj 2019-02-28 04:09:44.000000000 +0100
+++ new/tlpkg/tlpobj/tools.doc.tlpobj 2020-02-03 01:54:59.000000000 +0100
@@ -1,11 +1,10 @@
name tools.doc
category Package
-revision 49619
+revision 53640
shortdesc doc files of tools
relocated 1
-docfiles size=1639
+docfiles size=1651
RELOC/doc/latex/tools/README.md
- RELOC/doc/latex/tools/README.txt
RELOC/doc/latex/tools/afterpage.pdf
RELOC/doc/latex/tools/array.pdf
RELOC/doc/latex/tools/bm.pdf
++++++ tools.tar.xz ++++++
++++ 2024 lines of diff (skipped)
++++++ topiclongtable.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/topiclongtable/README.md new/doc/latex/topiclongtable/README.md
--- old/doc/latex/topiclongtable/README.md 2018-11-06 21:50:18.000000000 +0100
+++ new/doc/latex/topiclongtable/README.md 2020-04-12 23:33:39.000000000 +0200
@@ -6,12 +6,6 @@
This work is licensed under MIT License.
-This work is a LaTeX package consisting of the following files:
- * README.md
- * topiclongtable.sty
- * topiclongtable-doc.tex
- * topiclongtable-doc.pdf
-
---
This LaTeX package extends `longtable` implementing cells that:
@@ -23,3 +17,6 @@
The typical use case is a table spanning multiple pages that contains a list of hierarchically organized topics (hence the package name).
+---
+
+Copyright (c) 2017-2020 Paolo Brasolin (<paolo.brasolin(a)gmail.com>)
Binary files old/doc/latex/topiclongtable/topiclongtable-doc.pdf and new/doc/latex/topiclongtable/topiclongtable-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/topiclongtable/topiclongtable-doc.tex new/doc/latex/topiclongtable/topiclongtable-doc.tex
--- old/doc/latex/topiclongtable/topiclongtable-doc.tex 2019-03-28 21:59:17.000000000 +0100
+++ new/doc/latex/topiclongtable/topiclongtable-doc.tex 2020-04-12 23:33:39.000000000 +0200
@@ -1,16 +1,13 @@
%
-% This work is sponsored by Human Predictions, LLC (<http://www.humanpredictions.com>).
-%
-% This work is maintained by Paolo Brasolin (<paolo.brasolin(a)gmail.com>).
+% topiclongtable v1.3.2 - Renders autocollapsing cells in longtables
%
-% This work is licensed under MIT License.
+% Copyright (c) 2017-2020 Paolo Brasolin (<paolo.brasolin(a)gmail.com>)
%
-% This work is a LaTeX package consisting of the following files:
-% * README.md
-% * topiclongtable.sty
-% * topiclongtable-doc.tex
-% * topiclongtable-doc.pdf
+% This work is sponsored by Human Predictions, LLC (<http://www.humanpredictions.com>).
+% This work is maintained by Paolo Brasolin (<paolo.brasolin(a)gmail.com>).
+% This work is available under the terms of the MIT License.
%
+
\documentclass[full,kernel]{l3doc}
\usepackage{topiclongtable}
@@ -29,7 +26,7 @@
\href{mailto:paolo.brasolin@gmail.com}{paolo.brasolin@gmail.com}
}
-\date{2019/03/27 v1.3.0}
+\date{2020/04/12 v1.3.2}
\maketitle
@@ -63,7 +60,7 @@
\subsection*{Environment}
-\begin{function}[updated=2019-03-27]{topiclongtable}
+\begin{function}[updated=2019-07-08]{topiclongtable}
\begin{syntax}
\tn[no-index]{begin}\{\env{topiclongtable}\}\marg{column specification}
\ \ \meta{cells specification}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/topiclongtable.doc.tlpobj new/tlpkg/tlpobj/topiclongtable.doc.tlpobj
--- old/tlpkg/tlpobj/topiclongtable.doc.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/topiclongtable.doc.tlpobj 2020-04-16 01:57:28.000000000 +0200
@@ -1,6 +1,6 @@
name topiclongtable.doc
category Package
-revision 50629
+revision 54758
shortdesc doc files of topiclongtable
relocated 1
docfiles size=97
++++++ topiclongtable.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/topiclongtable/topiclongtable.sty new/tex/latex/topiclongtable/topiclongtable.sty
--- old/tex/latex/topiclongtable/topiclongtable.sty 2019-03-28 21:59:17.000000000 +0100
+++ new/tex/latex/topiclongtable/topiclongtable.sty 2020-04-12 23:33:39.000000000 +0200
@@ -1,16 +1,13 @@
%
-% This work is sponsored by Human Predictions, LLC (<http://www.humanpredictions.com>).
-%
-% This work is maintained by Paolo Brasolin (<paolo.brasolin(a)gmail.com>).
+% topiclongtable v1.3.2 - Renders autocollapsing cells in longtables
%
-% This work is licensed under MIT License.
+% Copyright (c) 2017-2020 Paolo Brasolin (<paolo.brasolin(a)gmail.com>)
%
-% This work is a LaTeX package consisting of the following files:
-% * README.md
-% * topiclongtable.sty
-% * topiclongtable-doc.tex
-% * topiclongtable-doc.pdf
+% This work is sponsored by Human Predictions, LLC (<http://www.humanpredictions.com>).
+% This work is maintained by Paolo Brasolin (<paolo.brasolin(a)gmail.com>).
+% This work is available under the terms of the MIT License.
%
+
\NeedsTeXFormat{LaTeX2e}[2017-04-15]
\RequirePackage{zref-abspage}[2016/05/21]
@@ -21,7 +18,7 @@
\RequirePackage{longtable}[2014/10/28]
\PassOptionsToPackage{longtable}{multirow}
-\ProvidesExplPackage {topiclongtable} {2019/03/27} {1.3.0} {Renders autocollapsing cells in longtables}
+\ProvidesExplPackage {topiclongtable} {2020/04/12} {v1.3.2} {Renders autocollapsing cells in longtables}
\ProcessOptions\relax
@@ -101,6 +98,7 @@
%% reset counters and table variables
\int_gzero:N \g_tlt_col_idx_int
\int_gzero:N \g_tlt_row_idx_int
+ \prop_gclear:N \g_tlt_topics_labels_prop
\clist_gset:Nn \g_tlt_multirows_heights_clist \c_empty_clist
\clist_gset:Nn \g_tlt_rows_spans_prop \c_empty_clist
}
@@ -357,7 +355,7 @@
\clist_pop:NNTF \l_tmpa_clist \l_tmpb_tl {
\int_set:Nn \l_tmpa_int \l_tmpb_tl
} {
- \int_set_eq:NN \l_tmpa_int \c_one
+ \int_set_eq:NN \l_tmpa_int \c_one_int
}
% if integer A is zero, skip
\int_compare:nNnTF { \l_tmpa_int } { = } { 0 } {} {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/topiclongtable.tlpobj new/tlpkg/tlpobj/topiclongtable.tlpobj
--- old/tlpkg/tlpobj/topiclongtable.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/topiclongtable.tlpobj 2020-04-16 01:57:28.000000000 +0200
@@ -1,6 +1,6 @@
name topiclongtable
category Package
-revision 50629
+revision 54758
shortdesc Extend longtable with cells that merge hierarchically
relocated 1
longdesc This LaTeX package extends longtable implementing cells that:
@@ -10,15 +10,13 @@
longdesc page breaks, and automatically draw the correct separation
longdesc lines. The typical use case is a table spanning multiple pages
longdesc that contains a list of hierarchically organized topics (hence
-longdesc the package name).
+longdesc the package name). The package depends on array, expl3,
+longdesc longtable, multirow, xparse, and zref-abspage.
runfiles size=4
RELOC/tex/latex/topiclongtable/topiclongtable.sty
catalogue-contact-bugs https://github.com/paolobrasolin/topiclongtable/issues
-catalogue-contact-development https://github.com/paolobrasolin/topiclongtable
-catalogue-contact-home https://github.com/paolobrasolin/topiclongtable
catalogue-contact-repository https://github.com/paolobrasolin/topiclongtable
catalogue-ctan /macros/latex/contrib/topiclongtable
-catalogue-date 2019-03-27 22:00:53 +0100
catalogue-license mit
-catalogue-topics table-long
-catalogue-version 1.3.0
+catalogue-topics table-long table expl3
+catalogue-version 1.3.2
++++++ toptesi.doc.tar.xz ++++++
++++ 3035 lines of diff (skipped)
++++++ toptesi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/topcoman.sty new/tex/latex/toptesi/topcoman.sty
--- old/tex/latex/toptesi/topcoman.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/topcoman.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topcmn')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{topcoman}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Additional commands for the TOPtesi bundle]
@@ -51,17 +51,19 @@
\fi
\providecommand{\ohm}{\textormath{\textohm}{\mathrm{\Omega}}}
\@ifpackageloaded{toptesi}{%
-\providecommand\ped{}\providecommand\ap{}
-\renewcommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}
-\renewcommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}{%
-\providecommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}%
-\providecommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}
-\@ifpackageloaded{siunitx}{\def\unit#1{\si{\,#1}}}{%
-\providecommand\unit{}%
-\renewcommand\unit[1]{\ensuremath{{\mathrm{\,#1}}}}
-}
-\providecommand{\gei}{\ensuremath{{\mathop{\mathrm{j}}\nolimits}}}
-\providecommand{\eu}{\ensuremath{{\mathop{\mathrm{e}}\nolimits}}}
+\providecommand\ped{}\providecommand\ap{}%
+\renewcommand*{\ped}[1]{\textormath{\textsubscript{#1}}{_{\mathrm{#1}}}}%
+\renewcommand*{\ap}[1]{\textormath{\textsuperscript{#1}}{^{\mathrm{#1}}}}}%
+{\providecommand*{\ped}[1]{\textormath{\textsubscript{#1}}%
+ {_{\mathrm{#1}}}}%
+\providecommand*{\ap}[1]{\textormath{\textsuperscript{#1}}%
+ {^{\mathrm{#1}}}}}
+\@ifpackageloaded{siunitx}{\def\unit#1{\si{\,#1}}}%
+ {\providecommand\unit{}%
+ \renewcommand\unit[1]{\ensuremath{{\mathrm{\,#1}}}}%
+ }
+\providecommand{\gei}{\ensuremath{\mathop{\mathrm{\mathstrut j}\nolimits}}}
+\providecommand{\eu}{\ensuremath{\mathop{\mathrm{e}}\nolimits}}
\providecommand{\micro}{\textormath{\textmu}{%
\ifPDFTeX
\ifdefined\muup\muup\else\mbox{\textmu}\fi
@@ -88,7 +90,7 @@
\let\p@figure\empty\let\p@table\empty}
\DisableFigTabNames
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/topfront.sty new/tex/latex/toptesi/topfront.sty
--- old/tex/latex/toptesi/topfront.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/topfront.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topfrn')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{topfront}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Title page for TOPtesi and other classes]
@@ -204,9 +204,11 @@
\newlength\T@Tlogoheight
\setlength\T(a)Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\logosede[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
-\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
-\expandafter\fillup@TCP@logobox\@logosede,!}}
+\newcommand\logosede[2][\T@Tlogoheight]%
+ {\def\@logosede{#2}\TPT@logoheight=#1\relax
+ \ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{%
+ \begin{lrbox}{\TPT@logobox}%
+ \expandafter\fillup@TCP@logobox\@logosede,!}}
\def\fillup@TCP@logobox#1,#2!{%
\ifblank{#1}{\end{lrbox}\ifdim\wd\TPT@logobox>\textwidth
@@ -556,7 +558,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-dottorale.sty new/tex/latex/toptesi/toptesi-dottorale.sty
--- old/tex/latex/toptesi/toptesi-dottorale.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-dottorale.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,13 +7,13 @@
%% toptesi.dtx (with options: `topdoc')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
\ProvidesPackage{toptesi-dottorale}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Ph.D. degree title page]
@@ -542,7 +542,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-magistrale.sty new/tex/latex/toptesi/toptesi-magistrale.sty
--- old/tex/latex/toptesi/toptesi-magistrale.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-magistrale.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topmag')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-magistrale}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Master degree title page]
@@ -98,12 +98,18 @@
}%
\newif\iffemminile
-\ifTOPfront\ifclassica
-\def\Candidato{Laureando}
-\def\Candidata{Laureanda}
-\def\Candidati{Laureandi}
-\def\Candidate{Laureande}
-\fi\fi
+\def\Candidato{\ifclassica Laureando\else Candidato\fi}
+\def\Candidata{\ifclassica Laureanda\else Candidata\fi}
+\def\Candidati{\ifclassica Laureandi\else Candidati\fi}
+\def\Candidate{\ifclassica Laureande\else Candidate\fi}
+\newcommand\TitoloListaCandidati[1]{\CandidateNames#1,,,,!}
+\def\CandidateNames#1,#2,#3,#4,!{%
+ \gdef\Candidato{#1}% Masc/neutr-sing
+ \gdef\Candidati{#2}% Masc/neutr-plur
+ \gdef\Candidata{#3}% Fem-sing
+ \gdef\Candidate{#4}% Fem-plur
+}
+
\let\@stitle\empty % default short title string
\newcommand*{\titolo}[2][]{%
@@ -379,29 +385,28 @@
\end{center}%
\fi
\ifclassica
- \ifnum\value{tomo}>\z@
- \par\bigskip
- \noindent\makebox[\textwidth]{%
- \large\textbf{%
- \ifcase\c@tomo%
- \or \PrimoTomo%
- \or \SecondoTomo%
- \or \TerzoTomo%
- \or \QuartoTomo%
- \else
- \PackageWarning{toptesi}{%
- Counter tomo equals \the\c@tomo\MessageBreak
- We never considered a thesis might get
- divided in more than four volumes}%
- \fi}}%
- \fi
- \vspace{1em}
+ \ifnum\value{tomo}>\z@
+ \par\bigskip
+ \noindent\makebox[\textwidth]{%
+ \large\textbf{%
+ \ifcase\c@tomo%
+ \or \PrimoTomo%
+ \or \SecondoTomo%
+ \or \TerzoTomo%
+ \or \QuartoTomo%
+ \else
+ \PackageWarning{toptesi}{%
+ Counter tomo equals \the\c@tomo\MessageBreak
+ We never considered a thesis might get\MessageeBreak
+ divided in more than four volumes}%
+ \fi}}%
+ \fi
+ \vspace{1em}
\fi
\par
\unless\iftopTPTlogos
{\vfill\centering \printloghi\par}\fi
\vfill
- \iflanguage{italian}{%
\iffemminile
\def\@nomecandidato{\Candidata}%
\else
@@ -413,7 +418,6 @@
\else
\def\@nomecandidato{\Candidati}%
\fi}
- }{}%
\unless\iftriennale
\def\BoxRelatori{%
@@ -487,7 +491,7 @@
{\null\vfill\thispagestyle{empty}\@retrofrontespizio\par\clearpage}%
\endgroup}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-monografia.sty new/tex/latex/toptesi/toptesi-monografia.sty
--- old/tex/latex/toptesi/toptesi-monografia.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-monografia.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topmon')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-monografia}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Bachelor degree title page]
@@ -54,7 +54,8 @@
\NomeRelatore{Relatore}{Relatori}
\providecommand\@principaladviser{}
\def\relatore#1{\gdef\@principaladviser{#1}}
-\providecommand\@secondadviser{}\def\secondorelatore#1{\gdef\@secondadviser{#1}}
+\providecommand\@secondadviser{}
+\def\secondorelatore#1{\gdef\@secondadviser{#1}}
\providecommand\@thirdadviser{}
\def\terzorelatore#1{\gdef\@thirdadviser{#1}}
@@ -98,32 +99,32 @@
\def\sedutadilaurea#1{\getseduta#1 !}
\def\getseduta#1 #2!{%
- \def\@tempA{#2}%
- \ifx\@tempA\empty
- \def\@submitdate{#1}%
+ \def\@tempA{#2}%
+ \ifx\@tempA\empty
+ \def\@submitdate{#1}%
+ \else
+ \unless\ifclassica
+ \def\@submitdate{#1 #2}%
\else
- \unless\ifclassica
- \def\@submitdate{#1 #2}%
- \else
- \s@dutaclassica#1 #2!%
- \fi
+ \s@dutaclassica#1 #2!%
\fi
+ \fi
}%
\def\s@dutaclassica#1 #2!{%
- \if@ldstyle
- \s@paranumeri#2-!%
- \ifx\2\empty
- \edef\@submitdate{\noexpand#1 \noexpand\oldstylenums{#2}}%
- \else
- \s@paranumeri#2!%
- \edef\@submitdate{\noexpand#1
- \noexpand\oldstylenums{\1} -- \noexpand\oldstylenums{\2}}%
- \fi
- \let\1\undefined
- \let\2\undefined
+ \if@ldstyle
+ \s@paranumeri#2-!%
+ \ifx\2\empty
+ \edef\@submitdate{\noexpand#1 \noexpand\oldstylenums{#2}}%
\else
- \def\@submitdate{#1 #2}%
+ \s@paranumeri#2!%
+ \edef\@submitdate{\noexpand#1
+ \noexpand\oldstylenums{\1} -- \noexpand\oldstylenums{\2}}%
\fi
+ \let\1\undefined
+ \let\2\undefined
+ \else
+ \def\@submitdate{#1 #2}%
+ \fi
}
\def\s@paranumeri#1-#2!{\def\1{#1}\def\2{#2}}%
@@ -150,7 +151,8 @@
\newlength\T@Tlogoheight
\setlength\T(a)Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\logosede[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
+\newcommand\logosede[2][\T@Tlogoheight]%
+{\def\@logosede{#2}\TPT@logoheight=#1\relax
\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
\expandafter\fillup@TCP@logobox\@logosede,!}}
@@ -197,7 +199,8 @@
\providecommand\Correlatori{Correlatori}
\newcommand\CoAdvisorName[2]{\gdef\Correlatore{#1}%
\gdef\Correlatori{#2}}
-\ifcsundef{iftopTPTlogos}{\newbool{topTPTlogos} \booltrue{topTPTlogos}}{}
+\ifcsundef{iftopTPTlogos}{\newbool{topTPTlogos}%
+ \booltrue{topTPTlogos}}{}
\NewDocumentEnvironment{ThesisTitlePage}{s}
{% OPENING
\IfBooleanTF{#1}{\boolfalse{topTPTlogos}}{\booltrue{topTPTlogos}}%
@@ -209,12 +212,15 @@
\PackageWarning{monografia}{No configuration file found}%
}%C
}{% CLOSING
- \ifbool{topTPTlogos}{\noindent\raisebox{-0.5em}[\z@][\z@]{\makebox[\textwidth]{\printloghi}}\par\bigskip}{}
+ \ifbool{topTPTlogos}{\noindent\raisebox{-0.5em}[\z@][\z@]%
+ {\makebox[\textwidth]{\printloghi}}\par\bigskip}{}
\ifdefempty{\ateneo}{}{{\centering\huge \@ateneo\par}}
- \ifdefempty{\@NomeAteneo}{}{\medskip{\centering\large
+ \ifdefempty{\@NomeAteneo}{}{\medskip{\centering\large
\expandafter\MakeUppercase\expandafter{\@NomeAteneo}\par}}
- \ifdefempty{\(a)strutturadi}{}{\vspace{\stretch{0.1}}\par{\centering \Large\@struttura\par}}
- \ifdefempty{\@corsodistudi}{}{\bigskip{\centering\large \NomeCorsoDiStudi\ \@corsodistudi\par}}
+ \ifdefempty{\(a)strutturadi}{}{\vspace{\stretch{0.1}}\par{\centering
+ \Large\@struttura\par}}
+ \ifdefempty{\@corsodistudi}{}{\bigskip{\centering\large
+ \NomeCorsoDiStudi\ \@corsodistudi\par}}
\ifdefempty{\@materia}{}{\medskip{\centering\large\@materia\par}}
\vspace{\stretch{0.25}}
{\centering\large \@monografia\par}
@@ -324,7 +330,7 @@
\newpage}
}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-scudo.sty new/tex/latex/toptesi/toptesi-scudo.sty
--- old/tex/latex/toptesi/toptesi-scudo.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-scudo.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topscu')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-scudo}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Extension for ScuDo theses]
@@ -27,10 +27,9 @@
\RequirePackage{unicode-math}
\fi
\AtBeginDocument{%
-\providecommand\diff{}%
-\renewcommand{\diff}{\mathop{}\!\mathrm{d}}
-\providecommand{\gei}{\ensuremath{{\mathop{\mathrm{j}}\nolimits}}}
-\providecommand{\eu}{\ensuremath{{\mathop{\mathrm{e}}\nolimits}}}
+\providecommand\diff{}\renewcommand{\diff}{\mathop{}\!\mathrm{d}}
+\providecommand{\gei}{\ensuremath{\mathop{\mathrm{\mathstrut j}}\nolimits}}
+\providecommand{\eu}{\ensuremath{\mathop{\mathrm{e}}\nolimits}}
\let\iu\gei}
\ifcsundef{ifmybibstyle}{\newif\ifmybibstyle\mybibstylefalse}{}
@@ -82,7 +81,11 @@
citestyle=numeric,
sorting=nty,
natbib]{biblatex} % LaTeX specific bibliography handler
- \addbibresource{references.bib}% bibliographic data base(s}
+ \IfFileExists{references.bib}% bibliographic data base(s}
+ {\addbibresource{references.bib}}%
+ {\IfFileExists{\jobname.bib}%
+ {\addbibresource{\jobname.bib}}%
+ {\relax}}
\fi
\usepackage{imakeidx}% to generate automatic indices
\ifPDFTeX \usepackage{indentfirst}\fi
@@ -99,15 +102,19 @@
\providecommand*\@title{}
\providecommand*\@subtitle{\vspace{\stretch{1}}}
\providecommand*\@author{}
-\providecommand*\@Nsupervisor{Supervisor}\providecommand*\@Nsupervisors{Supervisors}
+\providecommand*\@Nsupervisor{Supervisor}
+\providecommand*\@Nsupervisors{Supervisors}
\newcount\@supervisornumber
\providecommand*\@supervisorlist{}
\providecommand\@Nexaminationcommittee{Doctoral Examination Committee:}
\providecommand*\@Examinerlist{}
\providecommand*\@examlocation{Politecnico di Torino}
\providecommand*\@examinationdate{}
-\providecommand*\@creativecommons{This thesis is licensed under a Creative Commons License, Attribution - Noncommercial- NoDerivative Works 4.0 International: see \url{www.creativecommons.org}.
-The text may be reproduced for non-commercial purposes, provided that credit is given to the original author.}
+\providecommand*\@creativecommons{This thesis is licensed
+under a Creative Commons License, Attribution - Noncommercial-
+NoDerivative Works 4.0 International: see \url{www.creativecommons.org}.
+The text may be reproduced for non-commercial purposes, provided that
+credit is given to the original author.}
\providecommand\@disclaimer{\noindent I hereby declare that
the contents and organisation of this dissertation constitute
my own original work and does not compromise in any way the
@@ -142,7 +149,8 @@
\newlength\T@Tlogoheight
\setlength\T(a)Tlogoheight{0.8\dimexpr(\paperwidth-\textwidth)/2}}{}
-\newcommand\PhDschoolLogo[2][\T@Tlogoheight]{\def\@logosede{#2}\TPT@logoheight=#1\relax
+\newcommand\PhDschoolLogo[2][\T@Tlogoheight]%
+{\def\@logosede{#2}\TPT@logoheight=#1\relax
\ifcsvoid{@logosede}{\sbox{\TPT@logobox}{}}{\begin{lrbox}{\TPT@logobox}%
\expandafter\fillup@TCP@logobox\@logosede,!}}
@@ -257,7 +265,7 @@
}
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi-sss.sty new/tex/latex/toptesi/toptesi-sss.sty
--- old/tex/latex/toptesi/toptesi-sss.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi-sss.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topsss')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi-sss}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
High school title page]
@@ -143,7 +143,7 @@
\clearpage}%%
%%
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.cfg new/tex/latex/toptesi/toptesi.cfg
--- old/tex/latex/toptesi/toptesi.cfg 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.cfg 2019-05-06 23:04:32.000000000 +0200
@@ -7,7 +7,7 @@
%% toptesi.dtx (with options: `topcfg')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
@@ -65,7 +65,7 @@
provided that credit is given to the original author.}
\fi
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.cls new/tex/latex/toptesi/toptesi.cls
--- old/tex/latex/toptesi/toptesi.cls 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.cls 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `class')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesClass{toptesi}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Class for typesetting university theses]
@@ -73,7 +73,7 @@
\expandafter\stop
\fi
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/toptesi/toptesi.sty new/tex/latex/toptesi/toptesi.sty
--- old/tex/latex/toptesi/toptesi.sty 2018-11-21 22:59:18.000000000 +0100
+++ new/tex/latex/toptesi/toptesi.sty 2019-07-26 22:48:36.000000000 +0200
@@ -7,14 +7,14 @@
%% toptesi.dtx (with options: `topsty')
%% ______________________________________________________
%% The TOPtesi bundle
-%% Copyright (C) 2015-2018 Claudio Beccari
+%% Copyright (C) 2015-2019 Claudio Beccari
%% All rights reserved
%%
%% License information appended
%%
-\NeedsTeXFormat{LaTeX2e}[2016/01/01]
+\NeedsTeXFormat{LaTeX2e}[2018/01/01]
\ProvidesPackage{toptesi}[%
-2018/11/20 v.6.2.09
+2019-07-26 v.6.3.06
Extension for toptesi.cls]
@@ -227,19 +227,23 @@
\newif\iffigurespage
\newif\iftablespage
\newif\ifnumeriromani
+\newif\if@mainmatter
\newif\iffrontmatter
-\def\frontmatter{\clearpage\ps@plain%
+\def\frontmatter{\clearpage\ps@plain\@mainmatterfalse
\ifTOPnumerazioneromana\numeriromanitrue\fi
\frontmattertrue\@openrightfalse\c@secnumdepth=-2\relax
}
-\def\mainmatter{\if@twoside\@openrighttrue\fi
+\def\mainmatter{\@mainmattertrue
+\if@twoside\@openrighttrue\fi
\ifTOPnumerazioneromana\numeriromanifalse\fi
- \frontmatterfalse\c@secnumdepth=2
+ \frontmatterfalse
+ \c@secnumdepth=2
\clearpage\ps@headings
\ifTOPnumerazioneromana\pagenumbering{arabic}\fi
}
\newcommand\backmatter{\cleardoublepage[empty]%
+\@mainmatterfalse
\setcounter{secnumdepth}{-1}\if@twoside\@openrightfalse\fi}
\AtBeginDocument{%
@@ -247,6 +251,7 @@
}
\figurespagefalse
\tablespagefalse
+
\let\ps@blank\ps@plain
\newcommand*\blankpagestyle[1]{%
\expandafter\let\expandafter\ps@blank\csname ps@#1\endcsname}
@@ -256,6 +261,7 @@
\if@openright
\null\thispagestyle{#1}\clearpage
\fi\fi\fi}
+
\def\sommario{%
\iffrontmatter\else\frontmattertrue\fi
\chapter*{\summaryname}}
@@ -264,24 +270,47 @@
\iffrontmatter\else\frontmattertrue\fi
\chapter*{\acknowledgename}}
\let\acknowledgements\ringraziamenti
-\def\@chapter[#1]#2{\iffrontmatter\mainmatter\fi
- \ifnum \c@secnumdepth >\m@ne
- \refstepcounter{chapter}%
- \typeout{\(a)chapapp\space\thechapter.}%
- \addcontentsline{toc}{chapter}%
- {\protect\numberline{\thechapter}#1}%
- \else
- \addcontentsline{toc}{chapter}{#1}%
- \fi
- \chaptermark{#1}%
- \addtocontents{lof}{\protect\addvspace{10\p@}}%
- \addtocontents{lot}{\protect\addvspace{10\p@}}%
- \if@twocolumn
- \@topnewpage[\@makechapterhead{#2}]%
- \else
- \@makechapterhead{#2}%
- \@afterheading
- \fi}
+\RenewDocumentCommand{\chapter}
+ {s O{#4} O{#2} m O{plain}}{%
+ \if@openright\cleardoublepage
+ \else\clearpage\fi
+ \thispagestyle{#5}%
+ \global\@topnum\z@
+ \@afterindentfalse
+\IfBooleanTF{#1}{%
+ \c@secnumdepth=-3\relax
+ \let\iftoc\iffalse
+}{%
+ \iffrontmatter\mainmatter\fi
+ \let\iftoc\iftrue
+}%
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter % where \if@mainmatter is defined
+ % (e.g. book.cls, toptesi.cls)
+ \refstepcounter{chapter}%
+ \typeout{\(a)chapapp\space\thechapter.}%
+ \iftoc\addcontentsline{toc}{chapter}{%
+ \protect\numberline{\thechapter}#2}\fi
+ \else %
+ \iftoc\addcontentsline{toc}{chapter}{#2}\fi
+ \fi
+ \else % Were \mainmatter is not defined (e.g.report.cls)
+ \iftoc\addcontentsline{toc}{chapter}{#2}\fi
+ \fi
+ \markboth{#3}{#3}% No \MakeUppercase
+ \iftoc
+ \addtocontents{lof}%
+ {\protect\addvspace{10\p@}}%
+ \addtocontents{lot}%
+ {\protect\addvspace{10\p@}}%
+ \fi
+ \if@twocolumn
+ \@topnewpage[\@makechapterhead{#4}]%
+ \else
+ \@makechapterhead{#4}%
+ \@afterheading
+ \fi
+}
\def\@part[#1]#2{\iffrontmatter\mainmatter\fi
\ifnum \c@secnumdepth >-2\relax
\refstepcounter{part}%
@@ -300,30 +329,34 @@
\fi
\Huge \bfseries #2\par}%
\@endpart}
+
\renewcommand\tableofcontents{%
\chapter*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
\@starttoc{toc}%
\clearpage
\if@restonecol\twocolumn\fi
}
+
+\providecommand\phantomsection{}% in case \hyperref was not loaded
+
\renewcommand\listoffigures{%
- \chapter*{\listfigurename}
- \@mkboth{\listfigurename}{\listfigurename}%
+ \phantomsection
+ \chapter*{\listfigurename}%
\addcontentsline{toc}{chapter}{\listfigurename}
\@starttoc{lof}%
\clearpage
\if@restonecol\twocolumn\fi
}
+
\renewcommand\listoftables{%
+ \phantomsection
\chapter*{\listtablename}%
\addcontentsline{toc}{chapter}{\listtablename}
- \@mkboth{\listtablename}{\listtablename}%
\@starttoc{lot}%
\clearpage
\if@restonecol\twocolumn\fi
}
-\def\indici{%
+\def\indici{% If headings are desired, the pagestyle must be set in advance
\iffrontmatter\else\frontmattertrue\fi
\tableofcontents
\iftablespage
@@ -333,7 +366,7 @@
\listoftables
\let\addvspace=\saveaddvspace}
\fi
- \iffigurespage
+ \iffigurespage%
{\addvspace{10pt}
\let\saveaddvspace=\addvspace
\def\addvspace##1{}
@@ -342,6 +375,7 @@
\fi
\ifbool{@twoside}{\cleardoublepage[empty]}{}}
\let\allcontents\indici
+
\onecolumn
\if@twoside
\unless\ifScuDo
@@ -557,7 +591,6 @@
\usecounter{enumi}}
\else
\chapter*{\bibname}\relax
- \@mkboth{\bibname}{\bibname}\relax
\addcontentsline{toc}{chapter}{\bibname}\relax
\list{[\arabic{enumi}]}{\settowidth\labelwidth{[#1]}%
\leftmargin\labelwidth
@@ -733,7 +766,7 @@
}
\let\wittysentences\citazioni \let\endwittysentences\endcitazioni
%%
-%% Copyright 2005-2018 Claudio Beccari
+%% Copyright 2005-2019 Claudio Beccari
%%
%% Distributable under the LaTeX Project Public License,
%% version 1.3c or higher (your choice). The latest version of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/toptesi.tlpobj new/tlpkg/tlpobj/toptesi.tlpobj
--- old/tlpkg/tlpobj/toptesi.tlpobj 2019-02-28 04:09:50.000000000 +0100
+++ new/tlpkg/tlpobj/toptesi.tlpobj 2019-07-26 23:54:49.000000000 +0200
@@ -1,6 +1,6 @@
name toptesi
category Package
-revision 49211
+revision 51743
shortdesc Bundle for typesetting multilanguage theses
relocated 1
longdesc This bundle contains everything needed for typesetting a
@@ -27,7 +27,7 @@
RELOC/tex/latex/toptesi/toptesi.cls
RELOC/tex/latex/toptesi/toptesi.sty
catalogue-ctan /macros/latex/contrib/toptesi
-catalogue-date 2018-11-21 16:45:50 +0100
+catalogue-date 2019-07-26 15:59:19 +0200
catalogue-license lppl1.3c
-catalogue-topics dissertation class
-catalogue-version 6.2.09
+catalogue-topics dissertation class multilingual
+catalogue-version 6.3.06
++++++ tpic2pdftex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/tpic2pdftex.man1.pdf and new/texmf-dist/doc/man/man1/tpic2pdftex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj new/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj
--- old/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/tpic2pdftex.doc.tlpobj 2019-11-19 01:55:54.000000000 +0100
@@ -1,6 +1,6 @@
name tpic2pdftex.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of tpic2pdftex
docfiles size=26
texmf-dist/doc/man/man1/tpic2pdftex.1
++++++ tracklang.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/CHANGES new/doc/generic/tracklang/CHANGES
--- old/doc/generic/tracklang/CHANGES 2018-05-13 23:53:50.000000000 +0200
+++ new/doc/generic/tracklang/CHANGES 2019-12-01 22:36:02.000000000 +0100
@@ -1,3 +1,44 @@
+v1.4 (2019-11-30):
+
+ * tracklang.tex:
+
+ - Changed \TrackLangIfFileExists to also include script and
+ variant in file search (search order has changed slightly).
+
+ - Added \TrackLangRedefHook
+
+ - New commands provided to assist integration with language
+ packages:
+
+ \TrackLangAddExtraRegionFile
+ \TrackLangAddExtraScriptFile
+ \TrackLangProvidePredefinedLanguage
+ \TrackLangProvidePredefinedDialect
+
+ - New switch \ifTrackLangShowVerbose for debugging
+
+v1.3.9 (2019-11-11):
+
+ * tracklang.tex:
+
+ - added \TrackIfKnownLanguage
+
+v1.3.8 (2019-10-06):
+
+ * tracklang.tex:
+
+ - added undetermined (und) language
+ - added 'nil' as a dialect of 'undetermined'
+
+ * tracklang.sty:
+
+ - added \@tracklang@prelangpkgcheck@hook
+
+v1.3.7 (2019-08.31):
+
+ * tracklang.sty: corrected misspelt \AddTrackedLangage (should be
+ \AddTrackedLanguage)
+
v1.3.6 (2018-05-13):
* \GetTrackedDialectFromLanguageTag now sets
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/README new/doc/generic/tracklang/README
--- old/doc/generic/tracklang/README 2018-05-13 23:53:50.000000000 +0200
+++ new/doc/generic/tracklang/README 2019-12-01 22:36:02.000000000 +0100
@@ -1,6 +1,6 @@
-Generic TeX Bundle : tracklang v1.3.6
+Generic TeX Bundle : tracklang v1.4
-Last Modified : 2018-05-13
+Last Modified : 2019-11-30
Author : Nicola Talbot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/tracklang/samples/animals/animals.sty new/doc/generic/tracklang/samples/animals/animals.sty
--- old/doc/generic/tracklang/samples/animals/animals.sty 2016-10-09 01:34:41.000000000 +0200
+++ new/doc/generic/tracklang/samples/animals/animals.sty 2019-12-01 22:36:02.000000000 +0100
@@ -1,9 +1,17 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{animals}[2016/10/06 v1.2 (NLCT) Sample package to test tracklang.sty]
+\ProvidesPackage{animals}[2019/11/30 v1.2.1 (NLCT) Sample package to test tracklang.sty]
-\RequirePackage{tracklang}[2016/10/07]
+\RequirePackage{tracklang}[2019/11/30]
-\DeclareOption*{\TrackLanguageTag{\CurrentOption}}
+\DeclareOption*{%
+ \TrackIfKnownLanguage{\CurrentOption}%
+ {\PackageInfo{animals}{Tracking language `\CurrentOption'}}% successful
+ {% failed
+ \PackageError{animals}%
+ {Unknown language specification `\CurrentOption'}%
+ {You need to supply either a known dialect label or a valid language tag}%
+ }%
+}
\ProcessOptions
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-babel.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-de-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-de.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-de.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals.pdf and new/doc/generic/tracklang/samples/animals/sample-animals.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de2.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de3.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-de4.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2-poly.pdf differ
Binary files old/doc/generic/tracklang/samples/animals/sample-animals2.pdf and new/doc/generic/tracklang/samples/animals/sample-animals2.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions.pdf and new/doc/generic/tracklang/samples/regions/sample-regions.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-manx.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map2.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-map3.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2-nomap.pdf differ
Binary files old/doc/generic/tracklang/samples/regions/sample-regions2.pdf and new/doc/generic/tracklang/samples/regions/sample-regions2.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang.pdf and new/doc/generic/tracklang/samples/sample-tracklang.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang2.pdf and new/doc/generic/tracklang/samples/sample-tracklang2.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang3.pdf and new/doc/generic/tracklang/samples/sample-tracklang3.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang4.pdf and new/doc/generic/tracklang/samples/sample-tracklang4.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang5.pdf and new/doc/generic/tracklang/samples/sample-tracklang5.pdf differ
Binary files old/doc/generic/tracklang/samples/sample-tracklang6.pdf and new/doc/generic/tracklang/samples/sample-tracklang6.pdf differ
Binary files old/doc/generic/tracklang/tracklang.pdf and new/doc/generic/tracklang/tracklang.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tracklang.doc.tlpobj new/tlpkg/tlpobj/tracklang.doc.tlpobj
--- old/tlpkg/tlpobj/tracklang.doc.tlpobj 2019-02-28 04:09:51.000000000 +0100
+++ new/tlpkg/tlpobj/tracklang.doc.tlpobj 2019-12-02 01:58:14.000000000 +0100
@@ -1,9 +1,9 @@
name tracklang.doc
category Package
-revision 47704
+revision 52991
shortdesc doc files of tracklang
relocated 1
-docfiles size=314
+docfiles size=330
RELOC/doc/generic/tracklang/CHANGES
RELOC/doc/generic/tracklang/README
RELOC/doc/generic/tracklang/samples/animals/animals-en-GB.ldf
++++++ tracklang.tar.xz ++++++
++++ 2154 lines of diff (skipped)
++++++ translations.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/README new/doc/latex/translations/README
--- old/doc/latex/translations/README 2017-09-01 03:34:26.000000000 +0200
+++ new/doc/latex/translations/README 2020-02-28 23:29:38.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the TRANSLATIONS package v1.7a - 2017/08/31
+the TRANSLATIONS package v1.8 - 2020/02/28
internationalization of LaTeX2e packages
--------------------------------------------------------------------------
@@ -7,7 +7,7 @@
Web: https://github.com/cgnieder/translations
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2012-2017 Clemens Niederberger
+Copyright 2012--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/translations/translations_en.pdf and new/doc/latex/translations/translations_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/translations/translations_en.tex new/doc/latex/translations/translations_en.tex
--- old/doc/latex/translations/translations_en.tex 2017-09-01 03:34:26.000000000 +0200
+++ new/doc/latex/translations/translations_en.tex 2020-02-28 23:29:38.000000000 +0100
@@ -1,7 +1,7 @@
-% !arara: pdflatex: { shell: on }
+% arara: pdflatex: { shell: on, interaction: nonstopmode }
% !arara: biber
-% arara: pdflatex
-% arara: pdflatex
+% !arara: pdflatex
+% !arara: pdflatex
% --------------------------------------------------------------------------
% the TRANSLATIONS package
%
@@ -12,7 +12,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -31,8 +31,10 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\documentclass[load-preamble+,french,spanish,ngerman,english]{cnltx-doc}
+\documentclass[load-preamble]{cnltx-doc}
+\usepackage[french,spanish,ngerman,english]{babel}
% ----------------------------------------------------------------------------
+\usepackage{imakeidx}
% document layout and typographic features
\setcnltx{
package = {translations} ,
@@ -81,13 +83,19 @@
\microtypesetup{tracking=scshape}
-\defbibheading{bibliography}[\bibname]{\addsec{#1}}
-
+\usepackage[
+ backend=biber,
+ style=cnltx,
+ sortlocale=en_US,
+ indexing=cite]{biblatex}
\usepackage{csquotes}
+\addbibresource{cnltx.bib}
+
+\usepackage[biblatex]{embrac}
+\ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
+\ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
-\usepackage{embrac}[2012/06/29]
- \ChangeEmph{[}[,.02em]{]}[.055em,-.08em]
- \ChangeEmph{(}[-.01em,.04em]{)}[.04em,-.05em]
+\defbibheading{bibliography}{\section{References}}
% ----------------------------------------------------------------------------
% other packages, bibliography, index
@@ -420,7 +428,7 @@
\meta{false} if the current \pkg{babel} language is \code{american}.
\expandable\command{ifcurrentbaselanguage}[\marg{lang}\marg{true}\marg{false}]
\sinceversion{1.2}Places \meta{true} in the input stream if the current
- language is \meta{lang}. Note: a dialect does notcount as a language of
+ language is \meta{lang}. Note: a dialect does not count as a language of
it's own here. If the current \pkg{babel} language is \code{american}
then \cs{ifcurrentbaselanguage}\Marg{English} will be \meta{true}.
\end{commands}
@@ -488,7 +496,7 @@
chosen a language for which no translation is defined the language `fallback'
will be used, \ie, the translation provided with
\cs{DeclareTranslationFallback}. If no fallback translation is provided
-either the translation will expand to the literal string.
+either, the translation will expand to the literal string.
The following three examples should make this concept clear:
@@ -618,10 +626,13 @@
\item German, and
\item Spanish.
\end{itemize}
-The corresponding dictionary is loaded automatically if the document language
-is one of these languages. If you'd like to contribute and add the basic
-dictionary in your language this is more than welcome and highly appreciated!
-The easiest way to do this would be to copy one of the existing files
+The corresponding dictionary\footnote{Or dictionaries if more than one of
+ these languages are loaded in a document. This works since v0.18.} is loaded
+automatically if the document language is one of these languages.
+
+\emph{If you'd like to contribute and add the basic dictionary in your
+ language this is more than welcome and highly appreciated!} The easiest way
+to do this would be to copy one of the existing files
\code{translations-basic-dictionary-\meta{lang}.trsl} and modify the file
accordingly. You can then send me the file via email and I'll add it to
\translations.
@@ -775,4 +786,6 @@
% \section{Implementation}
% \lstinputlisting[style=cnltx]{translations.sty}
+\printbibliography
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.doc.tlpobj new/tlpkg/tlpobj/translations.doc.tlpobj
--- old/tlpkg/tlpobj/translations.doc.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translations.doc.tlpobj 2020-02-29 02:00:23.000000000 +0100
@@ -1,9 +1,9 @@
name translations.doc
category Package
-revision 45189
+revision 53962
shortdesc doc files of translations
relocated 1
-docfiles size=134
+docfiles size=132
RELOC/doc/latex/translations/README
RELOC/doc/latex/translations/translations_en.pdf
RELOC/doc/latex/translations/translations_en.tex
++++++ translations.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-catalan.trsl new/tex/latex/translations/translations-basic-dictionary-catalan.trsl
--- old/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-catalan.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-dutch.trsl new/tex/latex/translations/translations-basic-dictionary-dutch.trsl
--- old/tex/latex/translations/translations-basic-dictionary-dutch.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-dutch.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-english.trsl new/tex/latex/translations/translations-basic-dictionary-english.trsl
--- old/tex/latex/translations/translations-basic-dictionary-english.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-english.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-french.trsl new/tex/latex/translations/translations-basic-dictionary-french.trsl
--- old/tex/latex/translations/translations-basic-dictionary-french.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-french.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-german.trsl new/tex/latex/translations/translations-basic-dictionary-german.trsl
--- old/tex/latex/translations/translations-basic-dictionary-german.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-german.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations-basic-dictionary-spanish.trsl new/tex/latex/translations/translations-basic-dictionary-spanish.trsl
--- old/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2017-04-24 23:26:31.000000000 +0200
+++ new/tex/latex/translations/translations-basic-dictionary-spanish.trsl 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translations/translations.sty new/tex/latex/translations/translations.sty
--- old/tex/latex/translations/translations.sty 2017-09-01 03:34:26.000000000 +0200
+++ new/tex/latex/translations/translations.sty 2020-02-28 23:29:38.000000000 +0100
@@ -8,7 +8,7 @@
% Web: https://github.com/cgnieder/translations
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2012-2017 Clemens Niederberger
+% Copyright 2012--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,8 +25,8 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\newcommand*\@trnslt@date{2017/08/31}
-\newcommand*\@trnslt@version{v1.7a}
+\newcommand*\@trnslt@date{2018/02/28}
+\newcommand*\@trnslt@version{v1.8}
\newcommand*\@trnslt@packageinfo{internationalization of LaTeX2e packages}
\ProvidesPackage{translations}[%
@@ -143,7 +143,9 @@
\@trnslt@if@language{#1}
{}{%
\csdef{@trnslt@language@#1}{#1}%
- \listeadd\@trnslt@languages{#1}%
+ \@trnslt@if@dialect{#1}
+ {}
+ {\listeadd\@trnslt@languages{#1}}%
}%
}
@@ -838,6 +840,29 @@
\DeclareLanguage{vietnamese}
\DeclareLanguage{welsh}
+\DeclareLanguageDialect{british}{english}
+\DeclareLanguageDialect{australian}{english}
+\DeclareLanguageDialect{american}{english}
+\DeclareLanguageDialect{acadian}{french}
+\DeclareLanguageDialect{canadien}{french}
+\DeclareLanguageDialect{canadian}{english}
+\DeclareLanguageDialect{newzealand}{english}
+\DeclareLanguageDialect{irish}{gaelic}
+\DeclareLanguageDialect{scottish}{gaelic}
+\DeclareLanguageDialect{austrian}{german}
+\DeclareLanguageDialect{hindi}{hindustani}
+\DeclareLanguageDialect{urdu}{hindustani}
+\DeclareLanguageDialect{indonesian}{malay}
+\DeclareLanguageDialect{brazil}{portuges}
+\DeclareLanguageDialect{serbian}{serbocroatian}
+\DeclareLanguageDialect{croatian}{serbocroatian}
+\DeclareLanguageDialect{lowersorbian}{sorbian}
+\DeclareLanguageDialect{uppersorbian}{sorbian}
+\DeclareLanguageDialect{swissgerman}{german}
+\DeclareLanguageDialect{swissfrench}{french}
+\DeclareLanguageDialect{swissitalian}{italian}
+\DeclareLanguageDialect{swissromansh}{romansh}
+
% --------------------------------------------------------------------------
% aliases and dialects:
\DeclareLanguageAlias {Afrikaans}{afrikaans}
@@ -866,32 +891,23 @@
\DeclareLanguageAlias {Finnish}{finnish}
\DeclareLanguageAlias {francais}{french}
\DeclareLanguageAlias {Francais}{francais}
-\DeclareLanguageDialect{canadien}{french}
\DeclareLanguageAlias {Canadien}{canadien}
\DeclareLanguageAlias {French}{french}
-\DeclareLanguageDialect{acadian}{french}
\DeclareLanguageAlias {Acadian}{acadian}
\DeclareLanguageAlias {frenchle}{french}
-\DeclareLanguageDialect{american}{english}
\DeclareLanguageAlias {American}{american}
-\DeclareLanguageDialect{australian}{english}
\DeclareLanguageAlias {Australian}{australian}
-\DeclareLanguageDialect{british}{english}
\DeclareLanguageAlias {British}{british}
-\DeclareLanguageDialect{canadian}{english}
\DeclareLanguageAlias {Canadian}{canadian}
\DeclareLanguageAlias {English}{english}
\DeclareLanguageAlias {UKenglish}{british}
\DeclareLanguageAlias {USenglish}{american}
-\DeclareLanguageDialect{newzealand}{english}
\DeclareLanguageAlias {Newzealand}{newzealand}
\DeclareLanguageAlias {Ethiop}{ethiop}
\DeclareLanguageAlias {Esperanto}{esperanto}
\DeclareLanguageAlias {Estonian}{estonian}
\DeclareLanguageAlias {Friulan}{friulan}
\DeclareLanguageAlias {Gaelic}{gaelic}
-\DeclareLanguageDialect{irish}{gaelic}
-\DeclareLanguageDialect{scottish}{gaelic}
\DeclareLanguageAlias {Irish}{irish}
\DeclareLanguageAlias {irish gaelic}{irish}
\DeclareLanguageAlias {Irish Gaelic}{irish}
@@ -902,7 +918,6 @@
\DeclareLanguageAlias {German}{german}
\DeclareLanguageAlias {germanb}{german}
\DeclareLanguageAlias {ngerman}{german}
-\DeclareLanguageDialect{austrian}{german}
\DeclareLanguageAlias {Austrian}{austrian}
\DeclareLanguageAlias {naustrian}{austrian}
\DeclareLanguageAlias {Greek}{greek}
@@ -913,9 +928,7 @@
\DeclareLanguageAlias {Hindustani}{hindustani}
\DeclareLanguageAlias {hindi-urdu}{hindustani}
\DeclareLanguageAlias {Hindi-Urdu}{hindi-urdu}
-\DeclareLanguageDialect{hindi}{hindustani}
\DeclareLanguageAlias {Hindi}{hindi}
-\DeclareLanguageDialect{urdu}{hindustani}
\DeclareLanguageAlias {Urdu}{urdu}
\DeclareLanguageAlias {Hungarian}{hungarian}
\DeclareLanguageAlias {magyar}{hungarian}
@@ -949,7 +962,6 @@
\DeclareLanguageAlias {Bahasai}{bahasai}
\DeclareLanguageAlias {bahasam}{bahasa}
\DeclareLanguageAlias {Bahasam}{bahasam}
-\DeclareLanguageDialect{indonesian}{malay}
\DeclareLanguageAlias {Indonesian}{indonesian}
\DeclareLanguageAlias {indon}{indonesian}
%
@@ -975,7 +987,6 @@
\DeclareLanguageAlias {Piemonteis}{piemonteis}
\DeclareLanguageAlias {Pinyin}{pinyin}
\DeclareLanguageAlias {Polish}{polish}
-\DeclareLanguageDialect{brazil}{portuges}
\DeclareLanguageAlias {Brazil}{brazil}
\DeclareLanguageAlias {brazilian}{brazil}
\DeclareLanguageAlias {Brazilian}{brazilian}
@@ -998,18 +1009,14 @@
\DeclareLanguageAlias {Serbocroatian}{serbocroatian}
\DeclareLanguageAlias {serbo-croatian}{serbocroatian}
\DeclareLanguageAlias {Serbo-Croatian}{serbocroatian}
-\DeclareLanguageDialect{serbian}{serbocroatian}
\DeclareLanguageAlias {Serbian}{serbian}
\DeclareLanguageAlias {serbianc}{serbian}
-\DeclareLanguageDialect{croatian}{serbocroatian}
\DeclareLanguageAlias {Croatian}{croatian}
\DeclareLanguageAlias {Slovak}{slovak}
\DeclareLanguageAlias {Slovenian}{slovenian}
\DeclareLanguageAlias {slovene}{slovenian}
\DeclareLanguageAlias {Slovene}{slovene}
\DeclareLanguageAlias {Sorbian}{sorbian}
-\DeclareLanguageDialect{lowersorbian}{sorbian}
-\DeclareLanguageDialect{uppersorbian}{sorbian}
\DeclareLanguageAlias {Lowersorbian}{lowersorbian}
\DeclareLanguageAlias {Uppersorbian}{uppersorbian}
\DeclareLanguageAlias {lsorbian}{lowersorbian}
@@ -1023,10 +1030,6 @@
\DeclareLanguageAlias {Spanglish}{spanglish}
\DeclareLanguageAlias {Spanish}{spanish}
\DeclareLanguageAlias {Swedish}{swedish}
-\DeclareLanguageDialect{swissgerman}{german}
-\DeclareLanguageDialect{swissfrench}{french}
-\DeclareLanguageDialect{swissitalian}{italian}
-\DeclareLanguageDialect{swissromansh}{romansh}
\DeclareLanguageAlias {Swissgerman}{swissgerman}
\DeclareLanguageAlias {swiss german}{swissgerman}
\DeclareLanguageAlias {Swiss German}{swissgerman}
@@ -1060,11 +1063,22 @@
% OK, we have everything, do we? No, wait: let's load the basic dictionary
% that is part of this package if it is available for the document language
% --------------------------------------------------------------------------
-% load basic dictionary if available
+% load basic dictionaries if available
\AtBeginDocument{%
- \@trnslt@load@dictionary@silent@for
- {translations-basic-dictionary}
- \@trnslt@current@language
+ \@ifpackageloaded{babel}
+ {\let\@trnslt@loaded@languages\bbl@loaded}
+ {}%
+ \@ifpackageloaded{polyglossia}
+ {\let\@trnslt@loaded@languages\xpg@loaded}
+ {}%
+ \ifdefined\@trnslt@loaded@languages\else
+ \let\@trnslt@loaded@languages\@trnslt@current@language
+ \fi
+ \expanded{%
+ \noexpand\forcsvlist
+ {\noexpand\@trnslt@load@dictionary@silent@for{translations-basic-dictionary}}
+ {\expandonce\@trnslt@loaded@languages}%
+ }%
}
\endinput
@@ -1158,3 +1172,5 @@
2017/07/03 v1.6a - fix issue #6 (bug in \@trnslt@save@translation@for)
2017/07/06 v1.7 - return translation values in \unexpanded
2017/08/31 v1.7a - add missing dependency on pdftexcmds
+2020/02/28 v1.8 - load basic dictionary for each loaded language (if
+ available)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translations.tlpobj new/tlpkg/tlpobj/translations.tlpobj
--- old/tlpkg/tlpobj/translations.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translations.tlpobj 2020-02-29 02:00:23.000000000 +0100
@@ -1,6 +1,6 @@
name translations
category Package
-revision 45189
+revision 53962
shortdesc Internationalisation of LaTeX2e packages
relocated 1
longdesc This package (once part of the exsheets package), provides a
@@ -24,7 +24,6 @@
catalogue-contact-bugs https://github.com/cgnieder/translations/issues
catalogue-contact-repository https://github.com/cgnieder/translations/
catalogue-ctan /macros/latex/contrib/translations
-catalogue-date 2017-11-30 18:19:07 +0100
catalogue-license lppl1.3
catalogue-topics multilingual package-supp
-catalogue-version 1.7a
+catalogue-version 1.8
++++++ translator.doc.tar.xz ++++++
Binary files old/doc/latex/translator/translator.pdf and new/doc/latex/translator/translator.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translator.doc.tlpobj new/tlpkg/tlpobj/translator.doc.tlpobj
--- old/tlpkg/tlpobj/translator.doc.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translator.doc.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name translator.doc
category Package
-revision 46231
+revision 54512
shortdesc doc files of translator
relocated 1
docfiles size=57
++++++ translator.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator-environment-dictionary-French.dict new/tex/latex/translator/translator-environment-dictionary-French.dict
--- old/tex/latex/translator/translator-environment-dictionary-French.dict 2017-11-30 22:55:26.000000000 +0100
+++ new/tex/latex/translator/translator-environment-dictionary-French.dict 2019-05-31 23:46:14.000000000 +0200
@@ -7,4 +7,4 @@
\providetranslation{disadvantage}{d\'esavantage}
\providetranslation{Disadvantage}{D\'esavantage}
\providetranslation{disadvantages}{d\'esavantages}
-\providetranslation{disadvantages}{D\'esavantages}
+\providetranslation{Disadvantages}{D\'esavantages}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator-months-dictionary-Italian.dict new/tex/latex/translator/translator-months-dictionary-Italian.dict
--- old/tex/latex/translator/translator-months-dictionary-Italian.dict 2017-11-30 22:55:26.000000000 +0100
+++ new/tex/latex/translator/translator-months-dictionary-Italian.dict 2019-05-31 23:46:14.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesDictionary{translator-months-dictionary}{English}
+\ProvidesDictionary{translator-months-dictionary}{Italian}
\providetranslation{January}{gennaio}
\providetranslation{February}{febbraio}
@@ -26,11 +26,11 @@
\providetranslation{Nov}{nov}
\providetranslation{Dec}{dic}
-\providetranslation{Monday}{Luned\`i}
+\providetranslation{Monday}{luned\`i}
\providetranslation{Tuesday}{marted\`i}
\providetranslation{Wednesday}{mercoled\`i}
\providetranslation{Thursday}{gioved\`i}
-\providetranslation{Friday}{venerdi\`i}
+\providetranslation{Friday}{venerd\`i}
\providetranslation{Saturday}{sabato}
\providetranslation{Sunday}{domenica}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/translator/translator.sty new/tex/latex/translator/translator.sty
--- old/tex/latex/translator/translator.sty 2018-01-06 22:33:00.000000000 +0100
+++ new/tex/latex/translator/translator.sty 2019-05-31 23:46:14.000000000 +0200
@@ -1,7 +1,7 @@
% Copyright 2007 by Till Tantau
% Copyright 2010 by Vedran Mileti\'c
% Copyright 2012,2105 by Vedran Mileti\'c, Joseph Wright
-% Copyright 2017,2018 Joseph Wright
+% Copyright 2017-2019 Joseph Wright
%
% This file may be distributed and/or modified
%
@@ -11,7 +11,7 @@
% See the documentation file for more details.
\ProvidesPackage{translator}
- [2018/01/04 v1.12 Easy translation of strings in LaTeX]
+ [2019-05-31 v1.12a Easy translation of strings in LaTeX]
\RequirePackage{keyval}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/translator.tlpobj new/tlpkg/tlpobj/translator.tlpobj
--- old/tlpkg/tlpobj/translator.tlpobj 2019-02-28 04:09:55.000000000 +0100
+++ new/tlpkg/tlpobj/translator.tlpobj 2020-03-24 02:04:08.000000000 +0100
@@ -1,6 +1,6 @@
name translator
category Package
-revision 46231
+revision 54512
shortdesc Easy translation of strings in LaTeX
relocated 1
longdesc This LaTeX package provides a flexible mechanism for
@@ -121,7 +121,6 @@
catalogue-contact-bugs https://github.com/josephwright/translator/issues
catalogue-contact-repository https://github.com/josephwright/translator
catalogue-ctan /macros/latex/contrib/translator
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl
+catalogue-license lppl gpl
catalogue-topics multilingual package-supp
-catalogue-version 1.12
+catalogue-version 1.12a
++++++ ttfutils.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/ttf2afm.1 new/texmf-dist/doc/man/man1/ttf2afm.1
--- old/texmf-dist/doc/man/man1/ttf2afm.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/ttf2afm.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TTF2AFM 1 "8 March 2016" "Web2C 2019"
+.TH TTF2AFM 1 "8 March 2016" "Web2C 2020"
.PP
.SH "NAME"
ttf2afm \- utility to generate AFM files for TrueType fonts
Binary files old/texmf-dist/doc/man/man1/ttf2afm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2afm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttf2pk.man1.pdf and new/texmf-dist/doc/man/man1/ttf2pk.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf and new/texmf-dist/doc/man/man1/ttf2tfm.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/ttfdump.man1.pdf and new/texmf-dist/doc/man/man1/ttfdump.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.doc.tlpobj new/tlpkg/tlpobj/ttfutils.doc.tlpobj
--- old/tlpkg/tlpobj/ttfutils.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/ttfutils.doc.tlpobj 2020-03-04 23:54:20.000000000 +0100
@@ -1,6 +1,6 @@
name ttfutils.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of ttfutils
docfiles size=65
texmf-dist/doc/man/man1/ttf2afm.1
++++++ ttfutils.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ttfutils.tlpobj new/tlpkg/tlpobj/ttfutils.tlpobj
--- old/tlpkg/tlpobj/ttfutils.tlpobj 2019-03-27 02:27:00.000000000 +0100
+++ new/tlpkg/tlpobj/ttfutils.tlpobj 2020-03-04 23:54:20.000000000 +0100
@@ -1,6 +1,6 @@
name ttfutils
category TLCore
-revision 50602
+revision 54074
shortdesc convert TrueType to TFM and PK fonts
longdesc Utilities: ttf2afm ttf2pk ttf2tfm ttfdump. FreeType is the
longdesc underlying library.
++++++ tudscr.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/LICENSE.md new/doc/latex/tudscr/LICENSE.md
--- old/doc/latex/tudscr/LICENSE.md 2017-03-27 23:42:47.000000000 +0200
+++ new/doc/latex/tudscr/LICENSE.md 2020-01-14 22:52:06.000000000 +0100
@@ -1,8 +1,8 @@
- TUD-Script -- Corporate Design of Technische UniversitÀt Dresden
+ TUD-Script – Corporate Design of Technische UniversitÀt Dresden
----------------------------------------------------------------------------
- Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2017
+ Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2020
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tudscr/README.md new/doc/latex/tudscr/README.md
--- old/doc/latex/tudscr/README.md 2017-06-06 01:14:56.000000000 +0200
+++ new/doc/latex/tudscr/README.md 2020-01-14 22:52:06.000000000 +0100
@@ -1,10 +1,10 @@
- TUD-Script -- Corporate Design of Technische UniversitÀt Dresden
+ TUD-Script – Corporate Design of Technische UniversitÀt Dresden
----------------------------------------------------------------------------
- Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2017
+ Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2012-2020
- tudscr 2017/03/29 v2.05l
+ tudscr 2020/01/14 v2.06f
----------------------------------------------------------------------------
@@ -20,18 +20,11 @@
Das TUD-Script-Bundle stellt sowohl Klassen als auch Pakete bereit, um
LaTeX-Dokumente im Corporate Design der Technischen UniversitÀt Dresden zu
erstellen. Es basiert auf dem KOMA-Script-Bundle, welches zwingend vorhanden
-sein muss. AuÃerdem sollten die beiden PostScript-Schriftfamilien Univers und
-DIN-Bold installiert werden. Geschieht dies nicht, können die Dokumentklassen
-zwar genutzt werden, die ausgegebenen Dokumente entsprechen in diesem Fall
-jedoch nicht dem ursprÃŒnglich erhofftem Stil.
-
-Mitarbeiter und Studenten der Technischen UniversitÀt Dresden können die
-Schriftdateien unter https://tu-dresden.de/service/publizieren/cd/4_latex vom
-UniversitÀtsmarketing mit dem Hinweis auf die Verwendung von LaTeX anfordern.
-FÃŒr die Installation der PostScript-Schriften sei auf den entsprechenden
-Release unter https://github.com/tud-cd/tudscr/releases/tag/fonts und das
-LaTeX-Forum der Technischen UniversitÀt Dresden verwiesen:
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
+sein muss. Bei Fragen, Problemen und Anmerkungen sei entweder auf das
+[LaTeX-Forum der Technischen UniversitÀt Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+oder das
+[GitHub-Repository *tudscr*](https://github.com/tud-cd/tudscr/issues)
+verwiesen:
Klassen und Pakete
@@ -53,13 +46,45 @@
TUD-Script vereinfacht,
+ das Paket **mathswap** fÃŒr das Austauschen mathematischer Trennzeichen
innerhalb von Zahlen (Àhnlich zu **ionumbers**),
-+ das Paket **twocolfix** zur Fehlerbefehbung der Position von Ãberschriften im
- zweispaltigen Layout und
++ das Paket **twocolfix** zur Fehlerbefehbung der Position von Ãberschriften
+ im zweispaltigen Layout und
+ eine umfassende Anwenderdokumentation sowie mehrere Tutorials.
Versionen
---------
+**v2.06f** (2020/01/14)
++ Anpassungen fÃŒr Paket `scrbase v3.28`
+
+**v2.06e** (2019/10/23)
++ Bugfix fÃŒr Paket `scrlfile v3.27`
+
+**v2.06d** (2019/08/27)
++ Bugfix fÃŒr griechische Glyphen im Mathematikmodus beim Einsatz von LuaLaTeX
+ (Ligaturen fÃŒr angrenzende Glyphen sind entgegen der Definition aktiviert)
+
+**v2.06c** (2019/08/20)
++ Bugfix fÃŒr Paket **fix-tudscrfonts**
++ Bugfix fÃŒr `\textrightarrow`
++ vertikales Layout der Ausgaben von Paket **tudscrsupervisor** verbessert
++ Verwendung von Paket **mathastext** angepasst
+
+**v2.06b** (2019/07/17)
++ Bugfix fÃŒr nicht ordnungsgemÀÃes NFSS (New Font Selection Scheme)
+
+**v2.06a** (2019/07/09)
++ Bugfix fÃŒr Paket **mathastext** bezÃŒglich der Eingabekodierung
+
+**v2.06** (2019/06/28)
++ Open Sans als neue Schrift des Corporate Designs
++ Minuskelziffern als Standard auswÀhlbar
++ UnterstÃŒtzung von Roboto Mono als Schreibmaschinenschrift
++ Unterschriftenfeld auf Titel mit Option `titlesignature` bereitgestellt
++ E-Mail-Adresse auf Titel mit `\emailaddress` nutzbar
++ Befehl `\frontispiece` aus KOMA-Script unterstÃŒtzt
++ individuelle Untertitel fÃŒr Teile und Kapitel mit `\setpartsubtitle` und
+ `\setchaptersubtitle` möglich
+
**v2.05m** (2017/05/30)
+ Bugfix fÃŒr Unicode-Engines fÃŒr die Glyphe `Ã`
+ Bugfix fÃŒr Paket **siunitx** bei Erkennung der Schriftfamilie
@@ -154,7 +179,7 @@
+ Probleme mit der Klasse **standalone** behoben
+ Laden der Schriften des Corporate Designs im OpenType-Format mit Paket
**fontspec** ermöglicht
-+ verbesserte Installationsroutine der PostScript-Schriften
++ verbesserte Installationsroutine der Type1-Schriften
+ Seiten im Stil des Corporate Designs werden mithilfe des Paketes
**scrlayer-scrpage** erzeugt
+ verschiedene Optionen und Befehle zur individuellen Gestaltung dieser Seiten
@@ -191,20 +216,14 @@
Summary
-------
-The TUD-Script bundle provides both classes and packages in order to
-create LaTeX documents in the corporate design of the Technische UniversitÀt
-Dresden. It bases on the KOMA-Script bundle, which must necessarily be present.
-In addition, the PostScript font families Univers and DIN-Bold should be
-installed. Otherwise, the document classes can admittedly be used, but in this
-case, the created documents do not correspond to the originally thought style.
-
-Employees and students of the Technische UniversitÀt Dresden can request these
-fonts via https://tu-dresden.de/service/publizieren/cd/4_latex from the
-university marketing university marketing with regard to the use of LaTeX. To
-install the PostScript fonts, please refer to the corresponding release under
-https://github.com/tud-cd/tudscr/releases/tag/fonts and the LaTeX forum of the
-Technische UniversitÀt Dresden:
-http://latex.wcms-file3.tu-dresden.de/phpBB3/
+The TUD-Script bundle provides both classes and packages in order to create
+LaTeX documents in the corporate design of the Technische UniversitÀt Dresden.
+It bases on the KOMA-Script bundle, which must necessarily be present.
+For questions, problems and comments, please refer to eihter the
+[LaTeX forum of the Technische UniversitÀt Dresden](https://latex.wcms-file3.tu-dresden.de/phpBB3/)
+or the
+[GitHub repository *tudscr*](https://github.com/tud-cd/tudscr/issues):
+
Classes and Packages
--------------------
@@ -232,6 +251,38 @@
Versions
--------
+**v2.06f** (2020/01/14)
++ adaptions for package `scrbase v3.28`
+
+**v2.06e** (2019/10/23)
++ bug fix for package `scrlfile v3.27`
+
+**v2.06d** (2019/08/27)
++ bug fix for greek glyphs in math mode when using LuaLaTeX
+ (boundary ligatures are activated contrary to definition)
+
+**v2.06c** (2019/08/20)
++ bug fix for package **fix-tudscrfonts**
++ bug fix for `\textrightarrow`
++ improved vertical layout of output generated by package **tudscrsupervisor**
++ revised usage of package **mathastext**
+
+**v2.06b** (2019/07/17)
++ bug fix for improper NFSS (New Font Selection Scheme)
+
+**v2.06a** (2019/07/09)
++ bug fix for package **mathastext** regarding input encoding
+
+**v2.06** (2019/06/28)
++ Open Sans as new corporate design font
++ text figures selectable as default
++ support of Roboto Mono as typewriter font
++ signature field on title page with option `titlesignature` provided
++ e-mail address on title page with `\emailaddress` available
++ macro `\frontispiece` from KOMA-Script supported
++ customized subtitles for parts and chapters with `\setpartsubtitle` and
+ `\setchaptersubtitle` possible
+
**v2.05m** (2017/05/30)
+ bug fix for Unicode engines for glyph`Ã`
+ bug fix for package **siunitx** when recognizing the font family
@@ -325,7 +376,7 @@
+ fixed bug with class **standalone**
+ loading the corporate design fonts in OpenType format with package
**fontspec** is possible
-+ improved installation routine of PostScript fonts
++ improved installation routine of Type1 fonts
+ pages in the style of the corporate design are generated using the package
**scrlayer-scrpage**
+ various options and commands to customize these pages
Binary files old/doc/latex/tudscr/tudscr.pdf and new/doc/latex/tudscr/tudscr.pdf differ
Binary files old/doc/latex/tudscr/tudscr_print.pdf and new/doc/latex/tudscr/tudscr_print.pdf differ
Binary files old/doc/latex/tudscr/tudscrsource.pdf and new/doc/latex/tudscr/tudscrsource.pdf differ
Binary files old/doc/latex/tudscr/tutorials/mathswap.pdf and new/doc/latex/tudscr/tutorials/mathswap.pdf differ
Binary files old/doc/latex/tudscr/tutorials/mathtype.pdf and new/doc/latex/tudscr/tutorials/mathtype.pdf differ
Binary files old/doc/latex/tudscr/tutorials/treatise.pdf and new/doc/latex/tudscr/tutorials/treatise.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tudscr.doc.tlpobj new/tlpkg/tlpobj/tudscr.doc.tlpobj
--- old/tlpkg/tlpobj/tudscr.doc.tlpobj 2019-02-28 04:10:08.000000000 +0100
+++ new/tlpkg/tlpobj/tudscr.doc.tlpobj 2020-04-15 01:55:09.000000000 +0200
@@ -1,9 +1,9 @@
name tudscr.doc
category Package
-revision 44480
+revision 54744
shortdesc doc files of tudscr
relocated 1
-docfiles size=1143
+docfiles size=1096
RELOC/doc/latex/tudscr/LICENSE.md
RELOC/doc/latex/tudscr/README.md
RELOC/doc/latex/tudscr/tudscr.pdf
++++++ tudscr.tar.xz ++++++
++++ 37310 lines of diff (skipped)
++++++ tugboat-plain.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/plain/tugboat-plain/README new/doc/plain/tugboat-plain/README
--- old/doc/plain/tugboat-plain/README 2016-11-08 23:36:17.000000000 +0100
+++ new/doc/plain/tugboat-plain/README 2019-06-13 21:55:08.000000000 +0200
@@ -1,8 +1,8 @@
-$Id: README 169 2016-11-07 19:11:13Z karl $
+$Id: README 242 2019-06-12 22:01:32Z karl $
(This README file is public domain.)
The plain style files for TUGboat, the journal of the TeX Users Group.
-See http://tug.org/TUGboat for all issues, contact information,
+See https://tug.org/TUGboat for all issues, contact information,
notes for authors, and all else.
tugboat.sty is for both regular and proceedings issue. Just \input it.
Binary files old/doc/plain/tugboat-plain/tubguide.pdf and new/doc/plain/tugboat-plain/tubguide.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj
--- old/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat-plain.doc.tlpobj 2019-06-14 01:38:39.000000000 +0200
@@ -1,6 +1,6 @@
name tugboat-plain.doc
category Package
-revision 48608
+revision 51373
shortdesc doc files of tugboat-plain
relocated 1
docfiles size=60
++++++ tugboat-plain.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/plain/tugboat-plain/tugboat.sty new/tex/plain/tugboat-plain/tugboat.sty
--- old/tex/plain/tugboat-plain/tugboat.sty 2018-09-06 22:47:33.000000000 +0200
+++ new/tex/plain/tugboat-plain/tugboat.sty 2019-06-13 21:55:08.000000000 +0200
@@ -1,6 +1,6 @@
%% @texfile{
%% filename = "tugboat.sty",
-%% copyright = "Copyright 1993,1999,2003,2006,2011-2017 TeX Users Group.
+%% copyright = "Copyright 1993,1999,2003,2006,2011-2019 TeX Users Group.
%% Unlimited copying and redistribution of this file
%% are permitted as long as this file is not
%% modified. Modifications (and redistribution of
@@ -18,11 +18,11 @@
%% for preparation of items in TUGboat, the
%% Communications of the TeX Users Group.",
%% }
-%% $Id: tugboat.sty 207 2018-09-06 17:32:17Z karl $
+%% $Id: tugboat.sty 242 2019-06-12 22:01:32Z karl $
\def\thistubstyle{plain}
-\def\fileversion{v1.24}
-\def\filedate{2018-09-05}
+\def\fileversion{v1.25}
+\def\filedate{2019-06-10}
% general items
@@ -228,7 +228,7 @@
\belowdisplayskip=3pt plus 3pt minus 1pt
\abovedisplayshortskip=0pt plus 3pt
\belowdisplayshortskip=1pt plus 3pt minus 1pt
- \def\rm{\fam\z@\tenrm}%
+ \def\rm{\def\sl{\fam\slfam\tensl}\fam\z@\tenrm}%
\textfont\z@=\tenrm \scriptfont\z@=\sevenrm
\def\oldstyle{\fam\@ne\teni}%
\textfont\@ne=\teni \scriptfont\@ne=\seveni
@@ -2200,6 +2200,11 @@
Version Date Changes
------- --------- ---------------------------------------------------
+1.25 12 Jun 19 \tenpoint \rm: reset \sl to \tensl,
+ since the \tenpoint \bf changes it to \tenbfsl.
+
+1.24 5 Sep 18 only version number bump to match tugboat.cmn.
+
1.23 19 Mar 17 define \manual and \manualsl in each of \tenpoint,
\ninepoint, \eightpoint; define \SMC in \eightpoint.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat-plain.tlpobj new/tlpkg/tlpobj/tugboat-plain.tlpobj
--- old/tlpkg/tlpobj/tugboat-plain.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat-plain.tlpobj 2019-06-14 01:38:39.000000000 +0200
@@ -1,6 +1,6 @@
name tugboat-plain
category Package
-revision 48608
+revision 51373
shortdesc Plain TeX macros for TUGboat
relocated 1
longdesc The macros defined in this directory (in files tugboat.sty and
@@ -12,7 +12,7 @@
RELOC/tex/plain/tugboat-plain/tugproc.sty
catalogue-also tugboat
catalogue-ctan /macros/plain/contrib/tugboat
-catalogue-date 2018-09-06 20:20:38 +0200
+catalogue-date 2019-06-13 05:27:39 +0200
catalogue-license other-free
catalogue-topics journalpub
-catalogue-version 1.24
+catalogue-version 1.25
++++++ tugboat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tugboat/README new/doc/latex/tugboat/README
--- old/doc/latex/tugboat/README 2018-09-06 22:47:15.000000000 +0200
+++ new/doc/latex/tugboat/README 2020-03-12 21:31:15.000000000 +0100
@@ -1,11 +1,11 @@
-$Id: README 205 2018-09-06 17:28:53Z karl $
-Copyright 2006, 2009-2018 TeX Users Group.
+$Id: README 274 2020-03-12 16:47:21Z karl $
+Copyright 2006, 2009-2020 TeX Users Group.
You may freely use, modify and/or distribute this file.
LaTeX macros for use in TUGboat
===============================
-See the TUGboat web pages at http://tug.org/TUGboat for upcoming
+See the TUGboat web pages at https://tug.org/TUGboat for upcoming
deadlines, tips on writing articles, access to online issues, etc.
We greatly appreciate new article submissions!
@@ -24,7 +24,7 @@
Usually you can get the tugboat packages through your distribution.
But if you want to install it by hand from CTAN, its directory there
-(see http://ctan.org/pkg/tugboat) has three files containing TeX code:
+(see https://ctan.org/pkg/tugboat) has three files containing TeX code:
tugboat.dtx -- the source for the macros
tugboat.ins -- the docstrip instructions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tugboat/ltubguid.ltx new/doc/latex/tugboat/ltubguid.ltx
--- old/doc/latex/tugboat/ltubguid.ltx 2018-12-14 22:55:53.000000000 +0100
+++ new/doc/latex/tugboat/ltubguid.ltx 2020-03-12 21:31:15.000000000 +0100
@@ -1,8 +1,7 @@
-% $Id: ltubguid.ltx 216 2018-12-13 21:40:11Z karl $
+% $Id: ltubguid.ltx 274 2020-03-12 16:47:21Z karl $
% ltubguid.ltx - documentation for ltugboat classes.
%
-% Copyright 1994,1995,1996,2001,2005,2006,2010,2013,2014,2017,2018
-% TeX Users Group.
+% Copyright 1994-2020 TeX Users Group.
%
% This file is part of the tugboat package.
%
@@ -208,7 +207,7 @@
use with \LaTeX~2.09; major contributors have been Robin Fairbairns,
Sebastian Rahtz, Michel Goossens, Nico Poppelier and Johannes Braams.
Many others have been involved, including Barbara Beeton, Karl Berry,
-Mimi Burbank, and the \LaTeX3 team.
+Mimi Burbank, and the \LaTeX\ team.
\section{Availability}
@@ -227,8 +226,8 @@
is no longer used for proceedings or anything else.)
The\,\verb|.dtx| file may itself be processed by \LaTeX{} to
-produce a formatted (somewhat `literate') source listing for those who
-would like more detailed descriptions of the \TUB\ macros.
+produce a formatted (somewhat `literate') source listing for those
+interested in the implementation of the \TUB\ macros.
\section{The general structure of a paper}
@@ -313,7 +312,8 @@
Authors may note that the style of ordinary issues of \TUB{} makes
no distinction between the titles of the divisions; the visual style
relies on the section numbers to indicate where the divisions lie in
-the hierarchy.
+the hierarchy. If you use \cs{paragraph}, consider ending the paragraph
+label with a period; sometimes it is helpful, sometimes not.
Reference may, however, be made to the `title' of divisions of the
paper, whether they are numbered or not. The \cs{nameref} command
@@ -525,19 +525,35 @@
\TUB\ optional-argument feature is not available.
If you use the \pkgname{listings} package, please specify:
-\begin{verbatim}
-\lstset{columns=flexible}
-\end{verbatim}
-The other values for the \verb|columns| option don't work well in
-\TUB. Also, if you use \cs{small} for displayed verbatim, please reset
-inline verbatim to the normal text size:
\begin{verbatim}[\small]
-\lstset{columns=flexible,
+\lstset{columns=flexible, keepspaces=true,
+ commentstyle=\slshape,
basicstyle=\ttfamily\small}
\lstdefinestyle{inline}
- {basicstyle=\ttfamily\normalsize}
+ {basicstyle=\ttfamily\normalsize}
\end{verbatim}
+Explanations:
+\begin{itemize}
+\item \texttt{columns=flexible}:
+The other values for the \verb|columns| option don't work well in \TUB.
+
+\item \texttt{keepspaces=true}:
+However, having flexible columns makes spaces in the input not
+necessarily correspond to spaces in the output. That's usually desired,
+for alignment of the sources, hence \texttt{keepspaces}.
+
+\item \texttt{commentstyle=\cs{slshape}}:
+We prefer slanted to Computer Modern typewriter italic.
+Using regular upright typewriter for comments is fine too.
+
+\item \texttt{basicstyle=...}:
+We usually prefer \cs{small} for displayed verbatim; when using
+\texttt{listings}, it is necessary to reset inline verbatim to the
+normal text size.
+
+\end{itemize}
+
\section{Floating inserts}
The classes do not make any change to \LaTeX{}'s built-in provision
@@ -592,7 +608,6 @@
\verb|\MacOSX| & \MacOSX \\
\verb|\MathML| & \MathML \\
\verb|\MF| & \MF \\
- \verb|\MP| & \MP \\
\verb|\OMEGA| & \OMEGA \\
\verb|\PDF| & \PDF \\
\verb|\SGML| & \SGML \\
@@ -616,7 +631,7 @@
list in figure~\ref{fig:acro-logo} have already been used in the present
paper.
-\subsection{Other special typesetting}
+\subsection{Assorted other markup}
A small list of special typesetting commands follows: a large set of
such commands is defined in the classes, but the list covers most of
@@ -639,18 +654,22 @@
% for example \verb|\sfrac{3}{4}| is set as \sfrac{3}{4}\,.
\end{cmdlist}
+For commands to typeset urls, see section~\ref{sec:urls}.
+
\section{Use of packages}
-In general, authors can use non-standard packages in their papers.
-However, the paper does need to be processable on the \TUB{} production
-computers (running current \TeX\ Live). A sensible mechanism for
-submitting out-of-the-ordinary packages (as for paper-specific
-bibliographies) is by use of the \envname{filecontents} environment.
+Being a \TeX\ journal, authors may use both standard and non-standard
+external packages for their articles. The overriding criterion is that
+articles need to be processable on the \TUB{} production computers
+(running current \TeX\ Live). A sensible mechanism for submitting
+personal packages is by use of the \envname{filecontents} environment.
+It's also fine to submit manuscript source with additional packages in a
+zip or other archive.
In general, packages currently on \CTAN, and known to work with
-\emph{current} \LaTeX{} are unlikely to give problems. In particular,
+\emph{current} \LaTeX{} are likely to be fine. In particular,
the team is happy to accept papers using packages that are supported by
-members of the \LaTeX3 team,\footnote{%
+members of the \LaTeX\ team,\footnote{%
Those in the \LaTeX{} base distribution, or one of those in the
\CTANref{packages} sub-tree on \CTAN.} subject to the warning already
mentioned (section~\ref{sec:verbatim}): that use of the standard
@@ -658,33 +677,78 @@
facilities provided by the \TUB\ classes.
\tug{} has a policy that macro packages described in \TUB{} should be
-available for readers to use. Since typing macros from printed
-sources is such an error-prone undertaking, authors of publicly
-available packages are urged to submit their macros to the \CTAN{}
-archives. If a package is only available under restricted terms,
-authors are urged to make this fact clear when first submitting an
-article to the editor.
-
-At present, the list of canonically recommended packages consists of
-only two, \path|mflogo.sty| \cite{Vieth:mflogo:1995} and \path|url.sty|
-\cite{Arseneau:url:1996}.
-
-Both classes will load the \pkgname{mflogo} package if it is present on the
-author's system; if the package is not present, the classes will
-emulate its more important features; the package defines \MF{} and
-\MP{} logos using recent versions of Knuth's \verb|logo10| font family.
-
-The \pkgname{url} package is useful when one is typesetting significant
-numbers of file names, network addresses or \acro{URL}s; it is being
-used in the present paper (not least in the bibliography). Speaking of
-urls, nowadays we generally omit a leading \texttt{http://} or
-\texttt{https://}.
+available for readers to use. Since typing macros from printed sources
+is a tedious undertaking, authors of publicly available packages are
+urged to submit their macros to \CTAN{}. If a package is only available
+under restricted terms, authors are requested to make this fact clear
+when first submitting an article to the editor.
+
+The \texttt{ltugboat} class loads the package \path|mflogo.sty|
+\cite{Vieth:mflogo:1995} for typesetting the \MF\ logo. (If this package
+is not present by some mischance, \texttt{ltugboat} will emulate its
+important feature.)
+
+An additional canonically-recommended package is \path|url.sty|
+\cite{Arseneau:url:1996}, for typesetting filenames, email addresses,
+urls, etc.; it is being used throughout the present paper (not least in
+the bibliography), either on its own or via \texttt{hyperref}.
Although not necessarily recommended in all cases, many additional
packages are commonly used. To mention a few: \texttt{microtype} can
-help reduce overfull boxes; sometimes it may be preferable to use the
-Latin Modern fonts via \texttt{lmodern}; and \texttt{hyperref} allows
-for many internal links and other features.
+help reduce overfull boxes (and improve appearance); sometimes it may be
+preferable to use the Latin Modern fonts via \texttt{lmodern};
+\texttt{iftex} provides tests for the \TeX\ engine being run;
+\texttt{texosquery} provides operating system information; and
+\texttt{hyperref} supports live and internal hyperlinks, outlines, and
+many other features.
+
+\section{Typesetting urls}
+\label{sec:urls}
+
+As mentioned above, please load either \texttt{url} or (preferably)
+\texttt{hyperref} so that reasonable line breaking of urls can happen.
+
+Furthermore, for the printed (visible) \TUB\ page, nowadays we typically
+omit a leading \texttt{http://} or \texttt{https://}. But for the link
+to actually work in the output \PDF\ or \HTML, the protocol is required
+(or it appears to be a local filesystem path). Therefore the
+\texttt{ltugboat} class provides (as of version 2.23, released
+March~2020) commands \cs{tbsurl} for \texttt{https} and \cs{tbhurl} for
+\texttt{http}.\footnote{They are simple two-line wrapper around
+\cs{hyper@linkurl}, and are due to Ulrike Fischer.
+\url{https://github.com/latex3/hyperref/issues/125}\raggedright}
+
+For example, \verb|\tbsurl{tug.org}| typesets the text
+`\texttt{tug.org}' (with the usual url line breaks) as a link to
+\url{https://tug.org}.
+
+Similarly, \verb|\tbhurl{mirror.ctan.org}| typesets the text
+`\texttt{mirror.ctan.org}' as a link to \url{http://mirror.ctan.org}.
+
+\cs{tbsurl} and \cs{tbhurl} only add the protocol and make live links if
+\texttt{hyperref} is loaded. Without \texttt{hyperref}, they are merely
+synonyms for \cs{url}. This is ok, and we still request that the
+protocol not be included; if live links are not being produced in the
+output, the printed url without the protocol suffices. (When a user
+copies/pastes url text into a browser, it will normally work.)
+
+For \texttt{ftp}, \texttt{rsync}, and other protocols, it is best to
+include them explicitly and use \cs{url}:\\ \verb|\url{ftp://tug.org}|,\\
+\verb|\url{rsync://tug.org}|, etc.
+
+\subsection{Url shortcuts}
+\label{sec:urlshortcuts}
+
+Another aspect of urls: the \tug\ web server supports a shortcut url
+mechanism, \url{tug.org/l/}\meta{ident}, where \meta{ident} can be any
+tag, similar to \url{tinyurl.com} and similar sites. The idea is that
+\url{tug.org} shortcuts can be used in \TUB\ articles needing to link to
+excessively long and/or unstable web resources; then we update the
+shortcut if needed, and not worry that a commercial shortcut provider
+will disappear.
+
+The only way to create a \url{tug.org/l/} shortcut is by request, which
+we are happy to receive.
\section{Bibliography}
\label{sec:biblio}
@@ -692,8 +756,8 @@
In short: our basic recommendation for handling bibliographies is to use
\BibTeX\ and the \pkgname{tugboat} bibliography style. No document
options are needed or recommended. All that is required in the article
-source (as shown in the template available from
-\url{tug.org/TUGboat}) is the following:
+source (as in the template available from \url{tug.org/TUGboat}) is the
+following:
\begin{verbatim}[\small]
\bibliographystyle{tugboat}
@@ -707,30 +771,35 @@
\begin{itemize}
\item It is based on \pkgname{abbrvurl.bst} (see \url{ctan.org/pkg/urlbst}),
-\item thus supports \textsf{url} and \textsf{doi} fields, among others.
-
-\item The \textsf{url} field is ignored if either the \textsf{doi} or
-\textsf{howpublished} field is present, since in practice we observe
-that people put the same information in all those fields, and we don't
-want to use up space typesetting redundant information.
-
-\item Has even more abbreviations than \textsf{abbrv}, including
-printing only two author names (plus ``et~al\@.'') if there are more
-than four authors (thanks to Mico Loretan).
+\item and thus supports \textsf{url} and \textsf{doi} fields, among others.
+Please use \textsf{url} instead of putting urls in the
+\textsf{note} field, where possible. Also, please don't bother to
+include ``url access date'' information for \TUB; we find that extraneous.
+
+\item The \textsf{url} field is ignored if either the \textsf{howpublished} or
+\textsf{doi} field is present. In practice we observe that people put
+the same information in all those fields, and we don't want to typeset
+redundant information.
+
+\item Has even more abbreviations than \textsf{abbrv}, such as
+printing only two author names (plus ``et~al.'')\ if there are more than
+four authors (thanks to Mico Loretan).
\item Defines an \textsf{@online} entry type as an alias for \textsf{@misc}.
-\item For completeness only: \verb|tugboat.bst| provides ``secret''
+\item For completeness only: \verb|tugboat.bst| provides editor-intended
fields \textsf{newpage} to force a page break after the current item,
-and \textsf{urlnewline} to force a line break before the \textsf{url}
-value. We've found that these presentation tweaks are often necessary
-for the final typeset output. Authors need not worry about them.
+\textsf{urlnewline} to force a line break before the \textsf{url} value,
+and \textsf{journaltie} to output a tie instead of space after the
+\textsf{journal} value. As editors, we've found that these presentation
+tweaks can be desirable for the final typeset output. Authors need not
+worry about them.
\end{itemize}
If you use \BibTeX, feel free to take advantage of the accumulated
bibliography of \TUB{} itself (\url{info/tugboat.bib} on \CTAN), and the
-various compilations by Nelson Beebe in that same directory.
+other compilations by Nelson Beebe in that same directory.
Bibliographies provide further problems because they're notoriously
difficult to typeset at the best of times. \LaTeX{} sets \cs{sloppy}
@@ -742,32 +811,31 @@
\begin{verbatim}
\SetBibJustification{\raggedright}
\end{verbatim}
-as the present article does, to achieve somewhat better results.
+as the present article does, to often achieve somewhat better results.
-A last note for bibliographies: for references to other issues of \TUB,
-please use the format \textsl{volno:issno}, e.g., ``\TUB\ 32:1'' for
-volume~32, number~1.
+A last note for references: for \TUB\ issues, please use the format
+\textsl{volno\,:\,issno}, e.g., ``\TUB\ 32:1'' for volume~32, number~1.
\section{Non-recommended bibliography facilities}
The preceding gives the bibliography recommendations for current \TUB\
-article. If, for whatever reason, you cannot follow the recommendation,
-this section is about some of the myriad historical and other
-possibilities.
+articles. If, for whatever reason, you do not wish to follow those
+recommendations, this section is about some of the myriad historical and
+other possibilities.
-Notwithstanding the general recommendation for the \pkgname{tugboat}
-(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard
+Notwithstanding that general recommendation for the \pkgname{tugboat}
+(falling back to \pkgname{plain}) \BibTeX\ style, \TUB's Harvard-style
citation support may be selected by specifying \optname{harvardcite} as
an option of the \cs{documentclass} command.\footnote{%
The macros used derive rather directly from the `harvard' styles
- written by Glenn Paulley and now maintained by Peter Williams; the
+ written by Glenn Paulley and later maintained by Peter Williams; the
\BibTeX{} style derives from one developed by Patrick Daly.}
If your article demands Harvard-style citations, you may prefer to load
\pkgname{natbib} or similar instead of using \TUB's facilities; that's
-ok.
+fine.
-The basic citation format is `author(s), year', but the macros are
-capable of many variations: this in turn places somewhat of a load on
+This basic citation format is `author(s), year', but the macros are
+capable of many variations. This in turn places somewhat of a load on
the author to use the correct citation macro. The macros available are
shown in figure~\ref{fig:citation-macros}; the figure assumes an entry
in the bibliography with authors Tom, Dick, and~Harry, and with a 1990
@@ -805,7 +873,7 @@
options. The default state (option \optname{extralabel}) attaches the
extra characters.
-As for \BibLaTeX, we don't recommend it for \TUB. If you feel you must
+As for \BibLaTeX: we don't recommend it for \TUB. If you feel you must
use it, that is ok, but we may still change it to using the default
\LaTeX\ and \BibTeX\ facilities in processing for publication if the
output from \BibLaTeX\ is problematic, as we have often seen it to be.
@@ -852,11 +920,8 @@
Of course, the syntax of commands given to the \LaTeX{} classes is
different (as discussed in section~\ref{sec:syntax}); arguments are
-(almost always) enclosed in braces, and neither of the forms of
-argument provision promulgated by the `plain' macros
-(\cs{macro}\meta{argument}\linebreak[0]\cs{endmacro} and
-\cs{macro * }\meta{argument}\verb| *|) are provided by the \LaTeX{}
-classes.
+(almost always) enclosed in braces instead of the various
+forms provided by the `plain' macros.
\SetBibJustification{\raggedright}
\bibliographystyle{tugboat}
Binary files old/doc/latex/tugboat/ltubguid.pdf and new/doc/latex/tugboat/ltubguid.pdf differ
Binary files old/doc/latex/tugboat/tugboat.pdf and new/doc/latex/tugboat/tugboat.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.doc.tlpobj new/tlpkg/tlpobj/tugboat.doc.tlpobj
--- old/tlpkg/tlpobj/tugboat.doc.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat.doc.tlpobj 2020-03-13 02:07:59.000000000 +0100
@@ -1,9 +1,9 @@
name tugboat.doc
category Package
-revision 49415
+revision 54261
shortdesc doc files of tugboat
relocated 1
-docfiles size=204
+docfiles size=206
RELOC/doc/latex/tugboat/README
RELOC/doc/latex/tugboat/ltubguid.ltx
RELOC/doc/latex/tugboat/ltubguid.pdf
++++++ tugboat.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/bibtex/bst/tugboat/tugboat.bst new/bibtex/bst/tugboat/tugboat.bst
--- old/bibtex/bst/tugboat/tugboat.bst 2018-12-14 22:55:53.000000000 +0100
+++ new/bibtex/bst/tugboat/tugboat.bst 2020-03-12 21:31:15.000000000 +0100
@@ -1,15 +1,17 @@
-%%% $Id: tugboat.bst 210 2018-10-29 18:04:16Z karl $
+%%% $Id: tugboat.bst 271 2020-01-13 19:13:12Z karl $
%%% TUGboat changes are public domain.
%%%
%%% Modified for TUGboat from abbrvurl.bst:
-%%% abbreviate "page(s)" to "p(p).",
+%%% Abbreviate "page(s)" to "p(p).",
%%% "volume" to "vol.",
%%% "editor(s)" to "ed(s)".
-%%% urlintro=""
-%%% reduce long author lists in format.names per Mico.
-%%% new fields for editors:
-%%% "newpage" - force page break after entry
-%%% "urlnewline" - force line break before url value.
+%%% Set urlintro="".
+%%% Output "Ph.D." rather than "PhD".
+%%% Reduce long author lists in format.names per Mico Loretan.
+%%% New fields for editors:
+%%% "newpage" - force page break after entry;
+%%% "urlnewline" - force line break before url value;
+%%% "journaltie" - ~ instead of space after journal name.
%%% --karl, originally created 24jul18.
%%%
%%% Modification of BibTeX style file /usr/local/texlive/2009/texmf-dist/bibtex/bst/base/abbrv.bst
@@ -22,7 +24,7 @@
%%% Added hyperref support.
%%% Original headers follow...
-% BibTeX standard bibliography style `abbrv'
+% [was] BibTeX standard bibliography style `abbrv'
% version 0.99a for BibTeX versions 0.99a or later, LaTeX version 2.09.
% Copyright (C) 1985, all rights reserved.
% Copying of this file is authorized only if either
@@ -60,8 +62,9 @@
pubmed % urlbst
url % urlbst
lastchecked % urlbst
- newpage % tub
+ newpage % tub
urlnewline % tub
+ journaltie % tub
}
{}
{ label }
@@ -149,15 +152,23 @@
% urlbst
% arg on stack is what needs to be written.
+%
% If a journal, we want to omit the following comma, as in
% "TUGboat 39(1)" instead of the default "TUGboat, 39(1)".
%
+% Furthermore, if field journaltie is non-empty, output a tie after the
+% journal name instad of a space.
+%
FUNCTION {output.nonnull.original}
{ 's :=
output.state mid.sentence =
{ last.output.check "journal" = not
{ ", " * }
- { " " *}
+ { journaltie empty$ not
+ { "~" * }
+ { " " * }
+ if$
+ }
if$
write$
}
@@ -580,8 +591,8 @@
{ pages empty$
{ "" }
{ pages multi.page.check
- { "pp." pages n.dashify tie.or.space.connect }
- { "p." pages tie.or.space.connect }
+ { "pp.~" pages n.dashify * }
+ { "p.~" pages * }
if$
}
if$
@@ -1183,7 +1194,7 @@
title empty$ 'skip$ 'possibly.setup.inlinelink if$ % urlbst
format.btitle "title" output.check
new.block
- "PhD thesis" format.thesis.type output.nonnull
+ "Ph.D. thesis" format.thesis.type output.nonnull
school "school" output.check
address output
format.date "year" output.check
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.cls new/tex/latex/tugboat/ltugboat.cls
--- old/tex/latex/tugboat/ltugboat.cls 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugboat.cls 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://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.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugboat}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUGboat journal class%
]
\csname tugstyloaded@\endcsname
@@ -52,7 +52,7 @@
\let\tuborigthepage = \thepage
\def\thepage{%
\ifnum\value{page}>900
- \textsl{?\,\@arabic{\numexpr\the\c@page-900\relax}}%
+ \textsl{?\texorpdfstring{\,}{}\@arabic{\numexpr\the\c@page-900\relax}}%
\else
\arabic{page}%
\fi}%
@@ -78,6 +78,11 @@
\@tubrunningfull
}%
}
+\AtBeginDocument{%
+ \ifx\undefined\texorpdfstring
+ \DeclareRobustCommand{\texorpdfstring}[2]{#1}%
+ \fi
+}
\DeclareOption{11pt}{%
\TBWarning{The \@tugclass\space class only supports 10pt fonts:
\MessageBreak option \CurrentOption\space ignored}%
@@ -193,6 +198,7 @@
}
\def\BibLaTeX{\Bib\kern.02em \LaTeX}
\def\BibTeX{\Bib\kern-.08em \TeX}
+\def\bfBibTeX{B{\SMC\SMC IB}\TeX}
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
@@ -213,7 +219,7 @@
\def\DVItoVDU{DVIto\kern-.12em VDU}
\def\ECMA{\acro{ECMA}}
\def\EPS{\acro{EPS}}
-\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}\mbox{-}\kern-.125em\TeX}
\DeclareRobustCommand{\ExTeX}{%
\ensuremath{\textstyle\varepsilon_{\kern-0.15em\cal{X}}}\kern-.2em\TeX}
\def\FAQ{\acro{FAQ}}
@@ -224,6 +230,7 @@
\def\Hawaii{Hawai`i}
\def\HTML{\acro{HTML}}
\def\HTTP{\acro{HTTP}}
+\def\iOS{i\acro{OS}}
\def\IDE{\acro{IDE}}
\def\IEEE{\acro{IEEE}}
\def\ISBN{\acro{ISBN}}
@@ -249,7 +256,12 @@
A}%
\vss}%
}}
+\def\LuaHBTeX{Lua\acro{HB}\-\TeX}%
+\def\LuaHBLaTeX{Lua\acro{HB}\-\LaTeX}%
+\def\LuaLaTeX{Lua\-\LaTeX}% dtk-logos defines it and people like to use it
+\def\LuaTeX{Lua\-\TeX}% ditto
\def\LyX{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX}
+\def\macOS{mac\acro{OS}}
\def\MacOSX{Mac\,\acro{OS\,X}}
\def\MathML{Math\acro{ML}}
\def\Mc{\setbox\TestBox=\hbox{M}M\vbox
@@ -274,6 +286,8 @@
\def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
\def\PCTeX{PC\thinspace\TeX}
\def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
+\def\pdflatex{pdf\-\LaTeX}% dtk-logos
+\def\pdftex{pdf\-\TeX}% dtk-logos
\def\PDF{\acro{PDF}}
\def\PGF{\acro{PGF}}
\def\PHP{\acro{PHP}}
@@ -307,7 +321,7 @@
\def\TeXworks{\TeX\kern-.07em works}
\def\TeXXeT{\TeX-{}-\XeT}
\def\TFM{\acro{TFM}}
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\ifx\Umathchardef\@thisisundefined % xetex|luatex
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
@@ -346,6 +360,12 @@
\DeclareRobustCommand{\Xe}{\leavevmode
\tubhideheight{\hbox{X%
\setbox0=\hbox{\TeX}\setbox1=\hbox{E}%
+ \ifdim \fontdimen1\font>0pt
+ % XeTeX logo needs tinkering when slanted/italic font.
+ \def\XekernbeforeE{-.11em}%
+ \def\XekernafterE{-.11em}%
+ \dp1=-.17ex
+ \fi
\lower\dp0\hbox{\raise\dp1\hbox{\kern\XekernbeforeE\tubreflect{E}}}%
\kern\XekernafterE}}}
\def\XeTeX{\Xe\TeX}
@@ -464,6 +484,24 @@
\DeclareRobustCommand{\tubbraced}[1]{\mbox{\texttt{\char`\{#1\char`\}}}}
\DeclareRobustCommand{\env}[1]{\cs{begin}\tubbraced{#1}}
\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
+\AtBeginDocument{%
+\ifx\hyper@normalise\undefined
+ \def\tbsurl{\url}% no hyperref, so just \url is fine.
+ \def\tbhurl{\url}%
+\else
+ % This hyperref hook-in is due to Ulrike Fischer.
+ % \url{https://github.com/latex3/hyperref/issues/125}.
+ \DeclareRobustCommand*{\tbsurl}{\hyper@normalise\tbsurl@}%
+ \def\tbsurl@#1{\hyper@linkurl{\Hurl{#1}}{https://#1}}%
+ \DeclareRobustCommand*{\tbhurl}{\hyper@normalise\tbhurl@}
+ \def\tbhurl@#1{\hyper@linkurl{\Hurl{#1}}{http://#1}}%
+\fi
+}
+\DeclareRobustCommand{\!}{\ifmmode\mskip-\thinmuskip \else\kern-0.16667em \fi}
+\DeclareRobustCommand{\tubthinnerspace}
+ {\ifmmode\mskip.5\thinmuskip \else\kern0.08333em \fi}
+\DeclareRobustCommand{\tubthinnerspaceneg}
+ {\ifmmode\mskip-.5\thinmuskip \else\kern-0.08333em \fi}
\def\endash{--}
\def\emdash{\endash-}
\def\d@sh#1#2{\unskip#1\thinskip#2\thinskip\ignorespaces}
@@ -1004,7 +1042,10 @@
\let\and=\quad
\ignorespaces\@author}%
{%
- \noindent\bf\raggedright\ignorespaces\frenchspacing\@title\endgraf
+ \noindent\bf\raggedright\ignorespaces\frenchspacing
+ \let\BibTeX=\bfBibTeX % else LaTeX Font Warning:
+ % Font shape `OT1/cmr/bx/sc' undefined
+ \@title\endgraf
}%
\ifdim \wd0 < 5\p@ % omit if author is null
\else
@@ -1119,7 +1160,7 @@
\def\TB@nosection#1#2{\TBWarning{class does not support \string#1,
\string#2\space used instead}#2}
\def\TBtocsectionfont{\normalfont}
-\newskip\TBtocsectionspace \TBtocsectionspace=1.0em\@plus\p@
+\newskip\TBtocsectionspace \TBtocsectionspace=1.0ex\@plus\p@
\def\l@section#1#2{\addpenalty{\@secpenalty}%
\addvspace{\TBtocsectionspace}%
\@tempdima 1.5em
@@ -1319,7 +1360,6 @@
\@ifpackageloaded{microtype}
{\g@addto@macro\@verbatim{\microtypesetup{activate=false}}}{}
}
-
\if@Harvardcite
\let\@internalcite\cite
\def\cite{\def\@citeseppen{-1000}%
@@ -1458,9 +1498,11 @@
\topregister\vskip \headmargin \vskip 10\p@}}}}%
}
\def\@oddhead{\MakeRegistrationMarks
+ \frenchspacing
\normalsize\csname normalshape\endcsname\rm \tubheadhook
\rtitlex\qquad \midrtitle\hfil \rtitlenexttopage\quad \thepage}
\def\@evenhead{\MakeRegistrationMarks
+ \frenchspacing
\normalsize\csname normalshape\endcsname\rm \tubheadhook
\thepage \quad\rtitlenexttopage \hfil\midrtitle \qquad\rtitlex}
@@ -1474,7 +1516,7 @@
\let\newline=\\%
\frenchspacing
\hfil\rhTitle}
- \def\@evenfoot{\tubrunningauthor\hfil}
+ \def\@evenfoot{\frenchspacing \let\thanks\@gobble \tubrunningauthor\hfil}
}
\def\@tubrunningminimal{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugboat.sty new/tex/latex/tugboat/ltugboat.sty
--- old/tex/latex/tugboat/ltugboat.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugboat.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://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.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -31,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugboat}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG compatibility package%
]
\(a)obsoletefile{ltugboat.cls}{ltugboat.sty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugcomn.sty new/tex/latex/tugboat/ltugcomn.sty
--- old/tex/latex/tugboat/ltugcomn.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugcomn.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://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.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesPackage{ltugcomn}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUGboat `common macros' package%
]
\IfFileExists{mflogo.sty}%
@@ -118,6 +118,7 @@
}
\def\BibLaTeX{\Bib\kern.02em \LaTeX}
\def\BibTeX{\Bib\kern-.08em \TeX}
+\def\bfBibTeX{B{\SMC\SMC IB}\TeX}
\def\BSD{\acro{BSD}}
\def\CandT{\textsl{Computers \& Typesetting}}
\def\ConTeXt{C\kern-.0333emon\-\kern-.0667em\TeX\kern-.0333emt}
@@ -138,7 +139,7 @@
\def\DVItoVDU{DVIto\kern-.12em VDU}
\def\ECMA{\acro{ECMA}}
\def\EPS{\acro{EPS}}
-\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}-\kern-.125em\TeX}
+\DeclareRobustCommand{\eTeX}{\ensuremath{\varepsilon}\mbox{-}\kern-.125em\TeX}
\DeclareRobustCommand{\ExTeX}{%
\ensuremath{\textstyle\varepsilon_{\kern-0.15em\cal{X}}}\kern-.2em\TeX}
\def\FAQ{\acro{FAQ}}
@@ -149,6 +150,7 @@
\def\Hawaii{Hawai`i}
\def\HTML{\acro{HTML}}
\def\HTTP{\acro{HTTP}}
+\def\iOS{i\acro{OS}}
\def\IDE{\acro{IDE}}
\def\IEEE{\acro{IEEE}}
\def\ISBN{\acro{ISBN}}
@@ -174,7 +176,12 @@
A}%
\vss}%
}}
+\def\LuaHBTeX{Lua\acro{HB}\-\TeX}%
+\def\LuaHBLaTeX{Lua\acro{HB}\-\LaTeX}%
+\def\LuaLaTeX{Lua\-\LaTeX}% dtk-logos defines it and people like to use it
+\def\LuaTeX{Lua\-\TeX}% ditto
\def\LyX{L\kern-.1667em\lower.25em\hbox{Y}\kern-.125emX}
+\def\macOS{mac\acro{OS}}
\def\MacOSX{Mac\,\acro{OS\,X}}
\def\MathML{Math\acro{ML}}
\def\Mc{\setbox\TestBox=\hbox{M}M\vbox
@@ -199,6 +206,8 @@
\def\pcMF{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}MF\@}
\def\PCTeX{PC\thinspace\TeX}
\def\pcTeX{\leavevmode\raise.5ex\hbox{p\kern-.3\p@ c}\TeX}
+\def\pdflatex{pdf\-\LaTeX}% dtk-logos
+\def\pdftex{pdf\-\TeX}% dtk-logos
\def\PDF{\acro{PDF}}
\def\PGF{\acro{PGF}}
\def\PHP{\acro{PHP}}
@@ -232,7 +241,7 @@
\def\TeXworks{\TeX\kern-.07em works}
\def\TeXXeT{\TeX-{}-\XeT}
\def\TFM{\acro{TFM}}
-\expandafter\ifx\csname XeTeXrevision\endcsname\relax
+\ifx\Umathchardef\@thisisundefined % xetex|luatex
\def\Thanh{H\`an~Th\^e\llap{\raise 0.5ex\hbox{\'{}}}~Th\`anh}% non-XeTeX
\else
\def\Thanh{H\`an~Th\textcircumacute{e}~Th\`anh}% else xunicode drops the acute
@@ -271,6 +280,12 @@
\DeclareRobustCommand{\Xe}{\leavevmode
\tubhideheight{\hbox{X%
\setbox0=\hbox{\TeX}\setbox1=\hbox{E}%
+ \ifdim \fontdimen1\font>0pt
+ % XeTeX logo needs tinkering when slanted/italic font.
+ \def\XekernbeforeE{-.11em}%
+ \def\XekernafterE{-.11em}%
+ \dp1=-.17ex
+ \fi
\lower\dp0\hbox{\raise\dp1\hbox{\kern\XekernbeforeE\tubreflect{E}}}%
\kern\XekernafterE}}}
\def\XeTeX{\Xe\TeX}
@@ -389,6 +404,24 @@
\DeclareRobustCommand{\tubbraced}[1]{\mbox{\texttt{\char`\{#1\char`\}}}}
\DeclareRobustCommand{\env}[1]{\cs{begin}\tubbraced{#1}}
\DeclareRobustCommand{\thinskip}{\hskip 0.16667em\relax}
+\AtBeginDocument{%
+\ifx\hyper@normalise\undefined
+ \def\tbsurl{\url}% no hyperref, so just \url is fine.
+ \def\tbhurl{\url}%
+\else
+ % This hyperref hook-in is due to Ulrike Fischer.
+ % \url{https://github.com/latex3/hyperref/issues/125}.
+ \DeclareRobustCommand*{\tbsurl}{\hyper@normalise\tbsurl@}%
+ \def\tbsurl@#1{\hyper@linkurl{\Hurl{#1}}{https://#1}}%
+ \DeclareRobustCommand*{\tbhurl}{\hyper@normalise\tbhurl@}
+ \def\tbhurl@#1{\hyper@linkurl{\Hurl{#1}}{http://#1}}%
+\fi
+}
+\DeclareRobustCommand{\!}{\ifmmode\mskip-\thinmuskip \else\kern-0.16667em \fi}
+\DeclareRobustCommand{\tubthinnerspace}
+ {\ifmmode\mskip.5\thinmuskip \else\kern0.08333em \fi}
+\DeclareRobustCommand{\tubthinnerspaceneg}
+ {\ifmmode\mskip-.5\thinmuskip \else\kern-0.08333em \fi}
\def\endash{--}
\def\emdash{\endash-}
\def\d@sh#1#2{\unskip#1\thinskip#2\thinskip\ignorespaces}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.cls new/tex/latex/tugboat/ltugproc.cls
--- old/tex/latex/tugboat/ltugproc.cls 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugproc.cls 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://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.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -32,7 +32,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
\ProvidesClass {ltugproc}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG conference proceedings class%
]
\def\@tugclass{ltugproc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tugboat/ltugproc.sty new/tex/latex/tugboat/ltugproc.sty
--- old/tex/latex/tugboat/ltugproc.sty 2018-12-14 22:55:53.000000000 +0100
+++ new/tex/latex/tugboat/ltugproc.sty 2020-03-12 21:31:15.000000000 +0100
@@ -8,20 +8,20 @@
%%
%% This is a generated file.
%%
-%% Copyright 1994-2018 TeX Users Group.
+%% Copyright 1994-2020 TeX Users Group.
%%
%% It 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
+%% https://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.
%%
%% This file has the LPPL maintenance status "maintained".
%%
%% The Current Maintainer of this work is the TeX Users Group
-%% (http://tug.org/TUGboat).
+%% (https://tug.org/TUGboat).
%%
%% The list of all files belonging to the distribution is given in the file
%% `manifest.txt'.
@@ -31,7 +31,7 @@
%% extension .ins) which are part of the distribution.
%%
\ProvidesPackage{ltugproc}
- [2018-12-14 v2.21
+ [2020-03-12 v2.23
TUG compatibility package%
]
\(a)obsoletefile{ltugproc.cls}{ltugproc.sty}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tugboat.tlpobj new/tlpkg/tlpobj/tugboat.tlpobj
--- old/tlpkg/tlpobj/tugboat.tlpobj 2019-02-28 04:10:10.000000000 +0100
+++ new/tlpkg/tlpobj/tugboat.tlpobj 2020-03-13 02:07:59.000000000 +0100
@@ -1,12 +1,12 @@
name tugboat
category Package
-revision 49415
+revision 54261
shortdesc LaTeX macros for TUGboat articles
relocated 1
longdesc Provides ltugboat.cls for both regular and proceedings issues
-longdesc of the TUGboat journal. The distribution also a BibTeX style,
+longdesc of the TUGboat journal. Also provides a BibTeX style,
longdesc tugboat.bst.
-runfiles size=39
+runfiles size=40
RELOC/bibtex/bst/tugboat/ltugbib.bst
RELOC/bibtex/bst/tugboat/tugboat.bst
RELOC/tex/latex/tugboat/ltugboat.cls
@@ -17,7 +17,6 @@
catalogue-also tugboat-plain
catalogue-contact-home https://tug.org/TUGboat
catalogue-ctan /macros/latex/contrib/tugboat
-catalogue-date 2018-12-14 21:15:38 +0100
catalogue-license lppl1.3
catalogue-topics journalpub class
-catalogue-version 2.21
+catalogue-version 2.23
++++++ turabian-formatting.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/README new/doc/latex/turabian-formatting/README
--- old/doc/latex/turabian-formatting/README 2018-08-01 23:17:38.000000000 +0200
+++ new/doc/latex/turabian-formatting/README 2020-03-20 22:27:47.000000000 +0100
@@ -1,4 +1,4 @@
-Turabian Formatting for LaTeX (2018/08/01)
+Turabian Formatting for LaTeX (2020/03/19)
INTRODUCTION
@@ -37,7 +37,7 @@
==============================
-Copyright 2013-2018 Omar Abdool
+Copyright 2013-2020 Omar Abdool
This work may be distributed and/or modified under the conditions of the
LaTeX Project Public License (LPPL), either version 1.3 of this license
Binary files old/doc/latex/turabian-formatting/turabian-formatting-doc.pdf and new/doc/latex/turabian-formatting/turabian-formatting-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/turabian-formatting/turabian-formatting-doc.tex new/doc/latex/turabian-formatting/turabian-formatting-doc.tex
--- old/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2018-08-01 23:17:38.000000000 +0200
+++ new/doc/latex/turabian-formatting/turabian-formatting-doc.tex 2020-03-20 22:27:47.000000000 +0100
@@ -1,7 +1,7 @@
% Turabian Formatting for LaTeX -- Package Documentation
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -19,7 +19,7 @@
% and turabian-formatting-doc.pdf (in addition to the README file).
%
% ==============================
-% Last updated: 2018/08/01
+% Last updated: 2020/03/19
%
%
@@ -50,7 +50,7 @@
\usepackage{marginnote}
\renewcommand*{\raggedleftmarginnote}{}
\renewcommand*{\marginfont}{\ttfamily}
-\renewcommand*{\marginnotevadjust}{2\baselineskip}
+\renewcommand*{\marginnotevadjust}{\parskip}
\usepackage{geometry}
\geometry{top=1.5in, bottom=1.75in, left=1.75in, right=1.75in}
@@ -196,7 +196,7 @@
The \texttt{twocolumn} option, however, is not supported. More so, the \texttt{turabian-thesis} document class does not support the \texttt{notitlepage} option.
-Both documents classes, by default, are set to \texttt{oneside}. The \texttt{twoside} option is also supported.
+Both document classes, by default, are set to \texttt{oneside}. The \texttt{twoside} option is also supported.
\clearpage
\subsection{Ragged Right (Left Align) Text}
@@ -230,7 +230,9 @@
To produce a list of endnotes, use the \textcmd{theendnotes} command provided by the \texttt{endnotes} package. Through the \texttt{endnotes} option, each endnote is single-spaced with a ``blank line between notes." The default heading for this list of endnotes is typeset as \emph{Notes}.\footnote{%
The \emph{Notes} heading, when using the \texttt{turabian-researchpaper} document class, is typeset with \textcmd{section*}. The \texttt{turabian-thesis} document class, however, typesets the \emph{Notes} heading with \textcmd{chapter*}. If there are no endnotes preceding \textcmd{theendnotes}, this command will generate a \emph{Notes} heading with an empty endnotes list.}
-When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter. In this case, the endnotes list then uses subheadings that divide endnotes by each chapter.\autocite[162]{turabian_manual_2018}
+When used with \texttt{turabian-thesis}, the numbering of endnotes is restarted at the beginning of each chapter (using the \textcmd{chapter} command).\footnote{%
+ The starred \textcmd{chapter*} command does not restart the numbering of endnotes.}
+In this case, the endnotes list then uses subheadings that divide endnotes by each chapter.\autocite[162]{turabian_manual_2018}
\clearpage
@@ -335,7 +337,7 @@
\texttt{turabian-researchpaper} provides the optional \textcmd{course} command for typesetting course information (such as the course title).
\marginnote{\textbackslash institution\{\}\newline \textbackslash department\{\}\newline \textbackslash location\{\}}
-\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date.
+\texttt{turabian-thesis} also provides: (1) \textcmd{institution} for typesetting the institution at the top of the page, (2) \textcmd{department} for typesetting the name of the department, and (3) \textcmd{location} for typesetting a location just above the date.
To create a custom title page, use the \texttt{titlepage} environment.
@@ -416,9 +418,9 @@
\label{sec:required_packages}
-This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, \texttt{endnotes}, and \texttt{xparse}.
+This package requires \LaTeX{}2e and makes use of the following packages installed as part of a standard \LaTeX{} distribution: \texttt{etoolbox}, \texttt{setspace}, \texttt{nowidow}, \texttt{footmisc}, and \texttt{endnotes}.
-The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{fancyhdr}, \texttt{tocloft}, \texttt{ellipsis}, and \texttt{threeparttable}.
+The following packages are highly recommended: \texttt{biblatex-chicago}, \texttt{csquotes}, \texttt{tocloft}, \texttt{ellipsis}, and \texttt{threeparttable}.
\clearpage
@@ -426,6 +428,24 @@
\label{sec:updates}
+\marginnote{\rmfamily{2020/03/19}}%
+
+Part, chapter, section, and subsection headings are easier to adjust. This includes better support for \textcmd{MakeUppercase}.
+
+Vertical spacing, in typesetting part, chapter, section, and subsection headings, is more precise.
+
+The \texttt{appendixes} environment provides better support for adjusting the typesetting of appendix headings.
+
+Improved support for \texttt{biblatex}.
+
+The bibliography/references list, by default, is no longer included in the table of contents (instead, use the \texttt{heading=bibintoc} option with \textcmd{printbibliography}).
+
+Significantly improved support for implementing endnotes with the \texttt{endnotes} package.
+
+The \textcmd{chapter*} command no longer resets footnote and endnote counters.
+
+The \texttt{xparse} package is no longer required.
+
\marginnote{\rmfamily{2018/08/01}}%
If the \texttt{biblatex-chicago} package is loaded by the user, the \texttt{noibid} option is no longer passed to the package by default.
@@ -438,7 +458,7 @@
The \textcmd{tableofcontents} command no longer causes subsequent pages to be typeset using the \texttt{plain} page style.
-Paragraphs immediately following chapter, section, and subsection headings now have an indentation of 0.5 inches.
+Paragraphs, immediately following chapter, section, and subsection headings, now have an indentation of 0.5 inches.
The lists of figures, tables, and illustrations each appear as entries in the table of contents.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj
--- old/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2019-02-28 04:10:11.000000000 +0100
+++ new/tlpkg/tlpobj/turabian-formatting.doc.tlpobj 2020-03-20 23:58:45.000000000 +0100
@@ -1,6 +1,6 @@
name turabian-formatting.doc
category Package
-revision 48330
+revision 54436
shortdesc doc files of turabian-formatting
relocated 1
docfiles size=38
++++++ turabian-formatting.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-formatting.sty new/tex/latex/turabian-formatting/turabian-formatting.sty
--- old/tex/latex/turabian-formatting/turabian-formatting.sty 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-formatting.sty 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{turabian-formatting}[2018/08/01 Turabian Formatting]
+\ProvidesPackage{turabian-formatting}[2020/03/19 Turabian Formatting]
% Package options: flags and variables
@@ -74,13 +74,12 @@
\setlength\footskip{0.5in}
-% Text spacing is double spaced
+% Text spacing is double-spaced
\RequirePackage{setspace}
\setstretch{2}
-% Preserve normalsize and footnotesize single spacing baselineskip values
-
+% Preserve normalsize and footnotesize single-spacing baselineskip values
\newlength\tf@singlelineskip
\newlength\tf@fnsinglelineskip
@@ -143,13 +142,12 @@
% Footnotes: readjust footnote rule size and placement
\renewcommand{\footnoterule}{%
- \vspace*{-3pt}
- \hrule width 2in height 0.4pt
- \vspace*{-4pt}}
-
-% Footnotes: make command to set footnote punctuation
-\newcommand{\tf@setfnpunct}[1]{\def\tf@thefnpunct{#1\,\,}}
-\tf(a)setfnpunct{.}
+ \kern-3\p@
+ \hrule \@width 2in height 0.4\p@
+ \kern-4\p@}
+
+% Footnotes: set default footnote punctuation
+\def\tf(a)thefnpunct{.\,\,}
% Footnotes: renew command for typesetting footnotes
\renewcommand{\@makefntext}[1]{%
@@ -163,8 +161,8 @@
\def\ps@headings{%
\let\@oddfoot\@empty
\let\@evenfoot\@empty
- \def\@evenhead{\thepage\hfil\slshape\leftmark}
- \def\@oddhead{{\slshape\rightmark}\hfil\thepage}
+ \def\@evenhead{\thepage}
+ \def\@oddhead{\hfil\thepage}
\let\@mkboth\@gobbletwo
\let\markboth\@mkboth
\let\chaptermark\@gobble
@@ -192,8 +190,10 @@
% Set top section command name to "section" (default)
\def\tf@topsecname{section}
-% Set adjustment for baselineskip after \section and \section* headings
-\def\tf@adjaftersec{\dimexpr \baselineskip -\tf@singlelineskip -\p@ \relax}
+% Redefine \@afterheading to adjust for baselineskip after headings
+\def\tf@adjaftersec{\dimexpr \baselineskip -\tf@singlelineskip \relax}
+\let\tf@tempafterheading\@afterheading
+\def\@afterheading{\vskip -\tf@adjaftersec\relax \tf@tempafterheading}
% Headings formatting: \section, \subsection, and \subsubsection
\setcounter{secnumdepth}{0}
@@ -201,47 +201,96 @@
\renewcommand{\section}{%
\@startsection{section}{1}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\bfseries\normalsize\singlespacing\centering}}
+ {\normalfont\bfseries\normalsize\centering}}
\renewcommand{\subsection}{%
\@startsection{subsection}{2}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\mdseries\normalsize\singlespacing\centering}}
+ {\normalfont\mdseries\normalsize\centering}}
\renewcommand{\subsubsection}{%
\@startsection{subsubsection}{3}%
{\z@}%
- {-\tf@singlelineskip}%
+ {2\tf@singlelineskip}%
{\tf@singlelineskip}%
- {\normalfont\bfseries\normalsize\singlespacing\raggedright}}
+ {\normalfont\bfseries\normalsize\raggedright}}
+
+% Sections: section heading formatting
+\def\tf@makesectionhead#1#2#3#4#5{%
+ \vskip -\tf@singlelineskip\relax
+ \begingroup
+ \singlespacing
+ #4{%
+ \@hangfrom{\hskip #3\relax\@svsec}%
+ \interlinepenalty \@M #5\@@par}%
+ \endgroup}
+
+% Sections: formatting of TOC \addcontentsline
+\def\tf@tocline#1#2{\protect{\csname the#1\endcsname\quad}}
+
+% Sections: redefine \@sect to use \tf@makesectionhead and \tf@tocline
+\def\@sect#1#2#3#4#5#6[#7]#8{%
+ \ifnum #2>\c@secnumdepth
+ \let\@svsec\@empty
+ \else
+ \refstepcounter{#1}%
+ \protected@edef\@svsec{\@seccntformat{#1}\relax}%
+ \fi
+ \@tempskipa #5\relax
+ \ifdim \@tempskipa>\z@
+ \tf@makesectionhead{#1}{#2}{#3}{#6}{#8}
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else \tf@tocline{#1}{#2} \fi #7}%
+ \else
+ \def\@svsechd{%
+ #6{\hskip #3\relax \@svsec #8}%
+ \csname #1mark\endcsname{#7}%
+ \addcontentsline{toc}{#1}{%
+ \ifnum #2>\c@secnumdepth \else \tf@tocline{#1}{#2} \fi #7}}%
+ \fi
+ \@xsect{#5}}
-% Headings formatting: following paragraphs start with an indent
-\def\tf@afterindent{\@afterindenttrue}
+% Sections: redefine \@ssect
+\def\@ssect#1#2#3#4#5{%
+ \@tempskipa #3\relax
+ \ifdim \@tempskipa>\z@
+ \vskip -\tf@singlelineskip\relax
+ \begingroup
+ \singlespacing
+ #4{%
+ \@hangfrom{\hskip #1}%
+ \interlinepenalty \@M #5\@@par}%
+ \endgroup
+ \else
+ \def\@svsechd{#4{\hskip #1\relax #5}}%
+ \fi
+ \@xsect{#3}}
-% Table of Contents: renew formatting
+% Table of Contents: set adjustment for baselineskip after toc heading
+\def\tf@adjaftersectoc{%
+ \vspace{\dimexpr \baselineskip -3\tf@singlelineskip \relax}}
-\def\tf@tocpagestyle{\@empty}
+% Table of Contents: \@starttoc formatting hook
+\def\tf@starttocformat{\singlespacing}
\renewcommand{\tableofcontents}{%
- \tf@tocpagestyle
\expandafter\csname \tf@topsecname\endcsname*{\contentsname}%
- \@mkboth{\contentsname}{\contentsname}%
+ \@mkboth{}{}%
\if@optraggedright
\let\tf@tocrmarg\@tocrmarg
\def\@tocrmarg{\tf@tocrmarg plus1fil}
\fi
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{toc}}}%
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{toc}}}%
% List of Figures and List of Tables: adjust titles
-
\renewcommand{\listfigurename}{Figures}
\renewcommand{\listtablename}{Tables}
@@ -262,20 +311,18 @@
% List of Figures
\renewcommand{\listoffigures}{%
\expandafter\csname \tf@topsecname\endcsname*{\listfigurename}%
- \@mkboth{\listfigurename}{\listfigurename}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listfigurename}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{lof}}}
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{lof}}}
% List of Tables
\renewcommand{\listoftables}{%
\expandafter\csname \tf@topsecname\endcsname*{\listtablename}%
- \@mkboth{\listtablename}{\listtablename}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listtablename}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
- \@starttoc{lot}}}
+ \tf@adjaftersectoc
+ {\tf@starttocformat\@starttoc{lot}}}
% List of Illustrations
\newcommand{\listillustrationname}{Illustrations}
@@ -283,10 +330,10 @@
\newcommand{\listofillustrations}{%
\expandafter\csname \tf@topsecname\endcsname*{\listillustrationname}%
- \@mkboth{\listillustrationname}{\listillustrationname}%
+ \@mkboth{}{}%
\addcontentsline{toc}{\tf@topsecname}{\listillustrationname}%
- { \vspace{\dimexpr -3\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing
+ \tf@adjaftersectoc
+ { \tf@starttocformat
{\tf@illustrsection Figures}\par\nopagebreak
\@starttoc{lof}
\vspace{\tf@singlelineskip}
@@ -295,7 +342,6 @@
% Figures and Tables: float positioning
-
\setlength\textfloatsep{%
\dimexpr 2\tf@singlelineskip +\p@ \relax minus 1\tf@singlelineskip}
\setlength\floatsep{%
@@ -307,7 +353,6 @@
\def\fps@figure{!htb}
% Figures and Tables: caption formatting
-
\setlength\abovecaptionskip{\z@}
\setlength\belowcaptionskip{\z@}
@@ -317,7 +362,6 @@
\small#1. #2\par
\vskip\belowcaptionskip}
-
% Lists: enumerate and itemize formatting
\setlength\leftmargini{1.5\parindent}
\setlength\leftmargin{\leftmargini}
@@ -391,7 +435,6 @@
% thebibliography environment: formatting (adjust \@openbib@code hook default)
-
\setlength\bibindent{\parindent}
\renewcommand\@openbib@code{%
@@ -422,52 +465,36 @@
\DefineBibliographyStrings{english}{%
references = {Bibliography}}
\fi
- \renewcommand{\bibsetup}{%
- \addcontentsline{toc}{\tf@topsecname}{\bibname}
- \vspace{\dimexpr -2\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}}
- \renewcommand{\bibitemsep}{1\baselineskip}
+ \renewcommand{\bibitemsep}{\tf@singlelineskip}
\renewcommand{\bibhang}{0.5in}
+ \renewcommand{\bibsetup}{%
+ \vskip \tf@adjaftersec\relax
+ \vskip -\tf@singlelineskip\relax
+ \singlespacing}%
}{}}
\fi
% Endnotes: support and formatting
-
\if@endnotesformat
- \RequirePackage{endnotes, xparse}
+ \RequirePackage{endnotes}
% Changes footnote marker type and formatting
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\PassOptionsToPackage{notetype=endonly}{biblatex-chicago}
- \AtEndPreamble{%
- % Make endnotes use of "_" not a special character when in text mode
- \appto{\enoteheading}{%
- \catcode`_=12
- \begingroup\lccode`~=`_
- \lowercase{\endgroup\let~}\sb
- \mathcode`_="8000}
-
- % Create \jobname.ent if not already defined to avoid missing file error
- \preto{\theendnotes}{%
- \IfFileExists{./\jobname.ent}%
- {}%
- {%
- \immediate\openout\(a)enotes=\jobname.ent\relax
- \immediate\write\@enotes{}%
- }}}
+ % Create \jobname.ent to avoid missing file error
+ \@openenotes
% Set default endnotes formatting
\renewcommand{\enotesize}{\normalsize}
\renewcommand{\enoteformat}{%
+ \singlespacing
\if@optraggedright \raggedright \fi
\setlength\parindent{\footnotemargin}
- \vspace{\tf@singlelineskip}
\theenmark.\,\,}
\else
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-researchpaper.cls new/tex/latex/turabian-formatting/turabian-researchpaper.cls
--- old/tex/latex/turabian-formatting/turabian-researchpaper.cls 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-researchpaper.cls 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-researchpaper}[2018/08/01 Turabian Research Paper]
+\ProvidesClass{turabian-researchpaper}[2020/03/19 Turabian Research Paper]
% Default point size
@@ -79,118 +79,69 @@
\RequirePackage{turabian-formatting}
-% Part: formatting
-\def\tf@partformat{\normalfont\bfseries\singlespacing\centering}
-
-\def\@part[#1]#2{%
- \ifnum \c@secnumdepth >-2\relax
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect{\partname\space\thepart}}%
- \else
- \addcontentsline{toc}{part}{#1}%
- \fi
- \markboth{}{}%
- { \tf@partformat
- \interlinepenalty \@M
- \ifnum \c@secnumdepth >-2\relax
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \ifstrempty{#2}%
- {}%
- {#2\par\nobreak}}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
-\def\@spart#1{%
- { \tf@partformat
- \interlinepenalty \@M
- #1\par\nobreak}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
+% Sections: \section* adjustment to space after heading
+\newif\if@adjustssect\@adjustssecttrue
+\newlength\tf@ssectafterskip
% Sections: command to disable differentiate and reformat \section*
\gdef\noadjustssect{\@adjustssectionfalse}
-% Sections: \section* adjustment to space after heading
-\newif\if@adjustssection\@adjustssectiontrue
-\newlength\tf@ssect@afterskip
-\setlength\tf@ssect@afterskip{1\p@}
-
-% Sections: adjustment to space after \section heading
-\newif\if@tf@adjustsection\@tf@adjustsectionfalse
-\newlength\tf@sect@afterskip
-\setlength\tf@sect@afterskip{1\p@}
+% Sections: \section* heading formatting hook
+\def\tf@ssectformat#1{#1}
-% Sections: redefine \@startsection to differentiate starred version
+% Sections: redefine \@startsection to support \if@adjustssect and \tf@ssectformat
\def\@startsection#1#2#3#4#5#6{%
\if@noskipsec \leavevmode \fi
\par
\@tempskipa #4\relax
\@afterindenttrue
\ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \tf@afterindent
+ \@tempskipa -\@tempskipa \@afterindentfalse
\fi
\if@nobreak \everypar{} \else
\addpenalty\@secpenalty\addvspace\@tempskipa
\fi
- \setlength\tf@ssect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax}
- \if@adjustssection
- \ifstrequal{#1}{section}%
- {\setlength\tf@ssect@afterskip{%
- \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}%
- {}
- \fi
- \setlength\tf@sect@afterskip{\dimexpr #5 -\tf@adjaftersec \relax}
- \if@tf@adjustsection
- \ifstrequal{#1}{section}%
- {\setlength\tf@sect@afterskip{%
- \dimexpr 2\tf@singlelineskip -\tf@adjaftersec \relax}}%
- {}
+ \setlength\tf@ssectafterskip{#5}
+ \ifnum #2 =1
+ \if@adjustssect \setlength\tf@ssectafterskip{2\tf@singlelineskip} \fi
\fi
\@ifstar
- {\@ssect{#3}{#4}{\tf@ssect@afterskip}{#6}}%
- {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\tf@sect@afterskip}{#6}}}}
+ {\@ssect{#3}{#4}{\tf@ssectafterskip}{\tf@ssectformat{#6}}}%
+ {\@dblarg{\@sect{#1}{#2}{#3}{#4}{#5}{#6}}}}
-% Sections: formatting between \@svsec and heading
-\protected@edef\tf@secsep#1#2{\@empty}
-% Sections: formatting of TOC \addcontentsline
-\def\tf@tocline#1{\protect{\csname the#1\endcsname\quad}}
+% Part: formatting (unsupported)
+\def\tf@partformat{\normalfont\bfseries\centering}
-% Sections: redefine \@sect to support optional two-line formatting
-\def\@sect#1#2#3#4#5#6[#7]#8{%
- \ifnum #2>\c@secnumdepth
- \let\@svsec\@empty
- \else
- \refstepcounter{#1}%
- \protected@edef\@svsec{\@seccntformat{#1}\relax}%
- \fi
- \@tempskipa #5\relax
- \ifdim \@tempskipa>\z@
- \begingroup
- #6{%
- \@hangfrom{\hskip #3\relax\@svsec}%
- \interlinepenalty \@M \tf@secsep{#1}{#8}#8\@@par}%
- \endgroup
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c@secnumdepth \else
- \tf@tocline{#1}%
- \fi
- #7}%
+\def\@part[#1]#2{%
+ \@afterindenttrue
+ \ifnum \c@secnumdepth >\m@ne
+ \refstepcounter{part}%
+ \addcontentsline{toc}{part}{\protect{\partname\space\thepart}}%
\else
- \def\@svsechd{%
- #6{\hskip #3\relax\@svsec #8}%
- \csname #1mark\endcsname{#7}%
- \addcontentsline{toc}{#1}{%
- \ifnum #2>\c@secnumdepth \else
- \tf@tocline{#1}%
- \fi
- #7}}%
+ \addcontentsline{toc}{part}{#1}%
\fi
- \@xsect{#5}}
+ \markboth{}{}%
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
+ \interlinepenalty \@M
+ \tf@partformat{%
+ \ifnum \c@secnumdepth >\m@ne
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #2\@@par}%
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterheading}
+
+\def\@spart#1{%
+ \@afterindenttrue
+ { \singlespacing
+ \interlinepenalty \@M
+ \tf@partformat{#1\@@par}}%
+ \vskip 2\tf@singlelineskip
+ \@afterheading}
% Title page: commands for use with \maketitle
@@ -230,7 +181,7 @@
% Formatting for titlepage option
\renewcommand{\maketitle}{%
\begin{titlepage}%
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\let\footnoterule\relax
\normalfont\normalsize\centering\singlespacing
@@ -276,7 +227,6 @@
% Table of Contents, List of Figures, and List of Tables: item number alignment
-%\def\numberline#1{\hb@xt@\@tempdima{\hfil #1\hspace{1em}}}
\def\(a)tocrmarg{0.75in}
\def\(a)pnumwidth{3.5ex}
@@ -288,30 +238,33 @@
\renewcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{1\baselineskip}%
+ \vskip 2\tf@singlelineskip %
\setlength\(a)tempdima{0.5in}%
- \vskip \tf@singlelineskip
- { \parindent \z@
- \rightskip \z@
+ { \parindent \z@ \rightskip \z@
\parfillskip -\@rightskip
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
\bfseries #1\nobreak\hfil \nobreak\par}
+ \if@compatibility
+ \global\@nobreaktrue
+ \everypar{\global\@nobreakfalse\everypar{}}%
+ \fi
\fi}
\renewcommand*{\l@section}[2]{%
\ifnum \c@tocdepth >\z@
\addpenalty\@secpenalty
- \setlength\@tempdima{\z@}%
\vskip \tf@singlelineskip
- { \parindent \z@
- \rightskip \@tocrmarg
+ \setlength\@tempdima{\z@}%
+ \begingroup
+ \parindent \z@ \rightskip \@tocrmarg
\parfillskip -\rightskip
\leavevmode
\advance\leftskip\@tempdima
\hskip -\leftskip
- #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par}
+ #1\nobreak\hfil \nobreak\hb@xt@\@pnumwidth{\hss #2}\par
+ \endgroup
\fi}
\renewcommand*{\l@subsection}{%
@@ -344,31 +297,43 @@
% Appendixes: adjust formatting of section headings
\def\tf@appendixsecfrmt{%
- \DeclareRobustCommand{\@seccntformat}[1]{%
- \ifstrequal{##1}{section}%
- {\appendixname\space \csname the##1\endcsname}%
- {\csname the##1\endcsname\quad}}
- \DeclareRobustCommand{\tf@secsep}[2]{%
- \ifstrequal{##1}{section}%
- {\ifstrempty{##2}{}{\par\nobreak}}%
- {\@empty}}
- \def\tf@tocline##1{\appendixname\space \csname the##1\endcsname.\quad}
- \@tf@adjustsectiontrue}
+ \def\thesection{\@Alph\c@section}
+ \protect\def\tf@makesectionhead##1##2##3##4##5{%
+ \vskip -\tf@singlelineskip\relax
+ \ifnum ##2 =1
+ \begingroup
+ \singlespacing
+ \interlinepenalty \@M
+ ##4{\appendixname\space\thesection\relax\@@par ##5\@@par}%
+ \vskip \tf@singlelineskip
+ \endgroup
+ \else
+ \begingroup
+ \singlespacing
+ ##4{%
+ \@hangfrom{\hskip ##3\relax\@svsec}%
+ \interlinepenalty \@M ##5\@@par}%
+ \endgroup
+ \fi}
+ \def\tf@tocline##1##2{%
+ \ifnum ##2 =1
+ \protect{\appendixname\space\thesection.\quad}
+ \else
+ \protect{\csname the##1\endcsname\quad}
+ \fi}}
% Appendixes: make environment
\newenvironment{appendixes}%
{%
\setcounter{secnumdepth}{1}
- \tf@appendixsecfrmt
- \setcounter{section}{0}%
- \setcounter{subsection}{0}%
- \gdef\thesection{\@Alph\c@section}%
+ \setcounter{section}{0}
+ \setcounter{subsection}{0}
+ \tf@appendixsecfrmt%
}%
{%
\setcounter{secnumdepth}{0}%
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\thesection{\@arabic\c@section}%
}%
% Appendixes: remove \appendix command
@@ -377,14 +342,10 @@
% Endnotes: Notes heading formatted as \section*
\if@endnotesformat
- \renewcommand{\enoteheading}{%
+ \def\enoteheading{%
\section*{\notesname}%
- \markboth{\notesname}{\notesname}%
- \addcontentsline{toc}{section}{\notesname}%
- \vspace{\dimexpr -4\tf@singlelineskip +1\baselineskip \relax}
- \singlespacing\mbox{}%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
- \let\tf@afterindent\@afterindenttrue}%
+ \markboth{}{}%
+ \addcontentsline{toc}{section}{\notesname}}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/turabian-formatting/turabian-thesis.cls new/tex/latex/turabian-formatting/turabian-thesis.cls
--- old/tex/latex/turabian-formatting/turabian-thesis.cls 2018-08-01 23:17:38.000000000 +0200
+++ new/tex/latex/turabian-formatting/turabian-thesis.cls 2020-03-20 22:27:47.000000000 +0100
@@ -4,7 +4,7 @@
% and Dissertations," 9th edition.
%
% ==============================
-% Copyright 2013-2018 Omar Abdool
+% Copyright 2013-2020 Omar Abdool
%
% This work may be distributed and/or modified under the conditions of the LaTeX
% Project Public License (LPPL), either version 1.3 of this license or (at your
@@ -27,7 +27,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{turabian-thesis}[2018/08/01 Turabian Theses and Dissertations]
+\ProvidesClass{turabian-thesis}[2020/03/19 Turabian Theses and Dissertations]
% Default point size
@@ -128,57 +128,56 @@
\if@openright \cleardoublepage \else \clearpage \fi
\secdef\@part\@spart}
-\def\tf@partformat{\normalfont\bfseries\normalsize\singlespacing\centering}
+\def\tf@partformat{\normalfont\bfseries\normalsize\centering}
% Part: heading with empty page
\def\@part[#1]#2{%
\ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart}#1}%
- \else
- \addcontentsline{toc}{part}{#1}%
- \fi
+ \refstepcounter{part}
+ \setcounter{footnote}{0}
+ \addcontentsline{toc}{part}%
+ {\protect\numberline{\partname\space\thepart}#1}
\else
- \addcontentsline{toc}{part}{#1}%
+ \addcontentsline{toc}{part}{#1}
\fi
- \markboth{}{}%
- { \tf@partformat
+ \markboth{}{}
+ \thispagestyle{empty}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty \@M
- \thispagestyle{empty}%
- \ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
- #2\par}
+ \tf@partformat{
+ \ifnum \c@secnumdepth >-2\relax
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #1\@@par}%
+ \endgroup
\@endpart}
% Part: heading with plain page style; allows following part description
\def\@spart#1{%
\ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \refstepcounter{part}%
- \addcontentsline{toc}{part}%
- {\protect\numberline{\partname\space\thepart}#1}%
- \fi
+ \refstepcounter{part}
+ \setcounter{footnote}{0}
+ \addcontentsline{toc}{part}%
+ {\protect\numberline{\partname\space\thepart}#1}
+ \else
+ \addcontentsline{toc}{part}{#1}
\fi
- \markboth{}{}%
- { \tf@partformat
+ \markboth{}{}
+ \thispagestyle{plain}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty \@M
- \thispagestyle{plain}%
- \ifnum \c@secnumdepth >-2\relax
- \if@mainmatter
- \partname\nobreakspace\thepart
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
- \ifstrempty{#1}{}{#1\par\nobreak}}%
- \vspace{\dimexpr 3\tf@singlelineskip -\baselineskip \relax}
+ \tf@partformat{
+ \ifnum \c@secnumdepth >-2\relax
+ \partname\nobreakspace\thepart\relax\@@par
+ \fi%
+ #1\@@par}%
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterindenttrue
\@afterheading}
\def\@endpart{\if@openright \cleardoublepage \else \clearpage \fi}
@@ -220,83 +219,62 @@
\@tfchapterbeforefalse
\fi}
-% Chapter: formatting
-\def\tf@chapformat{\normalfont\bfseries\normalsize\singlespacing\centering}
-
-\newlength\tf@adjafterchapskip
-\setlength\tf@adjafterchapskip{\z@}
-
-\def\tf@setafterchapskip{%
- \setlength\tf@adjafterchapskip{%
- \dimexpr 3\tf@singlelineskip -\baselineskip \relax}}
-
+% Chapter: heading layout
\def\@chapter[#1]#2{%
\@figuredblnumfalse
\@tabledblnumfalse
- \tf@afterindent
+ \@afterindenttrue
\ifnum \c@secnumdepth >\m@ne
+ \setcounter{footnote}{0}
\if@mainmatter
\tf@chapcounter
- \typeout{\(a)chapapp\space\thechapter.}%
+ \typeout{\@chapapp\space\thechapter}
\addcontentsline{toc}{chapter}%
- {\protect\numberline{\@chapapp\space\thechapter}#1}%
+ {\protect\numberline{\@chapapp\space\thechapter}#1}
+ \tf@endnotesection{\@chapapp\space\thechapter}
\else
\tf@restoreftcounters
- \addcontentsline{toc}{chapter}{#1}%
+ \addcontentsline{toc}{chapter}{#1}
+ \tf@endnotesection{#1}
\fi
\else
- \addcontentsline{toc}{chapter}{#1}%
+ \addcontentsline{toc}{chapter}{#1}
\fi
- \chaptermark{#1}%
- \@makechapterhead{#2}%
+ \chaptermark{#1}
+ \@makechapterhead{#2}
\@afterheading}
\def\@schapter#1{%
\@figuredblnumfalse
\@tabledblnumfalse
\tf@restoreftcounters
- \tf@afterindent
- \@makeschapterhead{#1}%
+ \@afterindenttrue
+ \@makeschapterhead{#1}
\@afterheading}
+% Chapter: heading formatting
+\def\tf@chapformat{\normalfont\bfseries\normalsize\centering}
+
\def\@makechapterhead#1{%
- \tf@setafterchapskip
- { \tf@chapformat
- \ifnum \c@secnumdepth >\m@ne
- \if@mainmatter
- \@chapapp\space \thechapter
- \par\nobreak
- \vspace*{1\baselineskip}%
- \fi
- \fi
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
\interlinepenalty\@M
- \ifstrempty{#1}{}{#1\par\nobreak \vspace{\tf@adjafterchapskip}}}}
+ \tf@chapformat{
+ \ifnum \c@secnumdepth >\m@ne
+ \if@mainmatter
+ \@chapapp\space \thechapter\relax\@@par
+ \fi%
+ \fi%
+ #1\@@par}
+ \endgroup
+ \vskip 2\tf@singlelineskip}
\def\@makeschapterhead#1{%
- \tf@setafterchapskip
- { \tf@chapformat
+ { \singlespacing
\interlinepenalty\@M
- #1\par\nobreak
- \vspace{\tf@adjafterchapskip}}}
-
-
-% Sections: redefine \@startsection to support adjusting space after section headings
-\def\@startsection#1#2#3#4#5#6{%
- \if@noskipsec \leavevmode \fi
- \par
- \@tempskipa #4\relax
- \@afterindenttrue
- \ifdim \@tempskipa <\z@
- \@tempskipa -\@tempskipa \tf@afterindent
- \fi
- \if@nobreak
- \everypar{}%
- \else
- \addpenalty\@secpenalty\addvspace\@tempskipa
- \fi
- \@ifstar
- {\@ssect{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}%
- {\@dblarg{\@sect{#1}{#2}{#3}{#4}{\dimexpr #5 -\tf@adjaftersec \relax}{#6}}}}
+ \tf@chapformat{#1}\par\nobreak}%
+ \vskip 2\tf@singlelineskip}
% Title page: commands for use with \maketitle
@@ -357,7 +335,7 @@
\renewcommand{\maketitle}{%
\begin{titlepage}%
\singlespacing
- \tf@setfnpunct{}
+ \def\tf@thefnpunct{\,\,}
\renewcommand*{\thefootnote}{\fnsymbol{footnote}}
\let\footnoterule\relax
\normalfont\normalsize
@@ -404,9 +382,8 @@
\renewcommand*{\l@part}[2]{%
\ifnum \c@tocdepth >-2\relax
\addpenalty{-\@highpenalty}%
- \addvspace{1\baselineskip}%
+ \vskip 2\tf@singlelineskip %
\setlength\(a)tempdima{1.25in}%
- \vskip 1\baselineskip
{ \parindent \z@
\rightskip \z@
\parfillskip -\@rightskip
@@ -433,7 +410,7 @@
\renewcommand*{\l@section}{%
\ifnum \c@tocdepth >\z@ \vskip \tf@singlelineskip \fi
- \@dottedtocline{1}{1.5in}{\z@}}
+ \@dottedtocline{1}{1.25in}{\z@}}
\renewcommand*{\l@subsection}{%
\ifnum \c@tocdepth >1 \vskip \tf@singlelineskip \fi
@@ -493,19 +470,36 @@
\newcounter{appendix}
+% Appendixes: heading formatting
+\def\tf@appendixchapfrmt{%
+ \def\thechapter{\@Alph\c@appendix}
+ \def\@chapapp{\appendixname}%
+ \protect\def\@chapter[##1]##2{%
+ \tf@appendixcounter
+ \setcounter{footnote}{0}
+ \@afterindenttrue
+ \typeout{\@chapapp\space\thechapter}
+ \addcontentsline{toc}{chapter}%
+ {\protect\numberline{\@chapapp\space\thechapter}##1}
+ \chaptermark{##1}
+ \tf@endnotesection{\@chapapp\space\thechapter}
+ \begingroup
+ \setlength\parskip{\tf@singlelineskip}
+ \singlespacing
+ \interlinepenalty\@M
+ \tf@chapformat{\@chapapp\space \thechapter\@@par ##2\@@par}
+ \endgroup
+ \vskip 2\tf@singlelineskip
+ \@afterheading}}
+
\newenvironment{appendixes}%
{%
- \@mainmattertrue
- \setcounter{section}{0}%
- \def\@chapapp{\appendixname}%
- \def\thechapter{\@Alph\c@appendix}
- \def\tf@chapcounter{\refstepcounter{appendix}}
\if@doublenumerate
\if@tfchapterbefore \else
\setcounter{tf@tempchapfcnt}{\value{figure}}
\setcounter{tf@tempchaptcnt}{\value{table}}
\fi
- \def\tf@chapcounter{%
+ \def\tf@appendixcounter{%
\refstepcounter{appendix}
\@figuredblnumtrue
\@tabledblnumtrue}
@@ -513,70 +507,48 @@
\setcounter{table}{0}
\def\tf@figuredblnumprefix{A}
\def\tf@tabledblnumprefix{A}
+ \else
+ \def\tf@appendixcounter{%
+ \refstepcounter{appendix}
+ \@figuredblnumfalse
+ \@tabledblnumfalse}
\fi
+ \tf@appendixchapfrmt%
}%
{%
\if@doublenumerate
\setcounter{figure}{\value{tf@tempchapfcnt}}
\setcounter{table}{\value{tf@tempchaptcnt}}
- \fi
+ \fi%
}
% Appendixes: remove \appendix command
\def\appendix{\@empty}
-% Endnotes: layout and formatting
+% Endnotes: reset endnote counter and create endnote section heading
+\def\tf@endnotesection#1{%
+ \if@endnotesformat
+ \setcounter{endnote}{0}
+ \if@enotesopen
+ \addtoendnotes{\noexpand\tf@enotesechead{#1}}
+ \fi
+ \fi}
+% Endnotes: format and make endnote section heading if followed by an endnote
\if@endnotesformat
+ \def\tf@enotesechead#1{%
+ \@ifnextchar\@doanenote%
+ {\vskip\tf@singlelineskip\relax \section*{#1}}%
+ {}}
+\fi
- \let\tf@chapter\chapter
-
- \@addtoreset{endnote}{chapter}
-
- % Renew Notes heading formatted as \chapter* (also added to Table of Content)
- \renewcommand{\enoteheading}{%
- \tf@chapter*{\notesname}%
- \@mkboth{\notesname}{\notesname}%
- \addcontentsline{toc}{chapter}{\notesname}%
- \vspace{\dimexpr -5\tf@singlelineskip +1\baselineskip \relax}%
- \singlespacing\mbox{}%
- \def\tf@adjaftersec{\dimexpr \tf@singlelineskip -\p@ \relax}
- \let\tf@afterindent\@afterindenttrue}%
-
- % Renew \chapter command to: (1) reset endnotes counter at each chapter, and (2) add subheadings for each chapter in \endnotes formatting.
- \RenewDocumentCommand{\chapter}{som}{%
- \IfBooleanTF{#1}%
- {% if \chapter*
- \tf@chapter*{#3}%
- \setcounter{endnote}{0}%
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- }%
- {% if \chapter
- \IfNoValueTF{#2}%
- {\tf@chapter{#3}}%
- {\tf@chapter[#2]{#3}}%
- \setcounter{endnote}{0}%
- \if@mainmatter
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\@chapapp\space \thechapter}}%
- \else
- \addtoendnotes{%
- \noexpand\tf@enotedivider%
- {\noexpand\section*}{\unexpanded{#3}}}%
- \fi
- }}
-
- % Empty subheading divider before \theendnotes for use with \tf@enotedivider
- \preto{\theendnotes}{%
- \addtoendnotes{\noexpand\tf@enotedivider{}{}}}
-
- % Make endnote divider if not followed by another endnote divider
- \def\tf@enotedivider#1#2{\@ifnextchar\tf@enotedivider{}{#1{#2}}}%
-
+% Endnotes: Notes heading formatted as \chapter*
+\if@endnotesformat
+ \def\enoteheading{%
+ \chapter*{\notesname}%
+ \@mkboth{}{}%
+ \addcontentsline{toc}{chapter}{\notesname}}
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/turabian-formatting.tlpobj new/tlpkg/tlpobj/turabian-formatting.tlpobj
--- old/tlpkg/tlpobj/turabian-formatting.tlpobj 2019-02-28 04:10:11.000000000 +0100
+++ new/tlpkg/tlpobj/turabian-formatting.tlpobj 2020-03-20 23:58:45.000000000 +0100
@@ -1,6 +1,6 @@
name turabian-formatting
category Package
-revision 48330
+revision 54436
shortdesc Formatting based on Turabian's Manual
relocated 1
longdesc The turabian-formatting package provides Chicago-style
@@ -13,6 +13,5 @@
RELOC/tex/latex/turabian-formatting/turabian-thesis.cls
catalogue-also turabian biblatex-chicago
catalogue-ctan /macros/latex/contrib/turabian-formatting
-catalogue-date 2018-08-01 18:15:02 +0200
catalogue-license lppl1.3
catalogue-topics dissertation class
++++++ txfontsb.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/txfontsb/README new/doc/fonts/txfontsb/README
--- old/doc/fonts/txfontsb/README 2011-03-02 00:50:15.000000000 +0100
+++ new/doc/fonts/txfontsb/README 2019-11-12 22:42:19.000000000 +0100
@@ -1,6 +1,8 @@
-Release (v1.1/12/Jan/2011) of txfontsb package adding true small caps
+Release (v1.1.1/12/Nov/2019) of txfontsb package adding true small caps
and greek to txfonts package.
+OpenType fonts added (12/Nov/2019)
+
Go to the doc sudirectory for instructions.
A. Tsolomitis.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfontsb.doc.tlpobj new/tlpkg/tlpobj/txfontsb.doc.tlpobj
--- old/tlpkg/tlpobj/txfontsb.doc.tlpobj 2019-02-28 04:10:20.000000000 +0100
+++ new/tlpkg/tlpobj/txfontsb.doc.tlpobj 2020-03-24 02:04:16.000000000 +0100
@@ -1,6 +1,6 @@
name txfontsb.doc
category Package
-revision 21578
+revision 54512
shortdesc doc files of txfontsb
relocated 1
docfiles size=22
++++++ txfontsb.tar.xz ++++++
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf and new/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf and new/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifb.otf and new/fonts/opentype/public/txfontsb/FreeSerifb.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbBold.otf and new/fonts/opentype/public/txfontsb/FreeSerifbBold.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf and new/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf differ
Binary files old/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf and new/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/txfontsb.tlpobj new/tlpkg/tlpobj/txfontsb.tlpobj
--- old/tlpkg/tlpobj/txfontsb.tlpobj 2019-02-28 04:10:20.000000000 +0100
+++ new/tlpkg/tlpobj/txfontsb.tlpobj 2020-03-24 02:04:16.000000000 +0100
@@ -1,13 +1,13 @@
name txfontsb
category Package
-revision 21578
+revision 54512
shortdesc Extensions to txfonts, using GNU Freefont
relocated 1
longdesc A set of fonts that extend the txfonts bundle with small caps
longdesc and old style numbers, together with Greek support. The
longdesc extensions are made with modifications of the GNU Freefont.
execute addMap gptimes.map
-runfiles size=1596
+runfiles size=2083
RELOC/fonts/afm/public/txfontsb/FreeSerifb-SmallCaps.afm
RELOC/fonts/afm/public/txfontsb/FreeSerifb-SmallCapsAlt.afm
RELOC/fonts/afm/public/txfontsb/FreeSerifb.afm
@@ -17,6 +17,12 @@
RELOC/fonts/enc/dvips/txfontsb/gptimes.enc
RELOC/fonts/enc/dvips/txfontsb/gptimesy.enc
RELOC/fonts/map/dvips/txfontsb/gptimes.map
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb-SmallCaps.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb-SmallCapsAlt.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifb.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbBold.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbBoldItalic.otf
+ RELOC/fonts/opentype/public/txfontsb/FreeSerifbItalic.otf
RELOC/fonts/tfm/public/txfontsb/gtimesb6a.tfm
RELOC/fonts/tfm/public/txfontsb/gtimesb6r.tfm
RELOC/fonts/tfm/public/txfontsb/gtimesbi6a.tfm
@@ -74,7 +80,6 @@
RELOC/tex/latex/txfontsb/txfontsb.sty
catalogue-also newtx
catalogue-ctan /fonts/txfontsb
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license gpl
+catalogue-license gpl lppl1
catalogue-topics font font-maths font-greek font-type1
-catalogue-version 1.1
+catalogue-version 1.1.1
++++++ uantwerpendocs.doc.tar.xz ++++++
Binary files old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenbamathesis-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,11pt,twoside,openright,english]{uantwerpenbamathesis}
\usepackage[english]{babel} % or dutch if your text is in Dutch
@@ -40,7 +40,7 @@
\facultyacronym{TI}
\academicyear{2015-2016}
-\diploma{BA-IW-EM}
+\diploma{MA-IW-EM}
\defenselocation{Antwerpen}
\defensedate{juni 2016}
Binary files old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf and new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpencoursetext-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,11pt,oneside,openright,english,qr,copyright]{uantwerpencoursetext}
\usepackage[english,dutch]{babel}
Binary files old/doc/latex/uantwerpendocs/uantwerpendocs.pdf and new/doc/latex/uantwerpendocs/uantwerpendocs.pdf differ
Binary files old/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf and new/doc/latex/uantwerpendocs/uantwerpenexam-example1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex new/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex
--- old/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenexam-example1.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
Binary files old/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf and new/doc/latex/uantwerpendocs/uantwerpenexam-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex new/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex
--- old/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenexam-example2.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper,10pt]{uantwerpenexam}
\usepackage{newpxtext} % demonstration of some fine font packages
\usepackage{newpxmath}
Binary files old/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf and new/doc/latex/uantwerpendocs/uantwerpenletter-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex
--- old/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenletter-example.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[a4paper]{uantwerpenletter}
%% As a good UAntwerpen citizen, you would use the calibri font.
Binary files old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf and new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex
--- old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example1.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
\usepackage{mathptmx}
Binary files old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf and new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex
--- old/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2019-03-28 21:58:25.000000000 +0100
+++ new/doc/latex/uantwerpendocs/uantwerpenphdthesis-example2.tex 2019-05-05 20:05:56.000000000 +0200
@@ -24,8 +24,8 @@
%%
%% The Current Maintainer of this work is Walter Daems.
%%
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\documentclass[b5paper,10pt,twoside,openright,filled]{uantwerpenphdthesis}
\usepackage{newpxtext}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj
--- old/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2019-03-29 02:24:45.000000000 +0100
+++ new/tlpkg/tlpobj/uantwerpendocs.doc.tlpobj 2019-05-06 01:39:04.000000000 +0200
@@ -1,6 +1,6 @@
name uantwerpendocs.doc
category Package
-revision 50626
+revision 51007
shortdesc doc files of uantwerpendocs
relocated 1
docfiles size=366
++++++ uantwerpendocs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls new/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenbamathesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenbamathesis}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@titlepagenoartwork
\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
\newif\if@titlepagetableonly
@@ -411,6 +411,8 @@
{\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
\ifthenelse{\equal{#1}{MA-IW-EM-EN}}
{\MoSIW:\\elektromechanica, afstudeerrichting energie}{
+ \ifthenelse{\equal{#1}{MA-IW-EM}}
+ {\MoSIW:\\elektromechanica}{
\ifthenelse{\equal{#1}{MA-TEW-HI}}
{\MoSTEW: handelsingenieur}{
\ifthenelse{\equal{#1}{MA-TEW-HIBI}}
@@ -420,7 +422,7 @@
\ifthenelse{\equal{#1}{MA-TEW-BK}}
{\MoSTEW: bedrijfskunde}
{\errmessage{Error in argument to macro diploma: must be one of
- BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+ BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}
}
\newcommand\thesisname{ERROR}
\IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls
--- old/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpencoursetext.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpencoursetext}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@copyright
\DeclareOption{copyright}{\@copyrighttrue}
\newif\if@qr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenexam.cls new/tex/latex/uantwerpendocs/uantwerpenexam.cls
--- old/tex/latex/uantwerpendocs/uantwerpenexam.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenexam.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenexam}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@examiner
\DeclareOption{examiner}{\@examinertrue}
\ExecuteOptions{a4paper,twoside,10pt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenletter.cls new/tex/latex/uantwerpendocs/uantwerpenletter.cls
--- old/tex/latex/uantwerpendocs/uantwerpenletter.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenletter.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,9 +26,9 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenletter}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@filled
\DeclareOption{filled}{\@filledtrue}
\ExecuteOptions{a4paper,10pt,final,oneside,openright}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -26,10 +26,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{uantwerpenmasterthesis}
- [2019/03/27 v2.3 .dtx skeleton file]
+ [2019/04/10 v2.4 .dtx skeleton file]
\errmessage{This class is obsolete, use the uantwerpenbamathesis class instead !}
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\renewcommand{\headrulewidth}{0pt}
\renewcommand{\footrulewidth}{0pt}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls new/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
--- old/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2019-03-28 21:58:25.000000000 +0100
+++ new/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls 2019-05-05 20:05:56.000000000 +0200
@@ -25,9 +25,9 @@
%% The Current Maintainer of this work is Walter Daems.
%%
\ProvidesClass{uantwerpenphdthesis}
- [2019/03/27 v2.3 .dtx skeleton file]
-\def\fileversion{2.3}
-\def\filedate{2019/03/27}
+ [2019/04/10 v2.4 .dtx skeleton file]
+\def\fileversion{2.4}
+\def\filedate{2019/04/10}
\newif\if@titlepagenoartwork
\DeclareOption{titlepagenoartwork}{\@titlepagenoartworktrue}
\newif\if@titlepagetableonly
@@ -501,6 +501,8 @@
{\MoSIW:\\elektromechanica, afstudeerrichting elektromechanica}{
\ifthenelse{\equal{#1}{MA-IW-EM-EN}}
{\MoSIW:\\elektromechanica, afstudeerrichting energie}{
+ \ifthenelse{\equal{#1}{MA-IW-EM}}
+ {\MoSIW:\\elektromechanica}{
\ifthenelse{\equal{#1}{MA-TEW-HI}}
{\MoSTEW: handelsingenieur}{
\ifthenelse{\equal{#1}{MA-TEW-HIBI}}
@@ -510,7 +512,7 @@
\ifthenelse{\equal{#1}{MA-TEW-BK}}
{\MoSTEW: bedrijfskunde}
{\errmessage{Error in argument to macro diploma: must be one of
- BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}
+ BA-IW-XXX with XXX one of BK, BCH, CH, EI or EM, or MA-IW-XXX with XXX one of BK, BCH, CH, EI, EI-AE, EI-ICT, EM-AE, EM-AU, EM-EM, EM-EN, MA-TEW-YYY with YYY one of HI, HIBI, EB, BK! <<}}}}}}}}}}}}}}}}}}}}}
}
\newcommand\thesisname{ERROR}
\IfSubStr{#1}{MA-}{\renewcommand\thesisname{\masterthesisname}}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/uantwerpendocs.tlpobj new/tlpkg/tlpobj/uantwerpendocs.tlpobj
--- old/tlpkg/tlpobj/uantwerpendocs.tlpobj 2019-03-29 02:24:46.000000000 +0100
+++ new/tlpkg/tlpobj/uantwerpendocs.tlpobj 2019-05-06 01:39:04.000000000 +0200
@@ -1,6 +1,6 @@
name uantwerpendocs
category Package
-revision 50626
+revision 51007
shortdesc Course texts, master theses, and exams in University of Antwerp style
relocated 1
longdesc These class files implement the house style of the University
@@ -32,7 +32,7 @@
RELOC/tex/latex/uantwerpendocs/uantwerpenmasterthesis.cls
RELOC/tex/latex/uantwerpendocs/uantwerpenphdthesis.cls
catalogue-ctan /macros/latex/contrib/uantwerpendocs
-catalogue-date 2019-03-28 19:50:55 +0100
+catalogue-date 2019-04-10 20:30:42 +0200
catalogue-license lppl1.3
catalogue-topics class dissertation essay letter exam
-catalogue-version 2.3
+catalogue-version 2.4
++++++ ucalgmthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/README.md new/doc/latex/ucalgmthesis/README.md
--- old/doc/latex/ucalgmthesis/README.md 2019-04-01 00:04:57.000000000 +0200
+++ new/doc/latex/ucalgmthesis/README.md 2019-10-24 23:48:41.000000000 +0200
@@ -59,6 +59,11 @@
\end{document}
```
+The easiest way to get started is perhaps to rename
+`sample-thesis.tex`, change the metadata and layout options to your
+liking, and put the content of your thesis into the files it includes
+(`frontmatter.tex`, `chapter1.tex`, etc.)
+
Commands
--------
@@ -98,13 +103,17 @@
- `singlespaced`, `onehalfspaced`, `doublespaced` sets up the line
spacing (`onehalfspaced` is the default).
-- `palatino`, `times`, `garamond`, `utopia`, `libertine` offer some nice
- alternative typefaces (i.e., fonts) to the default Computer Modern.
-
-- `headers` produces running heads. Per the guidelines, must not be
- the thesis title or author's name, and must be separated from the
- main text by a line. The class uses the chapter number and title and
- places it flush right in the header.
+- `palatino`, `times`, `garamond`, `utopia`, `libertine` offer some
+ nice alternative typefaces (i.e., fonts) to the default Computer
+ Modern. Note that `garamond` uses the
+ [`garamondx`](https://ctan.org/tex-archive/fonts/garamondx?lang=en)
+ package, which is not included in the TeXLive distibution (and is
+ not available on Overleaf).
+
+- `headers` produces running heads. Per the guidelines, the running
+ heads must not be the thesis title or author's name, and must be
+ separated from the main text by a line. The class uses the chapter
+ number and title and places it flush right in the header.
- `fullpage` calls `\fullpagethesis`, so produces a thesis with 1"
margins all around. This produces very long lines and is not
@@ -186,6 +195,12 @@
- `garamond` and `utopia` use the `mathdesign` package, which has a buggy
`\hrulefill` command. The package tries to correct this.
+- `garamond` uses the `garamondx` package. This package has a
+ restrictive license and is thus not included in the TeXLive
+ distribution. Use the
+ [`getnonfreefonts`](https://www.tug.org/fonts/getnonfreefonts/)
+ installer to download it.
+
- The guidelines require that the official filed thesis is laid out
for one-sided printing (equal left and right margins). You may want
to print the thesis two-sided, however, e.g., to give a nice bound
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/appendix.tex new/doc/latex/ucalgmthesis/appendix.tex
--- old/doc/latex/ucalgmthesis/appendix.tex 2019-04-01 00:04:57.000000000 +0200
+++ new/doc/latex/ucalgmthesis/appendix.tex 2019-10-24 23:48:41.000000000 +0200
@@ -8,7 +8,7 @@
\chapter*{Appendix}\label{appendix}
% \chapter* doesn't include it in the TOC, so we have to do that by
-% hand. If you have multiple chapters, use \chapter instead and
+% hand. If you have multiple appendices, use \chapter instead and
% remove the following line.
\addcontentsline{toc}{chapter}{Appendix}
Binary files old/doc/latex/ucalgmthesis/sample-thesis.pdf and new/doc/latex/ucalgmthesis/sample-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucalgmthesis/sample-thesis.tex new/doc/latex/ucalgmthesis/sample-thesis.tex
--- old/doc/latex/ucalgmthesis/sample-thesis.tex 2019-04-02 23:02:20.000000000 +0200
+++ new/doc/latex/ucalgmthesis/sample-thesis.tex 2019-10-24 23:48:41.000000000 +0200
@@ -1,24 +1,28 @@
% A Sample Thesis for the University of Calgary
% =============================================
-% Load the UCalgary Memoir Thesis class. By default (without options),
-% this produces a 1-1/2 spaced thesis in 11 point font without running
-% heads. Use package options singlespaced or doublespaced for single
-% or double line spacing. The default font is LaTeX's Computer
-% Modern. Use package options times, palatino, libertine, garamond, or
-% utopia for other nice typefaces. (You may need to install the
-% relevant packages to get these to work.) Use package option headers
-% if you want running heads. Use option fullpage if you want the text
-% to occupy all allowable space (1 inch margins all around), or option
-% manuscript if you want a page layout suitable for reviewing and
-% proof reading. Option manuscript selects 12 pt type, doublespaced,
-% approx. 25 lines per page, with approx. 72 characters per line. You
-% may want to remove the option for the version you file in the Vault;
-% it looks nicer and is a bit more compact. You can also use any
-% options that the memoir class recognizes, such as 10pt for 10 point
-% font, 11pt for 11 point font, 12pt for 12 point type,
-% etc. Documentation of the memoir package can be found at
-% https://ctan.org/pkg/memoir?lang=en
+% This is a sample LaTeX document to build a University of Calgary
+% graduate thesis according to the guidelines of the Faculty of
+% Graduate Studies, available here:
+% https://grad.ucalgary.ca/current-students/thesis-based-students/thesis/buil…
+
+% To use this sample for your own thesis, rename this file, make any changes
+% necessary, then add the content of your thesis t othe included files
+% frontmatter.tex, chapter1.tex, etc.
+
+% First, we load the UCalgary Memoir Thesis class ucalgmthesis,
+% available at https://github.com/rzach/ucalgmthesis
+
+% By default (without options), this produces a 1-1/2 spaced thesis in
+% 11 point font without running heads. See the README file for a
+% description of all package options.
+
+% In our sample we give three options: Option utopia sets the thesis in a
+% nice font. Option headers produces running heads. Option manuscript
+% formats the page in a way suitable for reading and commenting: 12 pt type,
+% double spaced, approx. 25 lines per page, with approx. 72 characters
+% per line. For filing in the Vault, remove that option to produce a
+% more compact thesis with a slightly better layout.
\documentclass[utopia,headers,manuscript]{ucalgmthesis}
@@ -37,8 +41,7 @@
\usepackage{microtype}
% We'll need some colored links, so we load xcolor and hyperref. But
-% you can take that out if you don't want links at all or are happy
-% with the standard garish colored boxes.
+% you can take that out if you don't want links at all.
\usepackage[dvipsnames]{xcolor}
@@ -100,7 +103,7 @@
% The year
-\thesisyear{2018}
+\thesisyear{2019}
% Tell hyperref to put author and title into the PDF metadata
@@ -123,6 +126,8 @@
% \includeonly{titlepage}
+% and then copy the resulting PDF to a separate file.
+
\begin{document}
\frontmatter
@@ -153,8 +158,9 @@
\include{backmatter}
-% The appendix contains material that would clutter up the main
-% text. Remove it if you don't have an appendix.
+% The appendix contains material that would clutter up the main text,
+% such as program code, survey instruments, or interview transcripts.
+% Remove it if you don't have an appendix.
\appendix
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj new/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj
--- old/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj 2019-04-03 01:25:25.000000000 +0200
+++ new/tlpkg/tlpobj/ucalgmthesis.doc.tlpobj 2019-10-25 01:54:50.000000000 +0200
@@ -1,9 +1,9 @@
name ucalgmthesis.doc
category Package
-revision 50705
+revision 52527
shortdesc doc files of ucalgmthesis
relocated 1
-docfiles size=41
+docfiles size=42
RELOC/doc/latex/ucalgmthesis/LICENSE
RELOC/doc/latex/ucalgmthesis/README.md
RELOC/doc/latex/ucalgmthesis/appendix.tex
++++++ ucalgmthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ucalgmthesis/ucalgmthesis.cls new/tex/latex/ucalgmthesis/ucalgmthesis.cls
--- old/tex/latex/ucalgmthesis/ucalgmthesis.cls 2019-04-02 23:02:20.000000000 +0200
+++ new/tex/latex/ucalgmthesis/ucalgmthesis.cls 2019-10-24 23:48:41.000000000 +0200
@@ -11,7 +11,7 @@
% Distributed under the terms of the MIT License
% https://opensource.org/licenses/MIT
-\ProvidesClass{ucalgmthesis}[2019/04/02
+\ProvidesClass{ucalgmthesis}[2019/10/24
University of Calgary Memoir Thesis Class]
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
@@ -85,12 +85,12 @@
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{memoir}}
-% By default, typeset with one half spacing, no running heads, 11 pt
+% By default, typeset with one half spacing, no running heads
\ExecuteOptions{onehalfspaced,plain}
% Tell memoir the document has to be one-sided (i.e., don't switch
-% margins, etc.) and don't add empty pages before new chapters
+% margins, etc.), 11 pt, and don't add empty pages before new chapters
\PassOptionsToClass{openany,oneside,11pt}{memoir}
\ProcessOptions
@@ -119,8 +119,13 @@
\newcommand{\manuscriptthesis}{%
\setlxvchars
- \settypeblocksize{25\baselineskip}{1.1\lxvchars}{*}%
- \setulmargins{*}{*}{*}%
+ \settypeblocksize{25\baselineskip}{1.1\lxvchars}{*}
+ \if@twoside
+ \setlrmargins{*}{*}{1.618}
+ \else
+ \setlrmargins{*}{*}{1}
+ \fi
+ \setulmargins{*}{*}{*}
\checkandfixthelayout}
% fix a bug in mathdesign
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucalgmthesis.tlpobj new/tlpkg/tlpobj/ucalgmthesis.tlpobj
--- old/tlpkg/tlpobj/ucalgmthesis.tlpobj 2019-04-03 01:25:25.000000000 +0200
+++ new/tlpkg/tlpobj/ucalgmthesis.tlpobj 2019-10-25 01:54:50.000000000 +0200
@@ -1,6 +1,6 @@
name ucalgmthesis
category Package
-revision 50705
+revision 52527
shortdesc LaTeX thesis class for University of Calgary Faculty of Graduate Studies
relocated 1
longdesc ucalgmthesis.cls is a LaTeX class file that produces documents
@@ -20,6 +20,6 @@
catalogue-contact-bugs https://github.com/rzach/ucalgmthesis/issues
catalogue-contact-repository https://github.com/rzach/ucalgmthesis
catalogue-ctan /macros/latex/contrib/ucalgmthesis
-catalogue-date 2019-04-02 20:36:26 +0200
+catalogue-date 2019-10-24 21:00:42 +0200
catalogue-license mit
catalogue-topics class dissertation
++++++ ucbthesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/README new/doc/latex/ucbthesis/README
--- old/doc/latex/ucbthesis/README 2015-07-06 00:12:11.000000000 +0200
+++ new/doc/latex/ucbthesis/README 2019-07-21 00:54:02.000000000 +0200
@@ -1,14 +1,13 @@
-UCB Thesis Class Version 3.5, 2015-06-01
+UCB Thesis Class Version 3.6, 2019-07-19
-Copyright (C) 1988-2014 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
+Copyright (C) 1988-2019 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
This is a class file for producing Ph.D. dissertations and masters theses
conforming to the documents "Dissertation Filing Guide" and "Thesis
Filing Guide" produced by the UC Berkeley Graduate Division and available
-on the web at <http://grad.berkeley.edu/academic-progress/dissertation/>
-and <http://grad.berkeley.edu/academic-progress/thesis/>, respectively.
+on the web at <https://grad.berkeley.edu/academic-progress/>.
This class is currently based on the dissertation and thesis guides,
-dated May 2010 -- June 2015 and February 2011 -- June 2015, respectively.
+accessed in July 2019.
This class is a fork of the UCTHESIS document class (which is still being
maintained for use with older theses, but which should not be used for
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/example/chap1.tex new/doc/latex/ucbthesis/example/chap1.tex
--- old/doc/latex/ucbthesis/example/chap1.tex 2014-04-15 23:30:23.000000000 +0200
+++ new/doc/latex/ucbthesis/example/chap1.tex 2019-07-21 00:54:02.000000000 +0200
@@ -55,7 +55,7 @@
ashy Bujumbura may assess, hadn't servitor. Wash, Doff, Algorithm.
\begin{table}
-\begin{center}
+\centering
\begin{tabular}{|c|c|c|}
\hline
1-2-3 & yes & no \\
@@ -65,7 +65,6 @@
Wordstar & no & no \\
\hline
\end{tabular}
-\end{center}
\caption{Pigeonhole sportsman grin historic stockpile.}
\end{table}
Davidson witting and grammatic. Hoofmark and Avogadro ionosphere.
@@ -75,7 +74,7 @@
Sony tomography.
\begin{table}
-\begin{center}
+\centering
\begin{tabular}{|ccccc|}
\hline
\textbf{Mitre} & \textbf{Enchantress} & \textbf{Hagstrom} &
@@ -89,8 +88,7 @@
Leavenworth & Hidden & Benedictine & Vivacious & Utensil \\
\hline
\end{tabular}
-\end{center}
-\caption{Utensil wallaby Juno titanium.}
+\caption{Utensil wallaby Juno titanium}
\end{table}
Aviv censor seventh, conjugal. Faceplate emittance borough airline.
@@ -122,6 +120,24 @@
known ashy Bujumbura may, assess, hadn't servitor. Wash, Doff, and
Algorithm.
+\begin{sidewaystable}
+\centering
+\begin{tabular}{|ccccc|}
+\hline
+\textbf{Mitre} & \textbf{Enchantress} & \textbf{Hagstrom} &
+\textbf{Atlantica} & \textbf{Martinez} \\
+\hline
+Arabic & Spicebush & Sapient & Chaos & Conquer \\
+Jail & Syndic & Prevent & Ballerina & Canker \\
+Discovery & Fame & Prognosticate & Corroborate & Bartend \\
+Marquis & Regal & Accusation & Dichotomy & Soprano \\
+Indestructible & Porterhouse & Sofia & Cavalier & Trance \\
+Leavenworth & Hidden & Benedictine & Vivacious & Utensil \\
+\hline
+\end{tabular}
+\caption{Abeam utensil wallaby Juno titanium}
+\end{sidewaystable}
+
\begin{itemize}
\item Davidson witting and grammatic. Jukes foundry mesh sting speak,
Gillespie, Birmingham Bentley. Hedgehog, swollen McGuire; gnat.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/example/thesis.tex new/doc/latex/ucbthesis/example/thesis.tex
--- old/doc/latex/ucbthesis/example/thesis.tex 2014-04-15 23:30:23.000000000 +0200
+++ new/doc/latex/ucbthesis/example/thesis.tex 2019-07-21 00:54:02.000000000 +0200
@@ -6,6 +6,7 @@
\documentclass{ucbthesis}
\usepackage{biblatex}
+\usepackage{rotating} % provides sidewaystable and sidewaysfigure
% To compile this file, run "latex thesis", then "biber thesis"
% (or "bibtex thesis", if the output from latex asks for that instead),
@@ -19,6 +20,8 @@
% be indented (like the others), then include this line:
% \usepackage{indentfirst}
+\addtolength{\abovecaptionskip}{\baselineskip}
+
\newtheorem{theorem}{Jibberish}
\bibliography{references}
@@ -38,6 +41,10 @@
\chair{Professor Richard Francis Sony}
\othermembers{Professor Roger Spam \\
Associate Professor Michael Chex}
+% For a co-chair who is subordinate to the \chair listed above
+% \cochair{Professor Benedict Francis Pope}
+% For two co-chairs of equal standing (do not use \chair with this one)
+% \cochairs{Professor Richard Francis Sony}{Professor Benedict Francis Pope}
\numberofmembers{3}
% Previous degrees are no longer to be listed on the title page.
% \prevdegrees{B.A. (University of Northern South Dakota at Hoople) 1978 \\
@@ -47,8 +54,8 @@
% \emphasis{Colloidal Telemetry}
% This is optional, and rare
% \jointinstitution{University of Western Maryland}
-% This is optional
-\campus{Berkeley}
+% This is optional (default is Berkeley)
+% \campus{Berkeley}
% For a masters thesis, replace the above \documentclass line with
% \documentclass[masters]{ucbthesis}
@@ -108,9 +115,9 @@
\include{chap1}
\include{chap2}
+\printbibliography
+
% \appendix
% \chapter{More Monticello Candidates}
-\printbibliography
-
\end{document}
Binary files old/doc/latex/ucbthesis/ucbthesis.pdf and new/doc/latex/ucbthesis/ucbthesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/ucbthesis/ucbthesis.tex new/doc/latex/ucbthesis/ucbthesis.tex
--- old/doc/latex/ucbthesis/ucbthesis.tex 2015-07-06 00:12:11.000000000 +0200
+++ new/doc/latex/ucbthesis/ucbthesis.tex 2019-07-21 00:54:02.000000000 +0200
@@ -9,7 +9,7 @@
\title{The UCB Thesis Class}
\author{Paul Vojta\\Mathematics Department\\
\texttt{\href{mailto:vojta@math.berkeley.edu}{vojta@math.berkeley.edu}}}
-\date{Version 3.5\\June 1, 2015}
+\date{Version 3.6\\July 19, 2019}
\lstset{% settings taken from msu-thesis documentation
basicstyle=\ttfamily\small,
@@ -37,10 +37,9 @@
formatting requirements given in the \emph{Dissertation Filing Guide}
or the \emph{Thesis Filing Guide} (as appropriate) produced by the
UC Berkeley Graduate Division and available on the web at
-\url{http://grad.berkeley.edu/policies/}.
+\url{https://grad.berkeley.edu/academic-progress/}.
This version of the class is based on the dissertation and thesis guides,
-dated May 2010 -- December 2013 and February 2011 -- February 2014,
-respectively.\end{quote}}
+accessed in July 2019.\end{quote}}
\section{Introduction}
@@ -93,7 +92,7 @@
A (partial) list of thesis classes at other University of California
campuses is available on the web at
-\url{http://math.berkeley.edu/~vojta/ucthesis.html}.
+\url{https://math.berkeley.edu/~vojta/ucthesis.html}.
\section{Using the \pkg{ucbthesis} Class}
@@ -204,10 +203,9 @@
slick. The format of the front matter is specified quite explicitly
in the documents ``Dissertation Filing Guide'' and ``Thesis Filing Guide''
produced by the UC Berkeley Graduate Division and available on the web at
-\url{http://grad.berkeley.edu/policies/}.
+\url{https://grad.berkeley.edu/academic-progress/}.
The current version of the class is based on the dissertation and thesis
-guides, dated May 2010 -- July 2013 and February 2011 -- July 2013,
-respectively.
+guides, accessed in July 2019.
A complete example of the use of the front matter commands can be
found in the sample dissertation distributed with the class.
@@ -246,6 +244,8 @@
(e.g.~``Professor Michael A. Harrison'') \\
\lstinline|\\cochair| & Title and name of your committee co-chair
(use with \lstinline|\\chair|, if you have a co-chair). \\
+\lstinline|\\cochairs| & Titles and names of your (co-equal) committee
+ co-chairs (replaces \lstinline|\\chair| and \lstinline|\\cochair|). \\
\lstinline|\\othermembers| & The names of the other members of your committee
separated by linebreaks
(e.g.~\lstinline!Professor Susan L. Graham\\\\Professor Jim Pitman!) \\
@@ -397,4 +397,10 @@
Version 3.5 added support for printing the Designated Emphasis on the abstract
page (a Graduate Division requirement).
+Version 3.6 changed the font in the title from bold to regular and adjusted the
+spacing in the abstract page. It added \lstinline!\cochairs! to the
+documentation. In the example, it added a sideways table, added sample uses
+of \lstinline!\cochair! and \lstinline!\cochairs!, and moved the (commented-out)
+appendix to after the bibliography (as per requirements).
+
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucbthesis.doc.tlpobj new/tlpkg/tlpobj/ucbthesis.doc.tlpobj
--- old/tlpkg/tlpobj/ucbthesis.doc.tlpobj 2019-02-28 04:10:33.000000000 +0100
+++ new/tlpkg/tlpobj/ucbthesis.doc.tlpobj 2019-07-22 01:53:43.000000000 +0200
@@ -1,6 +1,6 @@
name ucbthesis.doc
category Package
-revision 37776
+revision 51690
shortdesc doc files of ucbthesis
relocated 1
docfiles size=51
++++++ ucbthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ucbthesis/ucbthesis.cls new/tex/latex/ucbthesis/ucbthesis.cls
--- old/tex/latex/ucbthesis/ucbthesis.cls 2015-07-06 00:12:11.000000000 +0200
+++ new/tex/latex/ucbthesis/ucbthesis.cls 2019-07-21 00:54:02.000000000 +0200
@@ -1,5 +1,5 @@
-%% ucbthesis.cls 2014-04-11
-%% Copyright (C) 1988-2014 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
+%% ucbthesis.cls 2019-07-19
+%% Copyright (C) 1988-2019 Daniel Gildea, BBF, Ethan Munson, Paul Vojta.
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -20,8 +20,8 @@
%%% ====================================================================
%%% @LaTeX-class-file{
%%% filename = "ucbthesis.cls",
-%%% version = "3.5",
-%%% date = "1 June 2015",
+%%% version = "3.6",
+%%% date = "19 July 2019",
%%% license = "LPPL",
%%% codetable = "ISO/ASCII",
%%% keywords = "LaTeX, ucbthesis",
@@ -111,6 +111,11 @@
%%% Version 3.5 adds the designated emphasis to the
%%% abstract (which is required).
%%%
+%%% Version 3.6 changes the title from bold font to
+%%% regular and adjusts the spacing in the abstract page.
+%%% It adds \cochairs to the documentation and makes some
+%%% fixes and adds some material to the example thesis.
+%%%
%%% A problem that some people have had is
%%% that you can't use \pagestyle{headings}
%%% and \markboth if you use \part. The solution
@@ -120,7 +125,7 @@
%%% ====================================================================
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{ucbthesis}[2015/06/01 v3.5 University of California, Berkeley Thesis Class]
+\ProvidesClass{ucbthesis}[2019/07/19 v3.6 University of California, Berkeley Thesis Class]
% ****************************************
% * OPTIONS *
@@ -358,7 +363,7 @@
\def\emphasis#1{\gdef\@emphasis{#1}}
% The name of your UC Campus (e.g. Berkeley, Los Angeles)
-\def\@campus{Berkeley} % default value is Berkeley
+\def\@campus{Berkeley} % default value is Berkeley
\def\campus#1{\gdef\@campus{#1}}
% The alwayssingle environment ensures that front matter is always
@@ -398,7 +403,7 @@
\begin{center}
\fmfont
- \textbf{\@title}\par
+ \@title\par
\vspace{14pt minus 4pt}
by \par
{\@author}\par
@@ -505,7 +510,7 @@
\thispagestyle{empty}
\begin{center}
{\fmfont
-{\bfseries\@title}\par
+\@title\par
\vspace{1in}
Copyright \@degreeyear\par
by\par
@@ -521,40 +526,33 @@
% of the rest of the dissertation in Arabic. It requires definition
% of the \title, \author, \degree, \field, \campus, and \chair macros.
-\def\abstract{
-\begin{alwayssingle}
-% \pagestyle{simple}
-\thispagestyle{simple}
-\setcounter{page}{1}
-\begin{center}
-{\fmfont
-{\bfseries \abstractname}\par
-\vspace{.5in}
-\@title\par
-\vspace{.1in}
-by\par
-\vspace{.1in}
-\@author\par
-\vspace{.1in}
-{\@degree} in \@field\par
- \ifdefined\@emphasis
- and the Designated Emphasis in\par
- {\@emphasis}\par
- \fi
-\vspace{.1in}
-University of California, {\@campus}\par
-\vspace{.1in}
-{\@chair}, \@chairtitle
-\ifdefined\@cochair
- \par
- \vspace{.1in}
- {\@cochair}, Co-chair
-\fi}
-\vspace{.1in}
-\end{center}}
-
-\def\endabstract{\par\vfil\null\end{alwayssingle}
-}
+\renewenvironment{abstract}
+ {\begin{alwayssingle}
+ % \pagestyle{simple}
+ \thispagestyle{simple}
+ \setlength{\parindent}{0pt}
+ \setlength{\parskip}{\baselineskip}
+ \setcounter{page}{1}
+ \begin{center}
+ \abstractname \par
+ \@title\par
+ by\par
+ \@author\par
+ {\@degree} in \@field\par
+ \ifdefined\@emphasis
+ and the Designated Emphasis in\par
+ {\@emphasis}\par
+ \fi
+ University of California, {\@campus}\par
+ {\@chair}, \@chairtitle \par
+ \ifdefined\@cochair
+ {\@cochair}, Co-chair\par
+ \fi
+ \end{center}
+ \setlength{\parskip}{.6\baselineskip}
+ \vspace{.4\baselineskip}
+ }
+ {\par\end{alwayssingle}}
% The abstract is no longer signed (12/2009)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ucbthesis.tlpobj new/tlpkg/tlpobj/ucbthesis.tlpobj
--- old/tlpkg/tlpobj/ucbthesis.tlpobj 2019-02-28 04:10:33.000000000 +0100
+++ new/tlpkg/tlpobj/ucbthesis.tlpobj 2019-07-22 01:53:43.000000000 +0200
@@ -1,6 +1,6 @@
name ucbthesis
category Package
-revision 37776
+revision 51690
shortdesc Thesis and dissertation class supporting UCB requirements
relocated 1
longdesc The class provides the necessary framework for electronic
@@ -10,7 +10,7 @@
runfiles size=6
RELOC/tex/latex/ucbthesis/ucbthesis.cls
catalogue-ctan /macros/latex/contrib/ucbthesis
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-20 07:42:59 +0200
catalogue-license lppl1.3
catalogue-topics dissertation
-catalogue-version 3.5
+catalogue-version 3.6
1
0
Hello community,
here is the log from the commit of package texlive-specs-w for openSUSE:Factory checked in at 2020-05-29 21:19:29
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-w (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-w"
Fri May 29 21:19:29 2020 rev:40 rq:806933 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.changes 2019-11-07 23:12:19.288258429 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606/texlive-specs-w.changes 2020-05-29 21:33:47.690010082 +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:
----
tetex.doc.tar.xz
tetex.tar.xz
tetex_scripts.dif
New:
----
tensind.doc.tar.xz
tensind.tar.xz
tex-nutshell.doc.tar.xz
texlive-ja.doc.tar.xz
texlive-scripts-extra.doc.tar.xz
texlive-scripts-extra.tar.xz
texlive-scripts-extra_scripts.dif
texlive-scripts.doc.tar.xz
texlive-scripts.tar.xz
texlive-scripts_scripts.dif
texonly.doc.tar.xz
texplate.doc.tar.xz
texplate.tar.xz
theanodidot.doc.tar.xz
theanodidot.tar.xz
theanomodern.doc.tar.xz
theanomodern.tar.xz
theanooldstyle.doc.tar.xz
theanooldstyle.tar.xz
thuaslogos.doc.tar.xz
thuaslogos.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-w.spec ++++++
++++ 12964 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-w/texlive-specs-w.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-w.new.3606/texlive-specs-w.spec
++++++ tablvar.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tablvar/README.md new/doc/latex/tablvar/README.md
--- old/doc/latex/tablvar/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tablvar/README.md 2019-07-03 23:39:58.000000000 +0200
@@ -0,0 +1,37 @@
+# The tablvar package
+
+
+## Presentation
+
+- A complete and easy to use package for typesetting pretty tables of signs and variations according to French usage.
+- The syntax is similar to that of the array environment and uses intuitive position commands.
+- Arrows are automatically drawn (with PSTricks by default or TikZ in option).
+- Macros are provided for drawing double bars, single bars crossing the zeros, areas where the function is not defined or placing special values.
+- Several features of variation tables can be customized.
+
+
+## Documentation
+
+The documentation is in French.
+
+
+## Installation
+
+- run LaTeX on tablvar.ins, you obtain the file tablvar.sty,
+- if then you run LaTeX + dvips + ps2pdf on tablvar.dtx you get the file tablvar.pdf which is also in the archive,
+- put the files tablvar.sty and tablvar.pdf in your TeX Directory Structure.
+
+
+## License
+
+This file may be distributed and/or modified under the conditions of
+the LaTeX Project Public License, either version 1.3 of this license
+or (at your option) any later version. The latest version of this
+license is in: http://www.latex-project.org/lppl.txt
+
+
+## Author
+
+Antoine Missier
+
+Email: antoine.missier(a)ac-toulouse.fr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tablvar/README.txt new/doc/latex/tablvar/README.txt
--- old/doc/latex/tablvar/README.txt 2018-12-24 23:15:05.000000000 +0100
+++ new/doc/latex/tablvar/README.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,43 +0,0 @@
-
-PURPOSE
-
-A complete and easy to use package for typesetting pretty
-tables of signs and variations according to french usage.
-
-The syntax is similar to that on array environment
-and uses intuitive position commands to draw arrows
-automatically (with pstricks by default or tikz in option).
-
-Many functionnalities are provided for drawing twin bars,
-single bars crossing the zeros, areas where the function
-is not defined, placing special values,...
-
-The design of tables can be customized.
-
-The documentation is in french.
-
-
-EXAMPLE
-
-A simple example of a table with 4 intervals (and 4 arrows) :
-\[
-\begin{tablvar}{4}
- \hline
- x & -5 && -1 && 2 && 3 && 5 \\
- \hline
- f'(x) & & + & 0 & - & 0 & + & 0 & - & \\
- \hline
- \variations{ \mil{f(x)} & \bas{0} && \haut{2} && \bas{1} &&
- \haut{4} && \bas{-3} }
- \hline
-\end{tablvar}
-\]
-
-
-LICENSE
-
-This file may be distributed and/or modified under the conditions of
-the LaTeX Project Public License, either version 1.3 of this license
-or (at your option) any later version. The latest version of this
-license is in: http://www.latex-project.org/lppl.txt
-
Binary files old/doc/latex/tablvar/tablvar.pdf and new/doc/latex/tablvar/tablvar.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tablvar.doc.tlpobj new/tlpkg/tlpobj/tablvar.doc.tlpobj
--- old/tlpkg/tlpobj/tablvar.doc.tlpobj 2019-02-28 04:06:40.000000000 +0100
+++ new/tlpkg/tlpobj/tablvar.doc.tlpobj 2019-07-04 01:54:01.000000000 +0200
@@ -1,8 +1,8 @@
name tablvar.doc
category Package
-revision 49493
+revision 51543
shortdesc doc files of tablvar
relocated 1
-docfiles size=50
- RELOC/doc/latex/tablvar/README.txt
+docfiles size=55
+ RELOC/doc/latex/tablvar/README.md
RELOC/doc/latex/tablvar/tablvar.pdf
++++++ tablvar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tablvar/tablvar.sty new/tex/latex/tablvar/tablvar.sty
--- old/tex/latex/tablvar/tablvar.sty 2018-11-21 23:00:23.000000000 +0100
+++ new/tex/latex/tablvar/tablvar.sty 2019-07-03 23:39:58.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by Antoine Missier <prenom.nom(a)ac-toulouse.fr>
+%% Copyright (C) 2018-2019 by Antoine Missier <antoine.missier(a)ac-toulouse.fr>
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3 of this license
@@ -22,15 +22,11 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesPackage{tablvar}
- [11/11/2018 v1.0 .dtx tablvar file]
-%% \DescribeEnv{tablvar}
-
-
-
+ [2019/07/01 v1.2 .dtx tablvar file]
\RequirePackage{array}
\RequirePackage{ifthen}
\RequirePackage{multido}
-\RequirePackage{colortbl}
+\RequirePackage{colortbl} % pour \ZIc
\newboolean{tikz}
\DeclareOption{tikz}{\setboolean{tikz}{true}}
@@ -45,7 +41,6 @@
\RequirePackage{pst-node}
}
-
\newlength{\intervalwidth}
\setlength{\intervalwidth}{2.5em} % largeur des "intervalles"
@@ -58,14 +53,13 @@
\newcounter{maxdiscont}
\setcounter{maxdiscont}{3} % nb max de discontinuités
-\newcommand{\tablvarstretch}{1.2}
+\newcommand{\tablvarstretch}{1.4}
\newlength{\tvbarrewidth}
\setlength{\tvbarrewidth}{0.5pt}
\definecolor{tvbarrecolor}{gray}{0.7}
-
\newcommand*{\fleche}[2]{
\ifthenelse{\boolean{tikz}}{
\tikz[remember picture,overlay]{\draw[->,>=stealth,
@@ -95,7 +89,7 @@
}
}
-\newcommand{\hachure}[2]{
+\newcommand*{\hachure}[2]{
\ifthenelse{\boolean{tikz}}{
\tikz[remember picture,overlay]{\fill[pattern=north east lines]
(#1) rectangle (#2);}
@@ -105,7 +99,6 @@
}
}
-
\newcounter{ligne} % numéro de ligne
\newcounter{noeud} % numéro du nœud
\newcounter{numvr} % numéro de la valeur remarquable
@@ -123,18 +116,17 @@
\newcounter{ZIstar} % numéro de ZI pour la commande \ZI*
\newcounter{ZIvarlignes} % dernière ligne des variations
-
\newcolumntype{i}[1]{>{\centering\arraybackslash $}p{#1}<{$}}
% nouveau type de colonne i pour les intervalles
\newcommand{\tablvarinit}{
+ \setlength{\extrarowheight}{0pt} % paramètre de l'extension array
\renewcommand{\arraystretch}{\tablvarstretch}
- % la redéfinition de \arraystretch sera locale dans tablvar
\setcounter{ligne}{0}
\setcounter{numvr}{0}
}
-\newcommand{\ZIinit}[1][\intervalwidth]{
+\newcommand*{\ZIinit}[1][\intervalwidth]{
\setlength{\ZIheight}{0pt}
\setlength{\ZIdepth}{0pt}
\setlength{\ZIwidth}{#1}
@@ -175,13 +167,12 @@
}
}{\end{array}}
-
\newcounter{loop@counter}
-\newcommand{\tvloop}[2]{%
+\newcommand{\varloop}[2]{%
\setcounter{loop@counter}{#1}
\addtocounter{loop@counter}{-1}% on boucle 1 fois de moins que #1
\ifthenelse{\value{loop@counter}=0}{}{%
- #2 \tvloop{\value{loop@counter}}{#2}%
+ #2 \varloop{\value{loop@counter}}{#2}%
}
}
@@ -192,7 +183,7 @@
\multido{\I=1+1}{\themaxdiscont}{\setcounter{discont\I}{0}}
\setcounter{ZIvarlignes}{#1} % nécessaire pour \ZIh
% boucle : on exécute le code #2 un nb de fois égal à (#1)-1
- \tvloop{#1}{%
+ \varloop{#1}{%
\setcounter{noeud}{0}\setcounter{numvr}{0}\setcounter{ZI}{0}
% à chaque boucle on réinitialise certains compteurs
\stepcounter{ligne} % le numéro de ligne est incrémenté
@@ -218,7 +209,6 @@
\\ % dernier retour ligne du tableau
}
-
\newcommand*{\@pos}[3][c]{
\stepcounter{noeud}
\ifthenelse{\theligne=#2}{
@@ -238,7 +228,6 @@
\newcommand*{\vdecal}[2]{\smash{\raisebox{#1}{$#2$}}}
-
\newcommand*{\bb}{\kern1pt\vrule\kern1pt\vrule\kern1pt}
\newcommand*{\barre}[1][]{\makebox[0pt]{$#1$}
@@ -256,7 +245,7 @@
\newsavebox{\@tvlbox}
\newsavebox{\@tvrbox}
-\newcommand{\bblim}[4]{
+\newcommand*{\bblim}[4]{
\sbox{\@tvlbox}{$#2$}
\sbox{\@tvrbox}{$#4$}
\ifdim \wd\@tvlbox > \wd\@tvrbox
@@ -279,7 +268,6 @@
}
}
-
\newcommand{\ZIc}{\discont \cellcolor[gray]{0.7}}
\newcommand*{\@ZI}[1][0pt]{%
@@ -308,7 +296,7 @@
\stepcounter{ZIstar}
}
-\newcommand{\ZIh}{\@ifstar{\@@ZI}{\@ZI}}
+\newcommand*{\ZIh}{\@ifstar{\@@ZI}{\@ZI}}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tablvar.tlpobj new/tlpkg/tlpobj/tablvar.tlpobj
--- old/tlpkg/tlpobj/tablvar.tlpobj 2019-02-28 04:06:40.000000000 +0100
+++ new/tlpkg/tlpobj/tablvar.tlpobj 2019-07-04 01:54:01.000000000 +0200
@@ -1,21 +1,21 @@
name tablvar
category Package
-revision 49493
+revision 51543
shortdesc Typesetting pretty tables of signs and variations according to French usage
relocated 1
-longdesc tablvar is a complete and easy to use package for typesetting
+longdesc This is a complete and easy-to-use package for typesetting
longdesc pretty tables of signs and variations according to French
-longdesc usage. The syntax is similar to that on array environment and
-longdesc uses intuitive position commands to draw arrows automatically
-longdesc (with PSTricks by default or TikZ in option). Many
-longdesc functionalities are provided for drawing twin bars, single bars
-longdesc crossing the zeros, areas where the function is not defined,
-longdesc placing special values,... The design of tables can be
+longdesc usage. The syntax is similar to that of the array environment
+longdesc and uses intuitive position commands. Arrows are drawn
+longdesc automatically (using PSTricks by default or TikZ as an option).
+longdesc Macros are provided for drawing twin bars, single bars crossing
+longdesc the zeros, areas where the function is not defined, or placing
+longdesc special values. Several features of the variation tables can be
longdesc customized.
runfiles size=3
RELOC/tex/latex/tablvar/tablvar.sty
catalogue-ctan /macros/latex/contrib/tablvar
-catalogue-date 2018-12-25 09:41:14 +0100
+catalogue-date 2019-07-02 22:29:19 +0200
catalogue-license lppl1.3
catalogue-topics maths-tabvar maths french
-catalogue-version 1.0
+catalogue-version 1.2
++++++ tabriz-thesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/README new/doc/xelatex/tabriz-thesis/README
--- old/doc/xelatex/tabriz-thesis/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/README 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,30 @@
+The tabriz-thesis class
+-----------------------
+
+This class file has been written for the University of Tabriz students to
+easily write their projects, theses, and dissertations.
+
+Author: Vahid Damanafshan <vdamanafshan(a)gmail.com>
+Copyright (C) 2011-2013 by Vahid Damanafshan <http://www.damanafshan.ir>
+
+
+
+To run the root file, you must have the XB Niloofar, IranNastaliq,
+and the Yas fonts on your computer and run XeLaTeX on the file.
+
+
+-------------------------------------------------------------------
+This file may be distributed and/or modified under the
+conditions of the LaTeX Project Public License, either version 1.3
+of this license or (at your option) any later version.
+The latest version of this license is in:
+
+ http://www.latex-project.org/lppl.txt
+
+and version 1.3 or later is part of all distributions of LaTeX
+version 2003/06/01 or later.
+
+This work has the LPPL maintenance status "author-maintained".
+
+-------------------------------------------------------------------
+To get help, please explore http://forum.parsilatex.com
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/appendix1.tex new/doc/xelatex/tabriz-thesis/appendix1.tex
--- old/doc/xelatex/tabriz-thesis/appendix1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/appendix1.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,12 @@
+\chapter{توپولوژیهای روی فضاهای اندازهها}
+\thispagestyle{empty}
+\section{ توپولوژیِ مبهمِ روی فضای اندازهها}
+چندین توپولوژی وجود دارد که میتوان آنها را برای مجموعه اندازهها انتخاب کرد. یک شرط قابل قبول و حداقلی این است که اگر تور
+ $ (m_{i})_{i\in I} $
+به
+$ m $
+همگرا باشد آنگاه باید در
+$\mathbb{R} $
+داشته باشیم
+$\int dm_{i}\to \int fdm $.
+برای مطالعه بیشتر، میتوان به \cite{mainarticle} مراجعه کرد. از طرف دیگر ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter1.tex new/doc/xelatex/tabriz-thesis/chapter1.tex
--- old/doc/xelatex/tabriz-thesis/chapter1.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter1.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,235 @@
+\chapter{راهنمای استفاده از کلاس}
+\thispagestyle{empty}
+\section{مقدمه}
+حروفچینی پروژه کارشناسی، پایاننامه یا رساله یکی از موارد پرکاربرد استفاده از زیپرشین است. از طرفی، یک پروژه، پایاننامه یا رساله، احتیاج به تنظیمات زیادی از نظر صفحهآرایی دارد که ممکن است برای
+یک کاربر مبتدی، مشکل باشد. به همین خاطر، برای راحتی کار کاربر، کلاس حاضر با نام
+ \LRE{\verb!tabriz-thesis!}
+ برای حروفچینی پروژهها، پایاننامهها و رسالههای دانشگاه تبریز با استفاده از نرمافزار زیپرشین، آماده شده است. این فایل به
+گونهای طراحی شده است که کلیه خواستههای مورد نیاز مدیریت تحصیلات تکمیلی دانشگاه تبریز را برآورده میکند و نیز، حروفچینی بسیاری
+از قسمتهای آن، به طور خودکار انجام میشود.
+
+کلیه فایلهای لازم برای حروفچینی با کلاس گفته شده، داخل پوشهای به نام
+ \LRE{\verb!tabriz-thesis!}
+ قرار داده شده است. توجه داشته باشید که برای استفاده از این کلاس باید فونتهای
+\LRE{\verb!XB Niloofar!}،
+ \verb!Yas!
+ و
+ \verb!IranNastaliq!
+ روی سیستم شما نصب شده باشد.
+\section{این همه فایل؟!}\label{sec2}
+از آنجایی که یک پایاننامه یا رساله، یک نوشته بلند محسوب میشود، لذا اگر همه تنظیمات و مطالب پایاننامه را داخل یک فایل قرار بدهیم، باعث شلوغی
+و سردرگمی میشود. به همین خاطر، قسمتهای مختلف پایاننامه یا رساله داخل فایلهای جداگانه قرار گرفته است. مثلاً تنظیمات پایهای کلاس، داخل فایل
+\LRE{\verb!tabriz-thesis.cls!}،
+تنظیمات قابل تغییر توسط کاربر، داخل
+\verb!commands.tex!،
+قسمت مشخصات فارسی پایاننامه، داخل
+\LRE{\verb!fa-title.tex!}،
+مطالب فصل اول، داخل
+\verb!chapter1!
+و ... قرار داده شده است. نکته مهمی که در اینجا وجود دارد این است که از بین این فایلها، فقط فایل
+\LRE{\verb!tabriz-thesis.tex!}
+قابل اجرا است. یعنی بعد از تغییر فایلهای دیگر، برای دیدن نتیجه تغییرات، باید این فایل را اجرا کرد. بقیه فایلها به این فایل، کمک میکنند تا بتوانیم خروجی کار را ببینیم. اگر به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+دقت کنید، متوجه میشوید که قسمتهای مختلف پایاننامه، توسط دستورهایی مانند
+\verb!input!
+و
+\verb!include!
+به فایل اصلی، یعنی
+\LRE{\verb!tabriz-thesis.tex!}
+معرفی شدهاند. بنابراین، فایلی که همیشه با آن سروکار داریم، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+است.
+در این فایل، فرض شده است که پایاننامه یا رساله، از ۳ فصل و یک پیوست، تشکیل شده است. با این حال، اگر
+ پایاننامه یا رساله، بیشتر از ۳ فصل و یک پیوست است، باید خودتان فصلهای بیشتر را به این فایل، اضافه کنید. این کار، بسیار ساده است. فرض کنید بخواهید یک فصل دیگر هم به پایاننامه، اضافه کنید. برای این کار، کافی است یک فایل با نام
+\verb!chapter4!
+و با پسوند
+\verb!.tex!
+بسازید و آن را داخل پوشه
+\LRE{\verb!tabriz-thesis!}
+قرار دهید و سپس این فایل را با دستور
+\verb!\include{chapter4}!
+داخل فایل
+\LRE{\verb!tabriz-thesis.tex!}
+و بعد از دستور
+\verb!\include{chapter3}!
+ قرار دهید.
+\section{از کجا شروع کنم؟}
+قبل از هر چیز، بدیهی است که باید یک توزیع تِک مناسب مانند
+\verb!Live TeX!
+و یک ویرایشگر تِک مانند
+\verb!Texmaker!
+را روی سیستم خود نصب کنید. نسخه بهینه شده \verb!Texmaker! را میتوانید از سایت
+ \href{http://www.parsilatex.com}{پارسیلاتک}%
+\LTRfootnote{\url{http://www.parsilatex.com}}
+ و \verb!Live TeX! را هم میتوانید از
+ \href{http://www.tug.org/texlive}{سایت رسمی آن}%
+\LTRfootnote{\url{http://www.tug.org/texlive}}
+ دانلود کنید.
+
+در مرحله بعد، سعی کنید که یک پشتیبان از پوشه
+\LRE{\verb!tabriz-thesis!}
+ بگیرید و آن را در یک جایی از هارددیسک سیستم خود ذخیره کنید تا در صورت خراب کردن فایلهایی که در حال حاضر، با آنها کار میکنید، همه چیز را از
+ دست ندهید.
+
+ حال اگر نوشتن \پ اولین تجربه شما از کار با لاتک است، توصیه میشود که یکبار به طور سرسری، کتاب «%
+\href{http://www.tug.ctan.org/tex-archive/info/lshort/persian/lshort.pdf}{مقدمهای نه چندان کوتاه بر
+\lr{\LaTeXe}}\LTRfootnote{\url{http://www.tug.ctan.org/tex-archive/info/lshort/persian/lshort.pdf}}»
+ ترجمه دکتر مهدی امیدعلی، عضو هیات علمی دانشگاه شاهد را مطالعه کنید. این کتاب، کتاب بسیار کاملی است که خیلی از نیازهای شما در ارتباط با حروفچینی را برطرف میکند.
+
+
+بعد از موارد گفته شده، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+و
+\LRE{\verb!fa-title!}
+را باز کنید و مشخصات پایاننامه خود مثل نام، نام خانوادگی، عنوان پایاننامه و ... را جایگزین مشخصات موجود در فایل
+\LRE{\verb!fa-title!}
+ کنید. دقت داشته باشید که نیازی نیست
+نگران چینش این مشخصات در فایل پیدیاف خروجی باشید. فایل
+\LRE{\verb!tabriz-thesis.cls!}
+همه این کارها را به طور خودکار برای شما انجام میدهد. در ضمن، موقع تغییر دادن دستورهای داخل فایل
+\LRE{\verb!fa-title!}
+ کاملاً دقت کنید. این دستورها، خیلی حساس هستند و ممکن است با یک تغییر کوچک، موقع اجرا، خطا بگیرید. برای دیدن خروجی کار، فایل
+\LRE{\verb!fa-title!}
+ را
+\verb!Save!،
+(نه
+\verb!As Save!)
+کنید و بعد به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+برگشته و آن را اجرا کنید. حال اگر میخواهید مشخصات انگلیسی \پ را هم عوض کنید، فایل
+\LRE{\verb!en-title!}
+را باز کنید و مشخصات داخل آن را تغییر دهید.%
+\RTLfootnote{
+برای نوشتن پروژه کارشناسی، نیازی به وارد کردن مشخصات انگلیسی پروژه نیست. بنابراین، این مشخصات، به طور خودکار،
+نادیده گرفته میشود.
+}
+ در اینجا هم برای دیدن خروجی، باید این فایل را
+\verb!Save!
+کرده و بعد به فایل
+\LRE{\verb!tabriz-thesis.tex!}
+برگشته و آن را اجرا کرد.
+
+برای راحتی بیشتر،
+فایل
+\LRE{\verb!tabriz-thesis.cls!}
+طوری طراحی شده است که کافی است فقط یکبار مشخصات \پ را وارد کنید. هر جای دیگر که لازم به درج این مشخصات باشد، این مشخصات به طور خودکار درج میشود. با این حال، اگر مایل بودید، میتوانید تنظیمات موجود را تغییر دهید. توجه داشته باشید که اگر کاربر مبتدی هستید و یا با ساختار فایلهای
+\verb!cls!
+ آشنایی ندارید، به هیچ وجه به این فایل، یعنی فایل
+\LRE{\verb!tabriz-thesis.cls!}
+دست نزنید.
+
+نکته دیگری که باید به آن توجه کنید این است که در فایل
+\LRE{\verb!tabriz-thesis.cls!}،
+سه گزینه به نامهای
+\verb!bsc!،
+\verb!msc!
+و
+\verb!phd!
+برای تایپ پروژه، پایاننامه و رساله،
+طراحی شده است. بنابراین اگر قصد تایپ پروژه کارشناسی، پایاننامه یا رساله را دارید،
+ در فایل
+\LRE{\verb!tabriz-thesis.tex!}
+باید به ترتیب از گزینههای
+\verb!bsc!،
+\verb!msc!
+و
+\verb!phd!
+استفاده کنید. با انتخاب هر کدام از این گزینهها، تنظیمات مربوط به آنها به طور خودکار، اعمل میشود.
+\section{مطالب \پ را چطور بنویسم؟}
+\subsection{نوشتن فصلها}
+همانطور که در بخش \ref{sec2} گفته شد، برای جلوگیری از شلوغی و سردرگمی کاربر در هنگام حروفچینی، قسمتهای مختلف \پ از جمله فصلها، در فایلهای جداگانهای قرار داده شدهاند.
+بنابراین، اگر میخواهید مثلاً مطالب فصل ۱ را تایپ کنید، باید فایلهای
+\LRE{\verb!tabriz-thesis.tex!}
+و
+\verb!chapter1!
+را باز کنید و محتویات داخل فایل
+\verb!chapter1!
+را پاک کرده و مطالب خود را تایپ کنید. توجه کنید که همانطور که قبلاً هم گفته شد، تنها فایل قابل اجرا، فایل
+\LRE{\verb!tabriz-thesis.tex!}
+است. لذا برای دیدن حاصل (خروجی) فایل خود، باید فایل
+\verb!chapter1!
+را
+\verb!Save!
+کرده و سپس فایل
+\LRE{\verb!tabriz-thesis.tex!}
+را اجرا کنید. یک نکته بدیهی که در اینجا وجود دارد، این است که لازم نیست که فصلهای \پ را به ترتیب تایپ کنید. میتوانید ابتدا مطالب فصل ۳ را تایپ کنید و سپس مطالب فصل ۱ را تایپ کنید.
+
+نکته بسیار مهمی که در اینجا باید گفته شود این است که سیستم \lr{\TeX}، محتویات یک فایل تِک را به ترتیب پردازش میکند. به عنوان مثال، اگه فایلی، دارای ۴ خط دستور باشد، ابتدا خط ۱، بعد خط ۲، بعد خط ۳ و در آخر، خط ۴ پردازش میشود. بنابراین، اگر مثلاً مشغول تایپ مطالب فصل ۳ هستید، بهتر است
+که دو دستور
+\verb!\include{chapter1}!
+و
+\verb!\include{chapter2}!
+را در فایل
+\LRE{\verb!tabriz-thesis.tex!}،
+غیرفعال%
+\RTLfootnote{
+برای غیرفعال کردن یک دستور، کافی است پشت آن، یک علامت
+\%
+ بگذارید.
+}
+ کنید. زیرا در غیر این صورت، ابتدا مطالب فصل ۱ و ۲ پردازش شده (که به درد ما نمیخورد؛ چون ما میخواهیم خروجی فصل ۳ را ببینیم) و سپس مطالب فصل ۳ پردازش میشود و این کار باعث طولانی شدن زمان اجرا میشود. زیرا هر چقدر حجم فایل اجرا شده، بیشتر باشد، زمان بیشتری هم برای اجرای آن، صرف میشود.
+\subsection{مراجع}
+برای وارد کردن مراجع \پ خود، کافی است فایل
+\verb!references.tex!
+را باز کرده و مراجع خود را مانند مراجع داخل آن، وارد کنید. اگر کاربر حرفهای تِک هستید، پیشنهاد میشود که از \lr{Bib\TeX} برای
+وارد کردن مراجع استفاده کنید. نکتهای که باید به آن توجه کنید این است که در نسخههای قدیمی زیپرشین،
+قسمت مراجع، حاشیههای نامناسبی ایجاد میکرد. لذا در نسخههای جدید، این حاشیهها اصلاح شده و به خاطر همین، چند دستور جدید، جایگزین شده است. بنابراین، اگه هنوز از نسخههای قدیمی زیپرشین استفاده میکنید، ممکن است هنگام پردازش قسمت مراجع، با خطا مواجه شوید. برای اطلاع از این دستورها، میتوانید به تالار گفتگوی پارسیلاتک و یا راهنمای بسته
+\verb!bidi!
+مراجعه کنید.
+\subsection{واژهنامه فارسی به انگلیسی و برعکس}
+برای وارد کردن واژهنامه فارسی به انگلیسی و برعکس، چنانچه کاربر مبتدی هستید، بهتر است مانند روش بکار رفته در فایلهای
+\verb!dicfa2en!
+و
+\verb!dicen2fa!
+عمل کنید. اما چنانچه کاربر پیشرفته هستید، بهتر است از بسته
+\verb!glossaries!
+استفاده کنید. راهنمای این بسته را میتوانید به راحتی و با یک جستجوی ساده در اینترنت پیدا کنید.
+\subsection{نمایه}
+برای وارد کردن نمایه، باید از
+\verb!xindy!
+استفاده کنید. زیرا
+\verb!MakeIndex!
+با حروف «گ»، «چ»، «پ»، «ژ» و «ک» مشکل دارد و ترتیب الفبایی این حروف را رعایت نمیکند. همچنین، فاصله بین هر گروه از کلمات در
+\verb!MakeIndex!،
+به درستی رعایت نمیشود که باعث زشت شدن حروفچینی این قسمت میشود. راهنمای چگونگی کار با
+\verb!xindy!
+را میتوانید در تالار گفتگوی پارسیلاتک، پیدا کنید.
+\section{اگر سوالی داشتم، از کی بپرسم؟}
+برای پرسیدن سوالهای خود در مورد حروفچینی با زیپرشین، میتوانید به
+ \href{http://forum.parsilatex.com}{تالار گفتگوی پارسیلاتک}%
+\LTRfootnote{\url{http://www.forum.parsilatex.com}}
+مراجعه کنید. شما هم میتوانید روزی به سوالهای دیگران در این تالار، جواب بدهید.
+
+در ادامه، برای فهم بیشتر مطالب، چند تعریف، قضیه و مثال آورده شده است!
+\begin{definition}
+مجموعه همه ارزیابیهای (پیوسته) روی $(X,\tau)$، دامنه توانی احتمالی
+\index{دامنه توانی احتمالی}
+$ X $
+نامیده میشود.
+\end{definition}
+\begin{theorem}[باناخ-آلااغلو]
+\index{قضیه باناخ-آلااغلو}
+اگر $ V $ یک همسایگی $ 0 $ در فضای برداری
+\index{فضای!برداری}
+ توپولوژیکی $ X $ باشد و
+\begin{equation}\label{eq1}
+K=\left\lbrace \Lambda \in X^{*}:|\Lambda x|\leqslant 1 ; \ \forall x\in V\right\rbrace,
+\end{equation}
+آنگاه $ K $، ضعیف*-فشرده است که در آن، $ X^{*} $ دوگان
+\index{فضای!دوگان}
+ فضای برداری توپولوژیکی $ X $ است به طوری که عناصر آن، تابعیهای
+خطی پیوسته
+\index{تابعی خطی پیوسته}
+ روی $X$ هستند.
+\end{theorem}
+تساوی \eqref{eq1} یکی از مهمترین تساویها در آنالیز تابعی است که در ادامه، به وفور از آن استفاده میشود.
+\begin{example}
+برای هر فضای مرتب، گردایه
+$$U:=\left\lbrace U\in O: U=\uparrow U\right\rbrace $$
+از مجموعههای بالایی باز، یک توپولوژی تعریف میکند که از توپولوژی اصلی، درشتتر است.
+\end{example}
+حال تساوی
+\begin{equation}\label{eq2}
+\sum_{n=1}^{+\infty} 3^{n}x+70x=\int_{1}^{n}8nx+\exp{(2nx)}
+\end{equation}
+را در نظر بگیرید. با مقایسه تساوی \eqref{eq2} با تساوی \eqref{eq1} میتوان نتیجه گرفت که ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter2.tex new/doc/xelatex/tabriz-thesis/chapter2.tex
--- old/doc/xelatex/tabriz-thesis/chapter2.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter2.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,9 @@
+\chapter{فضاهای فشرده پایدار و فضاهای مرتب فشرده}
+\thispagestyle{empty}
+\section{فضاهای فشرده پایدار}
+یک فضای توپولوژیک جزئاً مرتب (یا به طور خلاصه، فضای مرتب)، از دیدگاه آبرامسکی
+\cite{abramsky2}،
+مجموعهای مانند $ X $ همراه
+با یک توپولوژی $ \mathcal{O} $ و یک ترتیب $ \leq $ است به طوری که گراف ترتیب در $X\times X $ بسته باشد. بنابراین ...
+\section{فضاهای مرتب فشرده}
+در این بخش به بیان ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/chapter3.tex new/doc/xelatex/tabriz-thesis/chapter3.tex
--- old/doc/xelatex/tabriz-thesis/chapter3.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/chapter3.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,6 @@
+\chapter{اندازهها و ارزیابیها}
+\thispagestyle{empty}
+\section{اندازهها و تابعیهای خطی مثبت روی $\mathrm{C(X)}$}
+فرض کنید $X$ یک فضای توپولوژیکی روی ...
+\section{تابعیهای خطی}
+در این بخش ...
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/dicen2fa.tex new/doc/xelatex/tabriz-thesis/dicen2fa.tex
--- old/doc/xelatex/tabriz-thesis/dicen2fa.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/dicen2fa.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,15 @@
+\chapter*{واژهنامه انگلیسی به فارسی}\markboth{واژهنامه انگلیسی به فارسی}{واژهنامه انگلیسی به فارسی}
+\addcontentsline{toc}{chapter}{واژهنامه انگلیسی به فارسی}
+\thispagestyle{empty}
+
+\persiangloss{مجموعه جزئاً مرتب کامل جهتدار}{Dcpo}
+\persiangloss{فضای تابع}{Function Space}
+\persiangloss{اندازه }{Measure}
+\persiangloss{مرتب}{Ordered}
+\persiangloss{دامنهتوانی}{Powerdomain}
+\persiangloss{احتمالی}{Probabilistic}
+\persiangloss{قطعهبرنامه}{Program Fragment}
+\persiangloss{دامنه معنایی}{Semantic Domain}
+\persiangloss{پایدار}{Stably}
+\persiangloss{ارزیابی}{Valuation}
+\persiangloss{توپولوژی ضعیف}{Weak Topology}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/dicfa2en.tex new/doc/xelatex/tabriz-thesis/dicfa2en.tex
--- old/doc/xelatex/tabriz-thesis/dicfa2en.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/dicfa2en.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,15 @@
+\chapter*{واژهنامه فارسی به انگلیسی}\markboth{واژهنامه فارسی به انگلیسی}{واژهنامه فارسی به انگلیسی}
+\addcontentsline{toc}{chapter}{واژهنامه فارسی به انگلیسی}
+\thispagestyle{empty}
+
+\englishgloss{Probabilistic}{احتمالی}
+\englishgloss{Valuation}{ارزیابی}
+\englishgloss{Measure}{اندازه }
+\englishgloss{Stably}{پایدار}
+\englishgloss{Weak Topology}{توپولوژی ضعیف}
+\englishgloss{Powerdomain}{دامنهتوانی}
+\englishgloss{Function Space}{فضای تابع}
+\englishgloss{Semantic Domain}{دامنه معنایی}
+\englishgloss{Program Fragment}{قطعهبرنامه}
+\englishgloss{Dcpo}{مجموعه جزئاً مرتب کامل جهتدار}
+\englishgloss{Ordered}{مرتب}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/en-title.tex new/doc/xelatex/tabriz-thesis/en-title.tex
--- old/doc/xelatex/tabriz-thesis/en-title.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/en-title.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,23 @@
+% در این فایل، عنوان پایاننامه، مشخصات خود و چکیده پایاننامه را به انگلیسی، وارد کنید.
+% توجه داشته باشید که جدول حاوی مشخصات پروژه/پایاننامه/رساله، به طور خودکار، رسم میشود.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\baselineskip=.6cm
+\begin{latin}
+\latinuniversity{University of Tabriz}
+\latinfaculty{Faculty Of Mathematical Sciences}
+\latinsubject{Pure Mathematics}
+\latinfield{Mathematical Analysis}
+\latintitle{Writing Projects, Theses, and Dissertations Using \textsf{tabriz-thesis} Class}
+\firstlatinsupervisor{First Supervisor}
+%\secondlatinsupervisor{Second Supervisor}
+\firstlatinadvisor{First Advisor}
+%\secondlatinadvisor{Second Advisor}
+\latinname{Vahid}
+\latinsurname{Damanafshan}
+\latinthesisdate{2011}
+\latinkeywords{Probabilistic powerdomain; Stably compact space; Valuation}
+\en-abstract{
+This thesis studies on writing projects, theses and dissertations using \textsf{tabriz-thesis} Class. It ...
+}
+\latinvtitle
+\end{latin}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/fa-title.tex new/doc/xelatex/tabriz-thesis/fa-title.tex
--- old/doc/xelatex/tabriz-thesis/fa-title.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/fa-title.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,77 @@
+% در این فایل، عنوان پایاننامه، مشخصات خود، متن تقدیمی، ستایش، سپاسگزاری و چکیده پایاننامه را به فارسی، وارد کنید.
+% توجه داشته باشید که جدول حاوی مشخصات پروژه/پایاننامه/رساله و همچنین، مشخصات داخل آن، به طور خودکار، درج میشود.
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% دانشگاه خود را وارد کنید
+\university{تبریز}
+% دانشکده، آموزشکده و یا پژوهشکده خود را وارد کنید
+\faculty{دانشکده علوم ریاضی}
+% گروه آموزشی خود را وارد کنید
+\department{گروه ریاضی محض}
+% نام رشته تحصیلی خود را وارد کنید
+\subject{ریاضی محض}
+% گرایش خود را وارد کنید
+\field{آنالیز ریاضی}
+% عنوان پایاننامه را وارد کنید
+\title{نوشتن پروژه، پایاننامه و رساله با استفاده از کلاس
+\lr{\textsf{tabriz-thesis}}}
+% نام استاد(ان) راهنما را وارد کنید
+\firstsupervisor{استاد راهنمای اول}
+%\secondsupervisor{استاد راهنمای دوم}
+% نام استاد(دان) مشاور را وارد کنید. چنانچه استاد مشاور ندارید، دستور پایین را غیرفعال کنید.
+\firstadvisor{استاد مشاور اول}
+%\secondadvisor{استاد مشاور دوم}
+% نام پژوهشگر را وارد کنید
+\name{وحید}
+% نام خانوادگی پژوهشگر را وارد کنید
+\surname{دامنافشان}
+% تاریخ پایاننامه را وارد کنید
+\thesisdate{۱۳۹۰}
+% کلمات کلیدی پایاننامه را وارد کنید
+\keywords{ارزیابی، دامنهتوانی احتمالی، فضای فشرده پایدار}
+% چکیده پایاننامه را وارد کنید
+\fa-abstract{
+این پایاننامه، به بحث در مورد نوشتن پروژه، پایاننامه و رساله با استفاده از کلاس
+\lr{\textsf{tabriz-thesis}}
+میپردازد. در این پایاننامه سعی شده است که ...
+}
+\vtitle
+% چنانچه مایل به چاپ صفحات «تقدیم»، «نیایش» و «سپاسگزاری» در خروجی نیستید، خطهای زیر را با گذاشتن ٪ در ابتدای آنها غیرفعال کنید.
+ % پایاننامه خود را تقدیم کنید!
+\begin{acknowledgementpage}
+
+\vspace{4cm}
+
+{\nastaliq
+{\Huge
+ تقدیم به همه آنهایی که
+\vspace{1.5cm}
+
+\hspace{3cm}
+می خواهند بیشتر بدانند
+}}
+\end{acknowledgementpage}
+\newpage
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\thispagestyle{empty}
+% سپاسگزاری
+\noindent{\nastaliq
+سپاسگزاری...
+}
+\\[2cm]
+سپاس خداوندگار حکیم را که با لطف بیکران خود، آدمی را زیور عقل آراست.
+
+
+در آغاز وظیفه خود میدانم از زحمات بیدریغ استاد راهنمای خود، جناب آقای دکتر ...، صمیمانه تشکر
+و قدردانی کنم که قطعاً بدون
+راهنماییهای ارزنده ایشان، این مجموعه به انجام نمیرسید.
+
+از جناب آقای دکتر ... که زحمت مطالعه و مشاوره این رساله
+را تقبل فرمودند و
+در آماده سازی این رساله، به نحو احسن اینجانب را مورد راهنمایی قرار دادند، کمال امتنان را دارم.
+
+همچنین لازم میدانم از پدید آورندگان بسته زیپرشین، مخصوصاً جناب آقای وفا خلیقی، که این پایاننامه با استفاده از این بسته، آماده شده است و نیز از آقای دکتر مرتضی فغفوری و آقای محمود امینطوسی به خاطر پاسخگویی به سوالاتم در مورد \lr{\LaTeX}، کمال قدردانی را داشته باشم.
+
+ در پایان، بوسه میزنم بر دستان خداوندگاران مهر و مهربانی، پدر و مادر عزیزم و بعد از خدا، ستایش میکنم وجود مقدسشان را و تشکر میکنم از برادران عزیزم به پاس عاطفه سرشار و گرمای امیدبخش وجودشان، که در این سردترین روزگاران، بهترین پشتیبان من بودند.
+% با استفاده از دستور زیر، امضای شما، به طور خودکار، درج میشود.
+\signature
+\newpage\clearpage
\ No newline at end of file
Binary files old/doc/xelatex/tabriz-thesis/logo.jpg and new/doc/xelatex/tabriz-thesis/logo.jpg differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/references.tex new/doc/xelatex/tabriz-thesis/references.tex
--- old/doc/xelatex/tabriz-thesis/references.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/references.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,65 @@
+% مراجع خود را در این قسمت وارد کنید.
+% دستوری برای کوچک کردن اندازه فونتها
+\small
+% شروع محیط مراجع
+\begin{thebibliography}{9}
+\bibitem{semi}
+دامنافشان، وحید، \textbf{دامنه توانی احتمالی برای فضاهای فشرده پایدار با استفاده از فضاهای مرتب فشرده}، سمینار کارشناسی ارشد، دانشگاه تبریز، تبریز، ۱۳۸۸.
+\begin{LTRitems}
+\resetlatinfont
+
+\bibitem{abramsky1}
+S. Abramsky, {\em Domain theory in logical form}, Ann. Pure Applied Logic 51 (1991) 1–77.
+
+\bibitem{abramsky2}
+S. Abramsky, A. Jung, {\em Domain theory}, in: S. Abramsky, D.M. Gabbay, T.S.E. Maibaum (Eds.), Handbook of
+Logic in Computer Science, Vol. 3, Clarendon Press, Oxford, 1994, pp. 1–68.
+
+\bibitem{aliprantis}
+C.D. Aliprantis and O. Burkinshaw, {\em Principles of Real Analysis}. Academic Press.
+
+\bibitem{alvarez1}
+M. Alvarez-Manilla, {\em Measure theoretic results for continuous valuations on partially ordered spaces}, Ph.D.
+thesis, Imperial College, University of London, 2001.
+
+\bibitem{alvarez2}
+M. Alvarez-Manilla, A. Edalat, N. Saheb-Djahromi, {\em An extension result for continuous valuations}, J. London
+Math. Soc. 61 (2000) 629–640.
+
+\bibitem{mainarticle}
+M. Alvarez-Manilla, A. Jung, K. Keimel, {\em The probabilistic powerdomain for stably compact
+spaces}, Theoretical Computer Science 328 (2004) 221 – 244.
+
+\bibitem{birkhoff}
+G. Birkhoff, {\em Lattice Theory}, 3rd Edition, AMS Colloq. Publication, Vol. 25, American Mathematical Society,
+Providence, 1967.
+
+\bibitem{choq3}
+G. Choquet, {\em Lectures on Analysis}, Vol. 1, W. A. Benjamin Inc., London, 1969.
+
+\bibitem{desh}
+J. Desharnais, V. Gupta, R. Jagadeesan, P. Panangaden, {\em Metrics for labeled Markov systems}, in: J.C.M.
+Baeten, S. Mauw (Eds.), Proc. 10th Internat. Conf. on Concurrency Theory, Lecture Notes in Computer
+Science, Vol. 1664, Springer, Berlin, 1999, pp. 258–273.
+
+\bibitem{edward1}
+D.A. Edwards, {\em On the existence of probability measures with given marginals}, Ann. Inst. Fourier, Grenoble,
+28 (1978) 53–78.
+
+\bibitem{folland}
+G.B. Folland, {\em Real Analysis: Modern Techniques and Their Applications}, 2nd Edition, Wiley, 1999.
+
+\bibitem{gierz1}
+G. Gierz, K.H. Hofmann, K. Keimel, J.D. Lawson, M. Mislove, D.S. Scott, {\em A Compendium of Continuous
+Lattices}, Springer, Berlin, 1980.
+
+\bibitem{gierz2}
+G. Gierz, K.H. Hofmann, K. Keimel, J.D. Lawson, M. Mislove, D.S. Scott, {\em Continuous Lattices and
+Domains}, Encyclopedia of Mathematics and its Applications, Vol. 93, Cambridge University Press,
+Cambridge, 2003.
+
+\bibitem{horn}
+A. Horn, A. Tarski, {\em Measures on Boolean algebras}, Trans. Amer. Math. Soc. 64 (1948) 467–497.
+
+\end{LTRitems}
+\end{thebibliography}
\ No newline at end of file
Binary files old/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf and new/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/xelatex/tabriz-thesis/tabriz-thesis.tex new/doc/xelatex/tabriz-thesis/tabriz-thesis.tex
--- old/doc/xelatex/tabriz-thesis/tabriz-thesis.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/xelatex/tabriz-thesis/tabriz-thesis.tex 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,41 @@
+% !TEX TS-program = XeLaTeX
+%%% یک نمونه پروژه/پایاننامه/رساله با استفاده از کلاس Tabriz_thesis، نسخه 1.1
+%%% وحید دامنافشان، دانشگاه صنعتی کرمانشاه، http://www.damanafshan.ir
+%%% تالار گفتگوی پارسیلاتک، http://forum.parsilatex.com
+%%% آپدیت شده در اسفند ۹۱
+
+%-----------------------------------------------------------------------------------------------------
+% توجه داشته باشید برای دیدن خروجی کامل شامل نمایه و فهرست مطالب، ابتدا دو بار این فایل را
+% را اجرا کرده، سپس با استفاده از خط فرمان، به مسیر پوشه جاری رفته و دستور
+% xindy -L persian -C utf8 -M texindy -M page-ranges tabriz-thesis.idx
+% را در خط فرمان اجرا کنید. سپس دو بار دیگر، این فایل را اجرا کنید.
+% اگر قصد نوشتن پروژه کارشناسی را دارید، در خط زیر به جای msc، کلمه bsc و اگر قصد نوشتن رساله دکتری
+% را دارید، کلمه phd را قرار دهید. کلیه تنظیمات لازم، به طور خودکار، اعمال میشود.
+\documentclass[msc]{tabriz-thesis}
+\csname@twosidetrue\endcsname
+\usepackage{xepersian}
+\settextfont[Scale=1.1]{XB Niloofar}
+\defpersianfont\nastaliq[Scale=2]{IranNastaliq}
+% چنانچه میخواهید اعداد در فرمولها، انگلیسی باشد، خط زیر را غیرفعال کنید.
+\setdigitfont[Scale=1.1]{Yas}
+\begin{document}
+\baselineskip=.75cm
+\pagenumbering{harfi}
+\input{fa-title}
+\tableofcontents\clearpage
+%\listoffigures\clearpage
+%\listoftables\clearpage
+\pagenumbering{arabic}
+\include{chapter1}
+\include{chapter2}
+\include{chapter3}
+\appendix
+\include{appendix1}
+\include{references}
+\baselineskip=.75cm
+\include{dicfa2en}
+\include{dicen2fa}
+\printindex
+\input{en-title}
+\label{LastPage}
+\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj new/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj
--- old/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj 2019-02-28 04:06:41.000000000 +0100
+++ new/tlpkg/tlpobj/tabriz-thesis.doc.tlpobj 2019-07-26 00:58:27.000000000 +0200
@@ -1,9 +1,9 @@
name tabriz-thesis.doc
category Package
-revision 29421
+revision 51729
shortdesc doc files of tabriz-thesis
relocated 1
-docfiles size=85
+docfiles size=170
RELOC/doc/latex/tabriz-thesis/README
RELOC/doc/latex/tabriz-thesis/appendix1.tex
RELOC/doc/latex/tabriz-thesis/chapter1.tex
@@ -17,3 +17,16 @@
RELOC/doc/latex/tabriz-thesis/references.tex
RELOC/doc/latex/tabriz-thesis/tabriz-thesis.pdf
RELOC/doc/latex/tabriz-thesis/tabriz-thesis.tex
+ RELOC/doc/xelatex/tabriz-thesis/README
+ RELOC/doc/xelatex/tabriz-thesis/appendix1.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter1.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter2.tex
+ RELOC/doc/xelatex/tabriz-thesis/chapter3.tex
+ RELOC/doc/xelatex/tabriz-thesis/dicen2fa.tex
+ RELOC/doc/xelatex/tabriz-thesis/dicfa2en.tex
+ RELOC/doc/xelatex/tabriz-thesis/en-title.tex
+ RELOC/doc/xelatex/tabriz-thesis/fa-title.tex
+ RELOC/doc/xelatex/tabriz-thesis/logo.jpg
+ RELOC/doc/xelatex/tabriz-thesis/references.tex
+ RELOC/doc/xelatex/tabriz-thesis/tabriz-thesis.pdf
+ RELOC/doc/xelatex/tabriz-thesis/tabriz-thesis.tex
++++++ tabriz-thesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/xelatex/tabriz-thesis/tabriz-thesis.cls new/tex/xelatex/tabriz-thesis/tabriz-thesis.cls
--- old/tex/xelatex/tabriz-thesis/tabriz-thesis.cls 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/xelatex/tabriz-thesis/tabriz-thesis.cls 2019-07-25 23:49:36.000000000 +0200
@@ -0,0 +1,509 @@
+
+%%
+%% This is file `tabriz-thesis.cls',
+%% The original file was xepersian-thesis.cls by Vafa Khalighi
+%% __________________________________
+%% Copyright © 2011-2013 Vahid Damanafshan
+%%
+%% http://www.damanafshan.ir
+%% http://www.parsilatex.com
+%% http://forum.parsilatex.com
+%%
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesClass{tabriz-thesis}
+ [2013/03/17 v1.1 University of Tabriz projects/theses/dissertations Class]
+\DeclareOption*{\PassOptionsToClass{\CurrentOption}{book}}
+\ProcessOptions
+\LoadClass[a4paper,11pt,oneside,openany]{book}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\RequirePackage{amsthm}
+\RequirePackage{amssymb}
+\RequirePackage{amsmath}
+\RequirePackage[top=40mm, bottom=40mm, left=25mm, right=35mm]{geometry}
+\RequirePackage{graphicx}
+\RequirePackage{framed}
+\RequirePackage{lastpage}
+\RequirePackage{fancyhdr}
+\RequirePackage[nottoc]{tocbibind}
+\RequirePackage{makeidx}
+\makeindex
+\RequirePackage[]{hyperref}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\university#1{\gdef\@university{#1}}
+\def\department#1{\gdef\@department{#1}}
+\def\degree#1{\gdef\@degree{#1}}
+\def\thesisdate#1{\gdef\@thesisdate{#1}}
+\newcommand{\firstsupervisor}[1]{\def\@firstsupervisor{#1}}
+\newcommand{\secondsupervisor}[1]{\def\@secondsupervisor{#1}}
+\newcommand{\firstadvisor}[1]{\def\@firstadvisor{#1}}
+\newcommand{\secondadvisor}[1]{\def\@secondadvisor{#1}}
+\def\name#1{\gdef\@name{#1}}
+\def\surname#1{\gdef\@surname{#1}}
+\long\def\keywords#1{\gdef\@keywords{#1}}
+\long\def\fa-abstract#1{\gdef\@fa-abstract{#1}}
+\def\faculty#1{\gdef\@faculty{#1}}
+\def\subject#1{\gdef\@subject{#1}}
+\def\field#1{\gdef\@field{#1}}
+\def\department#1{\gdef\@department{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%
+\def\latintitle#1{\gdef\@latintitle{#1}}
+\def\latinauthor#1{\gdef\@latinauthor{#1}}
+\def\latindegree#1{\gdef\@latindegree{#1}}
+\def\latinfaculty#1{\gdef\@latinfaculty{#1}}
+\def\latinthesisdate#1{\gdef\@latinthesisdate{#1}}
+\def\latinsubject#1{\gdef\@latinsubject{#1}}
+\def\latinfield#1{\gdef\@latinfield{#1}}
+\def\firstlatinsupervisor#1{\gdef\@firstlatinsupervisor{#1}}
+\def\secondlatinsupervisor#1{\gdef\@secondlatinsupervisor{#1}}
+\def\firstlatinadvisor#1{\gdef\@firstlatinadvisor{#1}}
+\def\secondlatinadvisor#1{\gdef\@secondlatinadvisor{#1}}
+\def\latinname#1{\gdef\@latinname{#1}}
+\def\latinsurname#1{\gdef\@latinsurname{#1}}
+\long\def\en-abstract#1{\gdef\@en-abstract{#1}}
+\long\def\latinkeywords#1{\gdef\@latinkeywords{#1}}
+\def\latinuniversity#1{\gdef\@latinuniversity{#1}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newif\if@bscthesis
+\@bscthesisfalse
+\DeclareOption{bsc}{\@bscthesistrue}
+\newif\if@mscthesis
+\@mscthesisfalse
+\DeclareOption{msc}{\@mscthesistrue}
+\ProcessOptions
+%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcommand{\vtitle}{\begin{titlepage}
+\vspace{-10ex}\centerline{{\includegraphics[height=4.3cm]{logo}}}
+\vspace{-2ex}
+{\large\@faculty\par
+
+\vspace{-3ex}\@department}
+\vskip 4ex
+ \if@mscthesis
+{\large\bfseries پایاننامه}
+\else
+ \if@bscthesis
+ {\large\bfseries پروژه }
+ \else
+{\large\bfseries رساله}
+\fi\fi
+\vskip 2ex
+{\large\bfseries\writtenfor
+\if@mscthesis
+کارشناسی ارشد
+\else
+\if@bscthesis
+کارشناسی
+\else
+دکتری
+\fi\fi
+}
+{\large\bfseries{در رشته}}
+\vskip 1ex
+\centerline{\large \bfseries\@subject%
+\if@mscthesis%
+، گرایش
+\else
+\if@bscthesis%
+\relax%
+\else%
+، گرایش
+\fi\fi
+\@field}
+\vskip 6ex
+%\baselineskip=.750cm
+\centerline{\Large \bfseries\onvan}
+%\vskip .2cm
+ {\huge\bfseries {\baselineskip=1cm \(a)title}}\baselineskip=1.5cm\par
+\vskip 4ex
+ \baselineskip=.5cm
+\large
+{\ifx\@firstsupervisor\undefined%
+\ifx\@secondsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondsupervisor\undefined%
+استاد راهنما
+{\Large\bfseries\par
+\@firstsupervisor}
+\else
+\large
+استادان راهنما
+\par
+{\Large\bfseries \@firstsupervisor{} و \@secondsupervisor}
+\fi\fi}
+\par\large
+{\ifx\@firstadvisor\undefined%
+\ifx\@secondadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondadvisor\undefined%
+استاد مشاور
+{\Large\bfseries\par
+\@firstadvisor}
+\else
+
+\large
+استادان مشاور
+\par
+{\Large\bfseries\@firstadvisor{} و \@secondadvisor}
+\fi\fi}
+
+{\large%
+ \by}\par
+\par
+{\Large\bfseries{\nastaliq\large\bfseries \@name\ \ \@surname}}\par
+%\vskip 3ex
+%\vfill
+{\large \@thesisdate}
+%\vfill
+\end{titlepage}%
+\newpage
+\thispagestyle{empty}
+\baselineskip=.7cm
+\if@bscthesis \relax
+\else
+\begin{frame}
+\noindent
+نام خانوادگی دانشجو:
+\@surname
+ \hspace*{\fill}
+ نام:
+\@name
+ \hspace*{\fill}\\ \hrule
+ \vspace{3mm}
+ \noindent
+ عنوان:
+\@title\\ \hrule
+ \vspace{3mm}
+ \noindent
+{\ifx\@firstsupervisor\undefined%
+\ifx\@secondsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondsupervisor\undefined%
+استاد راهنما:
+{
+\@firstsupervisor}
+\else
+\large
+استادان راهنما:
+{\@firstsupervisor{} و \@secondsupervisor}
+\fi\fi}%\par
+\noindent
+{\ifx\@firstadvisor\undefined%
+\ifx\@secondadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondadvisor\undefined%
+\par\noindent
+استاد مشاور:
+{
+\@firstadvisor}
+\else\\
+\large
+استادان مشاور:
+{\@firstadvisor{} و \@secondadvisor}
+\fi\fi}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+ مقطع تحصیلی:
+ \if@mscthesis
+کارشناسی ارشد
+\else
+دکتری
+\fi
+ \hspace*{\fill}
+رشته:
+\@subject
+ \hspace*{\fill}
+ گرایش:
+\@field
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+دانشگاه:
+\@university
+ \hspace*{\fill}
+\@faculty\hspace*{\fill}
+\\
+تاریخ فارغالتحصیلی:
+\@thesisdate
+ \hspace*{\fill}
+تعداد صفحات:
+\pageref{LastPage}\hspace*{\fill}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+واژگان کلیدی:
+\@keywords
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\textbf{چکیده}\par
+\@fa-abstract
+\end{frame}
+\fi
+}
+\def\frame{\newpage
+\thispagestyle{empty}
+\begin{framed}\thispagestyle{empty}}
+\def\endframe{\thispagestyle{empty}\end{framed}
+\thispagestyle{empty}
+\newpage
+}
+\def\abstractpage{\newpage
+\thispagestyle{empty}
+\vskip 15mm
+\par
+\begin{abstract}}
+\def\endabstractpage{\end{abstract}
+\newpage
+}
+
+\def\latinabstract{\newpage
+\thispagestyle{empty}
+\vskip 15mm
+\begin{center}{\Large\bfseries \@latintitle \\[5mm]}
+{\bfseries Abstract}
+\end{center}
+\vspace{5mm}}
+
+\def\endlatinabstract{\newpage}
+
+\def\acknowledgementpage{\newpage
+\thispagestyle{empty}
+
+\vspace{1cm}
+\par\noindent}
+\def\endacknowledgementpage{\newpage}
+
+\def\titlepage{\newpage\centering
+ \thispagestyle{empty}
+ \parindent 0pt \parskip 10pt plus 1fil minus 1fil
+ \def\baselinestretch{1}\@normalsize\vbox to \vsize\bgroup\vbox to 9in\bgroup}
+\def\endtitlepage{\par\kern 0pt\egroup\vss\egroup\newpage}
+
+\def\signature{\vspace{1cm}
+\begin{flushleft}
+{\nastaliq \scriptsize \@name\ \@surname \\
+\@thesisdate}
+\end{flushleft}}
+
+\def\abstract{\subsection*{\abstractname}\small
+\@normalsize}
+\def\endabstract{\par}
+
+\newcommand{\latinvtitle}{%
+\if@bscthesis \relax
+\else
+\begin{frame}
+\noindent
+Surname:
+\@latinsurname
+ \hspace*{\fill}
+Name:
+\@latinname
+ \hspace*{\fill}\\ \hrule
+ \vspace{3mm}
+ \noindent
+Title:
+\@latintitle\\ \hrule
+ \vspace{3mm}
+ \noindent
+{\ifx\@firstlatinsupervisor\undefined%
+\ifx\@secondlatinsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinsupervisor\undefined%
+Supervisor:
+{
+\@firstlatinsupervisor}
+\else
+\large
+Supervisors:
+{ \@firstlatinsupervisor{} and \@secondlatinsupervisor}
+\fi\fi}\par
+\noindent
+{\ifx\@firstlatinadvisor\undefined%
+\ifx\@secondlatinadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinadvisor\undefined%
+Advisor:
+{
+\@firstlatinadvisor}
+\else
+\large
+Advisors:
+{\@firstlatinadvisor{} and \@secondlatinadvisor}
+\fi\fi}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+Degree:
+ \if@mscthesis
+ Master of Science
+\else
+ Doctor of Science
+\fi
+ \hspace*{\fill}
+Subject:
+\@latinsubject
+\hspace*{\fill}
+\\
+Field:
+\@latinfield
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\@latinuniversity
+ \hspace*{\fill}
+\@latinfaculty\hspace*{\fill}
+\\
+Date:
+\@latinthesisdate
+ \hspace*{\fill}
+Number of pages:
+\pageref{LastPage}\hspace*{\fill}
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+Keywords:
+\@latinkeywords
+\\ \hrule
+ \vspace{3mm}
+ \noindent
+\textbf{Abstract}\par
+\@en-abstract
+\end{frame}
+\begin{titlepage}
+\vspace{-1.5cm}{\includegraphics[height=4.3cm]{logo}}
+\centerline{\bf \@latinuniversity}
+\large\bfseries
+\@latinfaculty\space
+\vskip 5mm
+%{
+ \if@mscthesis
+Dissertation Submitted in Partial
+\\[.2cm]
+ Fulfillment of The Requirements For The
+\\[.2cm]
+Degree of Master of Science in\par
+\else
+Doctoral Thesis Submitted in Partial
+\\[.2cm]
+Fulfillment of The Requirements For The
+\\[.2cm]
+Degree of Doctor of Science in \par
+\fi
+{\large\bfseries \@latinsubject}
+\vskip 1cm
+\baselineskip=.750cm
+{\Large\bfseries\@latintitle}
+\baselineskip=.750cm \par
+%\addtolength{\baselineskip}{-5mm}
+\vskip 1.5cm
+\large
+{\ifx\@firstlatinsupervisor\undefined%
+\ifx\@secondlatinsupervisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinsupervisor\undefined%
+Supervisor
+{\large\bfseries\par
+\@firstlatinsupervisor}
+\else
+\large
+Supervisors
+\par
+{\large\bfseries \@firstlatinsupervisor{} and \@secondlatinsupervisor}
+\fi\fi}
+\par
+\large
+{\ifx\@firstlatinadvisor\undefined%
+\ifx\@secondlatinadvisor\undefined%
+\else\fi
+\else
+\ifx\@secondlatinadvisor\undefined%
+Advisor
+{\large\bfseries\par
+\@firstlatinadvisor}
+\else
+
+\large
+Advisors
+\par
+{\large\bfseries\@firstlatinadvisor{} and \@secondlatinadvisor}
+\fi\fi}
+\vskip 5mm
+{\bfseries\latinby}\par
+{\large %\supervisorfont
+\@latinname \; \@latinsurname}\par
+\vskip 5mm
+
+\par
+\vskip 1cm
+
+{\@latinthesisdate}
+\par
+\vskip 1cm
+
+\par
+
+\vfill
+%
+\end{titlepage}
+\fi}
+
+\def\onvan{عنوان}
+\def\writtenfor{برای دریافت درجه }
+\def\by{پژوهشگر}
+\def\latinby{By}
+\def\cleardoublepage{\clearpage\if@twoside \ifodd\c@page\else
+\hbox{}
+\thispagestyle{empty}
+\newpage
+\if@twocolumn\hbox{}\newpage\fi\fi\fi}
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+\renewcommand{\bibname}{مراجع}
+\newcommand\persiangloss[2]{#1\dotfill\lr{#2}\\}
+\newcommand\englishgloss[2]{#2\dotfill\lr{#1}\\}
+\newcommand{\پ}{پروژه/پایاننامه/رساله }
+%%%%%%%%%%%%%%%%%%%%%%%%%%
+\theoremstyle{definition}
+\newtheorem{definition}{تعریف}[section]
+\theoremstyle{theorem}
+\newtheorem{theorem}[definition]{قضیه}
+\newtheorem{lemma}[definition]{لم}
+\newtheorem{proposition}[definition]{گزاره}
+\newtheorem{corollary}[definition]{نتیجه}
+\newtheorem{remark}[definition]{ملاحظه}
+\theoremstyle{definition}
+\newtheorem{example}[definition]{مثال}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\pagestyle{fancy}
+\fancyhf{}
+\fancyhead[OL,EL]{\thepage}
+\fancyhead[OR]{\small\rightmark}
+\fancyhead[ER]{\small\leftmark}
+\renewcommand{\chaptermark}[1]{%
+\markboth{\thechapter.\ #1}{}}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%
+%% Copyright © 2011-2013 by Vahid Damanafshan
+%%
+%% Distributable under the LaTeX Project Public License,
+%% version 1.3c or higher (your choice). The latest version of
+%% this license is at: http://www.latex-project.org/lppl.txt
+%%
+%% This work is "maintained" (as per LPPL maintenance status)
+%% by Vahid Damanafshan.
+%%
+%%
+%%
+%%
+%% Special thanks to Vafa Khalighi for his invaluable hints.
+%%
+%% End of file `tabriz-thesis.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabriz-thesis.tlpobj new/tlpkg/tlpobj/tabriz-thesis.tlpobj
--- old/tlpkg/tlpobj/tabriz-thesis.tlpobj 2019-02-28 04:06:41.000000000 +0100
+++ new/tlpkg/tlpobj/tabriz-thesis.tlpobj 2019-07-26 00:58:28.000000000 +0200
@@ -1,15 +1,16 @@
name tabriz-thesis
category Package
-revision 29421
+revision 51729
shortdesc A template for the University of Tabriz
relocated 1
longdesc The package offers a document class for typesetting theses and
longdesc dissertations at the University of Tabriz. The class requires
longdesc use of XeLaTeX.
-runfiles size=3
+runfiles size=6
RELOC/tex/latex/tabriz-thesis/tabriz-thesis.cls
-catalogue-ctan /macros/latex/contrib/tabriz-thesis
-catalogue-date 2016-06-24 19:18:15 +0200
+ RELOC/tex/xelatex/tabriz-thesis/tabriz-thesis.cls
+catalogue-ctan /macros/xetex/latex/tabriz-thesis
+catalogue-date 2019-07-25 16:05:27 +0200
catalogue-license lppl1.3
-catalogue-topics dissertation persian xetex
+catalogue-topics class dissertation persian xetex
catalogue-version 1.1
++++++ tabto-ltx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabto-ltx.doc.tlpobj new/tlpkg/tlpobj/tabto-ltx.doc.tlpobj
--- old/tlpkg/tlpobj/tabto-ltx.doc.tlpobj 2019-03-02 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/tabto-ltx.doc.tlpobj 2020-03-04 23:53:52.000000000 +0100
@@ -1,6 +1,6 @@
name tabto-ltx.doc
category Package
-revision 50188
+revision 54080
shortdesc doc files of tabto-ltx
relocated 1
docfiles size=17
++++++ tabto-ltx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tabto-ltx.tlpobj new/tlpkg/tlpobj/tabto-ltx.tlpobj
--- old/tlpkg/tlpobj/tabto-ltx.tlpobj 2019-03-02 02:26:09.000000000 +0100
+++ new/tlpkg/tlpobj/tabto-ltx.tlpobj 2020-03-04 23:53:52.000000000 +0100
@@ -1,6 +1,6 @@
name tabto-ltx
category Package
-revision 50188
+revision 54080
shortdesc "Tab" to a measured position in the line
relocated 1
longdesc \tabto{<length>} moves the typesetting position to <length>
@@ -13,9 +13,9 @@
longdesc the next defined 'tab stop'.
runfiles size=2
RELOC/tex/latex/tabto-ltx/tabto.sty
+catalogue-alias tabto
catalogue-also tabto-generic
catalogue-ctan /macros/latex/contrib/tabto
-catalogue-date 2019-03-01 08:38:06 +0100
catalogue-license lppl1.3
catalogue-topics layout
catalogue-version 1.4
++++++ tagging.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tagging/README new/doc/latex/tagging/README
--- old/doc/latex/tagging/README 2011-08-31 22:22:27.000000000 +0200
+++ new/doc/latex/tagging/README 2019-09-09 23:19:49.000000000 +0200
@@ -1,13 +1,21 @@
- The `tagging' package provides document configuration by
+ The `tagging' package provides document configuration by
including or omitting tagged input.
- tagging is licenced under the LPPL. For more details,
-please see the accompanying manual: taggingmanual.pdf.
+ tagging is licenced under the LPPL. For more details,
+please see the accompanying manual: tagging.pdf.
Change History
~~~~~~~~~~~~~~
-2011-08-22 Initial release, providing:
+2019-09-09 1.1.0.1 Fix a stupid bug
+
+2019-09-07 1.1 Kindly provided and inspired by Frank Mittelbach:
+
+ Bug fixes
+ <nonsense by BL>: Removed interference with comment environment (from verbatim package)
+ Allow initial active tag list to be passed as package options
+
+2011-08-22 1.0 Initial release, providing:
\tagged{list}{y} Conditional inclusion
\untagged{list}{n} Conditional exclusion
Binary files old/doc/latex/tagging/tagging.pdf and new/doc/latex/tagging/tagging.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tagging/tagging.tex new/doc/latex/tagging/tagging.tex
--- old/doc/latex/tagging/tagging.tex 2011-08-31 22:22:27.000000000 +0200
+++ new/doc/latex/tagging/tagging.tex 2019-09-09 23:19:49.000000000 +0200
@@ -1,6 +1,10 @@
-% taggingmanual.tex
-% Copyright 2011 Brent Longborough
-%
+% !TEX TS-program = latexmkl
+% !TEX encoding = UTF-8 Unicode
+% !TeX spellcheck = en_GB
+% -----------------------------------------------------
+% tagging.tex
+% Copyright 2019 Brent Longborough
+% -----------------------------------------------------
% 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.
@@ -12,7 +16,7 @@
% This work has the LPPL maintenance status `maintained'.
% The Current Maintainer of this work is Brent Longborough.
%
-% This work consists of these files:
+% This work consists of these files:
% tagging.sty, tagging.tex, and tagging.pdf
% -----------------------------------------------------
\documentclass[a4paper,12pt,twoside,openany]{memoir}
@@ -36,10 +40,11 @@
\pagestyle{ruled}
\settocdepth{section}
\setsecnumdepth{none}
-\newcommand{\tpfname}{\textsf{tagging.sty}}
-\newcommand{\tpname}{\textsf{\itshape tagging}}
-\newcommand{\gitVtag}{\space1.0}
-\newcommand{\gitVtagn}{\space1.0}
+\newcommand{\tpn}{tagging}
+\newcommand{\tpfname}{\textsf{\tpn.sty}}
+\newcommand{\tpname}{\textsf{\itshape \tpn}}
+\newcommand{\gitVtag}{\space1.1.0.1}
+\newcommand{\gitVtagn}{\space1.1.0.1}
% -----------------------------------------------------
\usepackage[%
bookmarksnumbered,
@@ -59,7 +64,7 @@
\Large A package for document configuration
}
\author{Brent Longborough}
-\date{28th August, 2011}
+\date{9th September, 2019}
\maketitle
{\centering
@@ -84,17 +89,18 @@
to produce more than one result at different places
in a single document.
-To use \tpname, just include a standard \verb!\usepackage{tagging}!
-in your document preamble; there are no package options.
+To use \tpname, just include a standard
+\verb!\usepackage{tagging}! in your document preamble; there
+are no package options which alter its intrinsic behaviour,
+although later you will see how any options you may give are
+subverted.
With \tpname, you mark up parts of your
\LaTeX source code with \textit{tags} --- labels which
make some kind of sense for you in relation to
the document you are writing.
-For example, imagine you are writing a car owners' manual.\footnote{%
-OK, I know Peugeot don't do this,
-but imagine a top-end luxury car manufacturer.}
+For example, imagine you are writing a car owners' manual.
The car can have optional features, such as automatic transmission
or a navigation system, and can be powered by diesel or petrol.
@@ -111,7 +117,7 @@
Alternatively, you might prefer to tag pieces of the document
as applying to given models, by labelling them with one more
-model designations.
+model designations.
For such an application, you would probably have
a number of master document source files,
each of which would activate the appropriate tags,
@@ -126,7 +132,7 @@
in which something --- an idea, an algorithm, for instance --- has evolved.
The description of the evolving thing could be labelled with its stages,
and then repeatedly imbedded from a master source document with different
-active tags to reflect the stage in its evolution.
+active tags to reflect the stage in its evolution.
The possibilities are, if not limitless,
at least very extensive.
@@ -213,7 +219,7 @@
The tag control commands determine which tags
are active at any point in the document.
The document starts with all tags inactive;
-\tpname\ requires that you explicitly activate
+\tpname\ requires that you explicitly activate
the tags you need.
Once a tag has been activated, it remains active from that point
@@ -225,9 +231,18 @@
\subsection{{\ttfamily\textbackslash usetag\{{\itshape<taglist>}\}}}
This command activates \emph{all} the tags in \texttt{\itshape<taglist>}.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
+\subsection{{\ttfamily\textbackslash usepackage[{\itshape<taglist>}]\{\tpn\}}}
+If you wish, you may activate one or more tags, once, in your
+document preamble by passing a taglist as options when you call
+the package.
+\emph{All} the tags in \texttt{\itshape<taglist>} are activated.
+Any tags activated this way can still be deactivated and
+reactivated as many times as you may need in the body of the
+document.
+% - - - - - - - - - - - - - - - - - - - - - - - - - - -
\subsection{{\ttfamily\textbackslash droptag\{{\itshape<taglist>}\}}}
This command deactivates \emph{all} the tags in \texttt{\itshape<taglist>}.
-\tpname\ is too simple to include a command
+\tpname\ is too simple to include a command
to ``deactivate all known tags'' --- sorry.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -313,25 +328,30 @@
\section{Acknowledgements and dependencies}
\tpname\ is based on an idea by \href{http://tex.stackexchange.com/users/2674/leo-liu}{Leo Liu}.
-It would have been a lot more difficult to implement without the help of
+It would have been a lot more difficult to implement without the help of
Philipp Lehman's
\href{http://www.ctan.org/tex-archive/macros/latex/contrib/etoolbox}{etoolbox}
and of
\href{http://www.ctan.org/pkg/verbatim}{verbatim}, currently maintained by
-Rainer Schöpf, both of which are required for \tpname to work.
+Rainer Schöpf, both of which are required for \tpname\ to work.
+
+I am most grateful to Frank Mittelbach, who intervened to fix my
+dodgy code and to provide the ability to activate tags as
+package options, thereby directly inspiring v1.1.
-The \href{http://tex.stackexchange.com}{\TeX.SE community}
-has been a constant source of help, inspiration, and amazement.
+The \href{http://tex.stackexchange.com}{\TeX.SE community} has
+been a constant source of help, inspiration, and amazement.
-Of course, we all stand on the shoulders of giants: Donald Knuth,
-and then too many others to name.
+Of course, we all stand on the shoulders of giants: Donald
+Knuth, and then too many others to name.
Thank you all. Any failings that remain are entirely
``an ill-favoured thing, sir, but mine own''.
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
+\clearpage
\section{Copyright \& licence}
-Copyright \copyright\ 2011, Brent Longborough.
+Copyright \copyright\ 2019, Brent Longborough.
This work --- \tpname\ --- may be distributed and/or modified under the
conditions of the LaTeX Project Public License: either version 1.3
@@ -345,8 +365,8 @@
This work has the LPPL maintenance status `maintained';
the Current Maintainer of this work is Brent Longborough.
-This work consists of the files tagging.sty, taggingtest.tex,
-taggingmanual.tex, and taggingmanual.pdf
+This work consists of the files
+tagging.sty, tagging.tex, and tagging.pdf
% - - - - - - - - - - - - - - - - - - - - - - - - - - -
\section{From the author}
@@ -358,7 +378,7 @@
However, I'll be very happy to receive your comments by email.\\[\baselineskip]
Enjoy!\\
Brent Longborough\\[\baselineskip]
-\textsf{brent+tagging (at) longborough (dot) org}\\
+\textsf{brent+ctan (at) llwyd-consulting (dot) cymru}\\
and at \href{http://tex.stackexchange.com/users/344/brent-longborough}{\TeX.SE}
% -----------------------------------------------------
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagging.doc.tlpobj new/tlpkg/tlpobj/tagging.doc.tlpobj
--- old/tlpkg/tlpobj/tagging.doc.tlpobj 2019-02-28 04:06:44.000000000 +0100
+++ new/tlpkg/tlpobj/tagging.doc.tlpobj 2019-09-11 01:55:19.000000000 +0200
@@ -1,9 +1,9 @@
name tagging.doc
category Package
-revision 23761
+revision 52064
shortdesc doc files of tagging
relocated 1
-docfiles size=26
+docfiles size=33
RELOC/doc/latex/tagging/README
RELOC/doc/latex/tagging/tagging.pdf
RELOC/doc/latex/tagging/tagging.tex
++++++ tagging.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagging/tagging.sty new/tex/latex/tagging/tagging.sty
--- old/tex/latex/tagging/tagging.sty 2011-08-31 22:22:27.000000000 +0200
+++ new/tex/latex/tagging/tagging.sty 2019-09-09 23:19:49.000000000 +0200
@@ -1,5 +1,5 @@
% tagging.sty
-% Copyright 2011 Brent Longborough
+% Copyright 2019 Brent Longborough
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -12,11 +12,13 @@
% This work has the LPPL maintenance status `maintained'.
% The Current Maintainer of this work is Brent Longborough.
%
-% This work consists of these files:
+% This work consists of these files:
% tagging.sty, tagging.tex, and tagging.pdf
% --------------------------------------------------------------
-\ProvidesPackage{tagging}[2011/08/04]
+\ProvidesPackage{tagging}[2019/09/09 v1.1.0.1]
\RequirePackage{etoolbox,verbatim}
+
+
\newcommand{\taggedy}{\relax}
\newcommand{\taggedn}{\relax}
\newcommand\usetag[1]{%
@@ -25,6 +27,8 @@
\newcommand\droptag[1]{%
\def\do##1{\csundef{tagged@##1}{}}%
\docsvlist{#1}}%
+
+
\newenvironment{taggedblock}[1]%
{\def\do##1{%
\ifcsname tagged@##1\endcsname%
@@ -32,10 +36,10 @@
\let\endcomment\relax%
\fi}%
\docsvlist{#1}%
- \comment}%
- {\endcomment\leavevmode}%
+ \comment\ignorespaces}% FMi
+ {\endcomment\ignorespacesafterend}% FMi
\newenvironment{untaggedblock}[1]{%
- \csdef{@tagged@flag}{}
+ \csdef{@tagged@flag}{}% FMi
\def\do##1{%
\ifcsname tagged@##1\endcsname%
\csundef{@tagged@flag}{}
@@ -45,8 +49,10 @@
\let\comment\relax%
\let\endcomment\relax%
\fi%
- \comment}%
- {\endcomment\leavevmode}%
+ \comment\ignorespaces}% FMi
+ {\endcomment\ignorespacesafterend}% FMi
+
+
\newcommand{\iftagged}[3]%
{\renewcommand{\taggedy}{#2}%
\renewcommand{\taggedn}{#3}%
@@ -57,3 +63,7 @@
}%
\newcommand{\tagged}[2]{\iftagged{#1}{#2}{}}
\newcommand{\untagged}[2]{\iftagged{#1}{}{#2}}
+
+%FMi Allow tags to be activated as package options
+\DeclareOption*{\usetag{\CurrentOption}}
+\ProcessOptions
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagging.tlpobj new/tlpkg/tlpobj/tagging.tlpobj
--- old/tlpkg/tlpobj/tagging.tlpobj 2019-02-28 04:06:44.000000000 +0100
+++ new/tlpkg/tlpobj/tagging.tlpobj 2019-09-11 01:55:19.000000000 +0200
@@ -1,6 +1,6 @@
name tagging
category Package
-revision 23761
+revision 52064
shortdesc Document configuration with tags
relocated 1
longdesc The package allows the user to generate multiple documents from
@@ -8,7 +8,10 @@
longdesc and specifying which marked pieces to include or exclude.
runfiles size=1
RELOC/tex/latex/tagging/tagging.sty
+catalogue-contact-bugs https://github.com/Hightor/tagging/issues
+catalogue-contact-repository https://github.com/Hightor/tagging
catalogue-ctan /macros/latex/contrib/tagging
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-09 19:04:08 +0200
catalogue-license lppl1.3
catalogue-topics cond-comp
+catalogue-version 1.1.0.1
++++++ tagpdf.doc.tar.xz ++++++
++++ 26954 lines of diff (skipped)
++++++ tagpdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-attr-code.sty new/tex/latex/tagpdf/tagpdf-attr-code.sty
--- old/tex/latex/tagpdf/tagpdf-attr-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-attr-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-attr-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-attr-code} {2019/07/02} {0.61}
{part of tagpdf - code related to attributes and attribute classes}
% the obj is written in tagpdf-tree-code.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-checks-code.sty new/tex/latex/tagpdf/tagpdf-checks-code.sty
--- old/tex/latex/tagpdf/tagpdf-checks-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-checks-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-checks-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-checks-code} {2019/07/02} {0.61}
{part of tagpdf - code related to checks and messages}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-luatex.def new/tex/latex/tagpdf/tagpdf-luatex.def
--- old/tex/latex/tagpdf/tagpdf-luatex.def 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-luatex.def 2019-07-02 23:03:25.000000000 +0200
@@ -1,5 +1,5 @@
-\ProvidesExplFile {tagpdf-luatex.def} {2019/03/20} {0.60}
- {tagpdf driver for luatex}
+\ProvidesExplFile {tagpdf-luatex.def} {2019/07/02} {0.61}
+ {tagpdf~driver~for~luatex}
%\newattribute \g__uftag_mc_type_attr %the value represent the type
%\newattribute \g__uftag_mc_cnt_attr %will hold the \c@g__uftag_MCID_abs_int value
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-generic.sty new/tex/latex/tagpdf/tagpdf-mc-code-generic.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-generic.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-generic.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-generic} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-generic} {2019/07/02} {0.61}
{part of tagpdf - code related to marking chunks - generic mode}
% for the label system
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-lua.sty new/tex/latex/tagpdf/tagpdf-mc-code-lua.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-lua.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-lua.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-lua} {2019/07/02} {0.61}
{tagpdf - mc code only for the luamode }
% the two attibutes are defined in the driver file.
@@ -250,6 +250,7 @@
\exp_args:Nx \__uftag_mc_handle_stash:n { \__uftag_get_mc_abs_cnt: }
}
}
+ \bool_set_false:N\l__uftag_mc_artifact_bool
%\group_end:
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-mc-code-shared.sty new/tex/latex/tagpdf/tagpdf-mc-code-shared.sty
--- old/tex/latex/tagpdf/tagpdf-mc-code-shared.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-mc-code-shared.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-mc-code-shared} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-mc-code-shared} {2019/07/02} {0.61}
{part of tagpdf - code related to marking chunks - code shared by generic and luamode }
% I use a latex counter for the absolute count, so that it is added to
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-pdftex.def new/tex/latex/tagpdf/tagpdf-pdftex.def
--- old/tex/latex/tagpdf/tagpdf-pdftex.def 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-pdftex.def 2019-07-02 23:03:25.000000000 +0200
@@ -1,5 +1,5 @@
-\ProvidesExplFile {tagpdf-pdftex.def} {2019/03/20} {0.60}
- {tagpdf driver for pdftex}
+\ProvidesExplFile {tagpdf-pdftex.def} {2019/07/02} {0.61}
+ {tagpdf~driver~for~pdftex}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%%% driver (pdflatex) commands
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-roles-code.sty new/tex/latex/tagpdf/tagpdf-roles-code.sty
--- old/tex/latex/tagpdf/tagpdf-roles-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-roles-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-roles-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-roles-code} {2019/07/02} {0.61}
{part of tagpdf - code related to roles and structure names}
\__uftag_seq_new:N \g__uftag_role_tags_seq %to get names from numbers
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-space-code.sty new/tex/latex/tagpdf/tagpdf-space-code.sty
--- old/tex/latex/tagpdf/tagpdf-space-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-space-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-space-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-space-code} {2019/07/02} {0.61}
{part of tagpdf - code related to real space chars}
% luatex uses an attribute (declared in the driver file) and some luacode in tagpdf.lua
% perhaps I will split the code by engine in the future
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-struct-code.sty new/tex/latex/tagpdf/tagpdf-struct-code.sty
--- old/tex/latex/tagpdf/tagpdf-struct-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-struct-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-struct-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-struct-code} {2019/07/02} {0.61}
{part of tagpdf - code related to storing structure}
% I will use a latex counter for the structure count
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-tree-code.sty new/tex/latex/tagpdf/tagpdf-tree-code.sty
--- old/tex/latex/tagpdf/tagpdf-tree-code.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-tree-code.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-tree-code} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-tree-code} {2019/07/02} {0.61}
{part of tagpdf - code related to writing trees and dictionaries to the pdf}
%this does the actual finishing:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf-user.sty new/tex/latex/tagpdf/tagpdf-user.sty
--- old/tex/latex/tagpdf/tagpdf-user.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf-user.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,4 +1,4 @@
-\ProvidesExplPackage {tagpdf-user} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf-user} {2019/07/02} {0.61}
{tagpdf - user commands}
\NewDocumentCommand \tagpdfsetup { m }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf.lua new/tex/latex/tagpdf/tagpdf.lua
--- old/tex/latex/tagpdf/tagpdf.lua 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf.lua 2019-07-02 23:03:25.000000000 +0200
@@ -1,8 +1,18 @@
--- Packageversion: 0.60
--- Packagedate: 2019/03/20
-- tagpdf.lua
-- Ulrike Fischer
+local ProvidesLuaModule = {
+ name = "tagpdf",
+ version = "0.61", --TAGVERSION
+ date = "2019-07-02", --TAGDATE
+ description = "tagpdf lua code",
+ license = "The LATEX Project Public License 1.3c"
+}
+
+if luatexbase and luatexbase.provides_module then
+ luatexbase.provides_module (ProvidesLuaModule)
+end
+
--[[
The code has quite probably a number of problems
- more variables should be local instead of global
@@ -512,11 +522,10 @@
tableinsert(uftag.mc[mcnum]["kids"], kidtable )
end
+
function uftag.func.mc_num_of_kids (mcnum)
local num = 0
if uftag.mc[mcnum] and uftag.mc[mcnum]["kids"] then
- texio.write_nl("XXXXXXXXXXXXXXXXX")
- texio.write_nl(table.serialize(uftag.mc[mcnum]["kids"]))
num = #uftag.mc[mcnum]["kids"]
end
uftag.trace.log ("MC" .. mcnum .. "has " .. num .. "KIDS",4)
@@ -554,6 +563,7 @@
uftag.struct[structnum]["mc"]=uftag.struct[structnum]["mc"] or { }
-- a structure can contain more than on mc chunk, the content should be ordered
tableinsert(uftag.struct[structnum]["mc"],mcnum)
+ uftag.trace.log("MCNUM "..mcnum.." insert in struct "..structnum,3)
-- but every mc can only be in one structure
uftag.mc[mcnum]= uftag.mc[mcnum] or { }
uftag.mc[mcnum]["parent"] = structnum
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdf.sty new/tex/latex/tagpdf/tagpdf.sty
--- old/tex/latex/tagpdf/tagpdf.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdf.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,7 +1,7 @@
-\RequirePackage{expl3}[2018/06/14]
+\RequirePackage{expl3}[2019/07/01]
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
-\ProvidesExplPackage {tagpdf} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdf} {2019/07/02} {0.61}
{A package to experiment with pdf tagging}
%\debug_on:n{check-declarations,check-expressions,deprecation}
@@ -41,10 +41,11 @@
\RequirePackage{atbegshi}
\RequirePackage{zref-base,zref-lastpage}
\RequirePackage{etoolbox}
+\RequirePackage{l3pdf}
%\RequirePackage{pdfescape} %check if needed
%\RequirePackage{pdftexcmds}%check if needed (expandable commands!)
-\RequirePackage{l3str-convert}
+%\RequirePackage{l3str-convert}
\cs_generate_variant:Nn \str_set_convert:Nnnn {Nonn, Noon, Nnon }
@@ -83,18 +84,7 @@
tabsorder / structure .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {/Tabs/S}},
tabsorder / none .code:n = {\tl_set:Nn \l__uftag_tree_tabs_order_tl {}},
tabsorder .initial:n = structure,
- compresslevel .choices:nn = {1,2,3,4,5,6,7,8,9}
- {
- \driver_pdf_compresslevel:n {#1}
- \driver_pdf_objects_enable:
- },
- compresslevel / 0 .code:n =
- {
- \driver_pdf_compresslevel:n { 0 }
- \driver_pdf_objects_disable:
- },
- compresslevel .value_required:n = true,
- uncompress .meta:n = { compresslevel = 0 },
+ uncompress .code:n = {\pdf_uncompress: },
inputencoding .code:n =
{
\sys_if_engine_pdftex:T
@@ -102,7 +92,7 @@
},
}
-% escape commands are a bit engine specific so have been moved to the driver files.
+% escape commands are a bit engine specific so have been moved to the backend files.
% commands to escape strings so that they can be safely used in pdf
% currently not much used. But will be needed later, when alt and actualtext are added.
% we probably need the equivalent \pdfescapestring, \pdfescapename \pdfescapehex
@@ -114,7 +104,7 @@
%\cs_set_eq:NN \__uftag_pdf_escape_string:n \EdefEscapeString
%\cs_set_eq:NN \__uftag_pdf_escape_name:Nn \EdefEscapeName
-%escape command. They are driver specific as \pdf@escapehex would ignore most chars
+%escape command. They are backend specific as \pdf@escapehex would ignore most chars
%outside the "pdflatex" range
@@ -137,7 +127,7 @@
}
-%testing the engines and loading the driver files
+%testing the engines and loading the backend files
\sys_if_engine_xetex:T
{
\PackageError { tagpdf } { xelatex~is~not~supported~-~aborting } {}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tagpdf/tagpdfdocu-patches.sty new/tex/latex/tagpdf/tagpdfdocu-patches.sty
--- old/tex/latex/tagpdf/tagpdfdocu-patches.sty 2019-03-21 21:54:17.000000000 +0100
+++ new/tex/latex/tagpdf/tagpdfdocu-patches.sty 2019-07-02 23:03:25.000000000 +0200
@@ -1,7 +1,7 @@
\RequirePackage{expl3}[2018/06/14]
%\RequirePackage[enable-debug]{expl3}[2018/06/14]
\RequirePackage{xpatch}
-\ProvidesExplPackage {tagpdfdocu-patches} {2019/03/20} {0.60}
+\ProvidesExplPackage {tagpdfdocu-patches} {2019/07/02} {0.61}
{patches/commands for the tagpdf documentation}
% to do : marginnote, perhaps the description macros ...
@@ -198,7 +198,7 @@
% keys that overwrite \enit@format must be patched, eg like the follow
% the font key should be patched in a similar way
-\enitkv@key{enumitem}{format}{%
+\enitkv@key{}{format}{% new enumitem don't use first argument
\def\enit@format{%
\tagstructbegin{tag=LI}%
\tagstructbegin{tag=Lbl}%
@@ -213,20 +213,20 @@
{
\hook_put_left:nnn
{ pdf }
- { startlink_url }
+ { link_begin_url }
{
\uftag_struct_begin:n{tag=Link}
- \uftag_mc_begin:n{tag=Link}\def\blub{abc}
+ \uftag_mc_begin:n{tag=Link}
}
\hook_put:nnnn
{ pdf }
- { startlink_url_attr }
+ { link_begin_url_attr }
{ /StructParent }
{ \int_use:N\c@g__uftag_parenttree_obj_int }
\hook_put_right:nnn
{ pdf }
- { endlink_url }
+ { link_end_url }
{
\__uftag_struct_finish_link:
\uftag_mc_end:
@@ -235,19 +235,19 @@
\hook_put_left:nnn
{ pdf }
- { startlink_link }
+ { link_begin_link }
{
\uftag_struct_begin:n{tag=Link}
\uftag_mc_begin:n{tag=Link}
}
\hook_put:nnnn
{ pdf }
- { startlink_link_attr }
+ { link_begin_link_attr }
{ /StructParent }
{ \int_use:N\c@g__uftag_parenttree_obj_int }
\hook_put_right:nnn
{ pdf }
- { endlink_link }
+ { link_end_link }
{
\__uftag_struct_finish_link:
\uftag_mc_end:
@@ -257,13 +257,13 @@
% "alternative descriptions " for PAX3. How to get better text here??
\hook_put:nnnn
{ pdf }
- { startlink_url_attr }
+ { link_begin_url_attr }
{ /Contents }
{ (url) }
\hook_put:nnnn
{ pdf }
- { startlink_link_attr }
+ { link_begin_link_attr }
{ /Contents }
{ (ref) }
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tagpdf.tlpobj new/tlpkg/tlpobj/tagpdf.tlpobj
--- old/tlpkg/tlpobj/tagpdf.tlpobj 2019-03-22 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/tagpdf.tlpobj 2019-07-03 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
name tagpdf
category Package
-revision 50509
+revision 51535
shortdesc Tools for experimenting with tagging using pdfLaTeX and LuaLaTeX
relocated 1
longdesc The package offers tools to experiment with tagging and
@@ -31,7 +31,7 @@
catalogue-contact-repository https://github.com/u-fischer/tagpdf
catalogue-contact-support https://github.com/u-fischer/tagpdf/issues
catalogue-ctan /macros/latex/contrib/tagpdf
-catalogue-date 2019-03-21 08:11:50 +0100
+catalogue-date 2019-07-02 14:34:15 +0200
catalogue-license lppl1.3c
catalogue-topics tagged-pdf accessible
-catalogue-version 0.60
+catalogue-version 0.61
++++++ tasks.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/README new/doc/latex/tasks/README
--- old/doc/latex/tasks/README 2016-08-15 00:00:01.000000000 +0200
+++ new/doc/latex/tasks/README 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
--------------------------------------------------------------------------
-the TASKS package v0.12 2016/08/13
+the TASKS package v1.2 2020/03/21
- Horizontal columned lists.
+ lists with columns filled horizontally
--------------------------------------------------------------------------
Clemens Niederberger
Web: https://github.com/cgnieder/tasks/
E-Mail: contact(a)mychemistry.eu
--------------------------------------------------------------------------
-Copyright 2013-2016 Clemens Niederberger
+Copyright 2013--2020 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/tasks/tasks-manual.pdf and new/doc/latex/tasks/tasks-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/tasks-manual.tex new/doc/latex/tasks/tasks-manual.tex
--- old/doc/latex/tasks/tasks-manual.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/tasks/tasks-manual.tex 2020-03-21 22:17:24.000000000 +0100
@@ -0,0 +1,498 @@
+% --------------------------------------------------------------------------
+% the TASKS package
+%
+% lists with columns filled horizontally
+%
+% --------------------------------------------------------------------------
+% Clemens Niederberger
+% Web: https://github.com/cgnieder/tasks/
+% E-Mail: contact(a)mychemistry.eu
+% --------------------------------------------------------------------------
+% Copyright 2013--2020 Clemens Niederberger
+%
+% This work may be distributed and/or modified under the
+% conditions of the LaTeX Project Public License, either version 1.3
+% of this license or (at your option) any later version.
+% The latest version of this license is in
+% http://www.latex-project.org/lppl.txt
+% and version 1.3 or later is part of all distributions of LaTeX
+% version 2005/12/01 or later.
+%
+% This work has the LPPL maintenance status `maintained'.
+%
+% The Current Maintainer of this work is Clemens Niederberger.
+% --------------------------------------------------------------------------
+% If you have any ideas, questions, suggestions or bugs to report, please
+% feel free to contact me.
+% --------------------------------------------------------------------------
+\documentclass{tasks-manual}
+
+\begin{document}
+
+\section{Preface}
+\subsection{Motivation \& History}
+Originally \Tasks\ has been an integral part of the
+\ExSheets\changedversion{0.7} package~\cite{pkg:exsheets}. However, users
+told me that it indeed could be useful to have it as a stand-alone package not
+having to load the whole \ExSheets\ beast just for having the \env{tasks}
+environment available. Since I agree with this the environment has been
+extracted into a package if its own, \Tasks. Since then \Tasks\ has been
+distributed as a package of its own but as part of the \ExSheets\
+bundle\changedversion{0.10}. With v0.10 I decided to make it a completely
+independent package. So the relation to \ExSheets\ only is a historical one.
+
+The reason for the \env{tasks} environment is an unwritten agreement in German
+maths textbooks (exspecially in (junior) high school textbooks) to organize
+exercises in columns counting horizontally rather than vertically. That is
+what \code{tasks} primarily is for. If you don't need this feature you're
+better off using traditional \LaTeX\ lists and the \pkg{enumitem} package for
+customization.
+
+\subsection{Changes}
+The \sinceversion{1.0} step to version~1.0 brought some significant changes:
+\begin{itemize}
+ \item the option \option{counter-format} is deprecated. Labels can now be
+ set quite similar to the way they are set in \pkg{enumitem}. This also
+ made the \code{enumerate} option of the list template superfluous which has
+ been removed accordingly.
+ \item The commands \cs{NewTasks} and \cs{RenewTasks} have been renamed.
+ \item The multiple choice lists have been removed.
+ \item Custom definitions can be put in a \code{tasks.cfg} file which is
+ automatically loaded if available.
+\end{itemize}
+
+\section{License and Requirements}\label{sec:license}
+\license
+
+\Tasks\ requires the \bnd{l3kernel}~\cite{bnd:l3kernel} bundle,
+\needpackage{xparse} and \pkg{xtemplate}.
+
+\section{How it works}
+\subsection{Background}
+The \env{tasks} environment is similar to a list like \env{enumerate} but not
+the same. Here are some of the differences:
+\begin{tasks}[style=enumerate]
+ \task there is no pagebreak possible inside an item but only between items.
+ \task the enumeration default is a), b), c) \ldots
+ \task the body of the \env{tasks} environment is split at \emph{every}
+ occurrence of the item separator. For this reason the default separator
+ is not \cs*{item} but \cs{task} so it is unique to this environment only.
+ This directly leads to\ldots
+ \task \ldots\ the fact that the \env{tasks} environment cannot be nested.
+ You can, however, use an \env*{itemize} environment or another
+ \enquote{real} list in it.
+ \task A fifth difference: verbatim material cannot be used in it. You'll
+ have to use \cs*{string}, \cs*{texttt} or \cs*{detokenize}. If this
+ won't suffice then don't use \env{tasks}.
+\end{tasks}
+
+\begin{bewareofthedog}
+ The environments of \Tasks\ are what I like to call
+ \enquote{pseudo-environments}. This means like environments defined by the
+ package \pkg{environ}~\cite{pkg:environ} the body of the environment is read
+ as argument before it is processed. This is why verbatim material cannot be
+ used in \Tasks' lists.
+\end{bewareofthedog}
+
+\subsection{The Basics}
+\begin{environments}
+ \environment{tasks}[\oarg{options}\darg{num of columns}]
+ List like environment where the single items are introduced with
+ \cs{task}.
+\end{environments}
+Let's see an example:
+\begin{example}
+ % \Sample is defined to contain some sample text:
+ % \def\sample{This is some sample text we will use to create a somewhat
+ % longer text spanning a few lines.}
+ % \def\Sample{\sample\ \sample\par\sample}
+ Some text before the list.
+ \begin{tasks}
+ \task \Sample
+ \task \Sample
+ \task \Sample
+ \end{tasks}
+ And also some text after it.
+\end{example}
+
+The environment takes the optional argument \darg{num of columns} with which
+the number of columns used by the environment is specified.
+\begin{example}
+ \begin{tasks}(2)
+ \task \Sample
+ \task \sample\ \sample
+ \task \sample
+ \task \Sample
+ \task \sample\par\sample
+ \end{tasks}
+\end{example}
+
+\subsection{Items Spanning More Than One Column}
+Sometimes it may come in handy if an item is allowed to span more than one
+column. \Tasks\sinceversion{0.10} supports items using the remaining space by
+adding an optional\label{optional-star} star to \cs{task}:
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task* \sample
+ \task* \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+\Tasks\sinceversion{0.10} also supports items that span \emph{all} columns in
+any case by adding an optional bang\label{optional-bang} to \cs{task}.
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task! \sample
+ \task! \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+The optional star has itself an optional argument with parentheses where you
+can specify the number of columns the item is supposed to span:\label{debug}
+\begin{example}
+ \settasks{debug}
+ \begin{tasks}(4)
+ \task the first
+ \task the second
+ \task the third
+ \task the fourth
+ \task*(3) the fifth item is way too long for this and needs three columns
+ \task the sixth
+ \task the seventh
+ \task*(2) the eighth item is way too long for this and needs two columns
+ \task the nineth
+ \task the tenth
+ \end{tasks}
+\end{example}
+If there are not enough columns left (say two columns but you said
+\cs{task}\sarg\Darg{3}) the argument is ignored and the maximum number of
+remaining columns is used (two in case of our example).
+
+Both optional star and optional bang can be combined with the optional
+argument for a custom label:
+\begin{example}
+ \begin{tasks}(3)
+ \task \sample
+ \task* \sample
+ \task*[(x)] \sample
+ \task \sample
+ \task \sample
+ \end{tasks}
+\end{example}
+
+Forcing a new item line manually is also possible\sinceversion{0.9} using the
+following command:
+\begin{commands}
+ \command{startnewitemline}
+ Introduce a new line in a \env{tasks} environment.
+\end{commands}
+While this works it also needs a bit of care since the width of the items
+doesn't change which means in order to use the full width you'd have to use
+trickery like \cs*{rlap} which then means the danger of the item text sticking
+into the margin.
+
+\begin{example}
+ \begin{tasks}(4)
+ \task the first
+ \task the second
+ \task the third
+ \task the fourth
+ \task \rlap{the fifth item is way too long for this so we start a new row}
+ \startnewitemline
+ \task the sixth
+ \task the seventh
+ \task \rlap{the eighth item also is too long} \startnewitemline
+ \task the nineth
+ \task the tenth
+ \end{tasks}
+\end{example}
+
+\section{Available Options}\label{sec:tasks:options}
+
+The \Tasks\ package does not have any package options\changedversion{0.10}.
+
+The environment \env{tasks} has a number of options, though, namely the
+following ones that can be set using a setup command:
+\begin{commands}
+ \command{settasks}[\marg{options}]
+ Setup command for \Tasks.
+\end{commands}
+\begin{options}
+ \keyval{style}{instance}\Default
+ Choose the instance to be used. Read more on this in
+ section~\ref{sec:tasks}.
+ \keyval{label-format}{code}\Default
+ \changedversion{1.1a}Can be used to apply a formatting like, \eg,
+ \cs*{bfseries} to the labels. This may be code accepting the item as
+ mandatory argument.
+ \keyval{label}{code}\Default{\cs*{alph}\code{*)}}
+ \changedversion{1.0}Sets a custom label. The \code{*} is replaced by
+ \Marg{task}. This is heavily inspired by
+ \pkg{enumitem}'s~\cite{pkg:enumitem} \code{label} option.
+ \keyval{label-width}{dim}\Default{1em}
+ Sets the width of the item labels.
+ \keyval{label-offset}{dim}\Default{.3333em}
+ \sinceversion{0.7}Sets the offset, \ie, the distance between label and
+ item.
+ \keyval{item-format}{code}\Default
+ \sinceversion{0.11}Can be used to apply a formatting like, \eg,
+ \cs*{bfseries} to the items. This may be code accepting the item as
+ mandatory argument.
+ \keyval{item-indent}{dim}\Default{2.5em}
+ \sinceversion{0.9a}The indent of an item, \ie, the horizontal space
+ available for both label and label-offset. If
+ \[
+ \text{\code{indent}} =
+ \text{\code{label-width}} + \text{\code{label-offset}}
+ \]
+ the label will align with the textblock above (if
+ \keyis{label-align}{left} is set). Please see figure~\ref{fig:lengths}
+ for a sketch of the available lengths and how they are set.
+ \keyval{column-sep}{dim}\Default{0pt}
+ \sinceversion{0.10}A horizontal length that is inserted between columns ot
+ items.
+ \keychoice{label-align}{left,right,center}\Default{left}
+ \sinceversion{0.7}Determines how the labels are aligned within the
+ label-box whose width is set with \option{label-width}.
+ \keyval{before-skip}{skip}\Default{0pt}
+ Sets the skip before the list.
+ \keyval{after-skip}{skip}\Default{0pt}
+ Sets the skip after the list.
+ \keyval{after-item-skip}{skip}\Default{1ex plus 1ex minus 1ex}
+ \sinceversion{0.9}This vertical skip is inserted between rows of items.
+ \keybool{resume}\Default{false}
+ The enumeration will resume from a previous \env{tasks} environment. In
+ order to use this option properly you shouldn't mix different \env{tasks}
+ environments that both count their items.
+ \keyval{start}{integer}\Default{1}
+ \sinceversion{1.1}Set the starting value with which the list starts
+ counting.
+ \keyval{counter}{counter}\Default{task}
+ \sinceversion{1.2}The counter to be used to count the items.
+ \keybool{debug}\Default{false}
+ \sinceversion{0.10}If set to true \cs*{fboxsep} is set to \code{0pt}
+ inside the \env{tasks} environment and \cs*{fbox} is used to draw a frame
+ around the label boxes and the item boxes.
+\end{options}
+
+\begin{figure}
+ \centering
+ \begin{tikzpicture}[every node/.style={font=\footnotesize},scale=.5]
+ \coordinate (itemedge1) at (2,2) ;
+ \coordinate (itemedge2) at (13,2) ;
+ \draw
+ (itemedge1) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
+ \draw
+ (itemedge1) ++(-.5,0) coordinate(labeledge1)
+ -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
+ \draw (itemedge1) ++(-2,0) -- ++(0,-2) ;
+ \draw
+ (itemedge2) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
+ \draw
+ (itemedge2) ++(-.3,0) coordinate(labeledge2)
+ -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
+ \draw (itemedge2) ++(-2,0) -- ++(0,-2) ;
+ \draw[<->] (itemedge2) ++(-2,0) --node[above]{column sep} ++(-1,0) ;
+ \draw[<->] (0,-.5) --node[below]{item indent} (2,-.5) ;
+ \draw[<->] (2,-.5) --node[below]{item width} (10,-.5) ;
+ \draw[<->] (labeledge1) ++(0,1) --node[above]{label width} ++(-1,0) ;
+ \draw[<->] (labeledge1) --node[above]{label offset} ++(.5,0) ;
+ \end{tikzpicture}
+ \caption{A visual representation of the used lengths.}
+ \label{fig:lengths}
+\end{figure}
+
+Now the same list as above but with three columns and a different label:
+\begin{example}
+ \begin{tasks}[label=(\roman*),label-width=4ex](2)
+ \task \Sample
+ \task \sample\ \sample
+ \task \sample
+ \task \Sample
+ \task \sample\par\sample
+ \end{tasks}
+\end{example}
+
+Let's use it inside a question, \ie, inside \pkg{xsim}'s \env{exercise}
+environment~\cite{pkg:xsim}:
+\begin{example}
+ % since settings are local the following ones will be lost
+ % outside this example;
+ \settasks{
+ label = \theexercise.\arabic* ,
+ item-indent = 2em ,
+ label-width = 2em ,
+ label-offset = 0pt
+ }
+ \begin{exercise}
+ I have these two tasks for you. Shall we begin?
+ \begin{tasks}(2)
+ \task The first task: easy!
+ \task The second task: even more so!
+ \end{tasks}
+ \end{exercise}
+ \begin{solution}[print]
+ Now, let's see\ldots\ ah, yes:
+ \begin{tasks}
+ \task This is the first solution. Told you it was easy.
+ \task This is the second solution. And of course you knew that!
+ \end{tasks}
+ \end{solution}
+\end{example}
+
+Finally let's see what the \option{debug} option does (you could see it
+already on page~\pageref{debug}):
+\begin{example}
+ \settasks{debug}
+ \begin{tasks}(2)
+ \task \Sample
+ \task \Sample
+ \end{tasks}
+\end{example}
+
+\section{Available Instances}\label{sec:tasks:instances}
+There are currently three additional instances for the \code{tasks} object
+available:
+\begin{description}
+ \item[itemize] uses \cs*{labelitemi} as labels.
+ \item[enumerate] enumerates the items with 1., 2., \ldots
+ % \item[multiplechoice] a --~well~-- `multiple choice' list.
+\end{description}
+\begin{example}
+ \begin{tasks}[style=itemize](2)
+ \task that's just how\ldots
+ \task \ldots we expected
+ \end{tasks}
+ \begin{tasks}[style=enumerate](2)
+ \task that's just how\ldots
+ \task \ldots we expected
+ \end{tasks}
+\end{example}
+ % \begin{tasks}[style=multiplechoice](2)
+ % \task that's just how\ldots
+ % \task \ldots we expected
+ % \end{tasks}
+
+\section{Custom Labels}
+If you want to change a single label inside a list, you can use the optional
+argument of \cs{task}. This will temporarily overwrite the default label.
+\begin{example}[side-by-side]
+ \begin{tasks}[style=itemize]
+ \task a standard item
+ \task another one
+ \task[+] a different one
+ \task and another one
+ \end{tasks}
+\end{example}
+
+\begin{commands}
+ \command{tasksifmeasuringTF}[\marg{true}\marg{false}]
+ \sinceversion{1.2}This command used inside a label checks if the label is
+ typeset for measuring its width or if it is typeset \enquote{for
+ real}. Might be useful sometimes. There are also the variants
+ \cs{tasksifmeasuringT} and \cs{tasksifmeasuringF}.
+\end{commands}
+
+\section{New \code{tasks}-like Environments}
+It is possible to add custom environments that work like the \code{tasks}
+environment.
+\begin{commands}
+ \command{NewTasksEnvironment}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
+ Define environment \meta{name} that uses \meta{separator} to introduce a
+ new item. Default for \meta{separator} is \cs{task}, default for
+ \meta{cols} is \code{1}. The \meta{options} are the ones described in
+ section~\ref{sec:tasks:options}.
+ \command{RenewTasksEnvironment}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
+ Renew environment previously defined with \cs{NewTasksEnvironment}.
+\end{commands}
+The \env{tasks} environment is defined as follows:
+\begin{sourcecode}
+ \NewTasksEnvironment{tasks}
+\end{sourcecode}
+
+The separator does not have to be a control sequence:
+\begin{example}
+ % preamble:
+ % \usepackage{fontawesome}
+ \NewTasksEnvironment[label=\faThumbsOUp,label-width=15pt]{done}[*]
+ \begin{done}
+ * First task
+ * Second task
+ \end{done}
+\end{example}
+Although this might seem handy or even nice I strongly advice against using
+something different than a command sequence. Remember that the items will be
+split at \emph{every} occurrence of the separator. So in order to use the
+separator (here for example for a starred variant of a command) within an item
+it has to be hidden in braces. This is avoided of you use a command sequence
+which even doesn't have to be defined.
+
+Please also keep in mind that the separator still has an optional star
+argument (see~\pageref{optional-star}), an optional bang argument and the
+standard optional argument. Using \code{*} will prevent the optional star
+argument.
+
+\begin{example}
+ % preamble:
+ % \usepackage{fontawesome}
+ \NewTasksEnvironment[label=\faThumbsOUp,label-width=15pt]{done}[*]
+ \begin{done}(3)
+ * First task
+ * Second task
+ *! Third task spanning the full width available
+ * Fourth task
+ \end{done}
+\end{example}
+
+\section{Styling \Tasks}
+\Tasks\ uses \pkg{xtemplate} to declare additional instances for the lists.
+
+\subsection{The \code{tasks} Object}\label{sec:tasks}
+The object that's defined by \Tasks\ is the `tasks' object. This time there
+are four instances available for the one template (again `default') that was
+defined.
+
+\subsubsection{Available Options}
+This section only lists the options that can be used when defining an instance
+of the `default' template. The following subsections will give some examples
+of their usage.
+
+\begin{sourcecode}
+ \DeclareTemplateInterface{tasks}{default}{3}
+ {
+ % option : type = default
+ label : tokenlist = \alph*) ,
+ indent : length = 2.5em ,
+ label-format : tokenlist ,
+ label-width : length = 1em ,
+ label-offset : length = .3333em ,
+ after-item-skip : skip = 1ex plus 1ex minus 1ex
+ }
+\end{sourcecode}
+
+\subsubsection{Predefined Instances}
+This is rather brief this time:
+\begin{sourcecode}
+ % alphabetize: a) b) c)
+ \DeclareInstance{tasks}{alphabetize}{default}{}
+ % itemize
+ \DeclareInstance {tasks} {itemize} {default}
+ {
+ label-width = 1.125em ,
+ label = \labelitemi
+ }
+ % enumerate:
+ \DeclareInstance {tasks} {enumerate} {default}
+ { label = \arabic*. }
+\end{sourcecode}
+
+\clearpage
+\printbibliography
+
+\end{document}
Binary files old/doc/latex/tasks/tasks_en.pdf and new/doc/latex/tasks/tasks_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tasks/tasks_en.tex new/doc/latex/tasks/tasks_en.tex
--- old/doc/latex/tasks/tasks_en.tex 2016-05-04 23:01:14.000000000 +0200
+++ new/doc/latex/tasks/tasks_en.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,581 +0,0 @@
-% --------------------------------------------------------------------------
-% the TASKS package
-%
-% Horizontal columned lists.
-%
-% --------------------------------------------------------------------------
-% Clemens Niederberger
-% Web: https://github.com/cgnieder/tasks/
-% E-Mail: contact(a)mychemistry.eu
-% --------------------------------------------------------------------------
-% Copyright 2013-2014 Clemens Niederberger
-%
-% This work may be distributed and/or modified under the
-% conditions of the LaTeX Project Public License, either version 1.3
-% of this license or (at your option) any later version.
-% The latest version of this license is in
-% http://www.latex-project.org/lppl.txt
-% and version 1.3 or later is part of all distributions of LaTeX
-% version 2005/12/01 or later.
-%
-% This work has the LPPL maintenance status `maintained'.
-%
-% The Current Maintainer of this work is Clemens Niederberger.
-% --------------------------------------------------------------------------
-% If you have any ideas, questions, suggestions or bugs to report, please
-% feel free to contact me.
-% --------------------------------------------------------------------------
-\documentclass[load-preamble+]{cnltx-doc}
-\usepackage{tasks}
-
-\setcnltx{
- package = {tasks} ,
- authors = Clemens Niederberger ,
- email = {contact(a)mychemistry.eu} ,
- url = {https://github.com/cgnieder/tasks/} ,
- info = {create horizontal columned lists} ,
- add-cmds = {
- checkedchoicebox ,
- choicebox,
- NewTasks,
- settasks,
- startnewitemline ,
- task
- } ,
- add-silent-cmds = {
- choice, correct,
- DeclareInstance, DeclareTemplateInterface,
- leftthumbsup,
- sample, Sample
- }
-}
-
-\BeforeBeginEnvironment{example}{\vspace{\baselineskip}}
-\AfterEndEnvironment{example}{\vspace{\baselineskip}}
-\BeforeBeginEnvironment{sourcecode}{\vspace{\baselineskip}}
-\AfterEndEnvironment{sourcecode}{\vspace{\baselineskip}}
-
-\newpackagename\ExSheets{ExSheets}
-\newpackagename\ExSheetslistings{ExSheets-listings}
-\newpackagename\cntformats{cntformats}
-\newpackagename\Tasks{tasks}
-
-% ----------------------------------------------------------------------------
-% other packages, bibliography, index
-\usepackage{xcoffins,tikz,wasysym,enumitem,booktabs,siunitx}
-\usepackage[accsupp]{acro}
-\DeclareAcronym{id}{
- short = id ,
- long = Identifier ,
- format = \scshape ,
- pdfstring = ID ,
- accsupp = ID
-}
-
-\usepackage{filecontents}
-\usepackage{csquotes}
-
-
-
-% ----------------------------------------------------------------------------
-% example definitions that have to be done in the preamble:
-\usepackage{exsheets}
-\usepackage{dingbat}
-\NewTasks[style=multiplechoice]{multiplechoice}[\choice](3)
-\newcommand*\correct{\PrintSolutionsTF{\checkedchoicebox}{\choicebox}}
-
-
-\newcommand*\sample{This is some sample text we will use to create a somewhat
- longer text spanning a few lines.}
-\newcommand*\Sample{\sample\ \sample\par\sample}
-
-\begin{document}
-
-\section{Motivation}
-Originally \Tasks\ has been an integral part of the
-\ExSheets\changedversion{0.7} package. However, users told me that it indeed
-could be useful to have it as a stand-alone package not having to load the
-whole \ExSheets\ beast just for having the \env{tasks} environment available.
-Since I agree with this the environment has been extracted into a package if
-its own, \Tasks. Since then \Tasks{} has been distributed as a package of its
-own but as part of the \ExSheets{} bundle\changedversion{0.10}. With v0.10 I
-decided to make it a completely independent package. So the relation to
-\ExSheets{} only is a historical one.
-
-The reason for the \env{tasks} environment is an unwritten agreement in German
-maths textbooks (exspecially in (junior) high school textbooks) to organize
-exercises in columns counting horizontally rather than vertically. That is
-what \code{tasks} primarily is for. If you don't need this feature you're
-better off using traditional \LaTeX{} lists and the \pkg{enumitem} package for
-customization.
-
-\section{License and Requirements}\label{sec:license}
-\license
-
-\Tasks\ requires the \bnd{l3kernel}~\cite{bnd:l3kernel} bundle,
-\needpackage{xparse}, \pkg{xtemplate} and \needpackage{l3keys2e} which are
-part of the \bnd{l3packages}~\cite{bnd:l3packages} bundle,
-\pkg{epic}~\cite{pkg:epic}, \pkg{cntformats}~\cite{pkg:cntformats}, and
-\pkg{environ}~\cite{pkg:environ}.
-
-
-\section{How it works}
-\subsection{The Basics}
-The \env{tasks} environment is similar to a list like \env{enumerate} but not
-the same. Here are some of the differences:
-\begin{itemize}
- \item A first difference: there is no pagebreak possible inside an item but
- only between items.
- \item A second difference: the enumeration default is a), b), c) \ldots
- \item A third difference: the body of the \env{tasks} environment is split
- at \emph{every} occurrence of the item separator. For this reason the
- default separator is not \cs*{item} but \cs{task} so it is unique to this
- environment only. This directly leads to\ldots
- \item \ldots{} a fourth difference: the \env{tasks} environment cannot be
- nested. You can, however, use an \env*{itemize} environment or another
- \enquote{real} list in it.
- \item A fifth difference: verbatim material cannot be used in it. You'll
- have to use \cs*{string}, \cs*{texttt} or \cs*{detokenize}. If this
- won't suffice then don't use \env{tasks}.
-% \item A sixth difference: %footnotes
-\end{itemize}
-
-\begin{environments}
- \environment{tasks}[\oarg{options}\darg{num of columns}]
- List like environment where the single items are introduced with
- \cs{task}.
-\end{environments}
-Let's see an example:
-\begin{example}
- % \Sample is defined to contain some sample text:
- % \def\sample{This is some sample text we will use to create a somewhat
- % longer text spanning a few lines.}
- % \def\Sample{\sample\ \sample\par\sample}
- Some text before the list.
- \begin{tasks}
- \task \Sample
- \task \Sample
- \task \Sample
- \end{tasks}
- And also some text after it.
-\end{example}
-
-The environment takes the optional argument \darg{num of columns} with which
-the number of columns used by the environment is specified.
-\begin{example}
- \begin{tasks}(2)
- \task \Sample
- \task \sample\ \sample
- \task \sample
- \task \Sample
- \task \sample\par\sample
- \end{tasks}
-\end{example}
-
-\subsection{Items Spanning More Than One Column}
-Sometimes it may come in handy if an item is allowed to span more than one
-column. \Tasks\sinceversion{0.10} supports items using the remaining space by
-adding an optional\label{optional-star} star to \cs{task}:
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task* \sample
- \task* \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-\Tasks\sinceversion{0.10} also supports items that span \emph{all} columns in
-any case by adding an optional bang\label{optional-bang} to \cs{task}.
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task! \sample
- \task! \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-The optional star has itself an optional argument with parentheses where you
-can specify the number of columns the item is supposed to span:\label{debug}
-\begin{example}
- \settasks{debug}
- \begin{tasks}(4)
- \task the first
- \task the second
- \task the third
- \task the fourth
- \task*(3) the fifth item is way too long for this and needs three columns
- \task the sixth
- \task the seventh
- \task*(2) the eighth item is way too long for this and needs two columns
- \task the nineth
- \task the tenth
- \end{tasks}
-\end{example}
-If there are not enough columns left (say two columns but you said
-\cs{task}\sarg\Darg{3}) the argument is ignored and the maximum number of
-remaining columns is used (two in case of our example).
-
-Both optional star and optional bang can be combined with the optional
-argument for a custom label:
-\begin{example}
- \begin{tasks}(3)
- \task \sample
- \task* \sample
- \task*[(x)] \sample
- \task \sample
- \task \sample
- \end{tasks}
-\end{example}
-
-Forcing a new item line manually is also possible\sinceversion{0.9} using the
-following command:
-\begin{commands}
- \command{startnewitemline}
- Introduce a new line in a \env{tasks} environment.
-\end{commands}
-\begin{example}
- \begin{tasks}(4)
- \task the first
- \task the second
- \task the third
- \task the fourth
- \task \rlap{the fifth item is way too long for this so we start a new row}
- \startnewitemline
- \task the sixth
- \task the seventh
- \task \rlap{the eighth item also is too long} \startnewitemline
- \task the nineth
- \task the tenth
- \end{tasks}
-\end{example}
-
-While this works it also needs a bit of care since the width of the items
-doesn't change which means in order to use the full width you'd have to use
-trickery like \cs*{rlap} which then means the danger of the item text sticking
-into the margin\ldots
-
-\section{Available Options}\label{sec:tasks:options}
-
-The \Tasks{} package does not have any package options\changedversion{0.10}.
-
-The environment \env{tasks} has a number of options, though, namely the
-following ones that can be set using a setup command:
-\begin{commands}
- \command{settasks}[\marg{options}]
- Setup command for \Tasks.
-\end{commands}
-\begin{options}
- \keyval{style}{instance}\Default
- Choose the instance to be used. Read more on this in
- section~\ref{sec:tasks}.
- \keyval{counter-format}{counter specs}\Default{tsk[a])}
- \sinceversion{0.9}Sets a custom label. The letters \code{tsk} are
- replaced with the task-counter. An optional argument directly following
- these letters specifies the counter format: \code{1}: \cs*{arabic},
- \code{a}: \cs*{alph}, \code{A}: \cs*{Alph}, \code{r}: \cs*{roman} and
- \code{R}: \cs*{Roman}.
- \keyval{label-format}{code}\Default
- \changedversion{0.9}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the labels.
- \keyval{label}{code}\Default
- \changedversion{0.9}Overwrite the automatic label to a custom one.
- \keyval{label-width}{dim}\Default{1em}
- Sets the width of the item labels.
- \keyval{label-offset}{dim}\Default{.3333em}
- \sinceversion{0.7}Sets the offset, \ie, the distance between label and
- item.
- \keyval{item-format}{code}\Default
- \sinceversion{0.11}Can be used to apply a formatting like, \eg,
- \cs*{bfseries} to the items. This may be a macro accepting the item as
- mandatory argument.
- \keyval{item-indent}{dim}\Default{2.5em}
- \sinceversion{0.9a}The indent of an item, \ie, the horizontal space
- available for both label and label-offset. If
- \[
- \text{\code{indent}} =
- \text{\code{label-width}} + \text{\code{label-offset}}
- \]
- the label will align with the textblock above (if
- \keyis{label-align}{left} is set). Please see figure~\ref{fig:lengths}
- for a sketch of the available lengths and how they are set.
- \keyval{column-sep}{dim}\Default{0pt}
- \sinceversion{0.10}A horizontal length that is inserted between columns ot
- items.
- \keychoice{label-align}{left,right,center}\Default{left}
- \sinceversion{0.7}Determines how the labels are aligned within the
- label-box whose width is set with \option{label-width}.
- \keyval{before-skip}{skip}\Default{0pt}
- Sets the skip before the list.
- \keyval{after-skip}{skip}\Default{0pt}
- Sets the skip after the list.
- \keyval{after-item-skip}{skip}\Default{1ex plus 1ex minus 1ex}
- \sinceversion{0.9}This vertical skip is inserted between rows of items.
- \keybool{resume}\Default{false}
- The enumeration will resume from a previous \env{tasks} environment. In
- order to use this option properly you shouldn't mix different \env{tasks}
- environments that both count their items.
- \keybool{debug}\Default{false}
- \sinceversion{0.10}If set to true \cs*{fboxsep} is set to \code{0pt}
- inside the \env{tasks} environment and \cs*{fbox} is used to draw a frame
- around the label boxes and the item boxes.
-\end{options}
-
-\begin{figure}
- \centering
- \begin{tikzpicture}[every node/.style={font=\footnotesize},scale=.5]
- \coordinate (itemedge1) at (2,2) ;
- \coordinate (itemedge2) at (13,2) ;
- \draw
- (itemedge1) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
- \draw
- (itemedge1) ++(-.5,0) coordinate(labeledge1)
- -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
- \draw (itemedge1) ++(-2,0) -- ++(0,-2) ;
- \draw
- (itemedge2) -- ++(8,0) -- ++(0,-2) -- ++(-8,0) -- cycle ;
- \draw
- (itemedge2) ++(-.3,0) coordinate(labeledge2)
- -- ++(-1,0) --++ (0,-1) --++(1,0) --++(0,1) ;
- \draw (itemedge2) ++(-2,0) -- ++(0,-2) ;
- \draw[<->] (itemedge2) ++(-2,0) --node[above]{column sep} ++(-1,0) ;
- \draw[<->] (0,-.5) --node[below]{item indent} (2,-.5) ;
- \draw[<->] (2,-.5) --node[below]{item width} (10,-.5) ;
- \draw[<->] (labeledge1) ++(0,1) --node[above]{label width} ++(-1,0) ;
- \draw[<->] (labeledge1) --node[above]{item offset} ++(.5,0) ;
- \end{tikzpicture}
- \caption{A visual representation of the used lengths.}
- \label{fig:lengths}
-\end{figure}
-
-Now the same list as above but with three columns and a different label:
-\begin{example}
- \begin{tasks}[counter-format=(tsk[r]),label-width=4ex](2)
- \task \Sample
- \task \sample\ \sample
- \task \sample
- \task \Sample
- \task \sample\par\sample
- \end{tasks}
-\end{example}
-% \begin{tasks}[counter-format=(tsk[r]),label-width=4ex](3)
-% \task \Sample
-% \task \sample\ \sample
-% \task \sample
-% \task \Sample
-% \task \sample\par\sample
-% \end{tasks}
-
-Let's use it inside a question, \ie, inside \ExSheets' \env{question}
-environment:
-\begin{example}
- % since settings are local the following ones will be lost
- % outside this example;
- \settasks{
- counter-format = qu.tsk ,
- item-indent = 2em ,
- label-width = 2em ,
- label-offset = 0pt
- }
- \begin{question}[type=exam]{4}
- I have these two tasks for you. Shall we begin?
- \begin{tasks}(2)
- \task The first task: easy!
- \task The second task: even more so!
- \end{tasks}
- \end{question}
- \begin{solution}[print]
- Now, let's see\ldots\ ah, yes:
- \begin{tasks}
- \task This is the first solution. Told you it was easy.
- \task This is the second solution. And of course you knew that!
- \end{tasks}
- \end{solution}
-\end{example}
-
-Finally let's see what the \option{debug} option does (you could see it
-already on page~\pageref{debug}):
-\begin{example}
- \settasks{debug}
- \begin{tasks}(2)
- \task \Sample
- \task \Sample
- \end{tasks}
-\end{example}
-
-\section{Available Instances}\label{sec:tasks:instances}
-There are currently three additional instances for the \code{tasks} object
-available:
-\begin{description}
- \item[itemize] uses \cs*{labelitemi} as labels.
- \item[enumerate] enumerates the items with 1., 2., \ldots
- \item[multiplechoice] a --~well~-- `multiple choice' list.
-\end{description}
-\begin{example}
- \begin{tasks}[style=itemize](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
- \begin{tasks}[style=enumerate](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
- \begin{tasks}[style=multiplechoice](2)
- \task that's just how\ldots
- \task \ldots we expected
- \end{tasks}
-\end{example}
-
-\section{Custom Labels}
-If you want to change a single label inside a list, you can use the optional
-argument of \cs{task}. This will temporarily overwrite the default label.
-\begin{example}[side-by-side]
- \begin{tasks}[style=itemize]
- \task a standard item
- \task another one
- \task[+] a different one
- \task and another one
- \end{tasks}
-\end{example}
-
-\section{New Tasks}
-It is possible to add custom environments that work like the \code{tasks}
-environment.
-\begin{commands}
- \command{NewTasks}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
- Define environment \meta{name} that uses \meta{separator} to introduce a
- new item. Default for \meta{separator} is \cs{task}, default for
- \meta{cols} is \code{1}. The \meta{options} are the ones described in
- section~\ref{sec:tasks:options}.
- \command{RenewTasks}[\oarg{options}\marg{name}\oarg{separator}\darg{cols}]
- Renew environment previously defined with \cs{NewTasks}.
-\end{commands}
-The \env{tasks} environment is defined as follows:
-\begin{sourcecode}
- \NewTasks{tasks}
-\end{sourcecode}
-
-The separator does not have to be a control sequence:
-\begin{example}
- % preamble:
- % \usepackage{dingbat}
- \NewTasks[label=\footnotesize\leftthumbsup,label-width=1.3em]{done}[*]
- \begin{done}
- * First task
- * Second task
- \end{done}
-\end{example}
-Although this might seem handy or even nice I strongly advice against using
-something different than a command sequence. Remember that the items will be
-split at \emph{every} occurrence of the separator. So in order to use the
-separator (here for example for a starred variant of a command) within an item
-it has to be hidden in braces. This is avoided of you use a command sequence
-which even doesn't have to be defined.
-
-Please also keep in mind that the separator still has an optional star
-argument (see~\pageref{optional-star}), an optional bang argument and the
-standard optional argument. Using \code{*} will prevent the optional star
-argument.
-
-\begin{example}
- % preamble:
- % \usepackage{dingbat}
- \NewTasks[label=\footnotesize\leftthumbsup,label-width=1.3em]{done}[*]
- \begin{done}(3)
- * First task
- * Second task
- *! Third task spanning the full width available
- * Fourth task
- \end{done}
-\end{example}
-
-Let's say you want a \env*{multiplechoice} environment that has three columns
-in its default state. You could do something like this:
-\begin{example}
- % preamble:
- % \NewTasks[style=multiplechoice]{multiplechoice}[\choice](3)
- % \newcommand*\correct{\PrintSolutionsTF{\checkedchoicebox}{\choicebox}}
- %
- % \PrintSolutionsTF and the {question} environment are provided
- % by the ExSheets package
- \begin{question}
- \begin{multiplechoice}
- \choice First choice
- \choice Second choice
- \choice[\correct] Third choice
- \end{multiplechoice}
- \end{question}
- \begin{solution}[print]
- \begin{multiplechoice}
- \choice First choice
- \choice Second choice
- \choice[\correct] Third choice
- \end{multiplechoice}
- \end{solution}
-\end{example}
-
-The last example shows you two additional commands:
-\begin{commands}
- \command{choicebox}[\quad\choicebox]
- Print an empty square.
- \command{checkedchoicebox}[\quad\checkedchoicebox]
- Print a crossed-out square.
-\end{commands}
-
-
-\section{Styling \Tasks}
-Equivalent to the styling of \ExSheets\ \Tasks\ uses \pkg{xtemplate} to
-declare additional instances for the lists.
-
-\subsection{The \code{tasks} Object}\label{sec:tasks}
-The object that's defined by \Tasks\ is the `tasks' object. This time there
-are four instances available for the one template (again `default') that was
-defined.
-
-\subsubsection{Available Options}
-This section only lists the options that can be used when defining an instance
-of the `default' template. The following subsections will give some examples
-of their usage.
-
-\begin{sourcecode}
- \DeclareTemplateInterface{tasks}{default}{3}
- {
- % option : type = default
- enumerate : boolean = true ,
- label : tokenlist ,
- indent : length = 2.5em ,
- counter-format : tokenlist = tsk[a]) ,
- label-format : tokenlist ,
- label-width : length = 1em ,
- label-offset : length = .3333em ,
- after-item-skip : skip = 1ex plus 1ex minus 1ex
- }
-\end{sourcecode}
-
-\subsubsection{Predefined Instances}
-This is rather brief this time:
-\begin{sourcecode}
- % ALPHABETIZE: a) b) c)
- \DeclareInstance{tasks}{alphabetize}{default}{}
- % available when `load-tasks=true':
- % ITEMIZE:
- \DeclareInstance{tasks}{itemize}{default}
- {
- enumerate = false ,
- label-width = 1.125em
- }
- % ENUMERATE:
- \DeclareInstance{tasks}{enumerate}{default}
- { counter-format = tsk. }
- % MULTIPLECHOICE:
- \DeclareInstance{tasks}{multiplechoice}{default}
- {
- enumerate = false ,
- label = \choicebox ,
- }
-\end{sourcecode}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tasks.doc.tlpobj new/tlpkg/tlpobj/tasks.doc.tlpobj
--- old/tlpkg/tlpobj/tasks.doc.tlpobj 2019-02-28 04:06:46.000000000 +0100
+++ new/tlpkg/tlpobj/tasks.doc.tlpobj 2020-03-22 01:55:34.000000000 +0100
@@ -1,9 +1,9 @@
name tasks.doc
category Package
-revision 41851
+revision 54449
shortdesc doc files of tasks
relocated 1
-docfiles size=119
+docfiles size=120
RELOC/doc/latex/tasks/README
- RELOC/doc/latex/tasks/tasks_en.pdf
- RELOC/doc/latex/tasks/tasks_en.tex
+ RELOC/doc/latex/tasks/tasks-manual.pdf
+ RELOC/doc/latex/tasks/tasks-manual.tex
++++++ tasks.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tasks/tasks.cfg new/tex/latex/tasks/tasks.cfg
--- old/tex/latex/tasks/tasks.cfg 2016-05-04 23:01:14.000000000 +0200
+++ new/tex/latex/tasks/tasks.cfg 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% the TASKS package
%
-% Horizontal columned lists.
+% lists with columns filled horizontally
%
% --------------------------------------------------------------------------
% Clemens Niederberger
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013-2016 Clemens Niederberger
+% Copyright 2013--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,29 +25,5 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% further instances for the `tasks' environment
-\ProvidesFile{tasks.cfg}
- [%
- \csname c_tasks_date_tl\endcsname\space
- v\csname c_tasks_version_tl\endcsname\space
- tasks instances%
- ]
-
-% ITEMIZE:
-\DeclareInstance {tasks} {itemize} {default}
- {
- enumerate = false ,
- label-width = 1.125em
- }
-
-% ENUMERATE:
-\DeclareInstance {tasks} {enumerate} {default}
- { counter-format = tsk. }
-
-% MULTIPLECHOICE
-\DeclareInstance {tasks} {multiplechoice} {default}
- {
- enumerate = false ,
- label = \choicebox
- }
-
+%
+% fill this file with your custom definitions:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tasks/tasks.sty new/tex/latex/tasks/tasks.sty
--- old/tex/latex/tasks/tasks.sty 2016-08-15 00:00:01.000000000 +0200
+++ new/tex/latex/tasks/tasks.sty 2020-03-21 22:17:24.000000000 +0100
@@ -1,14 +1,14 @@
% --------------------------------------------------------------------------
% the TASKS package
%
-% Horizontal columned lists.
+% lists with columns filled horizontally
%
% --------------------------------------------------------------------------
% Clemens Niederberger
% Web: https://github.com/cgnieder/tasks/
% E-Mail: contact(a)mychemistry.eu
% --------------------------------------------------------------------------
-% Copyright 2013-2016 Clemens Niederberger
+% Copyright 2013--2020 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -25,63 +25,110 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-\RequirePackage { expl3 , xparse , epic , cntformats , xtemplate , environ }
+\RequirePackage {expl3,xparse,xtemplate}
\ExplSyntaxOn
-\tl_const:Nn \c_tasks_name_tl {tasks}
-\tl_const:Nn \c_tasks_date_tl {2016/08/13}
-\tl_const:Nn \c_tasks_version_tl {0.12}
-\tl_const:Nn \c_tasks_info_tl {Horizontal columned lists}
-
+\tl_const:Nn \c_tasks_date_tl {2020/03/21}
+\tl_const:Nn \c_tasks_version_major_number_tl {1}
+\tl_const:Nn \c_tasks_version_minor_number_tl {2}
+\tl_const:Nn \c_tasks_version_subrelease_tl {}
+\tl_const:Nx \c_tasks_version_number_tl
+ {
+ \c_tasks_version_major_number_tl .
+ \c_tasks_version_minor_number_tl
+ }
+\tl_const:Nx \c_tasks_version_tl
+ {
+ \c_tasks_version_number_tl
+ \c_tasks_version_subrelease_tl
+ }
+\tl_const:Nn \c_tasks_info_tl {lists~ with~ columns~ filled~ horizontally}
+
\ProvidesExplPackage
- {\c_tasks_name_tl}
+ {tasks}
{\c_tasks_date_tl}
{\c_tasks_version_tl}
- {\c_tasks_info_tl \c_space_tl (CN)}
+ {\c_tasks_info_tl}
% --------------------------------------------------------------------------
% variants of kernel functions:
-\cs_generate_variant:Nn \tl_if_eq:nnTF { V }
-\cs_generate_variant:Nn \tl_if_eq:nnT { V }
+\cs_generate_variant:Nn \tl_if_eq:nnTF {V}
+\cs_generate_variant:Nn \tl_if_eq:nnT {V}
+\cs_generate_variant:Nn \coffin_attach:NnnNnnnn {NnnNx}
+\cs_generate_variant:Nn \tl_set_rescan:Nnn {NnV}
+\cs_generate_variant:Nn \tl_set:Nn {cV}
+\cs_generate_variant:Nn \hbox_set:Nn {NV}
+\cs_generate_variant:Nn \msg_warning:nnnn {nnV,nnnx}
+\cs_generate_variant:Nn \tl_replace_once:Nnn {Nne}
+
+% --------------------------------------------------------------------------
+\msg_new:nnn {tasks} {width-too-small}
+ {
+ The~ width~ of~ `#1'~ is~ too~ small~ \msg_line_context: .~
+ Please~ set~ it~ at~ least~ to~ #2 pt.
+ }
+
+\msg_new:nnn {tasks} {no-item}
+ {
+ You've~ placed \\ \\
+ #1 \\ \\
+ before~ the~ first~ #2~ \msg_line_context: .~ I~ will~ throw~ it~ away~
+ and~ ignore~ it~ for~ the~ rest~ of~ the~ list.
+ }
+
+\msg_new:nnn {tasks} {deprecated}
+ {
+ You've~ tried~ setting~ #1~ `#2'~ \msg_line_context: .~ However,~
+ #1~ `#2'~ is~ deprecated.~
+ \tl_if_blank:nF {#3} {Please~ use~ #1~ `#3'~ instead.~}
+ Refer~ to~ the~ manual~ for~ details.
+ }
+
+% --------------------------------------------------------------------------
+\cs_new_protected:Npn \tasks_deprecated:NN #1#2
+ {
+ \cs_undefine:N #1
+ \cs_new:Npn #1
+ { \msg_warning:nnnnn {tasks} {deprecated} {command} {#1} {#2} #2 }
+ }
% --------------------------------------------------------------------------
% variables:
\seq_new:N \l__tasks_seq
-\int_new:N \l__tasks_depth_int
-\int_new:N \g__tasks_int
\int_new:N \g__tasks_total_items_int
\int_new:N \l__tasks_columns_int
-\int_new:N \l__tasks_rows_int
+\int_new:N \g__tasks_rows_int
\int_new:N \g__tasks_current_col_num_int
\int_new:N \g__tasks_current_row_num_int
\int_new:N \l__tasks_item_columns_int
+\int_new:N \g__tasks_env_int
+\int_new:N \l__tasks_start_int
-\bool_new:N \l__tasks_enumerate_bool
\bool_new:N \l__tasks_resume_bool
\bool_new:N \l__tasks_load_tasks_bool
\bool_new:N \l__tasks_label_width_bool
\bool_new:N \l__tasks_item_indent_bool
\bool_new:N \l__tasks_label_offset_bool
\bool_new:N \l__tasks_custom_label_bool
+\bool_new:N \l__tasks_custom_label_format_bool
\bool_new:N \l__tasks_custom_after_item_skip_bool
\bool_new:N \l__tasks_debug_bool
\bool_new:N \l__tasks_item_full_line_bool
\bool_new:N \l__tasks_item_rest_of_line_bool
+\bool_new:N \l__tasks_measuring_bool
\tl_new:N \l__tasks_instance_tl
\tl_new:N \l__tasks_label_tl
\tl_new:N \l__tasks_custom_label_tl
-\tl_new:N \l__tasks_label_pattern_tl
-\tl_new:N \l__tasks_custom_label_pattern_tl
\tl_new:N \l__tasks_label_format_tl
\tl_new:N \l__tasks_custom_label_format_tl
+\tl_new:N \l__tasks_counter_tl
\tl_new:N \l__tasks_item_format_tl
\tl_new:N \l__tasks_custom_item_format_tl
\tl_new:N \l__tasks_item_fill_left_tl
\tl_new:N \l__tasks_item_fill_right_tl
\tl_new:N \l__tasks_label_align_tl
-% \tl_new:N \task
\tl_new:N \l__tasks_item_tl
\tl_new:N \l__tasks_tmp_label_tl
@@ -93,6 +140,9 @@
\dim_new:N \l__tasks_label_offset_dim
\dim_new:N \l__tasks_label_default_offset_dim
\dim_new:N \l__tasks_column_sep_dim
+\dim_new:N \l__tasks_correction_dim
+
+\dim_new:N \l__tasks_full_width_dim
\skip_new:N \l__tasks_after_item_skip
\skip_new:N \l__tasks_custom_after_item_skip
@@ -102,14 +152,15 @@
\coffin_new:N \l__tasks_item_coffin
\coffin_new:N \l__tasks_label_coffin
-\NewCounterPattern* [ tasks ] { task } { tsk }
-\ReadCounterFrom [ tasks ] { task } \g__tasks_int
+\newcounter {task}
% temporary variables:
\int_new:N \l__tasks_tmpa_int
\int_new:N \l__tasks_tmpb_int
\tl_new:N \l__tasks_tmpa_tl
\coffin_new:N \l__tasks_tmpa_coffin
+\box_new:N \l__tasks_tmpa_box
+\bool_new:N \l__tasks_tmpa_bool
\cs_new:Npn \__tasks_debug:n #1
{
@@ -118,37 +169,45 @@
{ \use:n {#1} }
}
-% --------------------------------------------------------------------------
-% collect the tasks:
-\cs_new_protected:Npn \__tasks_collect_tasks:nww #1#2 \end #3
+\prg_new_conditional:Npnn \tasks_if_measuring: {p,T,F,TF}
{
- \tl_put_right:Nn \l__tasks_body_tl {#1}
- \end {#3}
- \tl_if_eq:nnF {#1} {#3}
- { \__tasks_collect_tasks:nww {#1} }
+ \bool_if:NTF \l__tasks_measuring_bool
+ { \prg_return_true: }
+ { \prg_return_false: }
}
+\DeclareExpandableDocumentCommand \tasksifmeasuringTF {+m+m}
+ { \tasks_if_measuring:TF {#1} {#2} }
+
+\DeclareExpandableDocumentCommand \tasksifmeasuringT {+m}
+ { \tasks_if_measuring:T {#1} }
+
+\DeclareExpandableDocumentCommand \tasksifmeasuringF {+m}
+ { \tasks_if_measuring:F {#1} }
+
+% --------------------------------------------------------------------------
% #1: instance
% #2: number of columns
% #3: item separator
% #4: environment body
-\cs_new_protected:Npn \__tasks:nnnn #1#2#3#4
+\cs_new_protected:Npn \tasks_environment:nnnn #1#2#3#4
{
\bool_if:NT \l__tasks_debug_bool { \dim_set:Nn \fboxsep {0pt} }
\seq_set_split:Nnn \l__tasks_seq {#3} {#4}
% remove the first (empty) item:
\seq_pop_left:NN \l__tasks_seq \l__tasks_tmpa_tl
- \tl_if_blank:VF \l__tasks_tmpa_tl { \@noitemerr }
+ \tl_if_blank:VF \l__tasks_tmpa_tl
+ { \msg_warning:nnVn {tasks}{no-item} \l__tasks_tmpa_tl {#3} }
\int_gset:Nn \g__tasks_total_items_int
{ \seq_count:N \l__tasks_seq }
\UseInstance {tasks} {#1}
{ \g__tasks_total_items_int }
{#2}
- { \l__tasks_custom_label_pattern_tl }
+ { }
% just to be sure:
\seq_clear:N \l__tasks_seq
}
-\cs_generate_variant:Nn \__tasks:nnnn { VnnV }
+\cs_generate_variant:Nn \tasks_environment:nnnn {V}
% #1: label
% #2: item format
@@ -169,17 +228,31 @@
\dim_set:Nn \l__tasks_item_width_dim
{
\bool_if:NTF \l__tasks_item_full_line_bool
- { \linewidth }
+ { \l__tasks_full_width_dim }
{
(
- \linewidth
+ \l__tasks_full_width_dim
- \l__tasks_columns_int \l__tasks_column_sep_dim
+ \l__tasks_column_sep_dim
) / \l__tasks_columns_int
}
- - \l__tasks_depth_int \l__tasks_item_indent_dim
+ - \l__tasks_item_indent_dim
\bool_if:NT \l__tasks_debug_bool { -2\fboxrule }
}
+ \dim_set:Nn \l_tmpa_dim
+ {
+ \l__tasks_columns_int \l__tasks_item_width_dim
+ + \l__tasks_columns_int \l__tasks_column_sep_dim
+ - \l__tasks_column_sep_dim
+ + \l__tasks_columns_int \l__tasks_item_indent_dim
+ \bool_if:NT \l__tasks_debug_bool { +\l__tasks_columns_int\fboxrule }
+ \bool_if:NT \l__tasks_debug_bool { +\l__tasks_columns_int\fboxrule }
+ }
+ \dim_compare:nNnT
+ { \l_tmpa_dim }
+ >
+ { \l__tasks_full_width_dim }
+ { \dim_sub:Nn \l__tasks_item_width_dim { \l__tasks_correction_dim } }
\__tasks_gset_rows_num:NN
\g__tasks_total_items_int
\l__tasks_columns_int
@@ -188,35 +261,33 @@
\int_compare:nNnT
{ \g__tasks_current_col_num_int } > { \l__tasks_columns_int }
{
- \int_gset:Nn \g__tasks_current_col_num_int { 1 }
- \int_incr:N \g__tasks_current_row_num_int
+ \int_gset:Nn \g__tasks_current_col_num_int {1}
+ \int_gincr:N \g__tasks_current_row_num_int
}
+ % if the next item fills rest of line:
\bool_if:NT \l__tasks_item_rest_of_line_bool
{
+ % number of remaining columns:
\int_set:Nn \l__tasks_tmpa_int
{ \l__tasks_columns_int - \g__tasks_current_col_num_int + 1 }
- \int_compare:nNnTF { \l__tasks_item_columns_int } = { 0 }
- {
- \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int - 1 } % 8
- }
+ % check requested column number and adjust:
+ \int_compare:nNnF { \l__tasks_item_columns_int } = {0}
{
\int_compare:nNnTF
{ \l__tasks_tmpa_int } > { \l__tasks_item_columns_int }
{ \int_set_eq:NN \l__tasks_tmpa_int \l__tasks_item_columns_int }
{ \int_zero:N \l__tasks_item_columns_int }
- \bool_if:nT
- {
- \l__tasks_item_rest_of_line_bool &&
- !\int_compare_p:nNn { \l__tasks_item_columns_int} = { 0 }
- }
+ \bool_lazy_and:nnT
+ { \l__tasks_item_rest_of_line_bool }
+ { !\int_compare_p:nNn { \l__tasks_item_columns_int } = {0} }
{
\int_gadd:Nn \g__tasks_current_col_num_int
- { \l__tasks_item_columns_int -1 }
+ { \l__tasks_item_columns_int -1 }
\int_gadd:Nn \g__tasks_total_items_int
- { \l__tasks_item_columns_int -1 }
+ { \l__tasks_item_columns_int - 1 }
}
- \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int -1 }
}
+ \int_set:Nn \l__tasks_tmpb_int { \l__tasks_tmpa_int - 1 }
\dim_set:Nn \l__tasks_item_width_dim
{
\l__tasks_tmpa_int \l__tasks_item_width_dim
@@ -231,7 +302,10 @@
{
\vcoffin_set:Nnn \l__tasks_tmpa_coffin
{ \l__tasks_item_width_dim }
- { \__tasks_setup: #2 {#3} \strut }
+ {
+ \__tasks_setup:
+ #2 { #3 \mode_if_horizontal:T { \strut } }
+ }
\__tasks_debug:n
{
\coffin_typeset:Nnnnn \l__tasks_tmpa_coffin
@@ -243,14 +317,15 @@
{
\vcoffin_set:Nnn \l__tasks_tmpa_coffin
{
- \l__tasks_label_width_dim
- \bool_if:NT \l__tasks_debug_bool {-2\fboxrule }
+ \dim_abs:n { \l__tasks_label_width_dim }
+ \bool_if:NT \l__tasks_debug_bool {+2\fboxrule }
}
{
\noindent
- \tl_use:N \l__tasks_item_fill_left_tl
- \strut #1
- \tl_use:N \l__tasks_item_fill_right_tl
+ \l__tasks_item_fill_left_tl
+ #1
+ \l__tasks_item_fill_right_tl
+ \strut
}
\__tasks_debug:n
{
@@ -260,50 +335,49 @@
}
% attach the label box at the left of the item box, shifted by
% \l__tasks_label_offset_dim :
- \coffin_attach:NnnNnnnn
- \l__tasks_item_coffin {l} {T}
- \l__tasks_label_coffin {l} {T}
- {
- \dim_compare:nNnTF
- { \l__tasks_item_indent_dim }
- <
- { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
+ \dim_compare:nNnTF { \l__tasks_label_width_dim } < {0pt}
+ {
+ \coffin_attach:NnnNnnnn
+ \l__tasks_item_coffin {l} {T}
+ \l__tasks_label_coffin {r} {T}
+ { - \l__tasks_label_offset_dim }
{0pt}
- { - \l__tasks_label_width_dim - \l__tasks_label_offset_dim }
- } { 0pt }
+ }
+ {
+ \coffin_attach:NnnNnnnn
+ \l__tasks_item_coffin {l} {T}
+ \l__tasks_label_coffin {l} {T}
+ {
+ - \l__tasks_label_offset_dim - \l__tasks_label_width_dim
+ \bool_if:NT \l__tasks_debug_bool {-2\fboxrule }
+ }
+ {0pt}
+ }
% when a new row starts enter vertical mode:
- \int_compare:nNnT { \g__tasks_current_col_num_int } = { 1 }
+ \int_compare:nNnT { \g__tasks_current_col_num_int } = {1}
{ \skip_vertical:N \c_zero_skip }
% skip horizontally by \l__tasks_item_indent_dim
\noindent
\skip_horizontal:N \l__tasks_item_indent_dim
% typeset the item (with the attached label protruding to the left):
- \coffin_typeset:Nnnnn \l__tasks_item_coffin
- {l}
- {T}
- {0pt}
- {0pt}
- \bool_if:nT
- {
- \l__tasks_item_full_line_bool ||
- (
- \l__tasks_item_rest_of_line_bool &&
- \int_compare_p:nNn { \l__tasks_item_columns_int } = { 0 }
- )
+ \coffin_typeset:Nnnnn \l__tasks_item_coffin {l} {T} {0pt} {0pt}
+ \bool_lazy_or:nnT
+ { \l__tasks_item_full_line_bool }
+ {
+ \bool_lazy_and_p:nn
+ { \l__tasks_item_rest_of_line_bool }
+ { \int_compare_p:nNn { \l__tasks_item_columns_int } = {0} }
}
{ \tasks_new_row: }
- % are we between items in a row? The skip by \l__tasks_column_sep_dim :
+ % are we between items in a row? Then skip by \l__tasks_column_sep_dim :
\int_compare:nNnT
{ \g__tasks_current_col_num_int } < { \l__tasks_columns_int }
{ \skip_horizontal:N \l__tasks_column_sep_dim }
% if we ended a row and a new row is still to come skip vertically by
% \l__tasks_after_item_skip :
- \bool_if:nT
- {
- ( \int_compare_p:nNn { \g__tasks_current_col_num_int } = { \l__tasks_columns_int } )
- &&
- ( \int_compare_p:n { \g__tasks_current_row_num_int != \l__tasks_rows_int } )
- }
+ \bool_lazy_and:nnT
+ { \int_compare_p:nNn { \g__tasks_current_col_num_int } = { \l__tasks_columns_int } }
+ { \int_compare_p:n { \g__tasks_current_row_num_int != \g__tasks_rows_int } }
{ \skip_vertical:N \l__tasks_after_item_skip }
% clean up:
\coffin_clear:N \l__tasks_item_coffin
@@ -312,35 +386,23 @@
\bool_set_false:N \l__tasks_item_full_line_bool
\bool_set_false:N \l__tasks_item_rest_of_line_bool
}
-\cs_generate_variant:Nn \__tasks_task:nnn { VVV }
+\cs_generate_variant:Nn \__tasks_task:nnn {VVV}
\cs_new_protected:Npn \__tasks_setup:
{
- \dim_set:Nn \parskip { 0pt }
- \skip_set:Nn \parfillskip { 0pt plus 1fil }
+ \dim_set:Nn \parskip {0pt}
+ \skip_set:Nn \parfillskip {0pt plus 1fil}
\dim_set_eq:NN \parskip \parsep
\dim_set_eq:NN \parindent \listparindent
\noindent
- \dim_compare:nNnT
- { \l__tasks_item_indent_dim }
- <
- { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- {
- \skip_horizontal:n
- {
- \l__tasks_label_offset_dim
- + \l__tasks_label_width_dim
- - \l__tasks_item_indent_dim
- }
- }
\strut
}
\cs_new_protected:Npn \__tasks_gset_rows_num:NN #1#2
{
- \int_gset:Nn \l__tasks_rows_int { \int_div_truncate:nn {#1} {#2} }
- \int_compare:nNnT { \int_mod:nn {#1} {#2} } > { 0 }
- { \int_gincr:N \l__tasks_rows_int }
+ \int_gset:Nn \g__tasks_rows_int { \int_div_truncate:nn {#1} {#2} }
+ \int_compare:nNnT { \int_mod:nn {#1} {#2} } > {0}
+ { \int_gincr:N \g__tasks_rows_int }
}
\cs_new_protected:Npn \__tasks_label_align:n #1
@@ -349,28 +411,27 @@
{
{left}
{
- \tl_clear:N \l__tasks_item_fill_left_tl
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_clear:N \l__tasks_item_fill_left_tl
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
{right}
{
- \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfill
- \tl_clear:N \l__tasks_item_fill_right_tl
+ \tl_set:Nn \l__tasks_item_fill_left_tl {\hfill}
+ \tl_clear:N \l__tasks_item_fill_right_tl
}
{center}
{
- \tl_set_eq:NN \l__tasks_item_fill_left_tl \hfill
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_set:Nn \l__tasks_item_fill_left_tl {\hfill}
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
}
{
- \tl_clear:N \l__tasks_item_fill_left_tl
- \tl_set_eq:NN \l__tasks_item_fill_right_tl \hfill
+ \tl_clear:N \l__tasks_item_fill_left_tl
+ \tl_set:Nn \l__tasks_item_fill_right_tl {\hfill}
}
}
-\cs_generate_variant:Nn \__tasks_label_align:n { V }
-\__tasks_label_align:n {left}
-
+\cs_generate_variant:Nn \__tasks_label_align:n {V}
+
% --------------------------------------------------------------------------
% the `tasks' object:
% #1: number of items
@@ -380,15 +441,13 @@
% the `default' template interface:
\DeclareTemplateInterface {tasks} {default} {3}
{
- enumerate : boolean = true ,
- label : tokenlist ,
- indent : length = 2.5em ,
- counter-format : tokenlist = tsk[a]) ,
- label-format : tokenlist ,
- label-width : length = 1em ,
- label-offset : length = .3333em ,
- item-format : tokenlist ,
- after-item-skip : skip = 1ex plus 1ex minus 1ex
+ label : tokenlist = \alph*) ,
+ indent : length = 2.5em ,
+ label-format : tokenlist ,
+ label-width : length = 11pt ,
+ label-offset : length = .3333em ,
+ item-format : tokenlist ,
+ after-item-skip : skip = 1ex plus 1ex minus 1ex
}
% in the next three commands we want a really unlikely to occur marker; for
@@ -400,10 +459,8 @@
% the `default' template code:
\DeclareTemplateCode {tasks} {default} {3}
{
- enumerate = \l__tasks_enumerate_bool ,
label = \l__tasks_label_tl ,
indent = \l__tasks_item_default_indent_dim ,
- counter-format = \l__tasks_label_pattern_tl ,
label-format = \l__tasks_label_format_tl ,
label-width = \l__tasks_label_default_width_dim ,
label-offset = \l__tasks_label_default_offset_dim ,
@@ -430,41 +487,24 @@
\l__tasks_label_offset_dim
\l__tasks_label_default_offset_dim
}
- % \dim_compare:nNnT
- % { \l__tasks_item_indent_dim }
- % <
- % { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- % {
- % \dim_set:Nn \l__tasks_item_indent_dim
- % { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
- % }
\bool_if:NT \l__tasks_custom_after_item_skip_bool
{
\skip_set_eq:NN
\l__tasks_after_item_skip
\l__tasks_custom_after_item_skip
}
- \bool_if:NT \l__tasks_custom_label_bool
- {
- \tl_set_eq:NN
- \l__tasks_label_tl
- \l__tasks_custom_label_tl
- \bool_set_false:N \l__tasks_enumerate_bool
- }
\__tasks_label_align:V \l__tasks_label_align_tl
% need this for enumerate list:
- \bool_if:nT { !\l__tasks_resume_bool && \l__tasks_enumerate_bool }
- { \int_gzero:N \g__tasks_int }
+ \bool_if:NF \l__tasks_resume_bool
+ {
+ \setcounter
+ { \l__tasks_counter_tl }
+ { \int_eval:n { \l__tasks_start_int -1 } }
+ }
\int_set:Nn \l__tasks_columns_int {#2}
% set all the items in their own coffins and join with the ground:
\int_gzero:N \g__tasks_current_col_num_int
- \int_set:Nn \g__tasks_current_row_num_int {1}
- \tl_if_blank:VF \l__tasks_custom_label_pattern_tl
- {
- \tl_set_eq:NN
- \l__tasks_label_pattern_tl
- \l__tasks_custom_label_pattern_tl
- }
+ \int_gset:Nn \g__tasks_current_row_num_int {1}
\tl_if_blank:VF \l__tasks_custom_label_format_tl
{
\tl_set_eq:NN
@@ -477,27 +517,55 @@
\l__tasks_item_format_tl
\l__tasks_custom_item_format_tl
}
+ % prepare counter according to given format:
+ \tl_set:Nx \l__tasks_tmpa_tl
+ {
+ \bool_if:NTF \l__tasks_custom_label_bool
+ { \tl_to_str:V \l__tasks_custom_label_tl }
+ { \tl_to_str:V \l__tasks_label_tl }
+ }
+ \bool_set_false:N \l__tasks_tmpa_bool
+ \tl_if_in:NnT \l__tasks_tmpa_tl {*}
+ {
+ \tl_replace_once:Nne \l__tasks_tmpa_tl {*} {{ \l__tasks_counter_tl }}
+ \bool_set_true:N \l__tasks_tmpa_bool
+ }
+ \tl_set_rescan:NnV \l__tasks_tmpa_tl {} \l__tasks_tmpa_tl
+ \bool_if:NT \l__tasks_tmpa_bool
+ { \tl_set:cV { the \l__tasks_counter_tl } \l__tasks_tmpa_tl }
+ \dim_compare:nNnT
+ { \l__tasks_item_indent_dim }
+ <
+ { \l__tasks_label_offset_dim + \l__tasks_label_width_dim }
+ {
+ \msg_warning:nnnx {tasks}
+ {width-too-small}
+ {item-indent}
+ { \dim_to_decimal:n { \l__tasks_label_offset_dim + \l__tasks_label_width_dim } }
+ }
+ % do the tasks:
\seq_map_inline:Nn \l__tasks_seq
{
\__tasks_read_item:www ##1 \q_stop
- \bool_if:NTF \l__tasks_enumerate_bool
- {
- \tl_if_eq:VnT \l__tasks_tmp_label_tl { $tasks$default$label$ }
- {
- \int_gincr:N \g__tasks_int
- \SaveCounterPatternFrom [tasks]
- \l__tasks_tmpa_tl
- \l__tasks_label_tl
- \l__tasks_label_pattern_tl
- \cs_gset:Npx \@currentlabel { \l__tasks_label_tl }
- }
- }
- {
- \tl_if_blank:VT \l__tasks_label_tl
- { \tl_set_eq:NN \l__tasks_label_tl \labelitemi }
+ \refstepcounter { \l__tasks_counter_tl }
+ \tl_set:Nx \l__tasks_label_tl { { \exp_not:V \l__tasks_tmpa_tl } }
+ \bool_if:NTF \l__tasks_custom_label_format_bool
+ { \tl_put_left:NV \l__tasks_label_tl \l__tasks_custom_label_format_tl }
+ { \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl }
+ % check if the label width is big enough:
+ \bool_set_true:N \l__tasks_measuring_bool
+ \hbox_set:NV \l__tasks_tmpa_box \l__tasks_label_tl
+ \dim_compare:nNnT
+ { \box_wd:N \l__tasks_tmpa_box }
+ >
+ { \l__tasks_label_width_dim }
+ {
+ \msg_warning:nnnx {tasks}
+ {width-too-small}
+ {label-width}
+ { \dim_to_decimal:n { \box_wd:N \l__tasks_tmpa_box } }
}
- \tl_put_left:NV \l__tasks_label_tl \l__tasks_label_format_tl
- % \tl_put_left:NV \l__tasks_item_tl \l__tasks_item_format_tl
+ \bool_set_false:N \l__tasks_measuring_bool
\tl_if_eq:VnTF \l__tasks_tmp_label_tl { $tasks$default$label$ }
{
\__tasks_task:VVV
@@ -517,13 +585,13 @@
\cs_new_protected:Npn \__tasks_read_item:www
{
- \peek_meaning_remove:NTF !
+ \peek_charcode_remove:NTF !
{
\bool_set_true:N \l__tasks_item_full_line_bool
\__tasks_read_item_aux:ww
}
{
- \peek_meaning_remove:NTF *
+ \peek_charcode_remove:NTF *
{
\bool_set_true:N \l__tasks_item_rest_of_line_bool
\__tasks_read_item_rest_of_line:ww
@@ -554,109 +622,72 @@
\cs_new_protected:Npn \__tasks_read_item_aux_ii:ww [#1]#2 \q_stop
{
- \tl_set:Nn \l__tasks_tmp_label_tl {#1}
- \tl_if_eq:nnF { #1 } { $tasks$default$label$ }
- { \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl }
+ \tl_if_eq:nnTF {#1} {$tasks$default$label$}
+ { \tl_set:Nn \l__tasks_tmp_label_tl {#1} }
+ {
+ \tl_set:Nn \l__tasks_tmp_label_tl {{#1}}
+ \tl_put_left:NV \l__tasks_tmp_label_tl \l__tasks_label_format_tl
+ }
\tl_set:Nx \l__tasks_item_tl { \tl_trim_spaces:n {#2} }
}
\__tasks_restore_dollar:
% --------------------------------------------------------------------------
-% choice box:
-\bool_new:N \l__tasks_choice_checked_bool
-\dim_new:N \l__tasks_choice_width_dim
-\dim_set:Nn \l__tasks_choice_width_dim { 1.25ex }
-\dim_new:N \l__tasks_choice_linewidth_dim
-\dim_set:Nn \l__tasks_choice_linewidth_dim { .3pt }
-\dim_new:N \l__tasks_choice_checkwidth_dim
-\dim_set:Nn \l__tasks_choice_checkwidth_dim { .5pt }
-\dim_new:N \l__tasks_choice_raise_dim
-\dim_set:Nn \l__tasks_choice_raise_dim { .1ex }
-
-\cs_new_protected:Npn \tasks_choice:
- {
- \leavevmode
- \group_begin:
- \bool_set_false:N \l__tasks_choice_checked_bool
- \box_move_up:nn
- { \l__tasks_choice_raise_dim }
- { \hbox:n { \__tasks_choice: } }
- \group_end:
- }
-
-\cs_new_protected:Npn \tasks_choice_checked:
- {
- \leavevmode
- \group_begin:
- \bool_set_true:N \l__tasks_choice_checked_bool
- \box_move_up:nn
- { \l__tasks_choice_raise_dim }
- { \hbox:n { \__tasks_choice: } }
- \group_end:
- }
-
-\cs_new_protected:Npn \__tasks_choice:
- {%
- \dim_set:Nn \unitlength { .1\l__tasks_choice_width_dim }
- \begin{picture}(10,0)
- \linethickness \l__tasks_choice_linewidth_dim
- \drawline(0,0)(0,10)(10,10)(10,0)(0,0)
- \linethickness \l__tasks_choice_checkwidth_dim
- \bool_if:NT \l__tasks_choice_checked_bool
- {
- \drawline(2,2)(8,8)
- \drawline(2,8)(8,2)
- }
- \end{picture}%
- }
-
-\providecommand* \choicebox { \tasks_choice: }
-\providecommand* \checkedchoicebox { \tasks_choice_checked: }
-
-% --------------------------------------------------------------------------
-% base instance:
-% ALPHABETIZE: a) b) c)
-\DeclareInstance {tasks} {alphabetize} {default} { }
-
\keys_define:nn {tasks/list}
{
- debug .bool_set:N = \l__tasks_debug_bool ,
- style .tl_set:N = \l__tasks_instance_tl ,
- style .initial:n = alphabetize ,
- counter-format .tl_set:N = \l__tasks_custom_label_pattern_tl ,
- label .code:n =
+ debug .bool_set:N = \l__tasks_debug_bool ,
+ break-correction .dim_set:N = \l__tasks_correction_dim ,
+ break-correction .initial:n = .00001pt ,
+ style .tl_set:N = \l__tasks_instance_tl ,
+ style .initial:n = alphabetize ,
+ counter-format .code:n =
+ \msg_warning:nnnnn {tasks} {deprecated} {option} {counter-format} {label}
+ \keys_set:nn {tasks/list} { label = #1 } ,
+ counter .tl_set:N = \l__tasks_counter_tl ,
+ counter .initial:n = task ,
+ label .code:n =
\bool_set_true:N \l__tasks_custom_label_bool
\tl_set:Nn \l__tasks_custom_label_tl {#1} ,
- label-format .tl_set:N = \l__tasks_custom_label_format_tl ,
- label-width .code:n =
+ label-format .code:n =
+ \bool_set_true:N \l__tasks_custom_label_format_bool
+ \tl_set:Nn \l__tasks_custom_label_format_tl {#1} ,
+ label-width .code:n =
\dim_set:Nn \l__tasks_label_width_dim {#1}
\bool_set_true:N \l__tasks_label_width_bool ,
- label-offset .code:n =
+ label-offset .code:n =
\dim_set:Nn \l__tasks_label_offset_dim {#1}
\bool_set_true:N \l__tasks_label_offset_bool ,
- label-align .tl_set:N = \l__tasks_label_align_tl ,
- item-format .tl_set:N = \l__tasks_custom_item_format_tl ,
- item-indent .code:n =
+ label-align .tl_set:N = \l__tasks_label_align_tl ,
+ item-format .tl_set:N = \l__tasks_custom_item_format_tl ,
+ item-indent .code:n =
\dim_set:Nn \l__tasks_item_indent_dim {#1}
\bool_set_true:N \l__tasks_item_indent_bool ,
- column-sep .dim_set:N = \l__tasks_column_sep_dim ,
- before-skip .skip_set:N = \l__tasks_before_list_skip ,
- after-skip .skip_set:N = \l__tasks_after_list_skip ,
+ column-sep .dim_set:N = \l__tasks_column_sep_dim ,
+ before-skip .skip_set:N = \l__tasks_before_list_skip ,
+ after-skip .skip_set:N = \l__tasks_after_list_skip ,
after-item-skip .code:n =
\bool_set_true:N \l__tasks_custom_after_item_skip_bool
\skip_set:Nn \l__tasks_custom_after_item_skip {#1} ,
- resume .bool_set:N = \l__tasks_resume_bool
+ resume .bool_set:N = \l__tasks_resume_bool ,
+ start .int_set:N = \l__tasks_start_int ,
+ start .initial:n = 1
}
% --------------------------------------------------------------------------
-% the generic environment:
-\NewEnviron {__tasks_env:} [3]
+
+\cs_new_protected:Npn \tasks_body:nnnn #1#2#3#4
{
- \if@inlabel
- \noindent\par\nobreak\vskip-\parskip\vskip-\baselineskip\hrule\@height\z@
- \fi
- \dim_compare:nNnF { \l__tasks_before_list_skip } = { 0pt }
+ \int_gincr:N \g__tasks_env_int
+ \legacy_if:nT {@inlabel}
+ {
+ \noindent\par
+ \nobreak
+ \vskip-\parskip
+ \vskip-\baselineskip
+ \hrule\@height\z@
+ }
+ \dim_compare:nNnF { \l__tasks_before_list_skip } = {0pt}
{ \vspace {\l__tasks_before_list_skip} }
\list {}
{
@@ -664,11 +695,11 @@
\dim_set:Nn \leftmargin {0pt}
\dim_set:Nn \rightmargin {0pt}
}
- \item \scan_stop:
- \int_incr:N \l__tasks_depth_int
- \__tasks:VnnV \l__tasks_instance_tl {#3} {#1} \BODY
+ \item \scan_stop:
+ \dim_set:Nn \l__tasks_full_width_dim { \linewidth }
+ \tasks_environment:Vnnn \l__tasks_instance_tl {#3} {#1} {#4}
\endlist
- \dim_compare:nNnF { \l__tasks_after_list_skip } = { 0pt }
+ \dim_compare:nNnF { \l__tasks_after_list_skip } = {0pt}
{ \vspace {\l__tasks_after_list_skip} }
}
@@ -693,37 +724,65 @@
% --------------------------------------------------------------------------
% the user environment:
-\NewDocumentCommand \NewTasks { O{}mO{\task}D(){1} }
+\NewDocumentCommand \NewTasksEnvironment { O{}mO{\task}D(){1} }
{
- \NewDocumentEnvironment {#2} { O{}D(){#4} }
- { \__tasks_env: {#3} { #1,##1 } {##2} }
- { \end__tasks_env: }
+ \NewDocumentEnvironment {#2} { O{}D(){#4}+b }
+ { \tasks_body:nnnn {#3} {#1,##1} {##2} {##3} }
+ { }
}
-\NewDocumentCommand \RenewTasks { O{}mO{\task}D(){1} }
+\NewDocumentCommand \RenewTasksEnvironment { O{}mO{\task}D(){1} }
{
- \RenewDocumentEnvironment {#2} { O{}D(){#4} }
- { \__tasks_env: {#3} { #1,##1 } {##2} }
- { \end__tasks_env: }
+ \RenewDocumentEnvironment {#2} { O{}D(){#4}+b }
+ { \tasks_body:nnnn {#3} {#1,##1} {##2} {##3} }
+ { }
}
+\tasks_deprecated:NN \NewTasks \NewTasksEnvironment
+\tasks_deprecated:NN \RenewTasks \RenewTasksEnvironment
+
% --------------------------------------------------------------------------
% default list:
-\NewTasks {tasks}
+\NewTasksEnvironment {tasks}
-\file_if_exist:nT {tasks.cfg} { \file_input:n {tasks.cfg} }
+% base instance:
+% ALPHABETIZE: a) b) c)
+\DeclareInstance {tasks} {alphabetize} {default} { }
+
+% ITEMIZE:
+\DeclareInstance {tasks} {itemize} {default}
+ {
+ label-width = 1.125em ,
+ label = \labelitemi
+ }
+
+% ENUMERATE:
+\DeclareInstance {tasks} {enumerate} {default}
+ { label = \arabic*. }
% --------------------------------------------------------------------------
% setup:
\cs_new_protected:Npn \tasks_setup:n #1
{ \keys_set:nn {tasks/list} {#1} }
-\NewDocumentCommand \settasks { m }
+\NewDocumentCommand \settasks { +m }
{ \tasks_setup:n {#1} }
+% default:
+ \__tasks_label_align:n {left}
+
% --------------------------------------------------------------------------
-\tex_endinput:D
+\file_if_exist:nT {tasks.cfg} { \file_input:n {tasks.cfg} }
+
+\AtBeginDocument
+ {
+ \@ifpackageloaded {hyperref}
+ { \tl_set:Nn \theHtask { \int_use:N \g__tasks_env_int . \thetask } }
+ {}
+ }
+\file_input_stop:
+% --------------------------------------------------------------------------
% HISTORY:
2013/01/19 v0.7 - extracted from `exsheets' package; this also lead to a
slightly new syntax and a few new options for it
@@ -734,11 +793,12 @@
* the former `label-format' is now `counter-format'
* new: `label-format'
- changed defaults for `label-width' and `label-offset'
- - ensure that the `after-item-skip' is only
- inserted in between rows
+ - ensure that the `after-item-skip' is only inserted in
+ between rows
- new option `after-item-skip'
- improvements when label are set with optional argument:
- * a provided but empty argument is now correctly recognized
+ * a provided but empty argument is now correctly
+ recognized
* the counter is _not_ stepped anymore for enumerated
lists when the optional argument is provided
- new command \startnewitemline that forces the next item to
@@ -776,3 +836,23 @@
together like one would expect: an item indent of 0pt will
align the complete item with the margin and the needed
overlap for the label is reserved
+2016/08/16 v0.13 - a negative value for label width will make the label
+ protrude to the margin
+2019/10/04 v1.0 - get rid of `cntformats', `environ' and `epic'
+ - no default multiple choice any more
+ - rename \NewTasks and \RenewTasks
+ - the option `counter-format' is deprecated
+2019/10/05 v1.0a - fix small bug in deprecation message
+2019/10/06 v1.0b - fix bug in `label-format' definition
+2019/10/07 v1.0c - fix bug in width warning
+ - fix bug in deprecation of `counter-format'
+2019/10/08 v1.0d - make \thetask usable; and correct \label/\ref
+2019/11/03 v1.1 - fix typo
+ - make \settasks' argument long
+ - new option `start'
+2020/01/11 v1.1a - allow `label-format' to end with command that needs an
+ argument
+2020/03/21 v1.2 - prefer lazy boolean evaluation
+ - \tasksifmeasuringTF
+ - new option `counter'
+ - rename manual files
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tasks.tlpobj new/tlpkg/tlpobj/tasks.tlpobj
--- old/tlpkg/tlpobj/tasks.tlpobj 2019-02-28 04:06:46.000000000 +0100
+++ new/tlpkg/tlpobj/tasks.tlpobj 2020-03-22 01:55:34.000000000 +0100
@@ -1,19 +1,18 @@
name tasks
category Package
-revision 41851
+revision 54449
shortdesc Horizontally columned lists
relocated 1
longdesc The reason for the creation of the tasks environment was an
-longdesc unwritten agreement in German maths textbooks (exspecially
+longdesc unwritten agreement in German maths textbooks (especially
longdesc (junior) high school textbooks) to organize exercises in
longdesc columns counting horizontally rather than vertically. This is
longdesc what the tasks package helps to achieve.
-runfiles size=8
+runfiles size=9
RELOC/tex/latex/tasks/tasks.cfg
RELOC/tex/latex/tasks/tasks.sty
catalogue-contact-repository https://github.com/cgnieder/tasks/
catalogue-ctan /macros/latex/contrib/tasks
-catalogue-date 2017-04-18 05:31:40 +0200
catalogue-license lppl1.3
catalogue-topics list list-enum expl3
-catalogue-version 0.12
+catalogue-version 1.2
++++++ tcolorbox.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/CHANGES new/doc/latex/tcolorbox/CHANGES
--- old/doc/latex/tcolorbox/CHANGES 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/CHANGES 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
@@ -1084,3 +1084,33 @@
* new options: 'beamer hidden', 'beamer alerted', 'hide', 'alert'
* option 'only' moved from package to skins library
- new documentation section '13 Beamer Support'
+
+version 4.21 (2019/09/19)
+- bug fix (#71): 'shield externalize' should be effective on all tcolorbox layers
+- bug fix (#76): 'spread inwards', 'spread outwards', 'spread sidewards' gave
+ wrong results for some document geometry settings
+- new options (#75): 'tabulars', 'tabulars*'
+- library 'extras':
+ * bug fix: all 'extras ...' options from library 'hooks' took code instead of options
+ * new options (#73): 'minted options app', 'minted options pre',
+ 'listing options app', 'listing options pre'
+- library 'xparse':
+ * bug fix: options 'IfNoValueTF', 'IfValueTF', 'IfBooleanTF' failed
+ to recognize arguments in some code line breaks situations
+- library 'documentation':
+ TikZ path operation documentation (#65):
+ * new color name: 'Fade'
+ * new macros and environments: '\colFade', 'docPathOperation',
+ '\refPathOperation', '\refPathOperation*'
+ * new options: 'color fade', 'color path', 'doc label', 'doc head path',
+ 'before doc body path', 'after doc body path'
+ * new language string: 'path', 'paths'
+- documentation: checkerbox for opacity examples was too dark
+
+version 4.22 (2019/11/15)
+- bug fix (#79) in library 'xparse':
+ 'sidebyside adapt' did not respect color, font, and other options.
+- bug fix (#85) in library 'raster':
+ 'raster before skip' and 'raster after skip' did not accept glue anymore.
+- new initialization option (#80): 'reset counter on overlays'
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/README new/doc/latex/tcolorbox/README
--- old/doc/latex/tcolorbox/README 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/README 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%%
%% -------------------------------------------------------------------------------------------
%% Copyright (c) 2006-2019 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
Binary files old/doc/latex/tcolorbox/tcolorbox-example-poster.pdf and new/doc/latex/tcolorbox/tcolorbox-example-poster.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-example-poster.tex new/doc/latex/tcolorbox/tcolorbox-example-poster.tex
--- old/doc/latex/tcolorbox/tcolorbox-example-poster.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-example-poster.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-example-poster.tex: a poster example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
Binary files old/doc/latex/tcolorbox/tcolorbox-example.pdf and new/doc/latex/tcolorbox/tcolorbox-example.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-example.tex new/doc/latex/tcolorbox/tcolorbox-example.tex
--- old/doc/latex/tcolorbox/tcolorbox-example.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-example.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-example.tex: an example for tcolorbox
%%
%% -------------------------------------------------------------------------------------------
Binary files old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf and new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex
--- old/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox-tutorial-poster.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox-tutorial-poster.tex: a tutorial for poster creation with tcolorbox
%%
%% -------------------------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex new/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.coreoptions.tex 2019-09-19 22:45:10.000000000 +0200
@@ -1535,7 +1535,7 @@
\begin{docTcbKey}{opacityframe}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the frame opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityframe}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[opacityframe=0.25,
colframe=red]
This is a \textbf{tcolorbox}.
@@ -1545,7 +1545,7 @@
\begin{docTcbKey}{opacityback}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the background opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacityback}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityback}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityframe=0.5, opacityback=0.5]
This is a \textbf{tcolorbox}.
@@ -1556,7 +1556,7 @@
\begin{docTcbKey}{opacitybacktitle}{=\meta{fraction}}{no default, initially \texttt{1.0}}
Sets the title background opacity of the box to the given \meta{fraction}.
-\begin{exdispExample*}{opacitybacktitle}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacitybacktitle}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityframe=0.5, opacitybacktitle=0.5,
title filled, title=This is a title]
@@ -1569,7 +1569,7 @@
\begin{docTcbKey}{opacityfill}{=\meta{fraction}}{style, no default, initially \texttt{1.0}}
Sets the fill opacity for frame, interior and optionally the title background
to the given \meta{fraction}.
-\begin{exdispExample*}{opacityfill}{sbs,lefthand ratio=0.6,segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacityfill}{sbs,lefthand ratio=0.6,segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[standard jigsaw,colframe=red,
opacityfill=0.7, title=This is a title]
This is a \textbf{tcolorbox}.
@@ -1582,7 +1582,7 @@
Sets the text opacity of the upper box part to the given \meta{fraction}.
\begin{exdispExample*}{opacityupper}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacityupper=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{exdispExample*}
@@ -1593,7 +1593,7 @@
Sets the text opacity of the lower box part to the given \meta{fraction}.
\begin{exdispExample*}{opacitylower}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacitylower=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
@@ -1605,7 +1605,7 @@
Sets the text opacity of the upper and the lower box part to the given \meta{fraction}.
\begin{exdispExample*}{opacitytext}{sbs,lefthand ratio=0.6}
\begin{tcolorbox}[enhanced,opacitytext=0.5,
- interior style={pattern=checkerboard light gray}]
+ interior style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\tcblower
This is the lower part.
@@ -1620,14 +1620,14 @@
\begin{tcolorbox}[enhanced,opacitytitle=0.7,
coltitle=black,
fonttitle=\bfseries,title=This is a title,
- title style={pattern=checkerboard light gray}]
+ title style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}]
This is a \textbf{tcolorbox}.
\end{tcolorbox}
\end{exdispExample*}
\end{docTcbKey}
-\begin{exdispExample*}{opacity_general}{segmentation style={pattern=checkerboard light gray}}
+\begin{exdispExample*}{opacity_general}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcolorbox}[enhanced jigsaw,fonttitle=\bfseries,title=This is a title,
opacityframe=0.5,opacityback=0.25,opacitybacktitle=0.25,opacitytext=0.8,
colback=red!5!white,colframe=red!75!black,colbacktitle=yellow!20!red]
@@ -2336,6 +2336,55 @@
\end{exdispExample}
\end{docTcbKey}
+
+\clearpage
+
+\begin{docTcbKey}[][doc new={2019-09-19}]{tabulars}{=\meta{preamble}}{style}
+ This style sets \refKey{/tcb/before upper} and \refKey{/tcb/after upper}
+ and several geometry keys to support a |tabular*| with the
+ given \meta{preamble}.
+ The packages |array| and |colortbl| have to be loaded separately.
+\begin{exdispExample}{tabulars_1}
+% \usepackage{array}
+% \usepackage{colortbl} - or - \usepackage[table]{xcolor}
+\tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily,
+ colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white,
+ coltitle=black,center title}
+
+\begin{tcolorbox}[tabulars={@{\extracolsep{\fill}\hspace{5mm}}lrrrrr@{\hspace{5mm}}},
+ boxrule=0.5pt,title=My table]
+Group & One & Two & Three & Four & Sum\\\hline\hline
+Red & 1000.00 & 2000.00 & 3000.00 & 4000.00 & 10000.00\\\hline
+Green & 2000.00 & 3000.00 & 4000.00 & 5000.00 & 14000.00\\\hline
+Blue & 3000.00 & 4000.00 & 5000.00 & 6000.00 & 18000.00\\\hline\hline
+Sum & 6000.00 & 9000.00 & 12000.00 & 15000.00 & 42000.00
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new={2019-09-19}]{tabulars*}{=\marg{code}\marg{preamble}}{style}
+ This is a variant of \refKey{/tcb/tabulars} which adds some \meta{code}
+ before the table starts.
+\begin{exdispExample}{tabulars_2}
+% \usepackage{array}
+% \usepackage{colortbl} - or - \usepackage[table]{xcolor}
+\tcbset{enhanced,fonttitle=\bfseries\large,fontupper=\normalsize\sffamily,
+ colback=yellow!10!white,colframe=red!50!black,colbacktitle=Salmon!30!white,
+ coltitle=black,center title}
+
+\begin{tcolorbox}[tabulars*={\arrayrulewidth0.5mm\renewcommand\arraystretch{1.4}}%
+ {@{\extracolsep{\fill}\hspace{20mm}}lll@{\hspace{20mm}}},
+ title=My table]
+One & Two & Three \\\hline\hline
+1000.00 & 2000.00 & 3000.00\\\hline
+2000.00 & 3000.00 & 4000.00
+\end{tcolorbox}
+\end{exdispExample}
+\end{docTcbKey}
+
+
+
\clearpage
\begin{marker}
If \refKey{/tcb/tabularx} or \refKey{/tcb/tabularx*} are used, one cannot
@@ -2386,6 +2435,7 @@
\end{docTcbKey}
+
\clearpage
\begin{docTcbKey}{tikz upper}{\colOpt{=\meta{options}}}{style}
This style adds a centered |tikzpicture| environment to the start and end
@@ -3547,7 +3597,7 @@
The following styles have a considerable influence on how layered boxes
are processed. Note especially that nested boxes are getting a
\refKey{/tcb/reset} by default. You can change this, but be prepared for
-suprises if you do.
+surprises if you do.
If the defaults are \emph{not changed}, a |tcolorbox| gets its options
in the following order. Following options overwrite preceding options.
@@ -4287,6 +4337,11 @@
\refKey{/tcb/shield externalize} is deactivated automatically inside a |tikzpicture|.
\end{marker}
+\begin{marker}
+\refKey{/tcb/shield externalize} is applied for every following |tcolorbox|
+inside the current \TeX\ group and is not affected by \refKey{/tcb/reset}.
+\end{marker}
+
\begin{docTcbKey}{external}{=\meta{file name}}{no default, initially unset}
Convenience option which calls |\tikzsetnextfilename|\marg{file name}. Typically,
it may be used inside the option list of a |tcolorbox| to set the
@@ -4310,7 +4365,8 @@
\begin{docTcbKey}{reset}{}{no value, initially set}
Sets (nearly) all |tcolorbox| settings (including loaded libraries) back to their default values
\emph{plus} any settings given by \refCom{tcbsetforeverylayer}.
-\refKey{/tcb/savedelimiter} and \refKey{/tcb/capture} keep their values.
+\refKey{/tcb/savedelimiter}, \refKey{/tcb/capture}, and
+\refKey{/tcb/shield externalize} keep their values.
Also, all raster values (see \Vref{sec:raster}) are not resetted.
This option is useful for boxes in boxes where the inner box should not inherit
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex new/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.documentation.tex 2019-09-19 22:45:10.000000000 +0200
@@ -131,6 +131,36 @@
\end{docEnvironment}
+
+
+\begin{docEnvironment}[doclang/environment content=operation description,
+ doc new=2019-09-18]{docPathOperation}{\oarg{options}\marg{name}\marg{parameters}}
+ Documents a \tikzname\ path operation with given \meta{name}.
+ The given \meta{options} are set with \refCom{tcbset}.
+ This \tikzname\ path operation takes mandatory or optional \meta{parameters}.
+ It is automatically indexed and can be referenced with
+ \refCom{refPathOperation}\marg{name}.
+\begin{dispExample}
+\begin{docPathOperation}{fooop}{\oarg{opt}(\meta{name})\colOpt{at(\meta{coord})}}
+ Imaginary path operation for illustration.
+\end{docPathOperation}
+\end{dispExample}
+\end{docEnvironment}
+
+
+\begin{docEnvironment}[doclang/environment content=command description,
+ doc new=2019-09-17]{docPathOperation*}{\oarg{options}\marg{name}\marg{parameters}}
+ Identical to \refEnv{docPathOperation}, but without index entry.
+\end{docEnvironment}
+
+
+
+
+
+
+
+
+
\begin{docCommand}{docValue}{\marg{name}}
Documents a value with given \meta{name}. Typically, this is a value for a key.
This value is automatically indexed.
@@ -144,6 +174,7 @@
Identical to \refCom{docValue}, but without index entry.
\end{docCommand}
+\clearpage
\begin{docCommand}[doc updated=2014-10-09]{docAuxCommand}{\marg{name}}
Documents an auxiliary or minor \LaTeX\ macro with given \meta{name}
@@ -170,7 +201,7 @@
Identical to \refCom{docAuxEnvironment}, but without index entry.
\end{docCommand}
-\clearpage
+
\begin{docCommand}{docAuxKey}{\oarg{key path}\marg{name}}
Documents an auxiliary key with given \meta{name} and an optional \meta{key path}.
@@ -208,6 +239,7 @@
Identical to \refCom{docLength}, but without index entry.
\end{docCommand}
+\clearpage
\begin{docCommand}{docColor}{\marg{name}}
Documents a color with given \meta{name}. The color is automatically indexed.
@@ -221,7 +253,7 @@
\end{docCommand}
-\clearpage
+
\begin{docCommand}{cs}{\marg{name}}
Macro from |ltxdoc| \cite{carlisle:2007a} to typeset a command word \meta{name}
where the backslash is prefixed. The library overwrites the original macro.
@@ -409,6 +441,24 @@
\end{docCommand}
+\begin{docCommand}[doc new=2019-09-17]{refPathOperation}{\marg{name}}
+ References a documented \tikzname\ path operation with given \meta{name}.
+ The page reference is suppressed if it links to the same page.
+\begin{dispExample}
+We have created \refPathOperation{fooop} as an example.
+\end{dispExample}
+\end{docCommand}
+
+\begin{docCommand}[doc new=2019-09-17]{refPathOperation*}{\marg{name}}
+ References a documented \tikzname\ path operation with given \meta{name}.
+ There is no page reference.
+\begin{dispExample}
+We have created \refPathOperation*{fooop} as an example.
+\end{dispExample}
+\end{docCommand}
+
+
+
\begin{docCommand}{refAux}{\marg{name}}
References some auxiliary environment, key, value, or color. The hyperlink color is
used, but there is no real link.
@@ -426,8 +476,8 @@
\end{dispExample}
\end{docCommand}
+\clearpage
-%
\begin{docCommand}{colDef}{\marg{text}}
Sets \meta{text} with the command color, see \refKey{/tcb/color command}.
\begin{dispExample}
@@ -442,7 +492,14 @@
\end{dispExample}
\end{docCommand}
-\clearpage
+
+\begin{docCommand}[doc new=2019-09-18]{colFade}{\marg{text}}
+ Sets \meta{text} with the fade color, see \refKey{/tcb/color fade}.
+\begin{dispExample}
+This is my \colFade{text}.
+\end{dispExample}
+\end{docCommand}
+
\begin{docCommand}[doc new=2014-09-19]{tcbdocmarginnote}{\oarg{options}\marg{text}}
Creates a |tcolorbox| note with the given \meta{text} inside the margin using
@@ -672,6 +729,10 @@
Sets the highlight color used by key definitions.
\end{docTcbKey}
+\begin{docTcbKey}[][doc new={2019-09-18}]{color path}{=\meta{color}}{no default, initially |Definition|}
+ Sets the highlight color used by \tikzname\ path operation definitions.
+\end{docTcbKey}
+
\begin{docTcbKey}{color value}{=\meta{color}}{no default, initially |Definition|}
Sets the highlight color used by value definitions.
\end{docTcbKey}
@@ -688,9 +749,9 @@
Sets the highlight color used by color definitions.
\end{docTcbKey}
-\begin{docTcbKey}{color definition}{=\meta{color}}{no default, initially |Definition|}
+\begin{docTcbKey}[][doc updated={2019-09-18}]{color definition}{=\meta{color}}{no default, initially |Definition|}
Sets the highlight color for \refKey{/tcb/color command}, \refKey{/tcb/color environment},
- \refKey{/tcb/color key}, \refKey{/tcb/color value}, \refKey{/tcb/color counter},
+ \refKey{/tcb/color key}, \refKey{/tcb/color path}, \refKey{/tcb/color value}, \refKey{/tcb/color counter},
\refKey{/tcb/color length}, and \refKey{/tcb/color color}.
\end{docTcbKey}
@@ -698,6 +759,12 @@
Sets the color used for optional arguments.
\end{docTcbKey}
+\begin{docTcbKey}{color fade}{=\meta{color}}{no default, initially |Fade|}
+ Sets the color used for faded text like \colFade{\textbackslash path}
+ in \refEnv{docPathOperation}.
+\end{docTcbKey}
+
+
\begin{docTcbKey}{color hyperlink}{=\meta{color}}{no default, initially |Hyperlink|}
Sets the color for all hyper-links, i.\,e. all internal and external links.
\end{docTcbKey}
@@ -759,11 +826,18 @@
Heading text in the index for lengths.
\end{langTcbKey}
-
\begin{langTcbKey}[][doc new={2014-09-19}]{new}{=\meta{text}}{no default, initially |New|}
Announcement text for new content.
\end{langTcbKey}
+\begin{langTcbKey}[][doc new={2019-09-18}]{path}{=\meta{text}}{no default, initially |path operation|}
+ Text used in the index for path operations.
+\end{langTcbKey}
+
+\begin{langTcbKey}[][doc new={2019-09-18}]{paths}{=\meta{text}}{no default, initially |Path operations|}
+ Heading text in the index for path operations.
+\end{langTcbKey}
+
\begin{langTcbKey}{pageshort}{=\meta{text}}{no default, initially |P.|}
Short text for page references.
\end{langTcbKey}
@@ -872,13 +946,27 @@
\end{dispExample}
\end{docTcbKey}
-\begin{docTcbKey}{doc head}{=\meta{options}}{no default, initially empty}
+\clearpage
+\begin{docTcbKey}[][doc new=2019-09-18]{doc head path}{=\meta{options}}{no default, initially empty}
+ Sets \meta{options} for the head line of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\begin{dispExample}
+\tcbset{doc head command={interior style={fill,left color=red!7!white,
+ right color=blue!7!white}}}
+
+\begin{docPathOperation*}{-{}-}{\meta{coordinate or cycle}}
+ This is the documentation of \refPathOperation{-{}-}.
+\end{docPathOperation*}
+\end{dispExample}
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc updated=2019-09-18]{doc head}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/doc head command}, \refKey{/tcb/doc head environment},
- and \refKey{/tcb/doc head key}.
+ \refKey{/tcb/doc head key}, and \refKey{/tcb/doc head path}.
\end{docTcbKey}
-\clearpage
+
The description texts of the main documentation environments \refEnv{docCommand},
\refEnv{docEnvironment}, \refEnv{docKey}, etc, are set in a compact form without
indention and |parskip=0pt|. This settings can overruled by using the following
@@ -916,7 +1004,7 @@
\end{dispExample}
\end{docTcbKey}
-
+\clearpage
\begin{docTcbKey}[][doc new=2015-10-09]{before doc body environment}{=\meta{code}}{no default, initially empty}
Executes \meta{code} before the description texts
of \refEnv{docEnvironment} and \refEnv{docEnvironment*}.
@@ -938,23 +1026,35 @@
of \refEnv{docKey} and \refEnv{docKey*}.
\end{docTcbKey}
-\begin{docTcbKey}[][doc new=2015-10-09]{before doc body}{=\meta{options}}{no default, initially empty}
+\begin{docTcbKey}[][doc new=2019-09-18]{before doc body path}{=\meta{code}}{no default, initially empty}
+ Executes \meta{code} before the description texts
+ of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-09-18]{after doc body path}{=\meta{code}}{no default, initially empty}
+ Executes \meta{code} after the description texts
+ of \refEnv{docPathOperation} and \refEnv{docPathOperation*}.
+\end{docTcbKey}
+
+
+\begin{docTcbKey}[][doc new and updated={2015-10-09}{2019-09-18}]{before doc body}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/before doc body command}, \refKey{/tcb/before doc body environment},
- and \refKey{/tcb/before doc body key}.
+ \refKey{/tcb/before doc body key}, and \refKey{/tcb/before doc body path}.
\end{docTcbKey}
-\begin{docTcbKey}[][doc new=2015-10-09]{after doc body}{=\meta{options}}{no default, initially empty}
+\begin{docTcbKey}[][doc new and updated={2015-10-09}{2019-09-18}]{after doc body}{=\meta{options}}{no default, initially empty}
Shortcut for setting the same \meta{options} for
\refKey{/tcb/after doc body command}, \refKey{/tcb/after doc body environment},
- and \refKey{/tcb/after doc body key}.
+ \refKey{/tcb/after doc body key}, and \refKey{/tcb/after doc body path}.
\end{docTcbKey}
-\clearpage
+%\clearpage
\begin{docTcbKey}{doc description}{=\meta{text}}{no default, initially empty}
Sets a (short!) additional description \meta{text} for
- \refEnv{docCommand} or \refEnv{docEnvironment}. Such a description is
+ \refEnv{docCommand}, \refEnv{docEnvironment}, or \refEnv{docPathOperation}.
+ Such a description is
mandatory for \refEnv{docKey}.
\begin{dispExample}
\begin{docCommand*}[doc description=my description]{myCommandF}{\marg{argument}}
@@ -968,6 +1068,19 @@
\end{marker}
\end{docTcbKey}
+\clearpage
+\begin{docTcbKey}[][doc new={2019-09-18}]{doc label}{=\meta{text}}{no default, initially unset}
+ If used inside the option list of \refEnv{docCommand}, \refEnv{docEnvironment},
+ \refEnv{docKey}, or \refEnv{docPathOperation}, then \meta{text} is used
+ for labeling instead of the name of the definition.
+\begin{dispExample}
+\begin{docPathOperation*}[doc label=pathline]{-{}-}{\meta{coordinate or cycle}}
+ This is the documentation of \refPathOperation{pathline}.
+\end{docPathOperation*}
+\end{dispExample}
+\end{docTcbKey}
+
+
\begin{docTcbKey}{doc into index}{\colOpt{=true\textbar false}}{default |true|, initially |true|}
If set to |false|, no index entries are written for the main documentation
environments. The same effect is achieved by using e.\,g.\ \refEnv{docCommand*}
@@ -1008,7 +1121,7 @@
\end{docTcbKey}
-\subsection{Predefined Colors of the Library}
+\subsection{Predefined Colors of the Library}\tcbdocmarginnote{\tcbdocupdated{2019-09-18}}
The following colors are predefined. They are used as default colors
in some library commands.
@@ -1018,6 +1131,7 @@
\dispColor{Definition},
\dispColor{ExampleFrame},
\dispColor{ExampleBack},
-\dispColor{Hyperlink}.
+\dispColor{Hyperlink},
+\dispColor{Fade}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex new/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.hooks.tex 2019-09-19 22:45:10.000000000 +0200
@@ -475,8 +475,8 @@
\subsection{Skin Code}
-The following option keys extend the options given in Subsection \ref{subsec:addcodeoptions}
-from page \pageref{subsec:addcodeoptions}.
+The following option keys extend the options given in Subsection~\ref{subsec:addcodeoptions}
+from page~\pageref{subsec:addcodeoptions}.
\begin{docTcbKey}{frame code app}{=\meta{graphical code}}{no default}
Appends the given \meta{graphical code} to \refKey{/tcb/frame code}.
@@ -575,3 +575,27 @@
Prepends the given \meta{options} to \refKey{/tcb/extras first and middle}.
\end{docTcbKey}
+
+\subsection{Listings}
+The following option keys extend the options given in
+Section~\ref{sec:listings}
+from page~\pageref{sec:listings}.
+
+
+\begin{docTcbKey}[][doc new=2019-07-11]{listing options app}{=\marg{options}}{no default}
+ Appends the given \meta{options} to \refKey{/tcb/listing options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{listing options pre}{=\marg{options}}{no default}
+ Prepends the given \meta{options} to \refKey{/tcb/listing options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{minted options app}{=\marg{options}}{no default}
+ Appends the given \meta{options} to \refKey{/tcb/minted options}.
+\end{docTcbKey}
+
+\begin{docTcbKey}[][doc new=2019-07-11]{minted options pre}{=\marg{options}}{no default}
+ Prepends the given \meta{options} to \refKey{/tcb/minted options}.
+\end{docTcbKey}
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex new/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex 2018-12-07 23:51:38.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.initoptions.tex 2019-11-15 22:42:38.000000000 +0100
@@ -106,6 +106,15 @@
be used to overrule a previous option.
\end{newTcbKey}
+
+\begin{newTcbKey}[][doc new=2019-10-18]{reset counter on overlays}{\colOpt{=true\textbar false}}{default |true|, initially |false|}
+For |beamer| slides, this invokes the |\resetcounteronoverlays| command
+for the box counter. The counter is automatically reset on subsequent
+overlay slides of a frame.
+Thereby, the counter will be the same on all slides of every frame.
+\end{newTcbKey}
+
+
\clearpage
\begin{newTcbKey}{number within}{=\meta{counter}}{no default, initially unset}
The automatic counter is set to zero, if \meta{counter} is increased.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.recording.tex new/doc/latex/tcolorbox/tcolorbox.doc.recording.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.recording.tex 2018-03-22 22:45:00.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.recording.tex 2019-09-19 22:45:10.000000000 +0200
@@ -15,6 +15,17 @@
Opens a file denoted by \meta{file name} for writing the records.
The default file name is |\jobname.records|.
See \Vref{sec:recording-exercises} for an example application.
+ \begin{marker}
+ In some situations, a not existing optional parameter may cause parsing
+ problems. If this happens (or just for precaution), use
+\begin{dispListing}
+\tcbstartrecording\relax
+\end{dispListing}
+ or
+\begin{dispListing}
+\tcbstartrecording[\jobname.records]
+\end{dispListing}
+ \end{marker}
\end{docCommand}
\begin{docCommand}[doc new=2014-11-28]{tcbrecord}{\marg{content}}
@@ -66,7 +77,7 @@
\inputpreamblelisting{L}
\begin{dispListing*}{breakable,before upper=}
-\tcbstartrecording
+\tcbstartrecording\relax
\begin{exercise}
Compute the derivative of the following function:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty new/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty
--- old/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.s_main.sty 2019-09-19 22:45:10.000000000 +0200
@@ -54,6 +54,7 @@
\tcbset{skin=enhanced,
doc head={colback=yellow!10!white,interior style=fill},
doc head key={colback=magenta!5!white,interior style=fill},
+ doc head path={colback=blue!50!gray!7!white,interior style=fill},
color key=DarkViolet,
color value=Teal,
color color=Teal,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.doc.skins.tex new/doc/latex/tcolorbox/tcolorbox.doc.skins.tex
--- old/doc/latex/tcolorbox/tcolorbox.doc.skins.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.doc.skins.tex 2019-09-19 22:45:10.000000000 +0200
@@ -596,7 +596,7 @@
\end{boxTcbKey}
\begin{boxTcbKey}{yshifttext}{=\meta{length}}{no default, initially |0pt|}
-The text inside the main box by \meta{length} to give room for e.\,g.\ a sunken title.
+The text inside the main box is shifted by \meta{length} to give room for e.\,g.\ a sunken title.
\begin{exdispExample*}{yshifttext}{sbs,lefthand ratio=0.66}
\begin{tcolorbox}[enhanced,title=My title,
attach boxed title to top center=
@@ -1303,7 +1303,7 @@
\begin{docEnvironment}{tcbinvclipframe}{}
Defines a |Tikz| scope which clips to the \emph{outside} of the frame area path.
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced jigsaw,fonttitle=\bfseries,opacityback=0.35,colback=blue!5!white,
frame style={left color=red!75!black,right color=red!10!yellow}}
@@ -2245,7 +2245,7 @@
applied a second time, the new \meta{tikz option list} is appended to the
current option list.
\begin{dispExample*}{sbs,lefthand ratio=0.66,
- segmentation style={pattern=checkerboard light gray}}
+ segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced,colback=red!5!white,
colframe=red!75!black,fonttitle=\bfseries}
@@ -2837,7 +2837,7 @@
and \refSkin{enhanced jigsaw}.
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\newcommand{\ballexample}{\begin{tikzpicture}
\path[use as bounding box] (0,0.8) rectangle +(0.1,0.1);
\shadedraw [shading=ball] (0,0) circle (1cm);
@@ -2863,7 +2863,7 @@
\end{dispExample*}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\tcbset{enhanced,colback=red!10!white,coltitle=black,
frame style={left color=red!75!black,right color=red!10!yellow},
fonttitle=\bfseries,interior hidden,title hidden}
@@ -2879,7 +2879,7 @@
\end{dispExample*}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\newtcolorbox{mybox}{skin=enhancedmiddle jigsaw,leftrule=5mm,rightrule=5mm,
boxsep=0mm,top=0mm,bottom=0mm,
frame style={top color=blue,bottom color=red},interior hidden}
@@ -3047,7 +3047,7 @@
This is an abbreviation for setting |skin=standard jigsaw|.
\end{docTcbKey}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[standard jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3366,7 +3366,7 @@
This is an abbreviation for setting |skin=enhanced jigsaw|.
\end{docTcbKey}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[enhanced jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3416,7 +3416,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedfirst jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3459,7 +3459,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedmiddle jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
@@ -3557,7 +3557,7 @@
\end{docSkin}
-\begin{dispExample*}{segmentation style={pattern=checkerboard light gray}}
+\begin{dispExample*}{segmentation style={preaction={fill=white},pattern=checkerboard,pattern color=gray!40}}
\begin{tcbraster}[skin=enhancedlast jigsaw,raster equal height,raster columns=4,
colback=LightGreen,colframe=DarkGreen,colbacktitle=LimeGreen!75!DarkGreen,
opacityframe=0.5,opacityback=0.5,opacitybacktitle=0.5,
Binary files old/doc/latex/tcolorbox/tcolorbox.pdf and new/doc/latex/tcolorbox/tcolorbox.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/tcolorbox/tcolorbox.tex new/doc/latex/tcolorbox/tcolorbox.tex
--- old/doc/latex/tcolorbox/tcolorbox.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/doc/latex/tcolorbox/tcolorbox.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,5 +1,5 @@
% \LaTeX-Main\
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox.tex: Manual
%%
%% -------------------------------------------------------------------------------------------
@@ -43,8 +43,8 @@
\setlength{\bibitemsep}{\smallskipamount}
\addbibresource{tcolorbox.doc.bib}
-\def\version{4.20}%
-\def\datum{2019/03/02}%
+\def\version{4.22}%
+\def\datum{2019/11/15}%
\makeindex
\hypersetup{
@@ -58,11 +58,11 @@
%\tcbset{draftmode}
\tcbset{/tcb/external/-}% for final run
-%\includeonly{tcolorbox.doc.skins}
+%\includeonly{tcolorbox.doc.initoptions}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\begin{document}
-\include{tcolorbox.doc.abstract}
+\input{tcolorbox.doc.abstract}
\include{tcolorbox.doc.intro}
\include{tcolorbox.doc.quickref}
\include{tcolorbox.doc.coremacros}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tcolorbox.doc.tlpobj new/tlpkg/tlpobj/tcolorbox.doc.tlpobj
--- old/tlpkg/tlpobj/tcolorbox.doc.tlpobj 2019-03-03 02:24:52.000000000 +0100
+++ new/tlpkg/tlpobj/tcolorbox.doc.tlpobj 2019-11-16 01:54:47.000000000 +0100
@@ -1,9 +1,9 @@
name tcolorbox.doc
category Package
-revision 50206
+revision 52809
shortdesc doc files of tcolorbox
relocated 1
-docfiles size=2500
+docfiles size=2287
RELOC/doc/latex/tcolorbox/Basilica_5.png
RELOC/doc/latex/tcolorbox/CHANGES
RELOC/doc/latex/tcolorbox/README
++++++ tcolorbox.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbbreakable.code.tex new/tex/latex/tcolorbox/tcbbreakable.code.tex
--- old/tex/latex/tcolorbox/tcbbreakable.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbbreakable.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbbreakable.code.tex: Code for breakable colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\let\tcb@parboxrestore@true=\tcb@parboxrestore
\let\tcb@parboxrestore@false\tcb@parbox@false@settings
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbdocumentation.code.tex new/tex/latex/tcolorbox/tcbdocumentation.code.tex
--- old/tex/latex/tcolorbox/tcbdocumentation.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbdocumentation.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbdocumentation.code.tex: Code for LaTeX documentations
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{listings,skins,xparse,external}
@@ -33,9 +33,11 @@
\definecolor{ExampleFrame}{rgb}{0.628,0.705,0.942}
\definecolor{ExampleBack}{rgb}{0.963,0.971,0.994}
\definecolor{Hyperlink}{rgb}{0.281,0.275,0.485}
+\definecolor{Fade}{rgb}{0.5,0.5,0.5}
\def\colDef#1{\textcolor{\kvtcb@col@command}{#1}}
\def\colOpt#1{\textcolor{\kvtcb@col@opt}{#1}}
+\def\colFade#1{\textcolor{\kvtcb@col@fade}{#1}}
\lstdefinestyle{tcbdocumentation}{language={[LaTeX]TeX},
aboveskip={0\p@ \@plus 6\p@},
@@ -105,6 +107,8 @@
length/.store in=\kvtcb@text@length,
lengths/.store in=\kvtcb@text@lengths,
new/.store in=\kvtcb@text@new,
+ path/.store in=\kvtcb@text@path,
+ paths/.store in=\kvtcb@text@paths,
pageshort/.store in=\kvtcb@text@pageshort,
updated/.store in=\kvtcb@text@updated,
value/.store in=\kvtcb@text@value,
@@ -125,8 +129,10 @@
color counter/.store in=\kvtcb@col@counter,
color length/.store in=\kvtcb@col@length,
color color/.store in=\kvtcb@col@color,
+ color fade/.store in=\kvtcb@col@fade,
+ color path/.store in=\kvtcb@col@path,
color definition/.style={color command={#1},color environment={#1},color key={#1},
- color value={#1},color color={#1},color counter={#1},color length={#1}},
+ color value={#1},color color={#1},color counter={#1},color length={#1}, color path={#1}},
color option/.store in=\kvtcb@col@opt,
color hyperlink/.store in=\kvtcb@colhyper,
color frame/.store in=\kvtcb@colhyper,
@@ -145,15 +151,22 @@
doc head command/.style={doc@head@command/.style={#1}},
doc head environment/.style={doc@head@environment/.style={#1}},
doc head key/.style={doc@head@key/.style={#1}},
- doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1}},
+ doc head path/.style={doc@head@path/.style={#1}},
+ doc head/.style={doc head command={#1},doc head environment={#1},doc head key={#1},
+ doc head path={#1}},
+ doc label/.store in=\kvtcb@doc@label,
before doc body command/.store in=\kvtcb@doc@body@command@before,
after doc body command/.store in=\kvtcb@doc@body@command@after,
before doc body environment/.store in=\kvtcb@doc@body@environment@before,
after doc body environment/.store in=\kvtcb@doc@body@environment@after,
before doc body key/.store in=\kvtcb@doc@body@key@before,
after doc body key/.store in=\kvtcb@doc@body@key@after,
- before doc body/.style={before doc body command={#1},before doc body environment={#1},before doc body key={#1}},
- after doc body/.style={after doc body command={#1},after doc body environment={#1},after doc body key={#1}},
+ before doc body path/.store in=\kvtcb@doc@body@path@before,
+ after doc body path/.store in=\kvtcb@doc@body@path@after,
+ before doc body/.style={before doc body command={#1},before doc body environment={#1},
+ before doc body key={#1},before doc body path={#1}},
+ after doc body/.style={after doc body command={#1},after doc body environment={#1}
+ ,after doc body key={#1},after doc body path={#1}},
doc description/.store in=\kvtcb@doc@description,%
doc into index/.is if=tcb@doc@toindex,%
doc updated/.style={before upper={\tcbdocmarginnote{\tcbdocupdated{#1}}}},
@@ -182,6 +195,7 @@
counter=counter,counters=Counters,
environment content=environment content,
environment=environment,environments=Environments,
+ path=path operation,paths=Path operations,
index=Index,
key=key,keys=Keys,
length=length,lengths=Lengths,
@@ -259,6 +273,10 @@
\newrobustcmd{\tcbIndexPrintKeyC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@key}}
\def\tcb@Print@Key#1{\textcolor{\kvtcb@col@key}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
+\newrobustcmd{\tcbIndexPrintPathCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@path}{\kvtcb@text@path}}
+\newrobustcmd{\tcbIndexPrintPathC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@path}}
+\def\tcb@Print@Path#1{\textcolor{\kvtcb@col@path}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
+
\newrobustcmd{\tcbIndexPrintValCA}[1]{\tcb@Index@Print@CA{#1}{\kvtcb@col@value}{\kvtcb@text@value}}
\newrobustcmd{\tcbIndexPrintValC}[1]{\tcb@Index@Print@C{#1}{\kvtcb@col@value}}
\def\tcb@Print@Val#1{\textcolor{\kvtcb@col@value}{\tcb@doc@bfseries\tcb@scantokens{#1}}}
@@ -279,6 +297,7 @@
\def\tcb@index@Env#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintEnvCA{#1}}\kvtcb@index@command{\kvtcb@text@envs\idx@level#1\idx@actual\tcbIndexPrintEnvC{#1}}\fi}
\def\tcb@index@Key#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintKeyCA{#1}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{#1}}\fi}%
\def\tcb@index@KeyPath#1#2{\iftcb@doc@toindex\kvtcb@index@command{#2\idx@actual\tcbIndexPrintKeyCA{#2}}\kvtcb@index@command{\kvtcb@text@keys\idx@level#1\idx@actual\tcbIndexPrintKeyC{/#1/}\idx@level#2\idx@actual\tcbIndexPrintKeyC{#2}}\fi}%
+\def\tcb@index@Path#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintPathCA{#1}}\kvtcb@index@command{\kvtcb@text@paths\idx@level#1\idx@actual\tcbIndexPrintPathC{#1}}\fi}
\def\tcb@index@Val#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintValCA{#1}}\kvtcb@index@command{\kvtcb@text@values\idx@level#1\idx@actual\tcbIndexPrintValC{#1}}\fi}
\def\tcb@index@Col#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintColCA{#1}}\kvtcb@index@command{\kvtcb@text@colors\idx@level#1\idx@actual\tcbIndexPrintColC{#1}}\fi}
\def\tcb@index@Count#1{\iftcb@doc@toindex\kvtcb@index@command{#1\idx@actual\tcbIndexPrintCountCA{#1}}\kvtcb@index@command{\kvtcb@text@counters\idx@level#1\idx@actual\tcbIndexPrintCountC{#1}}\fi}
@@ -311,20 +330,20 @@
enlarge bottom by=-0.2\baselineskip,#1}
% main documentation environments
-\newenvironment{docCommand}[3][]{\tcbset{#1}%
+\newenvironment{docCommand}[3][]{\tcbset{doc label={#2},#1}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@command}%
- \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:#2}{\ttfamily #3}%
+ \tcb@Print@Com{#2}\tcb@index@Com{#2}\protected@edef\@currentlabel{\noexpand\tcb@cs{#2}}\label{com:\kvtcb@doc@label}{\ttfamily #3}%
\tcb@doc@do@description%
\end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@command@before\ignorespaces}%
{\ifvmode\else\unskip\fi\kvtcb@doc@body@command@after\end{tcb@manual@entry}}
\newenvironment{docCommand*}{\bgroup\tcb@doc@toindexfalse\begin{docCommand}}{\end{docCommand}\egroup}
-\newenvironment{docEnvironment}[3][]{\tcbset{#1}%
+\newenvironment{docEnvironment}[3][]{\tcbset{doc label={#2},#1}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@environment}%
- \strut\cs{begin}\brackets{\tcb@Print@Env{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:#2}{\ttfamily #3}\par%
+ \strut\cs{begin}\brackets{\tcb@Print@Env{#2}}\tcb@index@Env{#2}\protected@edef\@currentlabel{#2}\label{env:\kvtcb@doc@label}{\ttfamily #3}\par%
\strut~~\meta{\kvtcb@text@envcontent}\par%
\strut\cs{end}\brackets{\tcb@Print@Env{#2}}%
\tcb@doc@do@description%
@@ -333,14 +352,14 @@
\newenvironment{docEnvironment*}{\bgroup\tcb@doc@toindexfalse\begin{docEnvironment}}{\end{docEnvironment}\egroup}
-\NewDocumentEnvironment{docKey}{ O{} +O{} m m +m }{\tcbset{#2,doc description={#5}}%
+\NewDocumentEnvironment{docKey}{ O{} +O{} m m +m }{\tcbset{doc label={#3},#2,doc description={#5}}%
\begin{tcb@manual@entry}%
\begin{tcb@doc@head}{doc@head@key}%
\ifblank{#1}{%
- \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:#3}{\ttfamily #4}%
+ \tcb@Print@Key{#3}\tcb@index@Key{#3}\protected@edef\@currentlabel{#3}\label{key:\kvtcb@doc@label}{\ttfamily #4}%
}{%
\tcb@Print@Key{/#1/#3}%
- \tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/#3}{\ttfamily #4}%
+ \tcb@index@KeyPath{#1}{#3}\protected@edef\@currentlabel{/#1/#3}\label{key:/#1/\kvtcb@doc@label}{\ttfamily #4}%
}%
\tcb@doc@do@description%
\end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@key@before\ignorespaces}%
@@ -356,6 +375,18 @@
\newenvironment{#1*}{\bgroup\tcb@doc@toindexfalse\begin{#1}}{\end{#1}\egroup}%
}
+\newenvironment{docPathOperation}[3][]{\tcbset{doc label={#2},#1}%
+ \begin{tcb@manual@entry}%
+ \begin{tcb@doc@head}{doc@head@path}%
+ \colFade{\tcb@cs{path ...}}\
+ \tcb@Print@Path{#2}\tcb@index@Path{#2}\protected@edef\@currentlabel{#2}\label{path:\kvtcb@doc@label}{\ttfamily #3}%
+ \ \colFade{\tcb@scantokens{...;}}
+ \tcb@doc@do@description%
+ \end{tcb@doc@head}\nobreak\tcbset{before upper=}\kvtcb@doc@body@path@before\ignorespaces}%
+ {\ifvmode\else\unskip\fi\kvtcb@doc@body@path@after\end{tcb@manual@entry}}
+
+\newenvironment{docPathOperation*}{\bgroup\tcb@doc@toindexfalse\begin{docPathOperation}}{\end{docPathOperation}\egroup}
+
\DeclareDocumentCommand\docAuxCommand{sm}{%
\tcb@Print@Com{#2}%
\IfBooleanTF{#1}{}{\tcb@index@Com{#2}}%
@@ -408,6 +439,7 @@
\def\refCom{\tcb@ref@doc{com}}
\def\refEnv{\tcb@ref@doc{env}}
\def\refKey{\tcb@ref@doc{key}}
+\def\refPathOperation{\tcb@ref@doc{path}}
\def\refAux#1{\textcolor{\kvtcb@colhyper}{\tcb@scantokens{#1}}}
\def\refAuxcs#1{\textcolor{\kvtcb@colhyper}{\tcb@cs{#1}}}
@@ -491,6 +523,7 @@
color option=Option,
color definition=Definition,
color hyperlink=Hyperlink,
+ color fade=Fade,
index command=\index,%
index format=pgf,
index default settings,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbexternal.code.tex new/tex/latex/tcolorbox/tcbexternal.code.tex
--- old/tex/latex/tcolorbox/tcbexternal.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbexternal.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbexternal.code.tex: Code for externalization
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{pro@cessing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbfitting.code.tex new/tex/latex/tcolorbox/tcbfitting.code.tex
--- old/tex/latex/tcolorbox/tcbfitting.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbfitting.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbfitting.code.tex: Code for fit boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\newdimen\tcbfitdim
\newdimen\tcb@lowerfitdim
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbhooks.code.tex new/tex/latex/tcolorbox/tcbhooks.code.tex
--- old/tex/latex/tcolorbox/tcbhooks.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbhooks.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbhooks.code.tex: Code for adding hooks
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbset{%
before upper app/.code={\appto\kvtcb@before@upper{#1}},%
@@ -74,10 +74,10 @@
title code app/.code={\appto\tcb@title@code{#1}},%
title code pre/.code={\preto\tcb@title@code{#1}},%
%
- extras unbroken pre/.code={\preto\tcb@extras@unbroken{#1}},%
- extras first pre/.code={\preto\tcb@extras@first{#1}},%
- extras middle pre/.code={\preto\tcb@extras@middle{#1}},%
- extras last pre/.code={\preto\tcb@extras@last{#1}},%
+ extras unbroken pre/.code={\preto\tcb@extras@unbroken{\tcbset{#1}}},%
+ extras first pre/.code={\preto\tcb@extras@first{\tcbset{#1}}},%
+ extras middle pre/.code={\preto\tcb@extras@middle{\tcbset{#1}}},%
+ extras last pre/.code={\preto\tcb@extras@last{\tcbset{#1}}},%
extras pre/.style={extras unbroken pre={#1},extras first pre={#1},extras middle pre={#1},extras last pre={#1}},%
extras broken pre/.style={extras first pre={#1},extras middle pre={#1},extras last pre={#1}},%
extras unbroken and first pre/.style={extras unbroken pre={#1},extras first pre={#1}},%
@@ -119,5 +119,10 @@
watermark text pre/.style={overlay pre={\tcb@drawspec@watermark@text{#1}}},
watermark text app on/.style args={#1 is #2}{overlay #1 app={\tcb@drawspec@watermark@text{#2}}},
watermark text pre on/.style args={#1 is #2}{overlay #1 pre={\tcb@drawspec@watermark@text{#2}}},
+ %
+ minted options app/.code={\appto\kvtcb@minted@options{,#1}},
+ minted options pre/.code={\preto\kvtcb@minted@options{#1,}},
+ listing options app/.code={\appto\kvtcb@listingoptions{,#1}},
+ listing options pre/.code={\preto\kvtcb@listingoptions{#1,}},
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistings.code.tex new/tex/latex/tcolorbox/tcblistings.code.tex
--- old/tex/latex/tcolorbox/tcblistings.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistings.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistings.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{listings}[2007/02/22]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistingscore.code.tex new/tex/latex/tcolorbox/tcblistingscore.code.tex
--- old/tex/latex/tcolorbox/tcblistingscore.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistingscore.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistingscode.code.tex: Auxiliary code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{pro@cessing}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcblistingsutf8.code.tex new/tex/latex/tcolorbox/tcblistingsutf8.code.tex
--- old/tex/latex/tcolorbox/tcblistingsutf8.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcblistingsutf8.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcblistingsutf8.code.tex: Code for colorboxes with listings in UTF-8
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{listingsutf8}[2011/11/10]
\tcbuselibrary{listings}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbmagazine.code.tex new/tex/latex/tcolorbox/tcbmagazine.code.tex
--- old/tex/latex/tcolorbox/tcbmagazine.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbmagazine.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbmagazine.code.tex: Code for box sets and magazine styles
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{breakable}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbminted.code.tex new/tex/latex/tcolorbox/tcbminted.code.tex
--- old/tex/latex/tcolorbox/tcbminted.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbminted.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbminted.code.tex: Code for colorboxes with listings
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{minted}[2011/09/17]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbposter.code.tex new/tex/latex/tcolorbox/tcbposter.code.tex
--- old/tex/latex/tcolorbox/tcbposter.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbposter.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbposter.code.tex: Code for posters
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{breakable,magazine,skins,fitting}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbprocessing.code.tex new/tex/latex/tcolorbox/tcbprocessing.code.tex
--- old/tex/latex/tcolorbox/tcbprocessing.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbprocessing.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbprocessing.code.tex: Code for conditional processing
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{pdftexcmds}
\RequirePackage{shellesc}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbraster.code.tex new/tex/latex/tcolorbox/tcbraster.code.tex
--- old/tex/latex/tcolorbox/tcbraster.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbraster.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\newcounter{tcbrastercolumn}
\newcounter{tcbrasterrow}
@@ -160,8 +160,8 @@
% sanitize
\tcbdimto\tcb@raster@width{\kvtcb@raster@width}%
\tcbdimto\tcb@raster@height{\kvtcb@raster@height}%
- \tcbdimto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
- \tcbdimto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
+ \tcbglueto\tcb@raster@skip@before{\kvtcb@raster@skip@before}%
+ \tcbglueto\tcb@raster@skip@after{\kvtcb@raster@skip@after}%
\tcbdimto\tcb@raster@skip@left{\kvtcb@raster@skip@left}%
\tcbdimto\tcb@raster@skip@right{\kvtcb@raster@skip@right}%
\tcbdimto\tcb@raster@xskip{\kvtcb@raster@xskip}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbskins.code.tex new/tex/latex/tcolorbox/tcbskins.code.tex
--- old/tex/latex/tcolorbox/tcbskins.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbskins.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskins.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{tikz}[2010/10/13]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex new/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex
--- old/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbskinsjigsaw.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbskinsjigsaw.code.tex: Code for colorboxes with different skins
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{skins}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbtheorems.code.tex new/tex/latex/tcolorbox/tcbtheorems.code.tex
--- old/tex/latex/tcolorbox/tcbtheorems.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbtheorems.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbtheorems.code.tex: Code for theorems in colorboxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,7 +18,7 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{amsmath}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbvignette.code.tex new/tex/latex/tcolorbox/tcbvignette.code.tex
--- old/tex/latex/tcolorbox/tcbvignette.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbvignette.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbvignette.code.tex: Code for ornamental frames
%%
%% -------------------------------------------------------------------------------------------
@@ -17,7 +17,7 @@
%%
%% This work consists of all files listed in README
%%
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\tcbuselibrary{skins}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcbxparse.code.tex new/tex/latex/tcolorbox/tcbxparse.code.tex
--- old/tex/latex/tcolorbox/tcbxparse.code.tex 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcbxparse.code.tex 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcbxparse.code.tex: Code for xparse features
%%
%% -------------------------------------------------------------------------------------------
@@ -18,14 +18,14 @@
%% This work consists of all files listed in README
%%
%\makeatletter
-\tcb@set@library@version{4.20}
+\tcb@set@library@version{4.22}
\RequirePackage{xparse}[2013/12/31]
\tcbset{%
- IfNoValueTF/.code args={#1#2#3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
- IfValueTF/.code args={#1#2#3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
- IfBooleanTF/.code args={#1#2#3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfNoValueTF/.code n args={3}{\IfNoValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfValueTF/.code n args={3}{\IfValueTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
+ IfBooleanTF/.code n args={3}{\IfBooleanTF{#1}{\pgfkeysalso{#2}}{\pgfkeysalso{#3}}},
verbatim/.style={fontupper=\ttfamily,nobeforeafter,tcbox raise base,top=0pt,bottom=0pt,left=1mm,right=1mm,boxrule=0.3mm}
}
@@ -232,6 +232,19 @@
\def\tcb@sbs@content@right{\tcb@sbs@text@left\tcblower\box\tcb@lowerbox}
\def\tcb@sbs@content@both{\box\tcb@upperbox\tcblower\box\tcb@lowerbox}
+\def\tcb@sbs@save@upper{%
+ \colorlet{tcbcol(a)origin}{.}%
+ \tcb@set@color{tcbcolupper}%
+ \sbox{\tcb@upperbox}{\kvtcb@fontupper\kvtcb@halignupper\tcb@insert@before@upper\tcb@sbs@text@left\tcb@insert@after@upper}%
+ \tcb@reset@color%
+}
+\def\tcb@sbs@save@lower{%
+ \colorlet{tcbcol(a)origin}{.}%
+ \tcb@set@color{tcbcollower}%
+ \sbox{\tcb@lowerbox}{\kvtcb@fontlower\kvtcb@halignlower\tcb@insert@before@lower\tcb@sbs@text@right\tcb@insert@after@lower}%
+ \tcb@reset@color%
+}
+
\tcbset{%
sidebyside adapt/.is choice,
sidebyside adapt/none/.style={%
@@ -241,19 +254,19 @@
},
sidebyside adapt/left/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\let\tcb@sbs@content\tcb@sbs@content@left},
+ code={\tcb@sbs@save@upper\let\tcb@sbs@content\tcb@sbs@content@left},
lefthand width=\wd\tcb@upperbox,
}%
},
sidebyside adapt/right/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@right},
+ code={\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@right},
righthand width=\wd\tcb@lowerbox,
}%
},
sidebyside adapt/both/.style={%
sidebyside@adapt@process/.style={%
- code={\sbox{\tcb@upperbox}{\tcb@sbs@text@left}\sbox{\tcb@lowerbox}{\tcb@sbs@text@right}\let\tcb@sbs@content\tcb@sbs@content@both},
+ code={\tcb@sbs@save@upper\tcb@sbs@save@lower\let\tcb@sbs@content\tcb@sbs@content@both},
text width=\wd\tcb@upperbox+\kvtcb@sbs@gap+\wd\tcb@lowerbox,
lefthand width=\wd\tcb@upperbox,
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/tcolorbox/tcolorbox.sty new/tex/latex/tcolorbox/tcolorbox.sty
--- old/tex/latex/tcolorbox/tcolorbox.sty 2019-03-02 23:11:06.000000000 +0100
+++ new/tex/latex/tcolorbox/tcolorbox.sty 2019-11-15 22:42:38.000000000 +0100
@@ -1,4 +1,4 @@
-%% The LaTeX package tcolorbox - version 4.20 (2019/03/02)
+%% The LaTeX package tcolorbox - version 4.22 (2019/11/15)
%% tcolorbox.sty: Text color boxes
%%
%% -------------------------------------------------------------------------------------------
@@ -18,8 +18,8 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{tcolorbox}[2019/03/02 version 4.20 text color boxes]
-\def\tcb(a)version{4.20}
+\ProvidesPackage{tcolorbox}[2019/11/15 version 4.22 text color boxes]
+\def\tcb(a)version{4.22}
\RequirePackage{pgf}[2008/01/15]
\RequirePackage{verbatim}[2003/08/22]
@@ -41,6 +41,7 @@
\newif\iftcb@fixedheight
\newif\iftcb@ignorenobreak
\newif\iftcb@checkpage
+\newif\iftcb@resetcounteronoverlays
\newbox\tcb@titlebox
\newbox\tcb@upperbox
@@ -62,6 +63,7 @@
\def\tcb@dim@to#1#2{\def#1{\the\dimexpr#2\relax}}
\def\tcbdimto#1#2{\edef#1{\the\dimexpr#2\relax}}
+\def\tcbglueto#1#2{\edef#1{\the\glueexpr#2\relax}}
\def\tcb@defToTotalHeightStandard#1#2{\tcbdimto#1{\ht#2+\dp#2}}
\let\tcb@defToTotalHeight\tcb@defToTotalHeightStandard
@@ -431,9 +433,15 @@
left skip/.style={grow to left by={-\dimexpr#1\relax}},
right skip/.style={grow to right by={-\dimexpr#1\relax}},
leftright skip/.style={left skip={#1},right skip={#1}},
- spread inwards/.style={grow to left by=1in+\hoffset+\oddsidemargin+\@totalleftmargin+(#1),code={\if@twoside\tcbset{toggle enlargement}\fi}},
+ spread inwards/.style={%
+ if odd page={grow to left by=1in+\hoffset+\oddsidemargin+\@totalleftmargin+(#1)}%
+ {grow to right by=\paperwidth-\textwidth-1in-\hoffset-\evensidemargin+(#1)}%
+ },
spread inwards/.default=\z@,
- spread outwards/.style={grow to right by=\paperwidth-\textwidth-1in-\hoffset-\oddsidemargin+(#1),code={\if@twoside\tcbset{toggle enlargement}\fi}},
+ spread outwards/.style={%
+ if odd page={grow to right by=\paperwidth-\textwidth-1in-\hoffset-\oddsidemargin+(#1)}%
+ {grow to left by=1in+\hoffset+\evensidemargin+\@totalleftmargin+(#1)}%
+ },
spread outwards/.default=\z@,
move upwards/.style={before={\clearpage%
\lineskip\z@skip%
@@ -576,10 +584,23 @@
tabularx*/.style 2 args={%
boxsep=\z@,top=\z@,bottom=\z@,leftupper=\z@,rightupper=\z@,
toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm,
- before upper*={\arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
+ before upper*={%
+ \let\tcb@CT@arc@save\CT@arc@%
+ \arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
\tcb@hack@currenvir\tabularx{\linewidth}{#2}},
- after upper*=\endtabularx\arrayrulecolor{black}},
+ after upper*={\endtabularx\global\let\CT@arc@\tcb@CT@arc@save}%
+ },
tabularx/.style={tabularx*={}{#1}},
+ tabulars*/.style 2 args={%
+ boxsep=\z@,top=\z@,bottom=\z@,leftupper=\z@,rightupper=\z@,
+ toptitle=1mm,bottomtitle=1mm,boxrule=0.5mm,
+ before upper*={%
+ \let\tcb@CT@arc@save\CT@arc@%
+ \arrayrulecolor{tcbcolframe}\def\arraystretch{1.1}#1%
+ \begin{tabular*}{\linewidth}{#2}},
+ after upper*={\end{tabular*}\global\let\CT@arc@\tcb@CT@arc@save}
+ },
+ tabulars/.style={tabulars*={}{#1}},
tikz upper/.style={before upper*={\centering\tcb@shield@externalize\begin{tikzpicture}[{#1}]},after upper*=\end{tikzpicture}},%
tikz lower/.style={before lower*={\centering\tcb@shield@externalize\begin{tikzpicture}[{#1}]},after lower*=\end{tikzpicture}},%
tikznode upper/.style={before upper={\centering\tcb@shield@externalize\begin{tikzpicture}\node[{align=center,inner sep=\z@,outer sep=\z@,#1}]\bgroup},after upper={\egroup;\end{tikzpicture}}},%
@@ -1825,6 +1846,7 @@
auto counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@auto},
use counter from/.code={\edef\kvtcb@new@counter{\csname tcb@cnt@#1\endcsname}\let\tcb@proc@counter=\tcb@proc@counter@from},
no counter/.code={\let\tcb@proc@counter=\tcb@proc@counter@no},
+ reset counter on overlays/.is if=tcb@resetcounteronoverlays,
%
number within/.store in=\kvtcb@new@numberwithin,
number format/.store in=\kvtcb@new@format,
@@ -1842,7 +1864,8 @@
blend into/tables/.style={use counter*=table,list inside=lot,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\fnum@table}}}}},%
blend into/listings/.style={use counter*=lstlisting,list inside=lol,/tcb/code={\appto\tcb@new@colopt{,before title={\tcb@blend@beforetitle{\lstlistingname~\thetcbcounter}}}}},%
%
- reset(a)new/.style={no counter,number within=,number format=\arabic,number freestyle=,list inside=,list type=tcolorbox,init@hook@clear},
+ reset(a)new/.style={no counter,number within=,number format=\arabic,number freestyle=,
+ list inside=,list type=tcolorbox,init@hook@clear,reset counter on overlays=false},
}
\def\tcb@proc@counter@autoanduse#1{%
@@ -1885,6 +1908,13 @@
\long\def\tcb@proc@options@init#1#2{%
\tcbset{new/.cd,reset@new,#1}%
\tcb@proc@counter{#2}%
+ \iftcb@resetcounteronoverlays%
+ \ifcsname resetcounteronoverlays\endcsname%
+ \ifcsname tcb@cnt@#2\endcsname%
+ \resetcounteronoverlays{\csname tcb@cnt@#2\endcsname}%
+ \fi%
+ \fi%
+ \fi%
\ifx\kvtcb@new@listof\@empty%
\else%
\csedef{tcb@lstof@#2}{\kvtcb@new@listof}%
@@ -2136,12 +2166,13 @@
before title=,after title=,before upper=,after upper=,before lower=,after lower=,
sidebyside=false,sidebyside align=center,sidebyside gap=10mm,
lefthand ratio=0.5,check odd page=false,nophantom,
- shield externalize=false,list entry=,no label type,
+ list entry=,no label type,
opacityupper=1.0,opacitylower=1.0,opacitytitle=1.0,opacityframe=1.0,opacityback=1.0,(a)opacitybacktitle=1.0,
subtitle style=,title filled=false,every float=,ignore nobreak=false,before nobreak=\noindent,
tcbox width=auto,
},
initialize@reset=reset@core,
+ shield externalize=false,
}
\def\tcbsetforeverylayer#1{\tcbset{initialize@reset={#1}}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tcolorbox.tlpobj new/tlpkg/tlpobj/tcolorbox.tlpobj
--- old/tlpkg/tlpobj/tcolorbox.tlpobj 2019-03-03 02:24:55.000000000 +0100
+++ new/tlpkg/tlpobj/tcolorbox.tlpobj 2019-11-16 01:54:50.000000000 +0100
@@ -1,6 +1,6 @@
name tcolorbox
category Package
-revision 50206
+revision 52809
shortdesc Coloured boxes, for LaTeX examples and theorems, etc
relocated 1
longdesc This package provides an environment for coloured and framed
@@ -12,7 +12,7 @@
longdesc package supports saving and reuse of source code and text
longdesc parts. The package depends on the pgf, verbatim, environ, and
longdesc etoolbox packages.
-runfiles size=140
+runfiles size=141
RELOC/tex/latex/tcolorbox/blueshade.png
RELOC/tex/latex/tcolorbox/crinklepaper.png
RELOC/tex/latex/tcolorbox/goldshade.png
@@ -38,7 +38,7 @@
RELOC/tex/latex/tcolorbox/tcolorbox.sty
catalogue-contact-bugs https://github.com/T-F-S/tcolorbox/issues
catalogue-ctan /macros/latex/contrib/tcolorbox
-catalogue-date 2019-03-02 12:23:55 +0100
+catalogue-date 2019-11-15 14:22:02 +0100
catalogue-license lppl1.3
catalogue-topics boxing colour verbatim listing
-catalogue-version 4.20
+catalogue-version 4.22
++++++ testidx.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/CHANGES new/doc/latex/testidx/CHANGES
--- old/doc/latex/testidx/CHANGES 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/CHANGES 2019-09-29 23:15:10.000000000 +0200
@@ -1,3 +1,11 @@
+v1.2 (2019-09-29):
+
+ * Added options ascii and noascii
+
+ * Added lonely sub-item
+
+ * Corrected description for seal
+
v1.1 (2017-08-11):
* Added more sample text, including examples starting with some
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/README new/doc/latex/testidx/README
--- old/doc/latex/testidx/README 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/README 2019-09-29 23:15:10.000000000 +0200
@@ -1,6 +1,6 @@
-LaTeX Package : testidx v1.1
+LaTeX Package : testidx v1.2
-Last Modified : 2017-08-11
+Last Modified : 2019-09-29
Author : Nicola Talbot
@@ -24,7 +24,8 @@
\end{document}
Note that the dummy indexing intentionally triggers multiple encap
-warnings for testing purposes.
+warnings for testing purposes. The package is designed to emulate
+common problems.
LICENCE
Binary files old/doc/latex/testidx/samples/sample-idx-a4.pdf and new/doc/latex/testidx/samples/sample-idx-a4.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-amsmath.pdf and new/doc/latex/testidx/samples/sample-idx-amsmath.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-babel-german.pdf and new/doc/latex/testidx/samples/sample-idx-babel-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-babel-german.tex new/doc/latex/testidx/samples/sample-idx-babel-german.tex
--- old/doc/latex/testidx/samples/sample-idx-babel-german.tex 2016-10-17 23:25:14.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-babel-german.tex 2019-09-29 23:15:10.000000000 +0200
@@ -18,7 +18,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{babel}
-\usepackage{testidx}
+\usepackage[ascii]{testidx}
\providecommand*\lettergroup[1]{%
\par\textbf{#1}\par
Binary files old/doc/latex/testidx/samples/sample-idx-german.pdf and new/doc/latex/testidx/samples/sample-idx-german.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-german.tex new/doc/latex/testidx/samples/sample-idx-german.tex
--- old/doc/latex/testidx/samples/sample-idx-german.tex 2016-10-17 23:25:14.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-german.tex 2019-09-29 23:15:10.000000000 +0200
@@ -18,7 +18,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{ngerman}
-\usepackage[german]{testidx}
+\usepackage[german,ascii]{testidx}
\providecommand*\lettergroup[1]{%
\par\textbf{#1}\par
Binary files old/doc/latex/testidx/samples/sample-idx-hyp.pdf and new/doc/latex/testidx/samples/sample-idx-hyp.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-letter.pdf and new/doc/latex/testidx/samples/sample-idx-letter.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-lua.pdf and new/doc/latex/testidx/samples/sample-idx-lua.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-lua.tex new/doc/latex/testidx/samples/sample-idx-lua.tex
--- old/doc/latex/testidx/samples/sample-idx-lua.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-lua.tex 2019-09-29 23:15:10.000000000 +0200
@@ -12,7 +12,7 @@
% arara: lualatex
% arara: xindy: {language: english, codepage: utf8,
% arara: --> log: sample-idx-lua.ilg,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-lua, texindy]}
% arara: lualatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-subset.pdf and new/doc/latex/testidx/samples/sample-idx-subset.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-t1.pdf and new/doc/latex/testidx/samples/sample-idx-t1.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idx-utf8.pdf and new/doc/latex/testidx/samples/sample-idx-utf8.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-utf8.tex new/doc/latex/testidx/samples/sample-idx-utf8.tex
--- old/doc/latex/testidx/samples/sample-idx-utf8.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-utf8.tex 2019-09-29 23:15:10.000000000 +0200
@@ -11,7 +11,7 @@
%
% arara: pdflatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-utf8, texindy]}
% arara: pdflatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-xe-digraphs.pdf and new/doc/latex/testidx/samples/sample-idx-xe-digraphs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex new/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex
--- old/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-xe-digraphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -4,9 +4,9 @@
% with XeLaTeX and xindy using digraph glyphs.
% You can build this document using:
%
-% xelatex sample-idx-xe
-% xindy -M sample-idx-xe -M texindy -C utf8 -L english -t sample-idx-xe.ilg sample-idx-xe.idx
-% xelatex sample-idx-xe
+% xelatex sample-idx-xe-digraphs
+% xindy -M sample-idx-xe-digraphs -M texindy -C utf8 -L english -t sample-idx-xe-digraphs.ilg sample-idx-xe-digraphs.idx
+% xelatex sample-idx-xe-digraphs
%
% You may want to experiment with different languages.
%
@@ -14,7 +14,7 @@
%
% arara: xelatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-xe-digraphs, texindy]}
% arara: xelatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx-xe.pdf and new/doc/latex/testidx/samples/sample-idx-xe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idx-xe.tex new/doc/latex/testidx/samples/sample-idx-xe.tex
--- old/doc/latex/testidx/samples/sample-idx-xe.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idx-xe.tex 2019-09-29 23:15:10.000000000 +0200
@@ -13,7 +13,7 @@
%
% arara: xelatex
% arara: xindy: {language: english, codepage: utf8,
-% arara: --> modules: [basename, texindy]}
+% arara: --> modules: [sample-idx-xe, texindy]}
% arara: xelatex
\documentclass{article}
Binary files old/doc/latex/testidx/samples/sample-idx.pdf and new/doc/latex/testidx/samples/sample-idx.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-bib2gls-xe.pdf and new/doc/latex/testidx/samples/sample-idxgloss-bib2gls-xe.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-bib2gls.pdf and new/doc/latex/testidx/samples/sample-idxgloss-bib2gls.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-desc.pdf and new/doc/latex/testidx/samples/sample-idxgloss-desc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idxgloss-desc.tex new/doc/latex/testidx/samples/sample-idxgloss-desc.tex
--- old/doc/latex/testidx/samples/sample-idxgloss-desc.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idxgloss-desc.tex 2019-09-29 23:15:10.000000000 +0200
@@ -5,7 +5,7 @@
\usepackage[T1]{fontenc}
\usepackage[hidelinks]{hyperref}
-\usepackage[desc]{testidx-glossaries}
+\usepackage[desc,ascii]{testidx-glossaries}
\tstidxmakegloss
Binary files old/doc/latex/testidx/samples/sample-idxgloss-xe-digraphs.pdf and new/doc/latex/testidx/samples/sample-idxgloss-xe-digraphs.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss-xindy.pdf and new/doc/latex/testidx/samples/sample-idxgloss-xindy.pdf differ
Binary files old/doc/latex/testidx/samples/sample-idxgloss.pdf and new/doc/latex/testidx/samples/sample-idxgloss.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/samples/sample-idxgloss.tex new/doc/latex/testidx/samples/sample-idxgloss.tex
--- old/doc/latex/testidx/samples/sample-idxgloss.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/samples/sample-idxgloss.tex 2019-09-29 23:15:10.000000000 +0200
@@ -6,7 +6,7 @@
\usepackage[T1]{fontenc}
\usepackage{amssymb}
\usepackage[a4paper,left=.75in,right=1.6in]{geometry}
-\usepackage[verbose]{testidx-glossaries}
+\usepackage[verbose,ascii]{testidx-glossaries}
\renewcommand*{\glstreenamefmt}[1]{#1}
\renewcommand*{\glstreegroupheaderfmt}[1]{\textbf{#1}}
Binary files old/doc/latex/testidx/samples/sample-noidxgloss.pdf and new/doc/latex/testidx/samples/sample-noidxgloss.pdf differ
Binary files old/doc/latex/testidx/testidx-code.pdf and new/doc/latex/testidx/testidx-code.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-diglyphs.tex new/doc/latex/testidx/testidx-glossaries-diglyphs.tex
--- old/doc/latex/testidx/testidx-glossaries-diglyphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-diglyphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-diglyphs.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex new/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex
--- old/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-nodiglyphs.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-nodiglyphs.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-samples.bib new/doc/latex/testidx/testidx-glossaries-samples.bib
--- old/doc/latex/testidx/testidx-glossaries-samples.bib 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-samples.bib 2019-09-29 23:15:10.000000000 +0200
@@ -27,6 +27,12 @@
description={particular areas or locations}
}
+@index{subitems,
+ category={word},
+ name={sub-items},
+ description={items that have a parent entry}
+}
+
@index{applications,
category={word},
description={computer programs}
@@ -877,7 +883,7 @@
@index{seal,
category={word},
- description={seal-dwelling fish-eating mammal with flippers}
+ description={sea-dwelling fish-eating mammal with flippers}
}
@index{sea,
@@ -1106,6 +1112,13 @@
description={attributes such as page size}
}
+(a)index{subitems.lonely,
+ name={lonely},
+ parent={subitems},
+ category={word},
+ description={a sub-item that doesn't have any siblings}
+}
+
@index{fontencoding.OT1,
name={OT1},
parent={fontencoding},
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-glossaries-samples.tex new/doc/latex/testidx/testidx-glossaries-samples.tex
--- old/doc/latex/testidx/testidx-glossaries-samples.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-glossaries-samples.tex 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries-samples.tex,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -45,6 +45,7 @@
\tstidxnewword{people}{human individuals (or fictional
anthropomorphisms)}
\tstidxnewword{places}{particular areas or locations}
+\tstidxnewword{sub-items}{items that have a parent entry}
\tstidxnewword{applications}{computer programs}
\tstidxnewword{environments}{a marked-up block within the document
that requires special action or formatting}
@@ -240,7 +241,7 @@
\tstidxnewword{thrilling}{exciting}
\tstidxnewword{quixotic}{impractically unselfish and idealist}
\tstidxnewword{sea}{large area of salt water}
-\tstidxnewword{seal}{seal-dwelling fish-eating mammal with flippers}
+\tstidxnewword{seal}{sea-dwelling fish-eating mammal with flippers}
\tstidxnewword{seaborne}{transported or travelling by sea}
\tstidxnewword{zither}{a type of stringed musical instrument}
\tstidxnewword{zealous}{having great enthusiasm for something}
@@ -513,6 +514,8 @@
is a popular method of describing aspects of chaos theory}
\tstidxnewartphrase{The}{End}{denotes the end of a
story, especially fairy tales}
+\tstidxnewsubword{sub-items}{lonely}{a sub-item that doesn't have
+any siblings}
\tstidxnewsubword{document}{properties}{attributes such as page size}
\tstidxnewsubword{font encoding}{OT1}{one of the original font
encodings supplied with \TeX}
Binary files old/doc/latex/testidx/testidx-manual.pdf and new/doc/latex/testidx/testidx-manual.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/testidx/testidx-manual.tex new/doc/latex/testidx/testidx-manual.tex
--- old/doc/latex/testidx/testidx-manual.tex 2017-08-12 01:06:40.000000000 +0200
+++ new/doc/latex/testidx/testidx-manual.tex 2019-09-29 23:15:10.000000000 +0200
@@ -27,12 +27,12 @@
\begin{document}
- \title{testidx.sty v1.1:
+ \title{testidx.sty v1.2:
dummy text for testing indexes}
\author{Nicola L.C. Talbot\\[10pt]
\url{http://www.dickimaw-books.com/}}
- \date{2017-08-11}
+ \date{2019-09-29}
\maketitle
\tableofcontents
@@ -41,7 +41,11 @@
The \styfmt{testidx} package is for testing indexes (\cs{index},
\env{theindex} and indexing applications, such as \app{makeindex}
-and \app{xindy}).
+and \app{xindy}). See also
+\href{http://tug.org/TUGboat/tb38-3/tb120talbot.pdf}{Testing
+indexes: \texttt{testidx.sty}} in
+\href{http://tug.org/TUGboat/Contents/contents38-3.html}{TUGboat issue 38:3, 2017}.
+
As with packages like \sty{lipsum} and \sty{blindtext}, this package
provides dummy text, but it's interspersed with \cs{index} commands.
The filler text is mostly English not lorum ipsum, as this makes it
@@ -112,13 +116,23 @@
\item Symbols and numbers that don't have a natural word order.
The numbers may or may not be ordered numerically, depending on the
indexing method.
+
+\item An item with just a single sub-item. (Perhaps the document
+author intended to index more sub-items but they weren't needed in
+the end.) Ideally this needs to be flagged and have the hierarchy
+removed. There are actually two lonely sub-items. The first is
+\qt{properties} as a sub-item of \qt{document}. In this case the
+parent \qt{document} has also been indexed and has a location. The
+second is \qt{lonely} as a sub-item of \qt{sub-items}. In this case
+the parent \qt{sub-items} hasn't been indexed and so doesn't have a
+location.
\end{itemize}
In addition, words containing extended Latin characters, digraphs and a
trigraph are indexed to help test various Latin alphabets, such as
Swedish, Icelandic, Welsh, Dutch, Polish and Hungarian. These may or
may not be recognised by indexing applications.
-Version 1.1 now comes with a supplementary package
+As from version 1.1, \sty{testidx} now comes with a supplementary package
\sty{testidx-glossaries} which provides a similar way of testing the
\sty{glossaries} or \sty{glossaries-extra} package.
@@ -150,6 +164,24 @@
to test how the indexing applications deal with this problem.
\end{important}
+Note that as from 2018, \LaTeX\ now automatically provides limited
+UTF-8 support even if the document doesn't load \sty{inputenc}. Therefore
+the above document will use the ASCII indexing tests with pre-2018
+\LaTeX, but will use the UTF-8 indexing tests with newer versions of
+the \LaTeX\ kernel (because \cs{inputencodingname} is now defined as
+\texttt{utf8}). If you specifically want to test ASCII indexing
+then you either need to switch to ASCII encoding:
+\begin{verbatim}
+\usepackage[ascii]{inputenc}
+\usepackage{makeidx}
+\usepackage{testidx}
+\end{verbatim}
+or use \sty{testidx}'s \pkgopt{ascii} option:
+\begin{verbatim}
+\usepackage{makeidx}
+\usepackage[ascii]{testidx}
+\end{verbatim}
+
If you want to use \app{xindy}, you'll need to define the
attributes (encaps) used in the dummy text. For example:
\begin{verbatim}
@@ -272,7 +304,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{ngerman}
-\usepackage[german]{testidx}
+\usepackage[german,ascii]{testidx}
\begin{filecontents*}{\jobname.ist}
quote '+'
@@ -302,7 +334,7 @@
\usepackage{filecontents}
\usepackage{makeidx}
\usepackage{babel}
-\usepackage{testidx}
+\usepackage[ascii]{testidx}
\begin{filecontents*}{\jobname.ist}
quote '+'
@@ -324,7 +356,7 @@
\documentclass{report}
\usepackage[T1]{fontenc}
-\usepackage{testidx-glossaries}
+\usepackage[ascii]{testidx-glossaries}
\renewcommand*{\glstreenamefmt}[1]{#1}
@@ -358,6 +390,15 @@
The following package options are provided:
\begin{description}
+\item[\pkgopt{ascii}] Use only ASCII tests even if the document
+supports UTF-8. Any characters outside
+that range are produced with \LaTeX\ commands.
+
+\item[\pkgopt{noascii}] (Default.) Don't enforce ASCII tests. This option
+doesn't actually provide UTF-8 support but will simply
+determine whether or not to use ASCII tests depending on the
+document's input encoding.
+
\item[\pkgopt{german} or \pkgopt{ngerman}]
This redefines the indexing \qt{quote} character to use \texttt{+}
instead of the double-quote character. Remember to add this
@@ -412,6 +453,10 @@
\begin{definition}[\DescribeMacro\testidxSanitizeOff]
\cs{testidxSanitizeOff}
\end{definition}
+Note that as from \LaTeX\ 2019/10/01 UTF-8 characters are no longer
+expanded while they are written to the \texttt{.idx} file. This
+means that there may be no difference between \pkgopt{sanitize} and
+\pkgopt{nosanitize} depending on the \LaTeX\ kernel in use.
\item[\pkgopt{showmarks}]
(Default.) Show the location of the \cs{index} commands
@@ -1026,12 +1071,16 @@
\label{sec:exlatin}
The dummy text includes words or phrases that have extended
-Latin characters. There are two modes:
+Latin characters. (The document encoding should be correctly set
+before loading \sty{testidx}.) There are two modes:
\begin{description}
-\item[ASCII] This mode is on \emph{unless} you are using
-\XeLaTeX\ or \LuaLaTeX, or the document has loaded
-\sty{inputenc} with the encoding set to \pkgopt{utf8}.
+\item[ASCII] This mode is on by default \emph{unless} you are using
+\XeLaTeX\ or \LuaLaTeX, or the document has the encoding set to \pkgopt{utf8}.
+Note that with new versions of \LaTeX, \cs{inputencodingname} is now
+automatically defined as \pkgopt{utf8} by the kernel. You can
+explicitly switch this mode on with the \pkgopt{ascii} package
+option.
Example that will switch on ASCII mode:
\begin{verbatim}
@@ -1049,12 +1098,30 @@
\printindex
\end{document}
\end{verbatim}
+(With new versions of \LaTeX\ this document will start with
+\cs{inputencodingname} set to \texttt{utf8} and then it will be
+changed to \texttt{latin1} when \sty{inputenc} is loaded.)
+
+Alternatively use the \pkgopt{ascii} package option:
+\begin{verbatim}
+\documentclass{article}
+
+\usepackage{makeidx}
+\usepackage[ascii]{testidx}
+
+\makeindex
+
+\begin{document}
+\testidx
+
+\printindex
+\end{document}
+\end{verbatim}
-\item[UTF-8] This mode is on \emph{if} you are using
-\XeLaTeX\ or \LuaLaTeX, or if the document has loaded
-\sty{inputenc} with the encoding set to \pkgopt{utf8}.
+\item[UTF-8] This mode is on by default \emph{if} you are using
+\XeLaTeX\ or \LuaLaTeX, or if \cs{inputencodingname} is set to \pkgopt{utf8}.
-Example that will switch on UTF-8 mode:
+Example that will switch on UTF-8 mode (\XeLaTeX\ or \LuaLaTeX):
\begin{verbatim}
\documentclass{article}
@@ -1070,7 +1137,7 @@
\printindex
\end{document}
\end{verbatim}
-Or
+Or (\sty{inputenc} sets the encoding to UTF-8):
\begin{verbatim}
\documentclass{article}
@@ -1087,13 +1154,30 @@
\printindex
\end{document}
\end{verbatim}
+Or with new versions of the \LaTeX\ kernel (which automatically
+provides UTF-8 support):
+\begin{verbatim}
+\documentclass{article}
+
+\usepackage[T1]{fontenc}
+\usepackage{makeidx}
+\usepackage{testidx}
+
+\makeindex
+
+\begin{document}
+\testidx
+
+\printindex
+\end{document}
+\end{verbatim}
If the UTF-8 mode is on, you can additionally use the
\pkgopt{diglyphs} package option to replace the
\tstidxqt{ll}, \tstidxqt{ij} and \tstidxqt{dz} digraphs with
a single glyph, but you'll need a font that supports
those glyphs. (The trigraph \tstidxqt{dzw} and other digraphs,
-such as \tstidxqt{th} aren't affected by this option.) For example
+such as \tstidxqt{th} aren't affected by this option.) For example:
\begin{verbatim}
\documentclass{article}
@@ -1174,7 +1258,7 @@
\end{verbatim}
(where 3 is the page number).
-Since this can confuse the indexing application,
+Since this expansion can confuse the indexing application,
\styfmt{testidx} provides a \pkgopt{sanitize} package option
which will first sanitize the UTF-8 characters before
indexing them. This option is on by default for regular \LaTeX\ and
@@ -1188,6 +1272,13 @@
\cs{tstindex} is defined as) behaves with these characters, then
switch it off.
+\begin{important}
+As from \LaTeX\ 2019/10/01 this behaviour has changed and the UTF-8
+characters are no longer expanded while they are written to the
+\texttt{.idx} file. This means that the tests may produce different
+results depending on the \LaTeX\ kernel in use.
+\end{important}
+
Note that this \pkgopt{sanitize} option isn't adjusting the
definition of \cs{index} or \cs{tstindex}, but is essentially
pretending that the user is doing something like:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/testidx.doc.tlpobj new/tlpkg/tlpobj/testidx.doc.tlpobj
--- old/tlpkg/tlpobj/testidx.doc.tlpobj 2019-02-28 04:06:55.000000000 +0100
+++ new/tlpkg/tlpobj/testidx.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,9 +1,9 @@
name testidx.doc
category Package
-revision 45021
+revision 52213
shortdesc doc files of testidx
relocated 1
-docfiles size=1358
+docfiles size=1362
RELOC/doc/latex/testidx/CHANGES
RELOC/doc/latex/testidx/README
RELOC/doc/latex/testidx/samples/sample-idx-a4.pdf
++++++ testidx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/testidx/testidx-glossaries.sty new/tex/latex/testidx/testidx-glossaries.sty
--- old/tex/latex/testidx/testidx-glossaries.sty 2017-08-12 01:06:40.000000000 +0200
+++ new/tex/latex/testidx/testidx-glossaries.sty 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx-glossaries.sty,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{testidx-glossaries}[2017/08/11 v1.1 (NLCT)]
+\ProvidesPackage{testidx-glossaries}[2019/09/29 v1.2 (NLCT)]
\newcommand*{\tstidx@glossariespkg}{glossaries}
\@ifpackageloaded{glossaries}
{%
@@ -2227,9 +2227,10 @@
any further sub-levels. Although \tstidxapp{xindy} allows more than
three levels (\tstidxapp{makeindex} doesn't), it's somewhat
\tstidxword{excessive} to go below a sub-sub-level.
- You'll have to add your own tests for anything deeper.%
-
+ You'll have to add your own tests for anything deeper.
+ Watch out for \tstidxsubword{sub-items}{lonely} sub-items.%
}
+
\let\@tidx@org@par@iii\@tidx@par@iii
\let\@tidx@par@iii\@tidx@gls@par@iii
\newcommand*{\@tidx@gls@par@iv}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/testidx/testidx.sty new/tex/latex/testidx/testidx.sty
--- old/tex/latex/testidx/testidx.sty 2017-08-12 01:06:40.000000000 +0200
+++ new/tex/latex/testidx/testidx.sty 2019-09-29 23:15:10.000000000 +0200
@@ -7,7 +7,7 @@
%% testidx.dtx (with options: `testidx.sty,package')
%%
%% testidx.dtx
-%% Copyright 2017 Nicola Talbot
+%% Copyright 2019 Nicola Talbot
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -39,7 +39,7 @@
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{testidx}[2017/08/11 v1.1 (NLCT)]
+\ProvidesPackage{testidx}[2019/09/29 v1.2 (NLCT)]
\RequirePackage{color}
\RequirePackage{ifxetex}
\RequirePackage{ifluatex}
@@ -54,13 +54,16 @@
\fi
\fi
}
-\newcommand*{\@tstidx@ifutfviii}[2]{%
+\newcommand*{\@@tstidx@ifutfviii}[2]{%
\@tstidx@ifxelua{#1}
{%
\ifx\inputencodingname\@tstidx@utfviii#1\else#2\fi
}%
}
\newcommand*{\@tstidx@utfviii}{utf8}
+\let\@tstidx@ifutfviii\@@tstidx@ifutfviii
+\DeclareOption{ascii}{\let\@tstidx@ifutfviii\@secondoftwo}
+\DeclareOption{noascii}{\let\@tstidx@ifutfviii\@@tstidx@ifutfviii}
\newcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip}
\newcommand*{\testidxStripAccents}{%
\renewcommand*{\tstidxprocessasciisort}{\tstidxprocessasciisortstrip}%
@@ -2347,7 +2350,8 @@
any further sub-levels. Although \tstidxapp{xindy} allows more than
three levels (\tstidxapp{makeindex} doesn't), it's somewhat
\tstidxword{excessive} to go below a sub-sub-level.
- You'll have to add your own tests for anything deeper.%
+ You'll have to add your own tests for anything deeper.
+ Watch out for \tstidxsubword{sub-items}{lonely} sub-items.%
}
\tstidxnewblock*{\@tidx@openrangepar}
{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/testidx.tlpobj new/tlpkg/tlpobj/testidx.tlpobj
--- old/tlpkg/tlpobj/testidx.tlpobj 2019-02-28 04:06:56.000000000 +0100
+++ new/tlpkg/tlpobj/testidx.tlpobj 2019-09-30 01:54:47.000000000 +0200
@@ -1,6 +1,6 @@
name testidx
category Package
-revision 45021
+revision 52213
shortdesc Dummy text for testing index styles and indexing applications
relocated 1
longdesc This is a LaTeX package that provides a command to produce
@@ -17,7 +17,7 @@
RELOC/tex/latex/testidx/testidx.sty
catalogue-also blindtext
catalogue-ctan /macros/latex/contrib/testidx
-catalogue-date 2017-08-11 14:31:03 +0200
+catalogue-date 2019-09-29 17:34:08 +0200
catalogue-license lppl1.3
catalogue-topics index dummy-gen
-catalogue-version 1.1
+catalogue-version 1.2
++++++ tex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/initex.man1.pdf and new/texmf-dist/doc/man/man1/initex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tex.1 new/texmf-dist/doc/man/man1/tex.1
--- old/texmf-dist/doc/man/man1/tex.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tex.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TEX 1 "16 June 2015" "Web2C 2019"
+.TH TEX 1 "6 August 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -182,6 +182,13 @@
.SH OPTIONS
This version of \*(TX understands the following command line options.
.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line. See the Kpathsea manual.
+.TP
.B -enc
Enable the enc\*(TX extensions. This option is only effective in
combination with
@@ -488,7 +495,7 @@
.br
K. Berry,
.IR "Eplain: Expanded plain \*(TX" ,
-ftp://ftp.cs.umb.edu/pub/tex/eplain/doc.
+https://tug.org/eplain
.br
Michael Spivak,
.IR "The Joy of \*(OX" ,
@@ -496,6 +503,7 @@
.br
.I TUGboat
(the journal of the \*(TX Users Group).
+https://tug.org/TUGboat
.\"=====================================================================
.SH TRIVIA
\*(TX, pronounced properly, rhymes with ``blecchhh.'' The proper
Binary files old/texmf-dist/doc/man/man1/tex.man1.pdf and new/texmf-dist/doc/man/man1/tex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex.doc.tlpobj new/tlpkg/tlpobj/tex.doc.tlpobj
--- old/tlpkg/tlpobj/tex.doc.tlpobj 2019-03-27 02:26:40.000000000 +0100
+++ new/tlpkg/tlpobj/tex.doc.tlpobj 2020-03-14 01:43:39.000000000 +0100
@@ -1,6 +1,6 @@
name tex.doc
category TLCore
-revision 50602
+revision 54276
shortdesc doc files of tex
docfiles size=27
texmf-dist/doc/man/man1/initex.1
++++++ tex4ebook.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/README new/texmf-dist/doc/support/tex4ebook/README
--- old/texmf-dist/doc/support/tex4ebook/README 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/README 2019-11-01 22:03:38.000000000 +0100
@@ -2,24 +2,22 @@
# Introduction
-`TeX4ebook` is bundle of Lua scripts and `LaTeX` packages for conversion of
-LaTeX files to ebook formats, for example `epub`, `mobi` and `epub3`. `tex4ht`
-is used as conversion engine.
+`TeX4ebook` is a tool for conversion from \LaTeX\ to
+ebook formats, such as EPUB, MOBI and EPUB 3.
+It is based on `TeX4ht`^[https://tug.org/tex4ht/],
+which provides instructions for the actual \LaTeX\ to HTML conversion,
+and on `make4ht`^[https://ctan.org/pkg/make4ht?lang=en].
-Note that while `mobi` is supported by Amazon Kindle, most widespread ebook
-reader, it doesn't support `mathml` and this means that math must re represented
-as images. The same is true for `epub`. This is not a good thing, especially
-for inline math, as you may experience wrong baselines. If your ebook contains
-math, the only correct solution is to produce `epub3`, as it supports `mathml`.
-The issue with `epub3` is, that majority of `e-ink` ebook readers doesn't
-support this format, reader applications exists mainly for Android and Apple
-devices. For books which contains mainly prose, all formats should be suitable,
-but `epub3` supports most features from web standards, such as `CSS`.
-As with `tex4ht`, the emphasis is on conversion of document's logical structure
-and metadata, basic visual appearance is preserved as well, but you should use
+The conversion is focused on the logical structure of the converted document
+and metadata. Basic visual appearance is preserved as well, but you should use
custom configurations if you want to make the document more visually appealing.
-You can include custom `CSS` or fonts in configuration files.
+You can include custom `CSS` or fonts in a configuration file.
+
+`TeX4ebook` supports the same features as `make4ht`, in particular build files and extensions.
+These may be used for post-processing of the generated HTML files, or to configure the image conversion.
+See the `make4ht` documentation to see the supported features.
+
## License
@@ -38,6 +36,7 @@
defined by `tex4ebook` in the document, or when your document uses a
package which causes a compilation error.
+
If you want to use `tex4ebook` commands, add this line to your document
preamble:
@@ -51,9 +50,13 @@
# Command line options
+`-a,--loglevel`
+
+: Set message log level. Possible values: debug, info, status, warning, error, fatal. Default: status.
+
`-c,--config`
-: specify custom config file for `tex4ht`
+: specify custom config file for `TeX4ht`
**example config file**: File `sample.cfg`
@@ -78,7 +81,11 @@
`-f,--format (default epub)`
-: Output format. Epub, Epub3 and Mobi formats are supported.
+: Output format. Possible values are `epub`, `epub3` and `mobi`.
+
+`-j,--jobname`
+
+: Specify the output file name, without file extension.
`-l,--lua`
@@ -97,7 +104,7 @@
`-s,--shell-escape`
-: Enable shell escape in htlatex run. This may be needed if you run external
+: Enable shell escape in the `htlatex` run. This is necessary for the execution of the external
commands from your source files.
`-t,--tidy`
@@ -112,12 +119,11 @@
`-v,--version`
: Print the version number.
-
# Configuration
-`tex4ebook` uses `tex4ht`^[http://www.tug.org/tex4ht/] for conversion from LaTeX
-to html. `tex4ht` is highly configurable using config files. Basic config file
+`TeX4ebook` uses `TeX4ht`^[http://www.tug.org/tex4ht/] for conversion from LaTeX
+to html. `TeX4ht` is highly configurable using config files. Basic config file
structure is
\Preamble{xhtml, comma separated list of options}
@@ -127,16 +133,16 @@
\EndPreamble
Basic info about command configurations can be found in a
-work-in-progres *tex4ht tutorial*^[https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial],
-*tex4ht documentation*^[http://www.tug.org/applications/tex4ht/mn11.html],
+work-in-progres *TeX4ht tutorial*^[https://github.com/michal-h21/helpers4ht/wiki/tex4ht-tutorial],
+*TeX4ht documentation*^[http://www.tug.org/applications/tex4ht/mn11.html],
and in series of blogposts on CV Radhakrishnan's blog:
-*Configure part 1*^[http://www.cvr.cc/?p=323],
-*Configure part 2*^[http://www.cvr.cc/?p=362],
-*Low level commands*^[http://www.cvr.cc/?p=482].
+*Configure part 1*^[https://web.archive.org/web/20180908234227/http://www.cvr.cc/?p=323],
+*Configure part 2*^[https://web.archive.org/web/20180908201057/http://www.cvr.cc/?p=362],
+*Low level commands*^[https://web.archive.org/web/20180909101325/http://cvr.cc/?p=482].
Available options for `\Preamble` command are listed in the article
-*TeX4ht: options*^[http://www.cvr.cc/?p=504]. *Comparison of tex4ebook and Pandoc output*^[https://github.com/richelbilderbeek/travis_tex_to_epub_example_1]
+*TeX4ht: options*^[https://web.archive.org/web/20180813043722/http://cvr.cc/?p=504]. *Comparison of tex4ebook and Pandoc output*^[https://github.com/richelbilderbeek/travis_tex_to_epub_example_1]
-Great source of tips for `tex4ht` configuring is *tex4ht tag on TeX.sx*^[http://tex.stackexchange.com/questions/tagged/tex4ht], there is also a *tag for tex4ebook*^[http://tex.stackexchange.com/questions/tagged/tex4ebook].
+A great source of tips for `TeX4ht` configuration is *tex4ht tag on TeX.sx*^[http://tex.stackexchange.com/questions/tagged/tex4ht]. There is also a *tag for tex4ebook*^[http://tex.stackexchange.com/questions/tagged/tex4ebook].
Examples of interesting questions are
*including images and fonts in ebooks*^[http://tex.stackexchange.com/a/213165/2891]
@@ -149,7 +155,7 @@
\Configure{UniqueIdentifier}{identifier}
-Every epub file should have unique identifier, like ISBN, DOI, URI etc.
+Every EPUB file should have unique identifier, like ISBN, DOI, URI etc.
Default identifier is URI, with value `http://example.com/\jobname`.
\Configure{@author}{\let\footnote\@gobble}
@@ -161,7 +167,7 @@
\Configure{OpfScheme}{URI}
Type of unique identifier, default type is URI. It is
-used only in `epub`, it is deprecated for `epub3`
+used only in the EPUB format, it is deprecated for EPUB 3.
\Configure{resettoclevels}{list of section types in descending order}
@@ -170,7 +176,7 @@
\Configure{DocumentLanguage}{language code}
-Each ePub file must declare the document language. It is inferred from `babel` main
+Each EPUB file must declare the document language. It is inferred from `babel` main
language by default, but you can configure it when it doesn't work correctly.
The `language code` should be in [ISO
639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes) form.
@@ -203,11 +209,11 @@
\Configure{xmlns}{prefix}{uri}
-Add xml name space to `xhtml` files. Useful in `EPUB 3`
+Add `XML` name space to the generated `XHTML` files. Useful in `EPUB 3`.
-## Commands available in config files
+## Commands available in the config file
`\OpfRegisterFile[filename]`
@@ -244,53 +250,44 @@
# Troubleshooting
+## Fixed layout EPUB
+
+The basic support for the Fixed layout EPUB 3 can be enabled using the following configurations:
+
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:layout">pre-paginated</meta>}}
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:orientation">landscape</meta>}}
+ \Configure{OpfMetadata}{\HCode{<meta property="rendition:spread">none</meta>}}
+ \Configure{@HEAD}{\HCode{<meta name="viewport" content="width=1920, height=1080"/>\Hnewline}}
+
+Modify the dimensions in the `<meta name="viewport>` element according to your needs.
+
+## Math issues
+
+Note that while `mobi` is supported by Amazon Kindle, most widespread ebook
+reader, it doesn't support `MathML`. This means that math must be represented
+as images. The same issue is true for the EPUB format as well.
+This is problematic especially for the inline math, as you may experience wrong
+vertical alignment of the math content and surrounding text. If your ebook contains
+math, a better solution is to produce the `epub3` format, as it supports `MathML`.
+The issue with EPUB 3 is that majority of `e-ink` ebook readers don't
+support it. Reader applications exists mainly for Android and Apple
+devices. For books which contains mainly prose, all formats should be suitable,
+but EPUB 3 supports most features from web standards, such as `CSS`.
+
+## Compilation errors
+
When compilation of the document breaks with error during `LaTeX` run, it may
-be caused by some problem in `tex4ht` configuration. Comment out line
+be caused by some problem in `TeX4ht` configuration. Comment out line
`\usepackage{tex4ebook}` in your source file and run command:
htlatex filename
-if same error as in `tex4ebook` run arises, the problem is in some `tex4ht`
+if same error as in `tex4ebook` run arises, the problem is in some `TeX4ht`
configuration. Try to identify the source of problem and if you cannot find the
solution, make minimal example showing the error and ask for help either on
-*tex4ht mailing list*^[http://tug.org/mailman/listinfo/tex4ht] or on
+*TeX4ht mailing list*^[http://tug.org/mailman/listinfo/tex4ht] or on
*TeX.sx*^[http://tex.stackexchange.com/].
-<!--
-## Fontspec
-
-`tex4ht` currently doesn't support `fontspec` and open type fonts. At this
-moment, workaround for this is to modify your source file and conditionally
-include fontspec and any other conflicting packages only when document is not
-processed with `tex4ht`.
-
-Sample:
-
- \documentclass{article}
- \makeatletter
- \@ifpackageloaded{tex4ht}{%
- % Packages for tex4ht unicode support
- \usepackage[utf8]{inputenc}
- \usepackage[T1]{fontenc}
- \usepackage[english,czech]{babel}
- }{%
- % Packages for xelatex
- \usepackage{fontspec}
- \usepackage{polyglossia}
- \setmainfont{Latin Modern Roman}
- }
- \makeatother
-
-The drawback is that not all characters of the Unicode range are supported with
-`inputenc`. For some solutions of this limitation, see a thread on *tex4ht
-mailing list*^[http://tug.org/pipermail/tex4ht/2013q1/000719.html]
-
-Other approach is to use `alternative4ht` package from [helpers4ht](https://github.com/michal-h21/helpers4ht)
-bundle. It works only with Lua backend, but it supports full unicode and you
-don't have to use conditional package inclusion in your document. See
-an [example](http://michal-h21.github.io/samples/helpers4ht/fontspec.html).
--->
-
## Validation
In case of successful compilation, use command line tool `epubcheck`^[you need
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/changelog.tex new/texmf-dist/doc/support/tex4ebook/changelog.tex
--- old/texmf-dist/doc/support/tex4ebook/changelog.tex 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/changelog.tex 2019-11-02 22:05:54.000000000 +0100
@@ -3,6 +3,118 @@
\begin{itemize}
\item
+ 2019/11/01
+
+ \begin{itemize}
+ \tightlist
+ \item
+ released version \texttt{0.3a}
+ \item
+ added \texttt{tex4ebook-} prefix to the output formats.
+ \item
+ removed unused files.
+ \end{itemize}
+\item
+ 2019/11/01
+
+ \begin{itemize}
+ \tightlist
+ \item
+ released version \texttt{0.3}
+ \end{itemize}
+\item
+ 2019/10/20
+
+ \begin{itemize}
+ \tightlist
+ \item
+ fixed the \texttt{TOC} cleanup in the \texttt{ePub\ 3} mode.
+ \item
+ added support for the \texttt{page-spread-left} and
+ \texttt{page-spreat-right} properties.
+ \end{itemize}
+\item
+ 2019/10/20
+
+ \begin{itemize}
+ \tightlist
+ \item
+ addapted to use the \texttt{make4ht} logging mechanism.
+ \end{itemize}
+\item
+ 2019/10/06
+
+ \begin{itemize}
+ \tightlist
+ \item
+ fixed bug with void elements parsing in the OPF file.
+ \item
+ undo \texttt{\textbackslash{}XeTeXcharclass} for the \texttt{:}
+ character when the OPF file is generated.
+ \end{itemize}
+\item
+ 2019/09/16
+
+ \begin{itemize}
+ \tightlist
+ \item
+ make the default build sequence before loading of the extensions.
+ Some extensions need to modify the build sequence.
+ \end{itemize}
+\item
+ 2019/08/28
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for reading input from \texttt{STDIN}.
+ \end{itemize}
+\item
+ 2019/08/27
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{-\/-jobname} command line option.
+ \end{itemize}
+\item
+ 2019/08/25
+
+ \begin{itemize}
+ \tightlist
+ \item
+ use the \texttt{mkparams.get\_args} function to retrieve the command
+ line options
+ \end{itemize}
+\item
+ 2019/07/24
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{\textbackslash{}author} command with
+ an optional argument
+ \end{itemize}
+\item
+ 2019/05/09
+
+ \begin{itemize}
+ \tightlist
+ \item
+ added support for the \texttt{\textbackslash{}title} command with an
+ optional argument
+ \end{itemize}
+\item
+ 2019/04/04
+
+ \begin{itemize}
+ \tightlist
+ \item
+ register appendix chapters and section in the OPF file list
+ \item
+ fixed handling of appendices in the NCX table of contents
+ \end{itemize}
+\item
2019/03/21
\begin{itemize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/readme.tex new/texmf-dist/doc/support/tex4ebook/readme.tex
--- old/texmf-dist/doc/support/tex4ebook/readme.tex 2019-03-21 21:57:24.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/readme.tex 2019-11-01 22:03:38.000000000 +0100
@@ -1,29 +1,23 @@
\hypertarget{introduction}{%
\section{Introduction}\label{introduction}}
-\texttt{TeX4ebook} is bundle of Lua scripts and \texttt{LaTeX} packages
-for conversion of LaTeX files to ebook formats, for example
-\texttt{epub}, \texttt{mobi} and \texttt{epub3}. \texttt{tex4ht} is used
-as conversion engine.
-
-Note that while \texttt{mobi} is supported by Amazon Kindle, most
-widespread ebook reader, it doesn't support \texttt{mathml} and this
-means that math must re represented as images. The same is true for
-\texttt{epub}. This is not a good thing, especially for inline math, as
-you may experience wrong baselines. If your ebook contains math, the
-only correct solution is to produce \texttt{epub3}, as it supports
-\texttt{mathml}. The issue with \texttt{epub3} is, that majority of
-\texttt{e-ink} ebook readers doesn't support this format, reader
-applications exists mainly for Android and Apple devices. For books
-which contains mainly prose, all formats should be suitable, but
-\texttt{epub3} supports most features from web standards, such as
-\texttt{CSS}.
-
-As with \texttt{tex4ht}, the emphasis is on conversion of document's
-logical structure and metadata, basic visual appearance is preserved as
-well, but you should use custom configurations if you want to make the
-document more visually appealing. You can include custom \texttt{CSS} or
-fonts in configuration files.
+\texttt{TeX4ebook} is a tool for conversion from \LaTeX~to ebook
+formats, such as EPUB, MOBI and EPUB 3. It is based on
+\texttt{TeX4ht}\footnote{\url{https://tug.org/tex4ht/}}, which provides
+instructions for the actual \LaTeX~to HTML conversion, and on
+\texttt{make4ht}\footnote{\url{https://ctan.org/pkg/make4ht?lang=en}}.
+
+The conversion is focused on the logical structure of the converted
+document and metadata. Basic visual appearance is preserved as well, but
+you should use custom configurations if you want to make the document
+more visually appealing. You can include custom \texttt{CSS} or fonts in
+a configuration file.
+
+\texttt{TeX4ebook} supports the same features as \texttt{make4ht}, in
+particular build files and extensions. These may be used for
+post-processing of the generated HTML files, or to configure the image
+conversion. See the \texttt{make4ht} documentation to see the supported
+features.
\hypertarget{license}{%
\subsection{License}\label{license}}
@@ -67,8 +61,11 @@
\section{Command line options}\label{command-line-options}}
\begin{description}
+\item[\texttt{-a,-\/-loglevel}]
+Set message log level. Possible values: debug, info, status, warning,
+error, fatal. Default: status.
\item[\texttt{-c,-\/-config}]
-specify custom config file for \texttt{tex4ht}
+specify custom config file for \texttt{TeX4ht}
\end{description}
\textbf{example config file}: File \texttt{sample.cfg}
@@ -95,7 +92,10 @@
Defaulf build file filename is \texttt{filename.mk4}, use this option if
you use different filename.
\item[\texttt{-f,-\/-format\ (default\ epub)}]
-Output format. Epub, Epub3 and Mobi formats are supported.
+Output format. Possible values are \texttt{epub}, \texttt{epub3} and
+\texttt{mobi}.
+\item[\texttt{-j,-\/-jobname}]
+Specify the output file name, without file extension.
\item[\texttt{-l,-\/-lua}]
Use LuaLaTeX as TeX engine.
\item[\texttt{-m,-\/-mode\ (default\ default)}]
@@ -107,8 +107,8 @@
Resolution of generated images, for example math. It should meet
resolution of target devices, which is usually about 167 ppi.
\item[\texttt{-s,-\/-shell-escape}]
-Enable shell escape in htlatex run. This may be needed if you run
-external commands from your source files.
+Enable shell escape in the \texttt{htlatex} run. This is necessary for
+the execution of the external commands from your source files.
\item[\texttt{-t,-\/-tidy}]
process output html files with \texttt{HTML\ tidy} command\footnote{It
needs to be installed separately}.
@@ -121,8 +121,8 @@
\hypertarget{configuration}{%
\section{Configuration}\label{configuration}}
-\texttt{tex4ebook} uses \texttt{tex4ht}\footnote{\url{http://www.tug.org/tex4ht/}}
-for conversion from LaTeX to html. \texttt{tex4ht} is highly
+\texttt{TeX4ebook} uses \texttt{TeX4ht}\footnote{\url{http://www.tug.org/tex4ht/}}
+for conversion from LaTeX to html. \texttt{TeX4ht} is highly
configurable using config files. Basic config file structure is
\begin{verbatim}
@@ -134,19 +134,19 @@
\end{verbatim}
Basic info about command configurations can be found in a
-work-in-progres \emph{tex4ht tutorial}\footnote{\url{https://github.com/michal-h21/helpers4ht/wiki/tex4h…,
-\emph{tex4ht documentation}\footnote{\url{http://www.tug.org/applications/tex4ht/mn11.ht…,
+work-in-progres \emph{TeX4ht tutorial}\footnote{\url{https://github.com/michal-h21/helpers4ht/wiki/tex4h…,
+\emph{TeX4ht documentation}\footnote{\url{http://www.tug.org/applications/tex4ht/mn11.ht…,
and in series of blogposts on CV Radhakrishnan's blog: \emph{Configure
-part 1}\footnote{\url{http://www.cvr.cc/?p=323}}, \emph{Configure part
-2}\footnote{\url{http://www.cvr.cc/?p=362}}, \emph{Low level
-commands}\footnote{\url{http://www.cvr.cc/?p=482}}. Available options
-for \texttt{\textbackslash{}Preamble} command are listed in the article
-\emph{TeX4ht: options}\footnote{\url{http://www.cvr.cc/?p=504}}.
+part 1}\footnote{\url{https://web.archive.org/web/20180908234227/http://www.cvr.…,
+\emph{Configure part 2}\footnote{\url{https://web.archive.org/web/20180908201057/http://www.cvr.…,
+\emph{Low level commands}\footnote{\url{https://web.archive.org/web/20180909101325/http://c….
+Available options for \texttt{\textbackslash{}Preamble} command are
+listed in the article \emph{TeX4ht: options}\footnote{\url{https://web.archive.org/web/20180813043722/http://cv….
\emph{Comparison of tex4ebook and Pandoc output}\footnote{\url{https://github.com/richelbilderbeek/travis_tex_to_epu…
-Great source of tips for \texttt{tex4ht} configuring is \emph{tex4ht tag
-on TeX.sx}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ht}},
-there is also a \emph{tag for tex4ebook}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4….
+A great source of tips for \texttt{TeX4ht} configuration is \emph{tex4ht
+tag on TeX.sx}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4ht}}.
+There is also a \emph{tag for tex4ebook}\footnote{\url{http://tex.stackexchange.com/questions/tagged/tex4….
Examples of interesting questions are \emph{including images and fonts
in ebooks}\footnote{\url{http://tex.stackexchange.com/a/213165/2891}} or
@@ -161,7 +161,7 @@
\Configure{UniqueIdentifier}{identifier}
\end{verbatim}
-Every epub file should have unique identifier, like ISBN, DOI, URI etc.
+Every EPUB file should have unique identifier, like ISBN, DOI, URI etc.
Default identifier is URI, with value
\texttt{http://example.com/\textbackslash{}jobname}.
@@ -179,8 +179,8 @@
\Configure{OpfScheme}{URI}
\end{verbatim}
-Type of unique identifier, default type is URI. It is used only in
-\texttt{epub}, it is deprecated for \texttt{epub3}
+Type of unique identifier, default type is URI. It is used only in the
+EPUB format, it is deprecated for EPUB 3.
\begin{verbatim}
\Configure{resettoclevels}{list of section types in descending order}
@@ -194,7 +194,7 @@
\Configure{DocumentLanguage}{language code}
\end{verbatim}
-Each ePub file must declare the document language. It is inferred from
+Each EPUB file must declare the document language. It is inferred from
\texttt{babel} main language by default, but you can configure it when
it doesn't work correctly. The \texttt{language\ code} should be in
\href{https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes}{ISO 639-1}
@@ -243,11 +243,12 @@
\Configure{xmlns}{prefix}{uri}
\end{verbatim}
-Add xml name space to \texttt{xhtml} files. Useful in \texttt{EPUB\ 3}
+Add \texttt{XML} name space to the generated \texttt{XHTML} files.
+Useful in \texttt{EPUB\ 3}.
-\hypertarget{commands-available-in-config-files}{%
-\subsection{Commands available in config
-files}\label{commands-available-in-config-files}}
+\hypertarget{commands-available-in-the-config-file}{%
+\subsection{Commands available in the config
+file}\label{commands-available-in-the-config-file}}
\begin{description}
\item[\texttt{\textbackslash{}OpfRegisterFile{[}filename{]}}]
@@ -293,8 +294,44 @@
\hypertarget{troubleshooting}{%
\section{Troubleshooting}\label{troubleshooting}}
+\hypertarget{fixed-layout-epub}{%
+\subsection{Fixed layout EPUB}\label{fixed-layout-epub}}
+
+The basic support for the Fixed layout EPUB 3 can be enabled using the
+following configurations:
+
+\begin{verbatim}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:layout">pre-paginated</meta>}}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:orientation">landscape</meta>}}
+\Configure{OpfMetadata}{\HCode{<meta property="rendition:spread">none</meta>}}
+\Configure{@HEAD}{\HCode{<meta name="viewport" content="width=1920, height=1080"/>\Hnewline}}
+\end{verbatim}
+
+Modify the dimensions in the
+\texttt{\textless{}meta\ name="viewport\textgreater{}} element according
+to your needs.
+
+\hypertarget{math-issues}{%
+\subsection{Math issues}\label{math-issues}}
+
+Note that while \texttt{mobi} is supported by Amazon Kindle, most
+widespread ebook reader, it doesn't support \texttt{MathML}. This means
+that math must be represented as images. The same issue is true for the
+EPUB format as well. This is problematic especially for the inline math,
+as you may experience wrong vertical alignment of the math content and
+surrounding text. If your ebook contains math, a better solution is to
+produce the \texttt{epub3} format, as it supports \texttt{MathML}. The
+issue with EPUB 3 is that majority of \texttt{e-ink} ebook readers don't
+support it. Reader applications exists mainly for Android and Apple
+devices. For books which contains mainly prose, all formats should be
+suitable, but EPUB 3 supports most features from web standards, such as
+\texttt{CSS}.
+
+\hypertarget{compilation-errors}{%
+\subsection{Compilation errors}\label{compilation-errors}}
+
When compilation of the document breaks with error during \texttt{LaTeX}
-run, it may be caused by some problem in \texttt{tex4ht} configuration.
+run, it may be caused by some problem in \texttt{TeX4ht} configuration.
Comment out line \texttt{\textbackslash{}usepackage\{tex4ebook\}} in
your source file and run command:
@@ -303,9 +340,9 @@
\end{verbatim}
if same error as in \texttt{tex4ebook} run arises, the problem is in
-some \texttt{tex4ht} configuration. Try to identify the source of
+some \texttt{TeX4ht} configuration. Try to identify the source of
problem and if you cannot find the solution, make minimal example
-showing the error and ask for help either on \emph{tex4ht mailing
+showing the error and ask for help either on \emph{TeX4ht mailing
list}\footnote{\url{http://tug.org/mailman/listinfo/tex4ht}} or on
\emph{TeX.sx}\footnote{\url{http://tex.stackexchange.com/}}.
Binary files old/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf and new/texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf new/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
--- old/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf 2019-11-02 22:05:54.000000000 +0100
@@ -0,0 +1,4 @@
+show-warnings: no
+numeric-entities:yes
+new-inline-tags:span,a,math,mi, mo, mn ,abs ,and ,annotation ,annotation-xml ,apply ,approx ,arccos ,arccosh ,arccot ,arccoth ,arccsc ,arccsch ,arcsec ,arcsech ,arcsin ,arcsinh ,arctan ,arctanh ,arg ,bind ,bvar ,card ,cartesianproduct ,cbytes ,ceiling ,cerror ,ci ,cn ,codomain ,complexes ,compose ,condition ,conjugate ,cos ,cosh ,cot ,coth ,cs ,csc ,csch ,csymbol ,curl ,declare ,degree ,determinant ,diff ,divergence ,divide ,domain ,domainofapplication ,el ,emptyset ,eq ,equivalent ,eulergamma ,exists ,exp ,exponentiale ,factorial ,factorof ,false ,floor ,fn ,forall ,gcd ,geq ,grad ,gt ,ident ,image ,imaginary ,imaginaryi ,implies ,in ,infinity ,int ,integers ,intersect ,interval ,inverse ,lambda ,laplacian ,lcm ,leq ,limit ,list ,ln ,log ,logbase ,lowlimit ,lt ,maction ,malign ,maligngroup ,malignmark ,malignscope ,math ,matrix ,matrixrow ,max ,mean ,median ,menclose ,merror ,mfenced ,mfrac ,mfraction ,mglyph ,mi ,min ,minus ,mlabeledtr ,mlongdiv ,mmultiscripts ,mn ,mo ,mode ,moment ,momentabout ,mover ,mpadded ,mphantom ,mprescripts ,mroot ,mrow ,ms ,mscarries ,mscarry ,msgroup ,msline ,mspace ,msqrt ,msrow ,mstack ,mstyle ,msub ,msubsup ,msup ,mtable ,mtd ,mtext ,mtr ,munder ,munderover ,naturalnumbers ,neq ,none ,not ,notanumber ,note ,notin ,notprsubset ,notsubset ,or ,otherwise ,outerproduct ,partialdiff ,pi ,piece ,piecewise ,plus ,power ,primes ,product ,prsubset ,quotient ,rationals ,real ,reals ,reln ,rem ,root ,scalarproduct ,sdev ,sec ,sech ,selector ,semantics ,sep ,set ,setdiff ,share ,sin ,sinh ,subset ,sum ,tan ,tanh ,tendsto ,times ,transpose ,true ,union ,uplimit ,variance ,vector ,vectorproduct ,xor ,bdi ,command ,details ,dialog ,summary ,figure ,figcaption ,footer ,header ,mark ,meter ,progress ,ruby ,rt ,rp ,time ,wbr ,altGlyph ,altGlyphDef ,altGlyphItem ,animate ,animateColor ,animateMotion ,animateTransform ,circle ,clipPath ,color-profile ,cursor ,defs ,desc ,ellipse ,feBlend ,feColorMatrix ,feComponentTransfer ,feComposite ,feConvolveMatrix ,feDiffuseLighting ,feDisplacementMap ,feDistantLight ,feFlood ,feFuncA ,feFuncB ,feFuncG ,feFuncR ,feGaussianBlur ,feImage ,feMerge ,feMergeNode ,feMorphology ,feOffset ,fePointLight ,feSpecularLighting ,feSpotLight ,feTile ,feTurbulence ,filter ,font ,font-face ,font-face-format ,font-face-name ,font-face-src ,font-face-uri ,foreignObject ,g ,glyph ,glyphRef ,hkern ,image ,line ,linearGradient ,marker ,mask ,metadata ,missing-glyph ,mpath ,path ,pattern ,polygon ,polyline ,radialGradient ,rect ,script ,set ,stop ,style ,svg ,switch ,symbol ,text ,textPath ,title ,tref ,tspan ,use
+new-blocklevel-tags: aside,section,article,nav
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/tex4ebook/tidyconf.conf new/texmf-dist/doc/support/tex4ebook/tidyconf.conf
--- old/texmf-dist/doc/support/tex4ebook/tidyconf.conf 2017-04-28 23:21:37.000000000 +0200
+++ new/texmf-dist/doc/support/tex4ebook/tidyconf.conf 1970-01-01 01:00:00.000000000 +0100
@@ -1,4 +0,0 @@
-show-warnings: no
-numeric-entities:yes
-new-inline-tags:span,a,math,mi, mo, mn ,abs ,and ,annotation ,annotation-xml ,apply ,approx ,arccos ,arccosh ,arccot ,arccoth ,arccsc ,arccsch ,arcsec ,arcsech ,arcsin ,arcsinh ,arctan ,arctanh ,arg ,bind ,bvar ,card ,cartesianproduct ,cbytes ,ceiling ,cerror ,ci ,cn ,codomain ,complexes ,compose ,condition ,conjugate ,cos ,cosh ,cot ,coth ,cs ,csc ,csch ,csymbol ,curl ,declare ,degree ,determinant ,diff ,divergence ,divide ,domain ,domainofapplication ,el ,emptyset ,eq ,equivalent ,eulergamma ,exists ,exp ,exponentiale ,factorial ,factorof ,false ,floor ,fn ,forall ,gcd ,geq ,grad ,gt ,ident ,image ,imaginary ,imaginaryi ,implies ,in ,infinity ,int ,integers ,intersect ,interval ,inverse ,lambda ,laplacian ,lcm ,leq ,limit ,list ,ln ,log ,logbase ,lowlimit ,lt ,maction ,malign ,maligngroup ,malignmark ,malignscope ,math ,matrix ,matrixrow ,max ,mean ,median ,menclose ,merror ,mfenced ,mfrac ,mfraction ,mglyph ,mi ,min ,minus ,mlabeledtr ,mlongdiv ,mmultiscripts ,mn ,mo ,mode ,moment ,momentabout ,mover ,mpadded ,mphantom ,mprescripts ,mroot ,mrow ,ms ,mscarries ,mscarry ,msgroup ,msline ,mspace ,msqrt ,msrow ,mstack ,mstyle ,msub ,msubsup ,msup ,mtable ,mtd ,mtext ,mtr ,munder ,munderover ,naturalnumbers ,neq ,none ,not ,notanumber ,note ,notin ,notprsubset ,notsubset ,or ,otherwise ,outerproduct ,partialdiff ,pi ,piece ,piecewise ,plus ,power ,primes ,product ,prsubset ,quotient ,rationals ,real ,reals ,reln ,rem ,root ,scalarproduct ,sdev ,sec ,sech ,selector ,semantics ,sep ,set ,setdiff ,share ,sin ,sinh ,subset ,sum ,tan ,tanh ,tendsto ,times ,transpose ,true ,union ,uplimit ,variance ,vector ,vectorproduct ,xor ,bdi ,command ,details ,dialog ,summary ,figure ,figcaption ,footer ,header ,mark ,meter ,progress ,ruby ,rt ,rp ,time ,wbr ,altGlyph ,altGlyphDef ,altGlyphItem ,animate ,animateColor ,animateMotion ,animateTransform ,circle ,clipPath ,color-profile ,cursor ,defs ,desc ,ellipse ,feBlend ,feColorMatrix ,feComponentTransfer ,feComposite ,feConvolveMatrix ,feDiffuseLighting ,feDisplacementMap ,feDistantLight ,feFlood ,feFuncA ,feFuncB ,feFuncG ,feFuncR ,feGaussianBlur ,feImage ,feMerge ,feMergeNode ,feMorphology ,feOffset ,fePointLight ,feSpecularLighting ,feSpotLight ,feTile ,feTurbulence ,filter ,font ,font-face ,font-face-format ,font-face-name ,font-face-src ,font-face-uri ,foreignObject ,g ,glyph ,glyphRef ,hkern ,image ,line ,linearGradient ,marker ,mask ,metadata ,missing-glyph ,mpath ,path ,pattern ,polygon ,polyline ,radialGradient ,rect ,script ,set ,stop ,style ,svg ,switch ,symbol ,text ,textPath ,title ,tref ,tspan ,use
-new-blocklevel-tags: aside,section,article,nav
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex4ebook.doc.tlpobj new/tlpkg/tlpobj/tex4ebook.doc.tlpobj
--- old/tlpkg/tlpobj/tex4ebook.doc.tlpobj 2019-03-22 02:24:09.000000000 +0100
+++ new/tlpkg/tlpobj/tex4ebook.doc.tlpobj 2019-11-03 01:55:06.000000000 +0100
@@ -1,11 +1,11 @@
name tex4ebook.doc
category Package
-revision 50512
+revision 52616
shortdesc doc files of tex4ebook
-docfiles size=30
+docfiles size=32
texmf-dist/doc/support/tex4ebook/README
texmf-dist/doc/support/tex4ebook/changelog.tex
texmf-dist/doc/support/tex4ebook/readme.tex
texmf-dist/doc/support/tex4ebook/tex4ebook-doc.pdf
texmf-dist/doc/support/tex4ebook/tex4ebook-doc.tex
- texmf-dist/doc/support/tex4ebook/tidyconf.conf
+ texmf-dist/doc/support/tex4ebook/tex4ebook-tidyconf.conf
++++++ tex4ebook.tar.xz ++++++
++++ 1773 lines of diff (skipped)
++++++ tex4ht.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tex4ht.doc.tlpobj new/tlpkg/tlpobj/tex4ht.doc.tlpobj
--- old/tlpkg/tlpobj/tex4ht.doc.tlpobj 2019-04-10 01:39:40.000000000 +0200
+++ new/tlpkg/tlpobj/tex4ht.doc.tlpobj 2020-04-20 01:55:53.000000000 +0200
@@ -1,6 +1,6 @@
name tex4ht.doc
category Package
-revision 50884
+revision 54806
shortdesc doc files of tex4ht
docfiles size=195
texmf-dist/doc/generic/tex4ht/bugfixes.css
++++++ tex4ht.tar.xz ++++++
++++ 74201 lines of diff (skipped)
++++++ texapi.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texapi.doc.tlpobj new/tlpkg/tlpobj/texapi.doc.tlpobj
--- old/tlpkg/tlpobj/texapi.doc.tlpobj 2019-02-28 04:07:38.000000000 +0100
+++ new/tlpkg/tlpobj/texapi.doc.tlpobj 2020-03-04 23:53:53.000000000 +0100
@@ -1,6 +1,6 @@
name texapi.doc
category Package
-revision 24237
+revision 54080
shortdesc doc files of texapi
relocated 1
docfiles size=48
++++++ texapi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texapi.tlpobj new/tlpkg/tlpobj/texapi.tlpobj
--- old/tlpkg/tlpobj/texapi.tlpobj 2019-02-28 04:07:38.000000000 +0100
+++ new/tlpkg/tlpobj/texapi.tlpobj 2020-03-04 23:53:53.000000000 +0100
@@ -1,6 +1,6 @@
name texapi
category Package
-revision 24237
+revision 54080
shortdesc Macros to write format-independent packages
relocated 1
longdesc Texapi provides utility macros to write format-independent (and
@@ -14,7 +14,6 @@
runfiles size=8
RELOC/tex/generic/texapi/texapi.tex
catalogue-ctan /macros/generic/texapi
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics macro-supp
+catalogue-topics macro-supp etex
catalogue-version 1.04
++++++ texdoc.doc.tar.xz ++++++
++++ 1829 lines of diff (skipped)
++++++ texdoc.tar.xz ++++++
++++ 35629 lines of diff (skipped)
++++++ texdoc_cnf.dif ++++++
--- /var/tmp/diff_new_pack.IwSaIz/_old 2020-05-29 21:33:57.786040135 +0200
+++ /var/tmp/diff_new_pack.IwSaIz/_new 2020-05-29 21:33:57.790040147 +0200
@@ -1,7 +1,56 @@
---
- texmf-dist/texdoc/texdoc.cnf | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ texmf-dist/scripts/texdoc/texdoclib-search.tlu | 24 +++++++++++++-----------
+ texmf-dist/texdoc/texdoc.cnf | 7 +++++--
+ 2 files changed, 18 insertions(+), 13 deletions(-)
+--- texmf-dist/scripts/texdoc/texdoclib-search.tlu
++++ texmf-dist/scripts/texdoc/texdoclib-search.tlu 2020-05-13 14:26:48.218370971 +0000
+@@ -30,7 +30,7 @@ local vanilla -- is this a vanilla TL or
+
+ -- find the TeX Live root
+ local function get_tlroot()
+- local tlroot = kpse.expand_path('$TEXMFROOT') -- it should be exisitng one
++ local tlroot = kpse.expand_path('$TEXMFDIST') -- it should be exisitng one
+ get_tlroot = function() return tlroot end
+ return tlroot
+ end
+@@ -575,7 +575,8 @@ end
+
+ -- get pre-hashed tlpdb info from a cache file
+ get_tlpinfo_from_cache = function(filename)
+- s_meta, tlp_from_runfile, tlp_doclist = dofile(filename)
++-- s_meta, tlp_from_runfile, tlp_doclist = dofile(filename)
++ s_meta, tlp_from_runfile, tlp_doclist = { }
+ end
+
+ -- get pre-hashed tlpdb info from a pseudo-cache file
+@@ -685,16 +686,17 @@ local function init_tlp_database()
+ else
+ dbg_print('tlpdb',
+ 'Getting data from tlpdb file ' .. texlive_tlpdb)
+- get_tlpinfo_from_tlpdb(texlive_tlpdb)
++-- get_tlpinfo_from_tlpdb(texlive_tlpdb)
++ get_tlpinfo_from_tlpdb('/dev/null')
+ dbg_print('tlpdb', 'Writing data in cache file ' .. cache_file)
+- local ok, msg = mkdir_p(texdoc.util.path_parent(cache_file))
+- if not ok then
+- err_print('warning',
+- 'Failed to create cache file in %s:', cache_file)
+- err_print('warning', msg)
+- else
+- print_out_tlpinfo(cache_file)
+- end
++-- local ok, msg = mkdir_p(texdoc.util.path_parent(cache_file))
++-- if not ok then
++-- err_print('warning',
++-- 'Failed to create cache file in %s:', cache_file)
++-- err_print('warning', msg)
++-- else
++-- print_out_tlpinfo(cache_file)
++-- end
+ end
+ else
+ dbg_print('tlpdb', 'Using shipped tlpdb data.')
--- texmf-dist/texdoc/texdoc.cnf
+++ texmf-dist/texdoc/texdoc.cnf 2019-05-10 11:11:06.935408551 +0000
@@ -60,8 +60,11 @@
++++++ texdoctk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/texdoctk.man1.pdf and new/texmf-dist/doc/man/man1/texdoctk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdoctk.doc.tlpobj new/tlpkg/tlpobj/texdoctk.doc.tlpobj
--- old/tlpkg/tlpobj/texdoctk.doc.tlpobj 2019-03-27 02:26:52.000000000 +0100
+++ new/tlpkg/tlpobj/texdoctk.doc.tlpobj 2020-03-26 23:29:44.000000000 +0100
@@ -1,6 +1,6 @@
name texdoctk.doc
category TLCore
-revision 50602
+revision 54557
shortdesc doc files of texdoctk
docfiles size=11
texmf-dist/doc/man/man1/texdoctk.1
++++++ texdoctk.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texdoctk/texdoctk.pl new/texmf-dist/scripts/texdoctk/texdoctk.pl
--- old/texmf-dist/scripts/texdoctk/texdoctk.pl 2019-03-25 18:26:20.000000000 +0100
+++ new/texmf-dist/scripts/texdoctk/texdoctk.pl 2020-03-26 12:58:31.000000000 +0100
@@ -33,10 +33,21 @@
eval { require Tk; };
if ($@) {
- if (-x "/usr/bin/xmessage") {
- `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
+ if ($IsWin32) {
+ $ENV{'RUNSCRIPT_ERROR_MESSAGE'} = "This Perl has no Perl/Tk module; aborting...";
+ my $vbsc = "";
+ $vbsc = `kpsewhich -format texmfscripts tl-errmess.vbs`;
+ if ($vbsc ne '') {
+ $vbsc =~ s!/!\\!g;
+ system("wscript $vbsc");
+ exit(0); # 0: prevent another error message from runscript
+ }
} else {
- printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
+ if (-x "/usr/bin/xmessage") {
+ `xmessage -center -buttons Quit "The program texdoctk needs the package perl-tk, please install it!"`;
+ } else {
+ printf STDERR "The program texdoctk needs the package perl-tk, please install it!\n";
+ }
}
exit(1);
# that didn't work out, so warn the user and continue with text mode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdoctk.tlpobj new/tlpkg/tlpobj/texdoctk.tlpobj
--- old/tlpkg/tlpobj/texdoctk.tlpobj 2019-03-27 02:26:52.000000000 +0100
+++ new/tlpkg/tlpobj/texdoctk.tlpobj 2020-03-26 23:29:44.000000000 +0100
@@ -1,6 +1,6 @@
name texdoctk
category TLCore
-revision 50602
+revision 54557
shortdesc Easy access to package documentation
longdesc A Perl/Tk-based GUI for easy access to package documentation
longdesc for TeX on Unix platforms; the databases it uses are based on
@@ -21,7 +21,6 @@
texmf-dist/texdoctk/texdocrc.defaults
texmf-dist/texdoctk/texdoctk.dat
catalogue-also texdoc
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics view-doc
catalogue-version 0.6.0
++++++ texdraw.doc.tar.xz ++++++
++++ 1714 lines of diff (skipped)
++++++ texdraw.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/blockdiagram.tex new/tex/generic/texdraw/blockdiagram.tex
--- old/tex/generic/texdraw/blockdiagram.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/blockdiagram.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% Block diagrams in TeXdraw
-% $Id: blockdiagram.tex,v 1.12 2019/03/28 texdraw-V2R0a $
+% $Id: blockdiagram.tex 1.15 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1993-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\input txdtools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/texdraw.sty new/tex/generic/texdraw/texdraw.sty
--- old/tex/generic/texdraw/texdraw.sty 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/texdraw.sty 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros
-% $Id: texdraw.sty,v 2.4 2019/03/28 texdraw-V2R0a $
+% $Id: texdraw.sty 2.6 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\NeedsTeXFormat{LaTeX2e}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/texdraw.tex new/tex/generic/texdraw/texdraw.tex
--- old/tex/generic/texdraw/texdraw.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/texdraw.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros
-% $Id: texdraw.tex,v 2.4 2019/03/28 texdraw-V2R0a $
+% $Id: texdraw.tex 2.7 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,16 +10,14 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
\def\setRevDate $#1 #2 #3${#2}
-\def\TeXdrawId{\setRevDate $Date: 2019/03/28 16:40:42 $ TeXdraw V2R0a}
+\def\TeXdrawId{\setRevDate $Date: 2019/04/18 14:10:45 $ TeXdraw V2R3}
% ===============================================================
@@ -29,7 +27,7 @@
% superimposed on the figure.
% (2) TeXdraw implements a \bsegment-\esegment environment which allows
% parameter changes and coordinate changes to be kept local. In
-% effect, these segments are self-contained relocatable procedures.
+% effect these segments are self-contained relocatable procedures.
% (3) TeX's macro facility can be used to modularize drawing units and
% produce more complex entities from simple elements.
% (4) The drawing can be positioned on the page like any other TeX box.
@@ -78,12 +76,12 @@
\def\btexdraw {\x@pix=0 \y@pix=0
\x@segoffpix=\x@pix \y@segoffpix=\y@pix
+ \let\p@sfile=\p@sundef
% Set the default values (define outside of the group so that \etexdraw can
% see the scaling parameters)
\t@exdrawdef
\setbox\t@xdbox=\vbox\bgroup\offinterlineskip
\global\d@bs=0 % pending segments
- \global\t@extonlytrue % no PS commands yet
\global\p@osinitfalse
\s@avemove \x@pix \y@pix % capture the initial position
\m@pendingfalse
@@ -93,34 +91,40 @@
% ====== End TeXdraw
% Write out a trailer, close the file, bring in the PostScript code as
-% a \special include file. The \special is offset to position on the page
-% to be (llx,ury) in PostScript coordinates.
+% a \special include file. The \special is offset on the page to be at
+% (llx,ury) in PostScript coordinates.
% The drawing is placed in a \vbox of appropriate size (zero depth). The
% temporary PostScript file is superimposed with offsets such that the
% lower lefthand corner of the drawing is aligned with the lower lefthand of
-% the box. Then, the position is temporarily offset to that corresponding
-% to (0 0) to place the TeX text. Note that TeX text goes on top of the
-% PostScript drawing.
-\def\etexdraw {\ift@extonly \else
- \t@drclose % close the PostScript file
- \fi
+% the box.
+\def\etexdraw {\p@sclose % close the PostScript file
\egroup % ends the \vbox \bgroup
- \ifdim \wd\t@xdbox>0pt
- \t@xderror {TeXdraw box non-zero size,
- possible extraneous text}%
- \fi
\vbox {\offinterlineskip
\pixtobp \xminpix \l@lxbp \pixtobp \yminpix \l@lybp
\pixtobp \xmaxpix \u@rxbp \pixtobp \ymaxpix \u@rybp
- \hbox{\t@xdinclude
- [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]{\p@sfile}}%
- \pixtodim \xminpix \t@xpos \pixtodim \yminpix \t@ypos
- \kern \t@ypos
- \hbox {\kern -\t@xpos
- \box\t@xdbox % TeX text
- \kern \t@xpos}%
- \kern -\t@ypos\relax}}
+ \ifx\p@sfile\p@sundef
+ \hbox{\t@xdempty
+ [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]}%
+ \else
+ \hbox{\t@xdinclude
+ [{\l@lxbp},{\l@lybp}][{\u@rxbp},{\u@rybp}]{\p@sfile}}%
+ \fi
+ \t@xdtext}%
+}
+% Superimpose TeX text. The position is temporarily offset to a position
+% corresponding to (0 0) to place the TeX text.
+\def\t@xdtext {
+ \ifdim \wd\t@xdbox>0pt
+ \t@xderror {TeXdraw box non-zero size, possible extraneous text}%
+ \fi
+ \pixtodim \xminpix \t@xpos \pixtodim \yminpix \t@ypos
+ \kern \t@ypos
+ \hbox {\kern -\t@xpos
+ \box\t@xdbox % TeX text
+ \kern \t@xpos}%
+ \kern -\t@ypos\relax
+}
% ===== Drawing scaling
% The units in any segment may be scaled arbitrarily. A unit scale is
@@ -161,10 +165,10 @@
\f@lushmove
\fi
\begingroup
- \x@segoffpix=\x@pix
- \y@segoffpix=\y@pix
- \setsegscale 1
- \global\advance \d@bs by 1\relax}
+ \x@segoffpix=\x@pix
+ \y@segoffpix=\y@pix
+ \setsegscale 1
+ \global\advance \d@bs by 1\relax}
\def\esegment {\endgroup
\ifnum \d@bs=0
\writetx {es}%
@@ -290,20 +294,20 @@
% Check if the argument starts with a left parenthesis
\def\htext #1{\def\testit {#1}%
\ifx \testit\l@paren
- \let\next=\h@move
+ \let\t@cmd=\h@move
\else
- \let\next=\h@text
+ \let\t@cmd=\h@text
\fi
- \next {#1}}
+ \t@cmd {#1}}
% Rotated text
\def\rtext td:#1 #2{\def\testit {#2}%
\ifx \testit\l@paren
- \let\next=\r@move
+ \let\t@cmd=\r@move
\else
- \let\next=\r@text
+ \let\t@cmd=\r@text
\fi
- \next td:#1 {#2}}
+ \t@cmd td:#1 {#2}}
% Vertical text
\def\vtext {\rtext td:90 }
@@ -626,7 +630,7 @@
% Need to be able to insert "%", "{" and "}" characters into the
% PostScript file.
% Define macros which have these characters with category "other".
-% We will assume, that these characters have the standard meanings --
+% We will assume that these characters have the standard meanings -
% after all, we use comments and braces in this code.
\catcode`\%=12
\def\p@b {%!} \def\p@p {%%}
@@ -693,8 +697,8 @@
\g@etargxy #2 #3 #4 \\#5#6% leading blank
\else
\def #6{#2}%
- \def\next {#3}%
- \ifx \next\empty \else
+ \def\a@rg {#3}%
+ \ifx \a@rg\empty \else
\t@xderror {TeXdraw: invalid coordinate}%
\fi
\fi}
@@ -725,8 +729,8 @@
% ===== Low level list decoding macros
% Pick off the first item -> #3, rest of string -> #4
\def\g@etitem #1 #2\\#3#4{\edef #4{#2}\edef #3{#1}}
-\def\a@pppix #1#2{\edef\next {#1}%
- \ifx \next\empty \else
+\def\a@pppix #1#2{\edef\a@rg {#1}%
+ \ifx \a@rg\empty \else
\coordtopix {#1}\t@pixa
\ifx #2\empty
\edef #2{\the\t@pixa}%
@@ -778,7 +782,7 @@
% Two flags are used. Both flags are local to a segment.
% - move pending: Set when a move has been invoked but the move command
-% has not been written out to the PostScript file
+% has not been written out to the PostScript file.
% - path in progress: Set when a PostScript path has been started but the
% path has not been terminated and stroked.
% (1) Moves are kept back. Using TeX's groups, a local flag and local
@@ -862,7 +866,7 @@
% \ifp@osinit indicates whether the next move should be captured as the
% initial values for \xminpix, \yminpix, \xmaxpix, and \ymaxpix. However,
% if a \f@lushmove is invoked, then we assume that the appropriate initial
-% values has already been set. The "mv" command in PostScript is defined
+% values have already been set. The "mv" command in PostScript is defined
% to stroke the current path (if any) and move to the pixel coordinates
% specified.
@@ -987,13 +991,26 @@
\advance \t@ypos by -#2 bp%
\t@xpos=#3 bp%
\advance \t@xpos by -#1 bp%
- \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
+ \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
\box0%
\endgroup}
\else
\let\t@xdinclude=\includegraphics
\fi
+% Leave space without including a PS file
+\def\t@xdempty [#1,#2][#3,#4]{%
+ \begingroup
+ \leavevmode
+ \setbox0=\hbox{}%
+ \t@ypos=#4 bp%
+ \advance \t@ypos by -#2 bp%
+ \t@xpos=#3 bp%
+ \advance \t@xpos by -#1 bp%
+ \dp0=0pt \ht0=\t@ypos \wd0=\t@xpos
+ \box0%
+ \endgroup}
+
% ===== Write to the PostScript file
% Macro to write PostScript commands to the temporary PostScript file
% To decrease the size of the PostScript file, moves are kept back to
@@ -1008,76 +1025,94 @@
% only for those commands which just change line parameters
% without drawing. This routine opens the file and writes the
% PS file header the first time it is called.
-% \w@rps : lowest level direct write to the PostScript file
+% \p@swr : lowest level direct write to the PostScript file
\def\writeps #1{\f@lushbs
\f@lushmove
\p@athtrue
\writetx {#1}}
-\def\writetx #1{\ift@extonly
- \global\t@extonlyfalse
- \t@xdpsfn \p@sfile
- \t@dropen \p@sfile
- \fi
- \w@rps {#1}}
-\def\w@rps #1{\immediate\write\drawfile {#1}}
+\def\writetx #1{\p@sopen
+ \ifx\p@sfile\p@sundef \else
+ \p@swr {#1}%
+ \fi}
+\def\p@swr #1{\immediate\write\drawfile {#1}}
-% ===== Open a PostScript file
+% ===== Open/Close a PostScript file
% Open a PostScript file, write the definitions used by TeXdraw.
-\def\t@xdpsfn #1{%
- \global\advance \t@xdnum by 1
- \ifnum \t@xdnum<10
- \xdef #1{\jobname.ps\the\t@xdnum}
- \else
- \xdef #1{\jobname.p\the\t@xdnum}
+\xdef\p@sundef{UnDeFiNeD}
+\def\p@sopen {%
+ \ifx\p@sfile\p@sundef
+ \p@sopenI
+ \fi
+}
+% The code has a hook to avoid generating the PS file under certain
+% circumstances. The amsmath package sometimes sets an expression twice,
+% once to measure it and again to actually typeset it. In the first case,
+% \ifmeasuring@ is set to true. For that setting, the PS file is not
+% generated.
+\def\p@sopenI {%
+ \ifx\ifmeasuring@\iftrue \else % \ifmeasuring@ undefined or false
+ \global\advance \t@xdnum by 1
+ \ifnum \t@xdnum<10
+ \xdef \p@sfile{\jobname.ps\the\t@xdnum}%
+ \else
+ \xdef \p@sfile{\jobname.p\the\t@xdnum}%
+ \fi
+ \t@xdopen \p@sfile
+ \fi
+}
+
+\def\p@sclose {
+ \ifx\p@sfile\p@sundef \else
+ \t@xdclose
\fi
}
-\def\t@dropen #1{%
+\def\t@xdopen #1{%
\immediate\openout\drawfile=#1%
- \w@rps {\p@b PS-Adobe-3.0 EPSF-3.0}%
- \w@rps {\p@p BoundingBox: (atend)}%
- \w@rps {\p@p Title: TeXdraw drawing: #1}%
- \w@rps {\p@p Pages: 1}%
- \w@rps {\p@p Creator: \TeXdrawId}%
- \w@rps {\p@p CreationDate: \the\year/\the\month/\the\day}%
- \w@rps {50 dict begin}%
- \w@rps {/mv {stroke moveto} def}%
- \w@rps {/lv {lineto} def}%
- \w@rps {/st {currentpoint stroke moveto} def}%
- \w@rps {/sl {st setlinewidth} def}%
- \w@rps {/sd {st 0 setdash} def}%
- \w@rps {/sg {st setgray} def}%
- \w@rps {/bs {gsave} def /es {stroke grestore} def}%
- \w@rps {/fl \l@br gsave setgray fill grestore}%
- \w@rps { currentpoint newpath moveto\r@br\space def}%
- \w@rps {/fp {gsave setgray fill grestore st} def}%
- \w@rps {/cv {curveto} def}%
- \w@rps {/cr \l@br gsave currentpoint newpath 3 -1 roll 0 360 arc}%
- \w@rps { stroke grestore\r@br\space def}%
- \w@rps {/fc \l@br gsave setgray currentpoint newpath}%
- \w@rps { 3 -1 roll 0 360 arc fill grestore\r@br\space def}%
- \w@rps {/ar {gsave currentpoint newpath 5 2 roll arc stroke grestore} def}%
- \w@rps {/el \l@br gsave /svm matrix currentmatrix def}%
- \w@rps { currentpoint translate scale newpath 0 0 1 0 360 arc}%
- \w@rps { svm setmatrix stroke grestore\r@br\space def}%
- \w@rps {/fe \l@br gsave setgray currentpoint translate scale newpath}%
- \w@rps { 0 0 1 0 360 arc fill grestore\r@br\space def}%
- \w@rps {/av \l@br /hhwid exch 2 div def /hlen exch def}%
- \w@rps { /ah exch def /tipy exch def /tipx exch def}%
- \w@rps { currentpoint /taily exch def /tailx exch def}%
- \w@rps { /dx tipx tailx sub def /dy tipy taily sub def}%
- \w@rps { /alen dx dx mul dy dy mul add sqrt def}%
- \w@rps { /blen alen hlen sub def}%
- \w@rps { gsave tailx taily translate dy dx atan rotate}%
- \w@rps { (V) ah ne {blen 0 gt {blen 0 lineto} if} {alen 0 lineto} ifelse}%
- \w@rps { stroke blen hhwid neg moveto alen 0 lineto blen hhwid lineto}%
- \w@rps { (T) ah eq {closepath} if}%
- \w@rps { (W) ah eq {gsave 1 setgray fill grestore closepath} if}%
- \w@rps { (F) ah eq {fill} {stroke} ifelse}%
- \w@rps { grestore tipx tipy moveto\r@br\space def}%
- \w@rps {\p@sfactor\space \p@sfactor\space scale}%
- \w@rps {1 setlinecap 1 setlinejoin}%
- \w@rps {3 setlinewidth [] 0 setdash}%
- \w@rps {0 0 moveto}%
+ \p@swr {\p@b PS-Adobe-3.0 EPSF-3.0}%
+ \p@swr {\p@p BoundingBox: (atend)}%
+ \p@swr {\p@p Title: TeXdraw drawing: #1}%
+ \p@swr {\p@p Pages: 1}%
+ \p@swr {\p@p Creator: \TeXdrawId}%
+ \p@swr {\p@p CreationDate: \the\year/\the\month/\the\day}%
+ \p@swr {50 dict begin}%
+ \p@swr {/mv {stroke moveto} def}%
+ \p@swr {/lv {lineto} def}%
+ \p@swr {/st {currentpoint stroke moveto} def}%
+ \p@swr {/sl {st setlinewidth} def}%
+ \p@swr {/sd {st 0 setdash} def}%
+ \p@swr {/sg {st setgray} def}%
+ \p@swr {/bs {gsave} def /es {stroke grestore} def}%
+ \p@swr {/fl \l@br gsave setgray fill grestore}%
+ \p@swr { currentpoint newpath moveto\r@br\space def}%
+ \p@swr {/fp {gsave setgray fill grestore st} def}%
+ \p@swr {/cv {curveto} def}%
+ \p@swr {/cr \l@br gsave currentpoint newpath 3 -1 roll 0 360 arc}%
+ \p@swr { stroke grestore\r@br\space def}%
+ \p@swr {/fc \l@br gsave setgray currentpoint newpath}%
+ \p@swr { 3 -1 roll 0 360 arc fill grestore\r@br\space def}%
+ \p@swr {/ar {gsave currentpoint newpath 5 2 roll arc stroke grestore} def}%
+ \p@swr {/el \l@br gsave /svm matrix currentmatrix def}%
+ \p@swr { currentpoint translate scale newpath 0 0 1 0 360 arc}%
+ \p@swr { svm setmatrix stroke grestore\r@br\space def}%
+ \p@swr {/fe \l@br gsave setgray currentpoint translate scale newpath}%
+ \p@swr { 0 0 1 0 360 arc fill grestore\r@br\space def}%
+ \p@swr {/av \l@br /hhwid exch 2 div def /hlen exch def}%
+ \p@swr { /ah exch def /tipy exch def /tipx exch def}%
+ \p@swr { currentpoint /taily exch def /tailx exch def}%
+ \p@swr { /dx tipx tailx sub def /dy tipy taily sub def}%
+ \p@swr { /alen dx dx mul dy dy mul add sqrt def}%
+ \p@swr { /blen alen hlen sub def}%
+ \p@swr { gsave tailx taily translate dy dx atan rotate}%
+ \p@swr { (V) ah ne {blen 0 gt {blen 0 lineto} if} {alen 0 lineto} ifelse}%
+ \p@swr { stroke blen hhwid neg moveto alen 0 lineto blen hhwid lineto}%
+ \p@swr { (T) ah eq {closepath} if}%
+ \p@swr { (W) ah eq {gsave 1 setgray fill grestore closepath} if}%
+ \p@swr { (F) ah eq {fill} {stroke} ifelse}%
+ \p@swr { grestore tipx tipy moveto\r@br\space def}%
+ \p@swr {\p@sfactor\space \p@sfactor\space scale}%
+ \p@swr {1 setlinecap 1 setlinejoin}%
+ \p@swr {3 setlinewidth [] 0 setdash}%
+ \p@swr {0 0 moveto}%
}
% Notes:
@@ -1116,15 +1151,15 @@
% indicate. This is due to the fact that multiple move commands in
% a row are collapsed into a single move. The BoundingBox information
% includes the effect of the moves which were expunged.
-\def\t@drclose {%
+\def\t@xdclose {%
\bgroup
- \w@rps {stroke end showpage}%
- \w@rps {\p@p Trailer:}%
+ \p@swr {stroke end showpage}%
+ \p@swr {\p@p Trailer:}%
\pixtobp \xminpix \l@lxbp \pixtobp \yminpix \l@lybp
\pixtobp \xmaxpix \u@rxbp \pixtobp \ymaxpix \u@rybp
- \w@rps {\p@p BoundingBox: \l@lxbp\space \l@lybp\space
+ \p@swr {\p@p BoundingBox: \l@lxbp\space \l@lybp\space
\u@rxbp\space \u@rybp}%
- \w@rps {\p@p EOF}%
+ \p@swr {\p@p EOF}%
\egroup
\immediate\closeout\drawfile
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdexamp.latex new/tex/generic/texdraw/txdexamp.latex
--- old/tex/generic/texdraw/txdexamp.latex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdexamp.latex 1970-01-01 01:00:00.000000000 +0100
@@ -1,514 +0,0 @@
-% TeXdraw examples for latex
-
-% $Id: txdexamp.latex,v 2.1 2019/03/28 texdraw-V2R0a $
-
-% These examples are taken from the TeXdraw manual.
-
-% Peter Kabal
-% Department of Electrical Engineering
-% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
-
-% peter dot kabal at mcgill dot ca
-
-\documentclass [11pt]{article}
-\usepackage {texdraw}
-
-\input txdtools
-\let\et=\etexdraw
-\def\etexdraw{\drawbb\et}
-
-\begin{document}
-
-\noindent
-TeXdraw examples using LaTeX.
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \avec (0 0.8) \textref h:C v:B \htext (0 0.9){\sl y}
- \move (0 0) \avec (0.8 0) \textref h:L v:C \htext(0.9 0){\sl x}
- \move (0 1.0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \drawdim{cm} \linewd 0.02
- \move(2 2) \lvec(3 3) \lvec(2 4) \lvec(1 3) \lvec(2 2)
- \textref h:C v:C \htext(2 3){$\sum \rho_n$}
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \drawdim in
- \linewd 0.03 \setgray 0.6 \arrowheadtype t:F \avec(0.5 0.5)
- \linewd 0.01 \setgray 0 \arrowheadtype t:V \avec(1.0 0.5)
- \linewd 0.015 \lpatt(0.067 0.1) \lvec (1.5 0)
- \linewd 0.02 \lpatt() \arrowheadtype t:T \avec(2.0 0.5)
- \arrowheadtype t:H \avec(2.5 0.5)
- \setgray 0.4 \arrowheadtype t:W \avec(3.0 0)
- \textref h:R v:T \htext (0.35 0.50){\tt t:F}
- \textref h:R v:T \htext (1.0 0.43){\tt t:V}
- \textref h:R v:T \htext (1.82 0.50){\tt t:T}
- \textref h:R v:T \htext (2.5 0.43){\tt t:H}
- \textref h:R v:B \htext (2.8 0){\tt t:W}
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \newcommand{\bdot}{\bsegment
- \fcir f:0 r:0.02
- \esegment}
- \newcommand{\Ttext}[1]{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
- \newcommand{\Btext}[1]{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
- \newcommand{\Ltext}[1]{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \newcommand{\Rtext}[1]{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \move (-1.5 0)
- \bsegment
- \move (+1.55 +0.45) \move (-1.55 -0.45) \move (0 0)
- \Ttext{Horizontal Text}
- \bdot \Btext{\tt h:C v:C}
- \move (-0.9 0) \bdot \Ltext{\tt h:L v:C}
- \move (+0.9 0) \bdot \Rtext{\tt h:R v:C}
- \move (0 +0.3) \bdot \Ttext{\tt h:C v:T}
- \move (0 -0.3) \bdot \Btext{\tt h:C v:B}
- \move (-0.9 -0.3) \bdot \Ltext{\tt h:L v:B}
- \lvec (-0.9 +0.3) \bdot \Ltext{\tt h:L v:T}
- \lvec (+0.9 +0.3) \bdot \Rtext{\tt h:R v:T}
- \lvec (+0.9 -0.3) \bdot \Rtext{\tt h:R v:B}
- \lvec (-0.9 -0.3)
- \esegment
- \newcommand{\atext}{\rtext td:45 }
- \newcommand{\ATtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:C v:B \atext (-0.06 +0.06){#1}
- \esegment}
- \newcommand{\ABtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:C v:T \atext (+0.060 -0.06){#1}
- \esegment}
- \newcommand{\ALtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:R v:C \atext (-0.08 -0.08){#1}
- \esegment}
- \newcommand{\ARtext}[1]{\bsegment
- \setsegscale 0.707
- \textref h:L v:C \atext (+0.08 +0.08){#1}
- \esegment}
- \move (+1.5 0)
- \bsegment
- \move (+1.33 +1.33) \move (-1.33 -1.33) \move (0 0)
- \setsegscale 0.707
- \ATtext{Rotated Text}
- \bdot \ABtext{\tt h:C v:C}
- \move (-0.9 -0.9) \bdot \ALtext{\tt h:L v:C}
- \move (+0.9 +0.9) \bdot \ARtext{\tt h:R v:C}
- \move (-0.3 +0.3) \bdot \ATtext{\tt h:C v:T}
- \move (+0.3 -0.3) \bdot \ABtext{\tt h:C v:B}
- \move (-0.6 -1.2) \bdot \ALtext{\tt h:L v:B}
- \lvec (-1.2 -0.6) \bdot \ALtext{\tt h:L v:T}
- \lvec (+0.6 +1.2) \bdot \ARtext{\tt h:R v:T}
- \lvec (+1.2 +0.6) \bdot \ARtext{\tt h:R v:B}
- \lvec (-0.6 -1.2)
- \esegment
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \move(-0.75 -0.25) \lvec (-0.75 +0.5) \lvec (+0.75 +0.5)
- \lvec(+0.75 -0.25) \ifill f:0.9 % fill the region
- \move(0 0)
- \avec(-0.75 -0.25) \textref h:R v:C \htext{H-text}
- \move(0 0) \avec(-0.75 +0.25) \textref h:R v:B \htext{H-text}
- \move(0 0) \avec(0 +0.5) \textref h:L v:T \vtext{V-text}
- \move(0 0) \avec(+0.75 +0.25) \textref h:L v:B \htext{H-text}
- \move(0 0) \avec(+0.75 -0.25) \textref h:L v:C \htext{H-text}
- \move (-1.15 -0.3) \move (+1.15 +0.92) % increase the size of the drawing
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \linewd 0.02
- \fcir f:0.7 r:1
- \larc r:1 sd:45 ed:135
- \lvec ( 0.707 0.707) \move (0 0) \lvec (-0.707 +0.707)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
- \newcommand{\Ltext}[1]{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \newcommand{\Rtext}[1]{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \newcommand{\bdot}{\fcir f:0 r:0.02 }
- \newcommand{\Ldot}[1]{\bdot \Ltext{#1}}
- \newcommand{\Rdot}[1]{\bdot \Rtext{#1}}
- \move (-2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 1) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 1)(1 0)
- \esegment
- \move (0 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0.5 0.8) \Ldot{1}
- \lvec (1.5 0.8) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0.5 1)(1.5 1)(1 0)
- \esegment
- \move ( 2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 0) \Rdot{2} \lvec (1 1) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 0)(1 1)
- \esegment
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\move (0.5 0)
-\lvec (0 0.5) \clvec (0.5 0.85)(1 0.65)(1.5 1)
-\lvec (2 0.5) \clvec (1.5 0.15)(1 0.35)(0.5 0)
-\lfill f:0.8
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\newcommand{\tbox}[1]{\bsegment
- \lvec (0 +0.25) \lvec (0.75 +0.25)
- \lvec (0.75 -0.25) \lvec (0 -0.25) \lvec (0 0)
- \textref h:C v:C \htext (0.375 0){#1}
- \savepos (0.75 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\begin{center}
-\begin{texdraw}
- \ravec (1 0) \tbox{$H(z)$} \ravec (1 0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\def\cavec (#1 #2)(#3 #4)(#5 #6){
- \clvec (#1 #2)(#3 #4)(#5 #6)
- \cossin (#3 #4)(#5 #6)\cosa\sina
- \rmove (0 0) % stroke the Bezier curve
- \bsegment
- \drawdim in \setsegscale 0.05
- \move ({-\cosa} -\sina) \avec (0 0)
- \esegment}
-
-\def\caw (#1 #2){
- \currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
-
-% The nominal wiggly curve is (0 0) (1+dx dy) (-dx -dy) (1 0)
-% Find the rotated offset (dx dy) -> (du dv)
- \rotatecoord (0.4 0.1)\cosa\sina \du\dv
-
-% calculate the length of the vector
- \vectlen ({\xa} \ya)(#1 #2)\len
-
-% draw the curve in normalized units
- \bsegment
- \setsegscale {\len}
- \realadd \cosa \du \tmpa \realadd \sina \dv \tmpb
- \cavec ({\tmpa} \tmpb)({-\du} -\dv)({\cosa} \sina)
- \esegment
-
- \move (#1 #2)}
-
-% rotate a coordinate (x y)
-% arguments: (x y) cosa sina x' y'
-% x' = cosa * x - sina * y; y' = sina * x + cosa * y
-\def\rotatecoord (#1 #2)#3#4#5#6{
- \getpos (#1 #2)\xarg\yarg
- \realmult \xarg {#3} \tmpa \realmult \yarg {#4} \tmpb
- \realadd \tmpa {-\tmpb} #5
- \realmult \xarg {#4} \tmpa \realmult \yarg {#3} \tmpb
- \realadd \tmpa \tmpb #6}
-
-\begin{center}
-\begin{texdraw}
- \arrowheadtype t:W
- \move (0 0)
- \cavec (1.4 0.1)(-0.4 -0.1)(1 0)
- \move (1 0) \caw (1 1) \htext{tip at \tt (1 1)}
- \move (1 0) \caw (2 1) \htext{tip at \tt (2 1)}
- \move (1 0) \caw (2 0) \htext{tip at \tt (2 0)}
- \move (0 1.13) \move (0 -0.04)
-\end{texdraw}
-\end{center}
-
-\vfill
-\newpage
-
-
-\bigskip
-\def\delay {\bsegment
- \setsegscale 0.3
- \lvec (0 +0.5) \lvec (1 +0.5) \lvec (1 -0.5)
- \lvec (0 -0.5) \lvec (0 0)
- \textref h:C v:C \htext (0.5 0){$z^{-1}$}
- \savepos (1 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\def\bdot {\fcir f:0 r:0.02 }
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.06 0){#1}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.06 0){#1}
- \esegment}
-\def\cradius {0.08}
-\def\pluss {\bsegment
- \setsegscale {\cradius}
- \move (-0.5 0) \lvec (+0.5 0)
- \move (0 -0.5) \lvec (0 +0.5)
- \esegment}
-\def\pcir {\lcir r:{\cradius} \pluss}
-\def\puttext (#1 #2)#3{\bsegment
- \setsegscale {\cradius}
- \textref h:C v:C \htext (#1 #2){#3}
- \esegment}
-\def\putwnw #1{\puttext (-1.7 +1.2){#1}}
-\def\putwsw #1{\puttext (-1.7 -1.2){#1}}
-\def\putn #1{\puttext ( 0 +2 ){#1}}
-\def\puts #1{\puttext ( 0 -2 ){#1}}
-\def\avectoc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \savepos (#1 #2)(*tx *ty)
- \bsegment
- \move (*tx *ty)
- \setsegscale {\cradius}
- \rmove ({-\cosa} -\sina)
- \savecurrpos (*ex *ey)
- \esegment
- \avec (*ex *ey)
- \move (#1 #2)}
-\def\avecfrc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \bsegment
- \setsegscale {\cradius}
- \move ({\cosa} \sina)
- \savecurrpos (*ex *ey)
- \esegment
- \move (*ex *ey)
- \avec (#1 #2)}
-
-\begin{center}
-\begin{texdraw}
-\drawdim in
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\pl {$\scriptscriptstyle +$} \def\mn {$\scriptscriptstyle -$}
-
-\move (0 +0.63) \move (0 -0.60) \move (0 0) % compensate for the text size
-
-% Input to the first stage
-\bsegment
- \Ltext{$x(n)$}
- \lvec (0.3 0) \bdot \lvec (0.3 +0.4)
- \move (0.3 0) \lvec (0.3 -0.4)
- \savepos (0.3 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% first lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.1 +0.4)
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_0(n)$}
- \move (2.0 +0.42) \Ttext {$f_1(n)$}
- \move (0.1 -0.4) \Btext {$b_0(n)$}
- \move (2.0 -0.4) \Btext {$b_1(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_1$}
- \textref h:L v:T \htext (1.15 -0.2){$K_1$}
- \savepos (2.1 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% center section
-\bsegment
- \textref h:C v:C
- \htext (0.3 +0.4){$\cdots$}
- \htext (0.3 -0.4){$\cdots$}
- \savepos (0.6 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% last lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.3 +0.4) \Rtext{$e(n)$}
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_{P-1}(n)$}
- \move (2.0 +0.42) \Ttext {$f_P(n)$}
- \move (0.1 -0.4) \Btext {$b_{P-1}(n)$}
- \move (2.0 -0.4) \Btext {$b_P(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_P$}
- \textref h:L v:T \htext (1.15 -0.2){$K_P$}
-\esegment
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\ds {\displaystyle}
-\def\ticklab (#1 #2)#3{\move(#1 #2)
- \bsegment
- \lvec (0 0.05)
- \textref h:C v:T \htext (0 -0.05){#3}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext ( 0.08 0){#1}
- \esegment}
-
-\move (2.4 -0.32) % move to set the size
-
-\move (0 0)
-% Axes
-\avec (0 1.4)
-\move (0 0) \avec (2.2 0) \Rtext{$\omega$}
-\ticklab (0 0) {0}
-\ticklab (0.8 0) {$\ds {\pi \over 2N} $}
-\ticklab (1.2 0) {$\omega_s$}
-\ticklab (1.6 0) {$\ds {\pi \over N} $}
-
-\linewd 0.025
-\move (0 1)
-\lvec (0.4 1)
-\lvec (0.44 0.998)
-\lvec (0.48 0.988)
-\lvec (0.52 0.973)
-\lvec (0.56 0.951)
-\lvec (0.60 0.923)
-\lvec (0.64 0.891)
-\lvec (0.68 0.852)
-\lvec (0.72 0.809)
-\lvec (0.76 0.760)
-\lvec (0.80 0.707)
-\lvec (0.84 0.649)
-\lvec (0.88 0.587)
-\lvec (0.92 0.522)
-\lvec (0.96 0.454)
-\lvec (1.00 0.382)
-\lvec (1.04 0.309)
-\lvec (1.08 0.233)
-\lvec (1.12 0.156)
-\lvec (1.16 0.078)
-\lvec (1.20 0)
-\lvec (1.9 0)
-\end{texdraw}
-\end{center}
-
-\bigskip
-\begin{center}
-\begin{texdraw}
-\arrowheadtype t:V \arrowheadsize l:0.08 w:0.04
-\linewd 0.01
-\setunitscale 1.5 % circle will have radius 1.5 inches
-
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.04){#1}
- \esegment}
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 0.04){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.04 0){#1}
- \esegment}
-\def\bdot {\fcir f:0 r:0.0133 }
-\def\vtick {\bsegment
- \move (0 -0.05) \lvec (0 0.05)
- \esegment}
-\def\htick {\bsegment
- \move (-0.05 0) \lvec ( 0.05 0)
- \esegment}
-\def\Hlen #1#2{\bsegment
- \vtick \avec ({#1} 0) \vtick \avec (0 0)
- \relsegscale 0.5
- \move ({#1} 0) \Ttext {#2}
- \esegment}
-\def\Vlen #1#2{\bsegment
- \htick \avec (0 {#1}) \htick \avec (0 0)
- \relsegscale 0.5
- \move (0 {#1}) \Ltext {#2}
- \esegment}
-
-\lcir r:1 % circle
-\move (-1.05 0) \lvec ( 1.05 0) % axes
-\move (0 -1.05) \lvec (0 1.05)
-
-\move (0 0) \lvec (0.707 0.707) \bdot
-\rmove (0.02 0.02) \textref h:L v:B \htext {X}
-\move (0.707 -0.707) \bdot
-\textref h:R v:T \htext(-0.02 -0.02){O}
-
-\move (0.5 0) % center of ellipse
-\bsegment
- \lellip rx:0.435 ry:0.804
- \bdot \Btext {$\beta_2$}
- \move (0 0.15) \Hlen {0.435}{$|\beta_1{+}\beta_3|$}
- \move (-0.7 0) \Vlen {0.804}{$|\beta_1{-}\beta_3|$}
-\esegment
-\end{texdraw}
-\end{center}
-
-\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdexamp.tex new/tex/generic/texdraw/txdexamp.tex
--- old/tex/generic/texdraw/txdexamp.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdexamp.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,485 +0,0 @@
-% TeXdraw examples
-
-% $Id: txdexamp.tex,v 2.1 2019/03/28 texdraw-V2R0a $
-
-% These examples are taken from the TeXdraw manual. Note that the fonts
-% for text will be different from those in the manual -- here we use the
-% plain TeX defaults.
-
-% Peter Kabal
-% Department of Electrical Engineering
-% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
-
-% peter dot kabal at mcgill dot ca
-
-\input texdraw
-\input txdtools
-\let\et=\etexdraw
-\def\etexdraw{\drawbb\et}
-
-\noindent
-TeXdraw examples using plain TeX.
-
-\bigskip
-\centertexdraw{
- \avec (0 0.8) \textref h:C v:B \htext (0 0.9){\sl y}
- \move (0 0) \avec (0.8 0) \textref h:L v:C \htext(0.9 0){\sl x}
- \move (0 1.0)}
-
-\bigskip
-\centertexdraw{
- \drawdim{cm} \linewd 0.02
- \move(2 2) \lvec(3 3) \lvec(2 4) \lvec(1 3) \lvec(2 2)
- \textref h:C v:C \htext(2 3){$\sum \rho_n$}
-}
-
-\bigskip
-\centertexdraw{
- \drawdim in
- \linewd 0.03 \setgray 0.6 \arrowheadtype t:F \avec(0.5 0.5)
- \linewd 0.01 \setgray 0 \arrowheadtype t:V \avec(1.0 0.5)
- \linewd 0.015 \lpatt(0.067 0.1) \lvec (1.5 0)
- \linewd 0.02 \lpatt() \arrowheadtype t:T \avec(2.0 0.5)
- \arrowheadtype t:H \avec(2.5 0.5)
- \setgray 0.4 \arrowheadtype t:W \avec(3.0 0)
- \textref h:R v:T \htext (0.35 0.50){\tt t:F}
- \textref h:R v:T \htext (1.0 0.43){\tt t:V}
- \textref h:R v:T \htext (1.82 0.50){\tt t:T}
- \textref h:R v:T \htext (2.5 0.43){\tt t:H}
- \textref h:R v:B \htext (2.8 0){\tt t:W}
-}
-
-\bigskip
-\centertexdraw{
- \def\bdot {\bsegment
- \fcir f:0 r:0.02
- \esegment}
- \def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
- \def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
- \def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \move (-1.5 0)
- \bsegment
- \move (+1.55 +0.45) \move (-1.55 -0.45) \move (0 0)
- \Ttext{Horizontal Text}
- \bdot \Btext{\tt h:C v:C}
- \move (-0.9 0) \bdot \Ltext{\tt h:L v:C}
- \move (+0.9 0) \bdot \Rtext{\tt h:R v:C}
- \move (0 +0.3) \bdot \Ttext{\tt h:C v:T}
- \move (0 -0.3) \bdot \Btext{\tt h:C v:B}
- \move (-0.9 -0.3) \bdot \Ltext{\tt h:L v:B}
- \lvec (-0.9 +0.3) \bdot \Ltext{\tt h:L v:T}
- \lvec (+0.9 +0.3) \bdot \Rtext{\tt h:R v:T}
- \lvec (+0.9 -0.3) \bdot \Rtext{\tt h:R v:B}
- \lvec (-0.9 -0.3)
- \esegment
- \def\atext {\rtext td:45 }
- \def\ATtext #1{\bsegment
- \setsegscale 0.707
- \textref h:C v:B \atext (-0.06 +0.06){#1}
- \esegment}
- \def\ABtext #1{\bsegment
- \setsegscale 0.707
- \textref h:C v:T \atext (+0.060 -0.06){#1}
- \esegment}
- \def\ALtext #1{\bsegment
- \setsegscale 0.707
- \textref h:R v:C \atext (-0.08 -0.08){#1}
- \esegment}
- \def\ARtext #1{\bsegment
- \setsegscale 0.707
- \textref h:L v:C \atext (+0.08 +0.08){#1}
- \esegment}
- \move (+1.5 0)
- \bsegment
- \move (+1.33 +1.33) \move (-1.33 -1.33) \move (0 0)
- \setsegscale 0.707
- \ATtext{Rotated Text}
- \bdot \ABtext{\tt h:C v:C}
- \move (-0.9 -0.9) \bdot \ALtext{\tt h:L v:C}
- \move (+0.9 +0.9) \bdot \ARtext{\tt h:R v:C}
- \move (-0.3 +0.3) \bdot \ATtext{\tt h:C v:T}
- \move (+0.3 -0.3) \bdot \ABtext{\tt h:C v:B}
- \move (-0.6 -1.2) \bdot \ALtext{\tt h:L v:B}
- \lvec (-1.2 -0.6) \bdot \ALtext{\tt h:L v:T}
- \lvec (+0.6 +1.2) \bdot \ARtext{\tt h:R v:T}
- \lvec (+1.2 +0.6) \bdot \ARtext{\tt h:R v:B}
- \lvec (-0.6 -1.2)
- \esegment
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\centertexdraw{
- \move(-0.75 -0.25) \lvec (-0.75 +0.5) \lvec (+0.75 +0.5)
- \lvec(+0.75 -0.25) \ifill f:0.9 % fill the region
- \move(0 0)
- \avec(-0.75 -0.25) \textref h:R v:C \htext{H-text}
- \move(0 0) \avec(-0.75 +0.25) \textref h:R v:B \htext{H-text}
- \move(0 0) \avec(0 +0.5) \textref h:L v:T \vtext{V-text}
- \move(0 0) \avec(+0.75 +0.25) \textref h:L v:B \htext{H-text}
- \move(0 0) \avec(+0.75 -0.25) \textref h:L v:C \htext{H-text}
- \move (-1.15 -0.3) \move (+1.15 +0.92) % increase the size of the drawing
-}
-
-\bigskip
-\centertexdraw{
- \linewd 0.02
- \fcir f:0.7 r:1
- \larc r:1 sd:45 ed:135
- \lvec ( 0.707 0.707) \move (0 0) \lvec (-0.707 +0.707)
-}
-
-\bigskip
-\centertexdraw{
- \def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.08 0){#1}
- \esegment}
- \def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.08 0){#1}
- \esegment}
- \def\bdot {\fcir f:0 r:0.02 }
- \def\Ldot #1{\bdot \Ltext{#1}}
- \def\Rdot #1{\bdot \Rtext{#1}}
- \move (-2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 1) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 1)(1 0)
- \esegment
- \move (0 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0.5 0.8) \Ldot{1}
- \lvec (1.5 0.8) \Rdot{2} \lvec (1 0) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0.5 1)(1.5 1)(1 0)
- \esegment
- \move ( 2 0)
- \bsegment
- \lpatt (0.033)
- \move (0 0) \Ldot{0} \lvec (0 1) \Ldot{1}
- \lvec (1 0) \Rdot{2} \lvec (1 1) \Rdot{3}
- \lpatt ()
- \move (0 0) \clvec (0 1)(1 0)(1 1)
- \esegment
-}
-
-\bigskip
-\centertexdraw{
-\move (0.5 0)
-\lvec (0 0.5) \clvec (0.5 0.85)(1 0.65)(1.5 1)
-\lvec (2 0.5) \clvec (1.5 0.15)(1 0.35)(0.5 0)
-\lfill f:0.8
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\def\tbox #1{\bsegment
- \lvec (0 +0.25) \lvec (0.75 +0.25)
- \lvec (0.75 -0.25) \lvec (0 -0.25) \lvec (0 0)
- \textref h:C v:C \htext (0.375 0){#1}
- \savepos (0.75 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\centertexdraw{
- \ravec (1 0) \tbox{$H(z)$} \ravec (1 0)
-}
-
-\bigskip
-\def\cavec (#1 #2)(#3 #4)(#5 #6){
- \clvec (#1 #2)(#3 #4)(#5 #6)
- \cossin (#3 #4)(#5 #6)\cosa\sina
- \rmove (0 0) % stroke the Bezier curve
- \bsegment
- \drawdim in \setsegscale 0.05
- \move ({-\cosa} -\sina) \avec (0 0)
- \esegment}
-
-\def\caw (#1 #2){
- \currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
-
-% The nominal wiggly curve is (0 0) (1+dx dy) (-dx -dy) (1 0)
-% Find the rotated offset (dx dy) -> (du dv)
- \rotatecoord (0.4 0.1)\cosa\sina \du\dv
-
-% calculate the length of the vector
- \vectlen ({\xa} \ya)(#1 #2)\len
-
-% draw the curve in normalized units
- \bsegment
- \setsegscale {\len}
- \realadd \cosa \du \tmpa \realadd \sina \dv \tmpb
- \cavec ({\tmpa} \tmpb)({-\du} -\dv)({\cosa} \sina)
- \esegment
-
- \move (#1 #2)}
-
-% rotate a coordinate (x y)
-% arguments: (x y) cosa sina x' y'
-% x' = cosa * x - sina * y; y' = sina * x + cosa * y
-\def\rotatecoord (#1 #2)#3#4#5#6{
- \getpos (#1 #2)\xarg\yarg
- \realmult \xarg {#3} \tmpa \realmult \yarg {#4} \tmpb
- \realadd \tmpa {-\tmpb} #5
- \realmult \xarg {#4} \tmpa \realmult \yarg {#3} \tmpb
- \realadd \tmpa \tmpb #6}
-
-\centertexdraw{
- \arrowheadtype t:W
- \move (0 0)
- \cavec (1.4 0.1)(-0.4 -0.1)(1 0)
- \move (1 0) \caw (1 1) \htext{tip at \tt (1 1)}
- \move (1 0) \caw (2 1) \htext{tip at \tt (2 1)}
- \move (1 0) \caw (2 0) \htext{tip at \tt (2 0)}
- \move (0 1.13) \move (0 -0.04)
-}
-
-\vfill
-\eject
-
-
-\bigskip
-\def\delay {\bsegment
- \setsegscale 0.3
- \lvec (0 +0.5) \lvec (1 +0.5) \lvec (1 -0.5)
- \lvec (0 -0.5) \lvec (0 0)
- \textref h:C v:C \htext (0.5 0){$z^{-1}$}
- \savepos (1 0)(*ex *ey)
- \esegment
- \move (*ex *ey)}
-\def\bdot {\fcir f:0 r:0.02 }
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 +0.06){#1}
- \esegment}
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.06){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.06 0){#1}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext (+0.06 0){#1}
- \esegment}
-\def\cradius {0.08}
-\def\pluss {\bsegment
- \setsegscale {\cradius}
- \move (-0.5 0) \lvec (+0.5 0)
- \move (0 -0.5) \lvec (0 +0.5)
- \esegment}
-\def\pcir {\lcir r:{\cradius} \pluss}
-\def\puttext (#1 #2)#3{\bsegment
- \setsegscale {\cradius}
- \textref h:C v:C \htext (#1 #2){#3}
- \esegment}
-\def\putwnw #1{\puttext (-1.7 +1.2){#1}}
-\def\putwsw #1{\puttext (-1.7 -1.2){#1}}
-\def\putn #1{\puttext ( 0 +2 ){#1}}
-\def\puts #1{\puttext ( 0 -2 ){#1}}
-\def\avectoc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \savepos (#1 #2)(*tx *ty)
- \bsegment
- \move (*tx *ty)
- \setsegscale {\cradius}
- \rmove ({-\cosa} -\sina)
- \savecurrpos (*ex *ey)
- \esegment
- \avec (*ex *ey)
- \move (#1 #2)}
-\def\avecfrc (#1 #2){\currentpos \xa\ya
- \cossin ({\xa} \ya)(#1 #2)\cosa\sina
- \bsegment
- \setsegscale {\cradius}
- \move ({\cosa} \sina)
- \savecurrpos (*ex *ey)
- \esegment
- \move (*ex *ey)
- \avec (#1 #2)}
-
-\centertexdraw{
-\drawdim in
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\pl {$\scriptscriptstyle +$} \def\mn {$\scriptscriptstyle -$}
-
-\move (0 +0.63) \move (0 -0.60) \move (0 0) % compensate for the text size
-
-% Input to the first stage
-\bsegment
- \Ltext{$x(n)$}
- \lvec (0.3 0) \bdot \lvec (0.3 +0.4)
- \move (0.3 0) \lvec (0.3 -0.4)
- \savepos (0.3 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% first lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.1 +0.4)
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_0(n)$}
- \move (2.0 +0.42) \Ttext {$f_1(n)$}
- \move (0.1 -0.4) \Btext {$b_0(n)$}
- \move (2.0 -0.4) \Btext {$b_1(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_1$}
- \textref h:L v:T \htext (1.15 -0.2){$K_1$}
- \savepos (2.1 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% center section
-\bsegment
- \textref h:C v:C
- \htext (0.3 +0.4){$\cdots$}
- \htext (0.3 -0.4){$\cdots$}
- \savepos (0.6 0)(*ex *ey)
-\esegment
-\move (*ex *ey)
-
-% last lattice stage
-\bsegment
- \move (0 +0.4) \avectoc (1.7 +0.4)
- \pcir \putwnw{\pl} \puts{\mn}
- \avecfrc (2.3 +0.4) \Rtext{$e(n)$}
- \move (0 -0.4) \avec (0.4 -0.4) \delay \avectoc (1.7 -0.4)
- \pcir \putwsw{\pl} \putn{\mn}
- \avecfrc (2.1 -0.4)
- \move (0.9 +0.4) \bdot \avectoc (1.7 -0.4)
- \move (0.9 -0.4) \bdot \avectoc (1.7 +0.4)
- \move (0.1 +0.42) \Ttext {$f_{P-1}(n)$}
- \move (2.0 +0.42) \Ttext {$f_P(n)$}
- \move (0.1 -0.4) \Btext {$b_{P-1}(n)$}
- \move (2.0 -0.4) \Btext {$b_P(n)$}
- \textref h:L v:B \htext (1.15 +0.2){$K_P$}
- \textref h:L v:T \htext (1.15 -0.2){$K_P$}
-\esegment
-}
-
-\bigskip
-\centertexdraw{
-\arrowheadtype t:F \arrowheadsize l:0.08 w:0.04
-\def\ds {\displaystyle}
-\def\ticklab (#1 #2)#3{\move(#1 #2)
- \bsegment
- \lvec (0 0.05)
- \textref h:C v:T \htext (0 -0.05){#3}
- \esegment}
-\def\Rtext #1{\bsegment
- \textref h:L v:C \htext ( 0.08 0){#1}
- \esegment}
-
-\move (2.4 -0.32) % move to set the size
-
-\move (0 0)
-% Axes
-\avec (0 1.4)
-\move (0 0) \avec (2.2 0) \Rtext{$\omega$}
-\ticklab (0 0) {0}
-\ticklab (0.8 0) {$\ds {\pi \over 2N} $}
-\ticklab (1.2 0) {$\omega_s$}
-\ticklab (1.6 0) {$\ds {\pi \over N} $}
-
-\linewd 0.025
-\move (0 1)
-\lvec (0.4 1)
-\lvec (0.44 0.998)
-\lvec (0.48 0.988)
-\lvec (0.52 0.973)
-\lvec (0.56 0.951)
-\lvec (0.60 0.923)
-\lvec (0.64 0.891)
-\lvec (0.68 0.852)
-\lvec (0.72 0.809)
-\lvec (0.76 0.760)
-\lvec (0.80 0.707)
-\lvec (0.84 0.649)
-\lvec (0.88 0.587)
-\lvec (0.92 0.522)
-\lvec (0.96 0.454)
-\lvec (1.00 0.382)
-\lvec (1.04 0.309)
-\lvec (1.08 0.233)
-\lvec (1.12 0.156)
-\lvec (1.16 0.078)
-\lvec (1.20 0)
-\lvec (1.9 0)
-}
-
-\bigskip
-\centertexdraw{
-\arrowheadtype t:V \arrowheadsize l:0.08 w:0.04
-\linewd 0.01
-\setunitscale 1.5 % circle will have radius 1.5 inches
-
-\def\Btext #1{\bsegment
- \textref h:C v:T \htext (0 -0.04){#1}
- \esegment}
-\def\Ttext #1{\bsegment
- \textref h:C v:B \htext (0 0.04){#1}
- \esegment}
-\def\Ltext #1{\bsegment
- \textref h:R v:C \htext (-0.04 0){#1}
- \esegment}
-\def\bdot {\fcir f:0 r:0.0133 }
-\def\vtick {\bsegment
- \move (0 -0.05) \lvec (0 0.05)
- \esegment}
-\def\htick {\bsegment
- \move (-0.05 0) \lvec ( 0.05 0)
- \esegment}
-\def\Hlen #1#2{\bsegment
- \vtick \avec ({#1} 0) \vtick \avec (0 0)
- \relsegscale 0.5
- \move ({#1} 0) \Ttext {#2}
- \esegment}
-\def\Vlen #1#2{\bsegment
- \htick \avec (0 {#1}) \htick \avec (0 0)
- \relsegscale 0.5
- \move (0 {#1}) \Ltext {#2}
- \esegment}
-
-\lcir r:1 % circle
-\move (-1.05 0) \lvec ( 1.05 0) % axes
-\move (0 -1.05) \lvec (0 1.05)
-
-\move (0 0) \lvec (0.707 0.707) \bdot
-\rmove (0.02 0.02) \textref h:L v:B \htext {X}
-\move (0.707 -0.707) \bdot
-\textref h:R v:T \htext(-0.02 -0.02){O}
-
-\move (0.5 0) % center of ellipse
-\bsegment
- \lellip rx:0.435 ry:0.804
- \bdot \Btext {$\beta_2$}
- \move (0 0.15) \Hlen {0.435}{$|\beta_1{+}\beta_3|$}
- \move (-0.7 0) \Vlen {0.804}{$|\beta_1{-}\beta_3|$}
-\esegment
-}
-
-\bye
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdps.tex new/tex/generic/texdraw/txdps.tex
--- old/tex/generic/texdraw/txdps.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdps.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw macros to access PostScript builtins
-% $Id: txdps.tex,v 1.8 2019/03/28 texdraw-V2R0a $
+% $Id: txdps.tex 1.10 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
\chardef\catamp=\the\catcode`\@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/texdraw/txdtools.tex new/tex/generic/texdraw/txdtools.tex
--- old/tex/generic/texdraw/txdtools.tex 2019-03-30 22:24:32.000000000 +0100
+++ new/tex/generic/texdraw/txdtools.tex 2019-05-07 00:06:13.000000000 +0200
@@ -1,6 +1,6 @@
% TeXdraw toolbox macros, useful for extended TeXdraw commands
-% $Id: txdtools.tex,v 1.9 2019/03/28 texdraw-V2R0a $
+% $Id: txdtools.tex 1.11 2019/04/18 TeXdraw-v2r3 $
% Copyright (C) 1991-2019 Peter Kabal
@@ -10,14 +10,12 @@
% Creative Commons, PO Box 1866, Mountain View, CA 94042, USA.
% Peter Kabal
-% Department of Electrical Engineering
+% Department of Electrical & Computer Engineering
% McGill University
-% 3480 University
-% Montreal, Quebec
-% Canada H3A 2A7
% peter dot kabal at mcgill dot ca
-
+% http://www-mmsp.ece.mcgill.ca/MMSP/Documents/Software/
+
% ===============================================================
% These macros use temporary count registers defined by TeXdraw
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texdraw.tlpobj new/tlpkg/tlpobj/texdraw.tlpobj
--- old/tlpkg/tlpobj/texdraw.tlpobj 2019-04-01 02:25:03.000000000 +0200
+++ new/tlpkg/tlpobj/texdraw.tlpobj 2019-05-07 01:40:16.000000000 +0200
@@ -1,26 +1,25 @@
name texdraw
category Package
-revision 50660
+revision 51030
shortdesc Graphical macros, using embedded PostScript
relocated 1
longdesc TeXdraw is a set of macro definitions for TeX, which allow the
longdesc user to produce PostScript drawings from within TeX and LaTeX.
longdesc TeXdraw has been designed to be extensible. Drawing 'segments'
longdesc are relocatable, self-contained units. Using a combination of
-longdesc the TeX's grouping mechanism and the gsave/grestore mechanism
-longdesc in PostScript, drawing segments allow for local changes to the
+longdesc TeX's grouping mechanism and the gsave/grestore mechanism in
+longdesc PostScript, drawing segments allow for local changes to the
longdesc scaling and line parameters. Using TeX's macro definition
longdesc capability, new drawing commands can be constructed from
longdesc drawing segments.
-runfiles size=26
+runfiles size=19
RELOC/tex/generic/texdraw/blockdiagram.tex
RELOC/tex/generic/texdraw/texdraw.sty
RELOC/tex/generic/texdraw/texdraw.tex
- RELOC/tex/generic/texdraw/txdexamp.latex
- RELOC/tex/generic/texdraw/txdexamp.tex
RELOC/tex/generic/texdraw/txdps.tex
RELOC/tex/generic/texdraw/txdtools.tex
catalogue-ctan /graphics/texdraw
-catalogue-date 2019-03-30 09:24:26 +0100
+catalogue-date 2019-05-06 20:46:20 +0200
catalogue-license cc-by-4
catalogue-topics graphics-in-tex
+catalogue-version v2r3
++++++ texfot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/texfot.1 new/texmf-dist/doc/man/man1/texfot.1
--- old/texmf-dist/doc/man/man1/texfot.1 2017-08-08 22:43:00.000000000 +0200
+++ new/texmf-dist/doc/man/man1/texfot.1 2020-03-11 22:18:30.000000000 +0100
@@ -1,4 +1,4 @@
-.\" Automatically generated by Pod::Man 4.07 (Pod::Simple 3.32)
+.\" Automatically generated by Pod::Man 4.11 (Pod::Simple 3.35)
.\"
.\" Standard preamble:
.\" ========================================================================
@@ -54,16 +54,20 @@
.\" Avoid warning from groff about undefined register 'F'.
.de IX
..
-.if !\nF .nr F 0
-.if \nF>0 \{\
-. de IX
-. tm Index:\\$1\t\\n%\t"\\$2"
+.nr rF 0
+.if \n(.g .if rF .nr rF 1
+.if (\n(rF:(\n(.g==0)) \{\
+. if \nF \{\
+. de IX
+. tm Index:\\$1\t\\n%\t"\\$2"
..
-. if !\nF==2 \{\
-. nr % 0
-. nr F 2
+. if !\nF==2 \{\
+. nr % 0
+. nr F 2
+. \}
. \}
.\}
+.rr rF
.\"
.\" Accent mark definitions (@(#)ms.acc 1.5 88/02/08 SMI; from UCB 4.2).
.\" Fear. Run. Save yourself. No user-serviceable parts.
@@ -129,7 +133,7 @@
.\" ========================================================================
.\"
.IX Title "TEXFOT 1"
-.TH TEXFOT 1 "2017-07-25" "texfot" "Karl Berry"
+.TH TEXFOT 1 "2020-03-10" "texfot" "Karl Berry"
.\" For nroff, turn off justification. Always turn off hyphenation; it makes
.\" way too many mistakes in technical documents.
.if n .ad l
@@ -149,12 +153,12 @@
\& # Sample basic invocation:
\& texfot pdflatex file.tex
\&
-\& # Ordinarily all output is copied to /tmp/fot before filtering;
-\& # that can be omitted:
-\& texfot pdflatex \-\-tee=/dev/null file.tex
+\& # Ordinarily all output is copied to /tmp/fot before filtering,
+\& # but that can be omitted:
+\& texfot \-\-tee=/dev/null lualatex file.tex
\&
\& # Example of more complex engine invocation:
-\& texfot lualatex \-\-recorder \*(Aq\enonstopmode\einput file\*(Aq
+\& texfot xelatex \-\-recorder \*(Aq\enonstopmode\einput file\*(Aq
.Ve
.PP
Aside from its own options, described below, \f(CW\*(C`texfot\*(C'\fR just runs the
@@ -190,9 +194,9 @@
Otherwise, if the line matches the list of regexps to show, show it.
.IP "5." 4
Otherwise, the default: if the line came from stdout, ignore it; if the
-line came from stderr, print it (to stdout). (This distinction is made
+line came from stderr, print it (to stdout). This distinction is made
because TeX engines write relatively few messages to stderr, and it's
-not unlikely that any such should be considered.
+likely that any such should be considered.
.Sp
It would be easy to add more options to allow for user additions to the
various regex lists, if that ever seems useful. Or email me (see end).
@@ -261,7 +265,11 @@
.IX Item "--no-quiet"
.PD
By default, the TeX command being invoked is reported on standard output.
-\&\f(CW\*(C`\-\-quiet\*(C'\fR omits that reporting.
+\&\f(CW\*(C`\-\-quiet\*(C'\fR omits that reporting. To get a completely silent run,
+redirect standard output: \f(CW\*(C`texfot\ ...\ >/dev/null\*(C'\fR. (The only
+messages to standard error should be errors from \f(CW\*(C`texfot\*(C'\fR itself, so it
+shouldn't be necessary to redirect that, but of course that can be done
+as well.)
.ie n .IP """\-\-stderr""" 4
.el .IP "\f(CW\-\-stderr\fR" 4
.IX Item "--stderr"
@@ -292,12 +300,12 @@
.SH "RATIONALE"
.IX Header "RATIONALE"
I wrote this because, in my work as a TUGboat editor
-(<http://tug.org/TUGboat>, journal submissions always welcome!), I end
-up running and rerunning many papers, many times each. It was too easy
-to lose warnings I needed to see in the mass of unvarying and
-uninteresting output from TeX, such as style files being read and fonts
-being used. I wanted to see all and only those messages which needed
-some action by me.
+(<http://tug.org/TUGboat>, journal submissions always welcome!), I run
+and rerun many documents, many times each. It was too easy to lose
+warnings I needed to see in the mass of unvarying and uninteresting
+output from TeX, such as style files being read and fonts being used. I
+wanted to see all and only those messages which needed some action by
+me.
.PP
I found some other programs of a similar nature, the LaTeX package
\&\f(CW\*(C`silence\*(C'\fR, and plenty of other (La)TeX wrappers, but it seemed none of
@@ -309,12 +317,10 @@
.PP
Here are some keywords if you want to explore other options:
texloganalyser, pydflatex, logfilter, latexmk, rubber, arara, and
-searching for \f(CW\*(C`log\*(C'\fR at <http://ctan.org/search>.
+searching for \f(CW\*(C`log\*(C'\fR at <https://ctan.org/search>.
.PP
\&\f(CW\*(C`texfot\*(C'\fR is written in Perl, and runs on Unix, and does not work on
-Windows. (If by some chance anyone wants to use this program on
-Windows, please make your own fork; I'm not interested in supporting
-that os.)
+Windows.
.PP
The name comes from the \f(CW\*(C`trip.fot\*(C'\fR and \f(CW\*(C`trap.fot\*(C'\fR files that are part
of Knuth's trip and trap torture tests, which record the online output
@@ -325,5 +331,5 @@
.IX Header "AUTHORS AND COPYRIGHT"
This script and its documentation were written by Karl Berry and both
are released to the public domain. Email \f(CW\*(C`karl(a)freefriends.org\*(C'\fR with
-bug reports. It has no home page beyond the package on \s-1CTAN:
-\&\s0<http://www.ctan.org/pkg/texfot>.
+bug reports. It has no home page beyond the package on \s-1CTAN:\s0
+<https://ctan.org/pkg/texfot>.
Binary files old/texmf-dist/doc/man/man1/texfot.man1.pdf and new/texmf-dist/doc/man/man1/texfot.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texfot.doc.tlpobj new/tlpkg/tlpobj/texfot.doc.tlpobj
--- old/tlpkg/tlpobj/texfot.doc.tlpobj 2019-02-28 04:07:43.000000000 +0100
+++ new/tlpkg/tlpobj/texfot.doc.tlpobj 2020-03-12 01:56:39.000000000 +0100
@@ -1,8 +1,8 @@
name texfot.doc
category Package
-revision 44991
+revision 54246
shortdesc doc files of texfot
-docfiles size=10
+docfiles size=13
texmf-dist/doc/man/man1/texfot.1
texmf-dist/doc/man/man1/texfot.man1.pdf
texmf-dist/doc/support/texfot/README
++++++ texfot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texfot/texfot.pl new/texmf-dist/scripts/texfot/texfot.pl
--- old/texmf-dist/scripts/texfot/texfot.pl 2017-08-08 22:43:00.000000000 +0200
+++ new/texmf-dist/scripts/texfot/texfot.pl 2020-03-11 22:18:30.000000000 +0100
@@ -1,5 +1,5 @@
#!/usr/bin/env perl
-# $Id: texfot,v 1.37 2017/07/25 15:06:53 karl Exp $
+# $Id: texfot,v 1.40 2020/03/10 22:35:15 karl Exp $
# Invoke a TeX command, filtering all but interesting terminal output;
# do not look at the log or check any output files.
# Exit status is that of the subprogram.
@@ -8,7 +8,7 @@
#
# Public domain. Originally written 2014 by Karl Berry.
-my $ident = '$Id: texfot,v 1.37 2017/07/25 15:06:53 karl Exp $';
+my $ident = '$Id: texfot,v 1.40 2020/03/10 22:35:15 karl Exp $';
(my $prg = $0) =~ s,^.*/,,;
select STDERR; $| = 1; # no buffering
select STDOUT; $| = 1;
@@ -83,7 +83,7 @@
# It's not ideal to read all of stdout and then all of stderr; it would
# be better to intermix them in the original order of child output.
- # this is simpler than other ways of avoiding possible deadlock (such
+ # But this is simpler than other ways of avoiding possible deadlock (such
# as select, sysread, etc.).
&debug ("processing stdout from child");
&process_output (\*TEXOUT, "");
@@ -104,9 +104,10 @@
-# Read filehandle $FH; print lines that we want to stdout, prefixed by
-# $PREFIX. If $PREFIX is null, omit lines by default; if $PREFIX is
-# non-null, print lines by default.
+# Read filehandle $FH, printing lines that we want to stdout,
+# prefixed by $PREFIX.
+# If $PREFIX is null (happens for processing stdout), omit lines by default;
+# if $PREFIX is non-null (processing stderr), print lines by default.
#
sub process_output {
my ($fh,$prefix) = @_;
@@ -118,7 +119,8 @@
warn "\n" if $opt_debug; # get blank line without texfot: prefix
&debug ("looking at line: $_");
- &debug ("checking if have print_next (is $print_next)\n");
+
+ &debug ("checking if have print_next (= $print_next)\n");
if ($print_next) {
&debug (" printing next ($print_next)\n");
print $prefix;
@@ -132,8 +134,9 @@
LaTeX\ Warning:\ You\ have\ requested\ package
|LaTeX\ Font\ Warning:\ Some\ font\ shapes
|LaTeX\ Font\ Warning:\ Size\ substitutions
- |Package\ caption\ Warning:\ Unsupported\ document\ class
+ |Package\ caption\ Warning:\ Un(supported|known)\ document\ class
|Package\ fixltx2e\ Warning:\ fixltx2e\ is\ not\ required
+ |Package\ layouts\ Warning:\ Layout\ scale
|Package\ frenchb?\.ldf\ Warning:\ (Figures|The\ definition)
|\*\*\*\ Reloading\ Xunicode\ for\ encoding # spurious ***
|This\ is\ `?(epsf\.tex|.*\.sty|TAP) # so what
@@ -226,12 +229,12 @@
# Sample basic invocation:
texfot pdflatex file.tex
- # Ordinarily all output is copied to /tmp/fot before filtering;
- # that can be omitted:
- texfot pdflatex --tee=/dev/null file.tex
+ # Ordinarily all output is copied to /tmp/fot before filtering,
+ # but that can be omitted:
+ texfot --tee=/dev/null lualatex file.tex
# Example of more complex engine invocation:
- texfot lualatex --recorder '\nonstopmode\input file'
+ texfot xelatex --recorder '\nonstopmode\input file'
Aside from its own options, described below, C<texfot> just runs the
given command with the given arguments (same approach to command line
@@ -279,9 +282,9 @@
=item 5.
Otherwise, the default: if the line came from stdout, ignore it; if the
-line came from stderr, print it (to stdout). (This distinction is made
+line came from stderr, print it (to stdout). This distinction is made
because TeX engines write relatively few messages to stderr, and it's
-not unlikely that any such should be considered.
+likely that any such should be considered.
It would be easy to add more options to allow for user additions to the
various regex lists, if that ever seems useful. Or email me (see end).
@@ -346,7 +349,11 @@
=item C<--no-quiet>
By default, the TeX command being invoked is reported on standard output.
-C<--quiet> omits that reporting.
+C<--quiet> omits that reporting. To get a completely silent run,
+redirect standard output: S<C<texfot ... E<gt>/dev/null>>. (The only
+messages to standard error should be errors from C<texfot> itself, so it
+shouldn't be necessary to redirect that, but of course that can be done
+as well.)
=item C<--stderr>
@@ -377,12 +384,12 @@
=head1 RATIONALE
I wrote this because, in my work as a TUGboat editor
-(L<http://tug.org/TUGboat>, journal submissions always welcome!), I end
-up running and rerunning many papers, many times each. It was too easy
-to lose warnings I needed to see in the mass of unvarying and
-uninteresting output from TeX, such as style files being read and fonts
-being used. I wanted to see all and only those messages which needed
-some action by me.
+(L<http://tug.org/TUGboat>, journal submissions always welcome!), I run
+and rerun many documents, many times each. It was too easy to lose
+warnings I needed to see in the mass of unvarying and uninteresting
+output from TeX, such as style files being read and fonts being used. I
+wanted to see all and only those messages which needed some action by
+me.
I found some other programs of a similar nature, the LaTeX package
C<silence>, and plenty of other (La)TeX wrappers, but it seemed none of
@@ -394,12 +401,10 @@
Here are some keywords if you want to explore other options:
texloganalyser, pydflatex, logfilter, latexmk, rubber, arara, and
-searching for C<log> at L<http://ctan.org/search>.
+searching for C<log> at L<https://ctan.org/search>.
C<texfot> is written in Perl, and runs on Unix, and does not work on
-Windows. (If by some chance anyone wants to use this program on
-Windows, please make your own fork; I'm not interested in supporting
-that os.)
+Windows.
The name comes from the C<trip.fot> and C<trap.fot> files that are part
of Knuth's trip and trap torture tests, which record the online output
@@ -412,6 +417,6 @@
This script and its documentation were written by Karl Berry and both
are released to the public domain. Email C<karl(a)freefriends.org> with
bug reports. It has no home page beyond the package on CTAN:
-L<http://www.ctan.org/pkg/texfot>.
+L<https://ctan.org/pkg/texfot>.
=cut
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texfot.tlpobj new/tlpkg/tlpobj/texfot.tlpobj
--- old/tlpkg/tlpobj/texfot.tlpobj 2019-02-28 04:07:43.000000000 +0100
+++ new/tlpkg/tlpobj/texfot.tlpobj 2020-03-12 01:56:39.000000000 +0100
@@ -1,6 +1,6 @@
name texfot
category Package
-revision 44991
+revision 54246
shortdesc Filter clutter from the output of a TeX run
longdesc The package provides a small Perl script to filter the online
longdesc output from a TeX run, attempting to show only those messages
@@ -10,7 +10,6 @@
runfiles size=4
texmf-dist/scripts/texfot/texfot.pl
catalogue-ctan /support/texfot
-catalogue-date 2017-08-08 20:53:45 +0200
catalogue-license pd
catalogue-topics comp-mgmt
-catalogue-version 1.37
+catalogue-version 1.40
++++++ texinfo.tar.xz ++++++
++++ 1733 lines of diff (skipped)
++++++ texlive-common.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-common/advanced-lnx.png and new/doc/texlive/texlive-common/advanced-lnx.png differ
Binary files old/doc/texlive/texlive-common/basic-w32.png and new/doc/texlive/texlive-common/basic-w32.png differ
Binary files old/doc/texlive/texlive-common/tlmgr-gui.png and new/doc/texlive/texlive-common/tlmgr-gui.png differ
Binary files old/doc/texlive/texlive-common/tlshell-macos.png and new/doc/texlive/texlive-common/tlshell-macos.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-common.doc.tlpobj new/tlpkg/tlpobj/texlive-common.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-common.doc.tlpobj 2019-03-20 02:24:39.000000000 +0100
+++ new/tlpkg/tlpobj/texlive-common.doc.tlpobj 2020-03-09 00:29:07.000000000 +0100
@@ -1,9 +1,9 @@
name texlive-common.doc
category TLCore
-revision 50466
+revision 54176
shortdesc doc files of texlive-common
relocated 1
-docfiles size=131
+docfiles size=141
RELOC/doc/texlive/index.html
RELOC/doc/texlive/texlive-common/advanced-lnx.png
RELOC/doc/texlive/texlive-common/basic-w32.png
++++++ texlive-cz.doc.tar.xz ++++++
++++ 13578 lines of diff (skipped)
++++++ texlive-de.doc.tar.xz ++++++
++++ 9338 lines of diff (skipped)
++++++ texlive-en.doc.tar.xz ++++++
++++ 20673 lines of diff (skipped)
++++++ texlive-es.doc.tar.xz ++++++
++++ 24761 lines of diff (skipped)
++++++ texlive-fr.doc.tar.xz ++++++
++++ 17825 lines of diff (skipped)
++++++ texlive-it.doc.tar.xz ++++++
++++ 13433 lines of diff (skipped)
++++++ texlive-pl.doc.tar.xz ++++++
++++ 14167 lines of diff (skipped)
++++++ texlive-ru.doc.tar.xz ++++++
++++ 11019 lines of diff (skipped)
++++++ texlive-scripts-extra_scripts.dif ++++++
---
texmf-dist/scripts/texlive-extra/texconfig-dialog.sh | 14 +++--
texmf-dist/scripts/texlive-extra/texconfig-sys.sh | 1
texmf-dist/scripts/texlive-extra/texconfig.sh | 35 ------------
texmf-dist/scripts/texlive-extra/texlinks.sh | 53 ++++++++++++-------
4 files changed, 50 insertions(+), 53 deletions(-)
--- texmf-dist/scripts/texlive-extra/texconfig-dialog.sh
+++ texmf-dist/scripts/texlive-extra/texconfig-dialog.sh 2018-05-03 08:15:39.975645684 +0000
@@ -157,7 +157,14 @@ termCtl()
###############################################################################
menuMain()
{
- cat <<-'eof'
+ rows="$(stty size)"
+ columns=${rows##* }
+ rows=${rows%% *}
+ test -n "$rows" || rows=0
+ test -n "$columns" || columns=0
+
+ if test $rows -lt 24 -a $columns -lt 80 ; then
+ cat <<-'eof'
The interactive texconfig utility will be started now. Make sure
your screen has at least 24 rows and 80 columns. If texconfig
crashes now, you can still set up your TeX system using the
@@ -169,8 +176,9 @@ menuMain()
More likely these days, you're better off using tlmgr.
See http://tug.org/texlive/tlmgr.html.
-eof
- termCtl readln
+ eof
+ termCtl readln
+ fi
while :; do
logMessage='view logfile'
--- texmf-dist/scripts/texlive-extra/texconfig-sys.sh
+++ texmf-dist/scripts/texlive-extra/texconfig-sys.sh 2018-05-03 08:15:39.975645684 +0000
@@ -30,4 +30,5 @@ TEXMFVAR="$v"
TEXMFCONFIG="$c"
export TEXMFVAR TEXMFCONFIG
+umask 022
exec texconfig ${1+"$@"}
--- texmf-dist/scripts/texlive-extra/texconfig.sh
+++ texmf-dist/scripts/texlive-extra/texconfig.sh 2009-09-02 12:47:26.000000000 +0000
@@ -40,7 +40,7 @@ envVars="
TEXMFDBS TEXMFINI TEXMFSCRIPTS TEXPICTS TEXPKS TEXPOOL TEXPSHEADERS
TEXSOURCES TFMFONTS TRFONTS TTFONTS VFFONTS WEB2C WEBINPUTS
"
-tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$
+tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/tctmp.$$.$RANDOM
needsCleanup=false
lastUpdatedFile=
@@ -997,21 +997,6 @@ For more information about these \`featu
;;
formats)
- cat >&2 <<EOM
-texconfig formats is no longer supported, because manual edits of
-fmtutil.cnf will be overwritten by the new TeX Live package manager,
-tlmgr, which regenerates that file as needed upon package changes.
-Thus, to add or remove formats, the recommended method is to use tlmgr
-to add or remove the appropriate package.
-
-If you need to make manual additions, you can edit the file
-fmtutil-local.cnf under TEXMFLOCAL. Further information with
-tlmgr --help and at http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
setupTmpDir
echo "$progname: analyzing old configuration..." >&2
fmtutil --catcfg > $tmpdir/pre
@@ -1037,22 +1022,6 @@ EOM
# "hyphen FORMAT"
hyphen)
- cat >&2 <<EOM
-texconfig hyphen is no longer supported, because manual edits of
-language.dat (or language.def) will be overwritten by the new TeX Live
-package manager, tlmgr, which regenerates those configuration files as
-needed upon package changes. Thus, to add or remove hyphenation
-patterns, the recommended method is to use tlmgr to add or remove the
-appropriate package.
-
-If you need to make manual additions, you can edit the files
-language-local.dat and language-local.def under TEXMFLOCAL. Further
-information with tlmgr --help and at http://tug.org/texlive/tlmgr.html.
-
-Exiting.
-EOM
- exit 1 # but leave the real code for posterity
-
tcBatchHyphenFormat=$2
formatsForHyphen=`getFormatsForHyphen`
formatsForHyphenFmt=`echo "$formatsForHyphen" | myFmt | sed 's@^@ @'`
@@ -1301,7 +1270,7 @@ Valid PAPER settings:
;;
rehash)
- mktexlsr
+ ( unset KPSE_DOT; mktexlsr )
;;
#
--- texmf-dist/scripts/texlive-extra/texlinks.sh
+++ texmf-dist/scripts/texlive-extra/texlinks.sh 2018-05-03 08:15:39.979645610 +0000
@@ -100,7 +100,7 @@ setupTmpDir()
trap 'cleanup 1' 1 2 3 7 13 15
needsCleanup=true
- (umask 077; mkdir "$tmpdir") \
+ (umask 077; mkdir -m 0700 "$tmpdir") \
|| abort "could not create directory \`$tmpdir'"
}
@@ -108,16 +108,18 @@ setupTmpDir()
# search a binary along $PATH:
check_for_binary()
{
- testbin=$1
- set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
- for i
- do
- if [ -x "$i/$testbin" ]; then
- echo "$i/$testbin"
- return 0
- fi
- done
- return 1
+# testbin=$1
+# set x `echo "$PATH" | sed 's/^:/.:/; s/:$/:./; s/::/:.:/g; s/:/ /g'`; shift
+# for i
+# do
+# if [ -x "$i/$testbin" ]; then
+# echo "$i/$testbin"
+# return 0
+# fi
+# done
+# return 1
+
+ type -p $1
}
@@ -208,8 +210,22 @@ search_symlinkdir()
upd_symlinkdir()
{
search_symlinkdir || return 0
- for i in `sed 's@ .*@@' cnf_file_ln.$$`; do
- install_link "$selfautoloc/$i" "$symlinkdir/$i"
+ set x `cat cnf_file_ln.$$` ; shift
+ while test $# != 0; do
+ fmt=$1; ini=$3; shift; shift; shift
+
+ # Some broken shells destroy the positional arguments when calling a
+ # shellfunction. Therefore, we save and restore them "by hand" in the
+ # main_args_while variable.
+ main_args_while="$@"
+
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
+ install_link "$selfautoloc/$fmt" "$symlinkdir/$fmt"
+
+ # restore positional arguments:
+ set x $main_args_while; shift
done
}
@@ -274,12 +290,12 @@ main()
test -f "$cnf_file" || abort "config file \`$cnf' not found"
- tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$
+ tmpdir=${TMPDIR-${TEMP-${TMP-/tmp}}}/texlinks.$$.$RANDOM
setupTmpDir
cd "$tmpdir" || cleanup 1
- sed '/^[ ]*#/d; /^[ ]*$/d' $cnf_file \
- | awk '{print $1, $2}' > cnf_file_ln.$$
+ sed '/^[ ]*#/d; /^[ ]*$/d; s%\*%%' $cnf_file \
+ | awk '{print $1, $2, $NF}' > cnf_file_ln.$$
if test -z "$dirs"; then
if test $multiplatform = true; then
@@ -300,13 +316,16 @@ main()
# cnf_file_ln.$$ has lines with "format engine" pairs
set x `cat cnf_file_ln.$$`; shift
while test $# != 0; do
- fmt=$1; engine=$2; shift; shift
+ fmt=$1; engine=$2; ini=$3; shift; shift; shift
# Some broken shells destroy the positional arguments when calling a
# shellfunction. Therefore, we save and restore them "by hand" in the
# main_args_while variable.
main_args_while="$@"
+ kpsewhich -progname=$fmt -format=tex $ini >/dev/null 2>&1
+ test $? -ne 0 && continue
+
test "x$fmt" = "x$engine" && continue
if test -f "$d/$engine$exeext"; then
case $unlink in
++++++ texlive-scripts_scripts.dif ++++++
---
texmf-dist/scripts/texlive/fmtutil-sys.sh | 1 +
texmf-dist/scripts/texlive/fmtutil.pl | 20 ++++++++++++++------
texmf-dist/scripts/texlive/updmap-sys.sh | 1 +
texmf-dist/scripts/texlive/updmap.pl | 16 ++++++++++------
4 files changed, 26 insertions(+), 12 deletions(-)
--- texmf-dist/scripts/texlive/fmtutil-sys.sh
+++ texmf-dist/scripts/texlive/fmtutil-sys.sh 2018-05-11 10:51:14.298775065 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec fmtutil --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/fmtutil.pl
+++ texmf-dist/scripts/texlive/fmtutil.pl 2018-05-11 10:51:51.546080553 +0000
@@ -10,16 +10,16 @@
# History:
# Original shell script (C) 2001 Thomas Esser, public domain
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg", "$TEXMFROOT/texmf-dist/scripts/texlive");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
require "mktexlsr.pl";
TeX::Update->import();
}
@@ -70,7 +70,7 @@ TeXLive::TLUtils::prepend_own_path();
# this function checks by itself whether it is running on windows or not
reset_root_home();
-chomp(our $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(our $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(our $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(our $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(our $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -361,7 +361,14 @@ sub callback_build_formats {
TeXLive::TLWinGoo::maybe_make_ro ($tmpdir);
}
} else {
+ my ($uid, $gid);
$tmpdir = File::Temp::tempdir(CLEANUP => 1);
+ if ($> == 0 && ($uid=getpwnam("nobody")) && ($gid=getgrnam("mktex"))) {
+ my $cnt = chown $uid, $gid, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ $cnt = chmod 0770, $tmpdir;
+ die "could not create directory $tmpdir" if $cnt <= 0;
+ }
}
# set up destination directory
$opts{'fmtdir'} ||= "$texmfvar/web2c";
@@ -599,6 +606,7 @@ sub rebuild_one_format {
# check for existence of ini file before doing anything else
if (system("kpsewhich -progname=$fmt -format=$kpsefmt $inifile >$nul 2>&1") != 0) {
# we didn't find the ini file, skip
+ return $FMT_NOTAVAIL if (!$opts{'no-error-if-no-engine'});
print_deferred_warning("inifile $inifile for $fmt/$eng not found.\n");
# The original script just skipped it but in TeX Live we expect that
# all activated formats are also buildable, thus return failure.
--- texmf-dist/scripts/texlive/updmap-sys.sh
+++ texmf-dist/scripts/texlive/updmap-sys.sh 2018-05-11 10:53:43.971984421 +0000
@@ -22,4 +22,5 @@ PATH="$mydir:$PATH"; export PATH
# hack around a bug in zsh:
test -n "${ZSH_VERSION+set}" && alias -g '${1+"$@"}'='"$@"'
+umask 022
exec updmap --sys ${1+"$@"}
--- texmf-dist/scripts/texlive/updmap.pl
+++ texmf-dist/scripts/texlive/updmap.pl 2018-06-19 08:49:26.931648791 +0000
@@ -16,15 +16,17 @@
my $svnid = '$Id: updmap.pl 51338 2019-06-07 16:36:59Z karl $';
-my $TEXMFROOT;
+my $TEXMFDIST;
BEGIN {
$^W = 1;
- $TEXMFROOT = `kpsewhich -var-value=TEXMFROOT`;
+ $TEXMFDIST = `kpsewhich -var-value=TEXMFDIST`;
if ($?) {
- die "$0: kpsewhich -var-value=TEXMFROOT failed, aborting early.\n";
+ die "$0: kpsewhich -var-value=TEXMFDIST failed, aborting early.\n";
}
- chomp($TEXMFROOT);
- unshift(@INC, "$TEXMFROOT/tlpkg");
+ chomp($TEXMFDIST);
+ unshift(@INC, "$TEXMFDIST/tlpkg", "$TEXMFDIST/scripts/texlive");
+ require "mktexlsr.pl";
+ TeX::Update->import();
}
my $lastchdate = '$Date: 2019-06-07 18:36:59 +0200 (Fri, 07 Jun 2019) $';
@@ -46,7 +48,7 @@ use TeXLive::TLUtils qw(mkdirhier mktexu
# see more comments at the definition of this function.
reset_root_home();
-chomp(my $TEXMFDIST = `kpsewhich --var-value=TEXMFDIST`);
+chomp(my $TEXMFROOT = `kpsewhich --var-value=TEXMFROOT`);
chomp(my $TEXMFVAR = `kpsewhich -var-value=TEXMFVAR`);
chomp(my $TEXMFSYSVAR = `kpsewhich -var-value=TEXMFSYSVAR`);
chomp(my $TEXMFCONFIG = `kpsewhich -var-value=TEXMFCONFIG`);
@@ -398,6 +400,8 @@ sub main {
print "in $changes_config_file\n";
print "Do you really want to continue (y/N)? ";
my $answer = <STDIN>;
+ my $dosync = $ENV{'UPDMAPSYNC'};
+ $answer = "y" if !defined($dosync);
$answer = "n" if !defined($answer);
chomp($answer);
print "answer =$answer=\n";
++++++ texlive-sr.doc.tar.xz ++++++
++++ 8390 lines of diff (skipped)
++++++ texlive-zh-cn.doc.tar.xz ++++++
Binary files old/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf and new/doc/texlive/texlive-zh-cn/texlive-zh-cn.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex
--- old/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2019-03-20 05:14:54.000000000 +0100
+++ new/doc/texlive/texlive-zh-cn/texlive-zh-cn.tex 2020-03-23 01:06:36.000000000 +0100
@@ -13,14 +13,14 @@
\usepackage{tex-live-zh-cn, indentfirst}
\title{%
- {\huge \textit{\TeX\ Live 指南---2019}}%
+ {\huge \textit{\TeX\ Live 指南---2020}}%
}
\author{Karl Berry 编写 \\[3mm]
\url{https://tug.org/texlive/}
}
-\date{2019 年 4 月}
+\date{2020 年 3 月}
\begin{document}
\maketitle
@@ -61,7 +61,7 @@
至于 Windows,\TL{} 仅支持 Windows~7 或后续版本。
Windows Vista 可能可以继续工作,但 \TL{} 不能在 Windows XP
-或者更早的版本上运行。我们没有包含 64 位的 Windows
+或者更早的版本上运行。\TL{} 没有包含 64 位的 Windows
可执行文件,不过 32 位的可执行文件也能 64 位的系统上正常运行。
除了 \TL{} 以外,Windows 和 \MacOSX 用户还有其它的选择,请参考
@@ -71,7 +71,7 @@
\label{sec:basic}
你可以使用 \DVD{} 方式或者网络方式来安装 \TL{}
-(\url{http://tug.org/texlive/acquire.html})。
+(\url{https://tug.org/texlive/acquire.html})。
通过网络的安装程序本身非常小,它可以从网上下载所有的你所要求的软
件包。网络安装程序对仅使用 \TL{} 一小部分的用户来说非常适宜。
@@ -113,47 +113,52 @@
最后,\TeX\ (及其相关程序) 在处理文档时是可以写文件的,这个功能可以被各种
方式滥用。所以我们再一次强调最保险的是在新的子目录下处理未知的文档。
+安全的另一个方面是保证下载的内容与内容创建时一致。如果安装了 \prog{gpg}
+(GNU Privacy Guard) 程序,\prog{tlmgr} 程序 (第~\ref{sec:tlmgr}~节) 会自动
+对现在内容进行加密验证。\prog{gpg} 不和 \TL{} 一起分发,但可以参见
+\url{https://texlive.info/tlgpg/} 了解更多信息。
+
\subsection{获得帮助}
\label{sec:help}
\TeX{} 社群是活跃而友好的,几乎所有认真的提问都能得到回答。尽管如此,这种由志愿者
和业余用户组成的技术支持仍然显得不太正式,所以,在提问前最好做好功课。(如果你更喜欢
有保障的商业性技术支持,可以放弃 \TL{},改为购买商业 \TeX{} 系统,在
-\url{http://tug.org/interest.html#vendors} 上有一份销售商的列表。)
+\url{https://tug.org/interest.html#vendors} 上有一份销售商的列表。)
按照推荐使用的顺序,我们列出了这样一份资源列表:
\begin{description}
-\item [起步] 如果你刚刚接触 \TeX,\url{http://tug.org/begin.html}
+\item [起步] 如果你刚刚接触 \TeX,\url{https://tug.org/begin.html}
这个网页提供了这个系统的简短介绍。
\item [\TeX{} FAQ] 这套庞大的 \TeX{} FAQ 对各种各样的
问题——从最基础到最晦涩的——都给予了简明的回答,它在 \TL{} 的
\OnCD{texmf-dist/doc/generic/FAQ-en/},也可以在
-\url{http://www.tex.ac.uk/faq} 网站上找到。有问题时请先看看这里能否找
+\url{https://texfaq.org} 网站上找到。有问题时请先看看这里能否找
到解答。
\item [\TeX{} Catalogue] 如果你在寻找某个特定的宏包、字体、程序等等,\TeX{}
Catalogue 就是你首先该找的地方。这里是所有 \TeX{} 相关内容的一个巨大集合。参见
-\url{http://ctan.org/pkg/catalogue/}。
+\url{https://ctan.org/pkg/catalogue}。
-\item [\TeX{} 网上资源] \url{http://tug.org/interest.html}~页面上有
+\item [\TeX{} 网上资源] \url{https://tug.org/interest.html}~页面上有
许多和 \TeX{} 相关的链接,包括讨论这个系统方方面面的许多书籍、手册和文章。
\item [支持信息的归档] 最重要的 \TeX\ 技术支持论坛是
\LaTeX{} 社区网站 \url{http://latex-community.org/}, 问答网站
-\url{http://tex.stackexchange.com}, Usenet 的新闻组 \url{news:comp.text.tex}
+\url{https://tex.stackexchange.com}, Usenet 的新闻组 \url{news:comp.text.tex}
和邮件列表 \email{texhax@tug.org}。它们的内容归档中有多年以来的提问和回答供你
搜索。最后两种你可以用 \\
\url{http://groups.google.com/groups?group=comp.text.tex} 和 \\
-\url{http://tug.org/mail-archives/texhax} 进行查询。当然,一般性的搜索
-方式,比如用 \url{http://google.com} 找找,总没有坏处。
+\url{https://tug.org/mail-archives/texhax} 进行查询。当然,一般性的搜索
+方式也没有坏处。
-\item [提问] 如果你还是找不到答案,可以在 \url{http://latex-community.org/} 和
-\url{http://tex.stackexchange.com/} 网站上提问,通过 Google
+\item [提问] 如果你还是找不到答案,可以在 \url{https://latex.org} 和
+\url{https://tex.stackexchange.com/} 网站上提问,通过 Google
或者你的新闻组阅读器在 \dirname{comp.text.tex} 上提问,或者发送邮件到
\email{texhax(a)tug.org}.xn--,-qo6athj7ijqbb5o90xtn7ecba212fdtr9ha FAQ 上的这一条:
-\url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=askquestion},
+\url{https://texfaq.org/FAQ-askquestion},
它能提高你获得回答的可能性。
\item [\TL{} 技术支持] 如果你需要报告 bug,或者提出对 \TL{} 的发行、安装或
@@ -182,17 +187,17 @@
\begin{description}
\item [\TL] 是一个完整的 \TeX{} 系统,它可以安装在本
-地磁盘上。主页: \url{http://tug.org/texlive/}。
+地磁盘上。主页: \url{https://tug.org/texlive/}。
\item [Mac\TeX] 在 \TL{} 的基础上增加了原生的 \MacOSX\ (目前 Apple 把它称作
macOS,但在这份文档中我们还沿用它的旧名字) 的安装程序和一些其它的
-Mac 应用程序。它的主页在 \url{http://tug.org/mactex/}。
+Mac 应用程序。它的主页在 \url{https://tug.org/mactex/}。
\item [pro\TeX{}t] 是 Windows 下的 \MIKTEX\ 发行版的一个增强版本。\ProTeXt\ 在
\MIKTEX\ 基础上增加了一些工具,简化了安装。它完全独立于 \TL{},有其
-自己的安装步骤。主页: \url{http://tug.org/protext}。
+自己的安装步骤。主页: \url{https://tug.org/protext}。
-\item [CTAN] 一份 \CTAN{} 仓库的快照 (\url{http://www.ctan.org/})。
+\item [CTAN] 一份 \CTAN{} 仓库的快照 (\url{https://ctan.org/})。
\end{description}
@@ -221,9 +226,6 @@
Windows 的特殊支持。
\end{ttdescription}
-上述目录之外,安装脚本和 (多种语言的) \filename{README} 文件也存放在发行版的顶层
-目录下。
-
至于文档,顶层目录下的 \OnCD{doc.html} 文件中提供的完整的链接会有帮助。
几乎所有内容的文档 (宏包、格式文件、字体、程序手册,man page, Info 文件等) 在
\dirname{texmf-dist/doc} 目录下,因为这些程序本身是属于 \dirname{texmf} 目录的。
@@ -238,6 +240,7 @@
\item{英语:} \OnCD{texmf-dist/doc/texlive/texlive-en}
\item{法语:} \OnCD{texmf-dist/doc/texlive/texlive-fr}
\item{意大利语:} \OnCD{texmf-dist/doc/texlive/texlive-it}
+\item{日语:} \OnCD{texmf-dist/doc/texlive/texlive-ja}
\item{波兰语:} \OnCD{texmf-dist/doc/texlive/texlive-pl}
\item{俄语:} \OnCD{texmf-dist/doc/texlive/texlive-ru}
\item{塞尔维亚语:} \OnCD{texmf-dist/doc/texlive/texlive-sr}
@@ -254,7 +257,7 @@
名称的对应关系。
所有这些目录树,包括个人的,都应该遵循 \TeX\ 目录结构 (\TDS,
-\url{http://tug.org/tds}),包括其中所有细小的子目录,否则文件就
+\url{https://tug.org/tds}),包括其中所有细小的子目录,否则文件就
可能找不到。第 \ref{sec:local-personal-macros} 节 (第
\pageref{sec:local-personal-macros} 页) 有更详细的介绍。这里描述的顺序和搜索的
优先级相反,也就是说,列在更靠后的目录树会被更优先搜索。
@@ -272,9 +275,9 @@
的目录。
\item [TEXMFHOME] 给用户存放它们自己独立安装的的宏包、字体等等。
这个变量根据不同的用户选择不同的主目录。
-\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap+ 和
- \verb+fmtutil+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
-\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap+、和 \verb+fmtutil+
+\item [TEXMFVAR] 这个目录是给 \verb+texconfig+、\verb+updmap-user+ 和
+ \verb+fmtutil-user+ 存储 (缓存) 格式文件、生成 map 文件这类运行时个人数据的。
+\item [TEXMFCONFIG] 给 \verb+texconfig+、\verb+updmap-sys+、和 \verb+fmtutil-sys+
这些程序存储个人修改过的配置文件。
\item [TEXMFCACHE] \ConTeXt\ MkIV 和 Lua\LaTeX\ 用来保存 (缓存的) 运行时
数据的目录树;缺省为 \code{TEXMFSYSVAR},如果该目录不可写,则使用
@@ -287,8 +290,8 @@
\item[全系统根目录] 可以包含多个 \TL{} 版本:
(在 Unix 下默认是 \texttt{/usr/local/texlive})
\begin{ttdescription}
- \item[2018] 上一个版本。
- \item[2019] 当前版本。
+ \item[2019] 上一个版本。
+ \item[2020] 当前版本。
\begin{ttdescription}
\item [bin] ~
\begin{ttdescription}
@@ -307,8 +310,8 @@
\item[用户主 (home) 目录] (\texttt{\$HOME} 或
\texttt{\%USERPROFILE\%})
\begin{ttdescription}
- \item[.texlive2018] 给上个版本的,个人生成和配置的数据。
- \item[.texlive2019] 给这个版本的,个人生成和配置的数据。
+ \item[.texlive2019] 给上个版本的,个人生成和配置的数据。
+ \item[.texlive2020] 给这个版本的,个人生成和配置的数据。
\begin{ttdescription}
\item [texmf-var\ \ \ ] \envname{TEXMFVAR}, \envname{TEXMFCACHE}
\item [texmf-config] \envname{TEXMFCONFIG}
@@ -339,18 +342,18 @@
这是针对 \prog{etex}, \prog{latex} 或 \prog{pdflatex} 这些格式使用的缺省程序。
它的主页在 \url{http://www.pdftex.org/},文档在
\OnCD{texmf-dist/doc/pdftex/manual/pdftex-a.pdf}。可以在
-\OnCD{texmf-dist/doc/pdftex/manual/samplepdf/samplepdf.tex} 找到展示部分功能的例
+\OnCD{texmf-dist/doc/pdftex/samplepdftex/samplepdf.tex} 找到展示部分功能的例
子。
\item [Lua\TeX] 是 pdf\TeX\ 指定的后继者,而且对 pdf\TeX\ 保持大部分
(但不是完全地) 向下兼容。它也希望包含 Aleph (见后) 的功能,尽管未必能完美兼容。
-它内置的 Lua 语言解释器 (\url{http://www.lua.org}) 为许多棘手的 \TeX{}
+它内置的 Lua 语言解释器 (\url{https://lua.org}) 为许多棘手的 \TeX{}
问题提供了优雅的解决方案。当以 \filename{texlua} 命令执行时,它就像一个标准的
Lua 解释器一样工作,所以,Lua\TeX\ 在 \TL\ 中也被作为 Lua 程序的解释器。
见 \url{http://www.luatex.org} 和 \OnCD{texmf-dist/doc/luatex/luatex.pdf}。
\item [Xe\TeX] 通过第三方库,增加对 Unicode 输入文本和 OpenType 字体的支持,
-能够直接使用系统字体。参见 \url{http://tug.org/xetex}。
+能够直接使用系统字体。参见 \url{https://tug.org/xetex}。
\item [\OMEGA\ (Omega)] 基于 Unicode (16 位字符集),因而同时支持处理世界上
几乎所有的语言。它同时还支持所谓的 `\OMEGA{} Translation Processes' (OTP),
@@ -401,7 +404,7 @@
\label{sec:inst-start}
首先请找来一张 \TK{} 的 \DVD{},或者下载 \TL{} 的网络安装程序。参见
-\url{http://tug.org/texlive/acquire.html} 以了解更多关于获得这个软件的信息和方法。
+\url{https://tug.org/texlive/acquire.html} 以了解更多关于获得这个软件的信息和方法。
\begin{description}
\item [网络安装程序,.zip 或 .tar.gz 格式:] 在 \CTAN 的 \dirname{systems/texlive/tlnet}
@@ -418,8 +421,8 @@
\item [\TeX{} Collection \DVD:] 打开 \DVD\ 的 \dirname{texlive} 这个子目录。
在 Windows 下安装程序通常在插入 \DVD 后就自动启动了。要获得 \DVD 的
话可以加入一个 \TeX\ 用户组织 (推荐这么做,参见
-\url{http://tug.org/usergroups.html}) 或是单独购买 (通过
-\url{http://tug.org/store}),又或者是自己从 \ISO\ 镜像刻录。
+\url{https://tug.org/usergroups.html}) 或是单独购买 (通过
+\url{https://tug.org/store}),又或者是自己从 \ISO\ 镜像刻录。
在多数系统里你都可以直接挂载这个 \ISO{}。在从 \DVD\ 或者 \ISO{} 安装后,
如果还希望从 Internet 获得持续的更新,请看第 \ref{sec:dvd-install-net-updates}
节。
@@ -437,7 +440,7 @@
如果你需要用代理服务器来下载,Wget 的代理服务器设置可以使用 \filename{~/.wgetrc}
文件或者环境变量来指定
-(\url{http://www.gnu.org/software/wget/manual/html_node/Proxies.html}),
+(\url{https://www.gnu.org/software/wget/manual/html_node/Proxies.html}),
或者你使用的下载工具对应的配置文件。如果你是从 \DVD\ 或者 \ISO\ 镜像来安装就
没有关系了。
@@ -481,7 +484,7 @@
\label{sec:macosx}
如第~\ref{sec:tl-coll-dists}~节提到的,我们给 \MacOSX 准备了一套独立的
-发行版,叫做 Mac\TeX\ (\url{http://tug.org/mactex})。我们推荐使用原生的
+发行版,叫做 Mac\TeX\ (\url{https://tug.org/mactex})。我们推荐使用原生的
Mac\TeX\ 安装程序,而不是 \TL\ 自带的那个,因为原生的安装程序做了一些
针对 Mac 的调整,尤其是使用 \TeX{}Dist 数据结构方便在 \MacOSX 下的多个 \TeX\ 发
行版 (Mac\TeX, Fink, MacPorts, \ldots) 之间切换。
@@ -520,7 +523,7 @@
\begin{figure}[tb]
\begin{boxedverbatim}
-Installing TeX Live 2019 from: ...
+Installing TeX Live 2020 from: ...
Platform: x86_64-linux => 'GNU/Linux on x86_64'
Distribution: inst (compressed)
Directory for temporary files: /tmp
@@ -532,11 +535,11 @@
<S> Set installation scheme: scheme-full
<C> customizing installation collections
- 40 collections out of 41, disk space required: 5829 MB
+ 40 collections out of 41, disk space required: 6536 MB
<D> directories:
TEXDIR (the main TeX directory):
- /usr/local/texlive/2019
+ /usr/local/texlive/2020
...
<O> options:
@@ -623,12 +626,12 @@
===============================================================================
a [ ] Cygwin on Intel x86 (i386-cygwin)
b [ ] Cygwin on x86_64 (x86_64-cygwin)
- c [ ] MacOSX current (10.12-) on x86_64 (x86_64-darwin)
+ c [ ] MacOSX current (10.13-) on x86_64 (x86_64-darwin)
d [ ] MacOSX legacy (10.6-) on x86_64 (x86_64-darwinlegacy)
e [ ] FreeBSD on x86_64 (amd64-freebsd)
f [ ] FreeBSD on Intel x86 (i386-freebsd)
g [ ] GNU/Linux on ARM64 (aarch64-linux)
- h [ ] GNU/Linux on ARMhf (armhf-linux)
+ h [ ] GNU/Linux on ARMv6/RPi (armhf-linux)
i [ ] GNU/Linux on Intel x86 (i386-linux)
j [X] GNU/Linux on x86_64 (x86_64-linux)
k [ ] GNU/Linux on x86_64 with musl (x86_64-linuxmusl)
@@ -699,8 +702,8 @@
缺省的目录布局在第~\ref{sec:texmftrees}~节有过叙述,见
第~\pageref{sec:texmftrees}~页。在 Unix 下默认的安装目录是
-\dirname{/usr/local/texlive/2019} 而 Windows 下是
-|%SystemDrive%\texlive\2019|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
+\dirname{/usr/local/texlive/2020} 而 Windows 下是
+|%SystemDrive%\texlive\2020|。这样的安排允许你有多个并行存在的 \TL\ 安装,每年的
发行版本一个,你可以通过修改搜索路径来在它们中间切换。
这个安装路径可以通过设置安装程序中的 \dirname{TEXDIR} 来修改。这个选项和其他选项
@@ -710,11 +713,11 @@
你也可以通过在运行安装程序以前修改特定的环境变量来改变安装目录,最常见的是
\envname{TEXLIVE\_INSTALL\_PREFIX} 或者 \envname{TEXLIVE\_INSTALL\_TEXDIR},参见
-|install-tl --help| 的文档 (\url{http://tug.org/texlive/doc/install-tl.html} 有
+|install-tl --help| 的文档 (\url{https://tug.org/texlive/doc/install-tl.html} 有
在线版本) 以了解完整的列表和更多的信息。
一个合理的选择是你自己主目录下的一个子目录,尤其在只有你一个人
-使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2019|'。
+使用的时候。使用 `|~|' 来表示主目录,比如 `|~/texlive/2020|'。
我们建议在目录名称中保留年份,这样可以让你保留多个不同版本的
\TL{}。(你可能希望还维护一个类似 \dirname{/usr/local/texlive-cur}
@@ -771,7 +774,7 @@
\filename{texmf.cnf} 中定义。参见 2010 版新闻 (第~\ref{sec:2010news} 节)
以了解更多信息。
-\item[create format files:] 虽然创建不必要的格式文件会浪费一
+\item[create all format files:] 虽然创建不必要的格式文件会浪费一
点时间,也会多占一些磁盘空间,但
我们还是建议现在保持这个选项的选定状态,因为如果这次不生成,下次
用到的时候格式文件就会在用户个人的 \dirname{TEXMFVAR} 目录树内生
@@ -791,7 +794,8 @@
现有的文件,比如给它指定系统目录。最保险和推荐的做法还是不要
选择这个选项。
-\item[after installation \ldots\ \CTAN:] 从 \DVD\ 安装时,这个选项
+\item[after install, set CTAN as source for package updates:]
+从 \DVD\ 安装时,这个选项
被缺省启用,因为通常你会希望在此后通过 \CTAN\ 安装一年内更新的软件
包。禁用它唯一可能的原因是你只安装了 \DVD\ 内容的一部分,计划在以后
扩展安装。无论如何,安装程序时和安装后的更新的软件包仓库如果需要可
@@ -833,7 +837,7 @@
\item[-gui] 尽可能用 \GUI{} 模式的安装程序。它需要 Tcl/Tk 版本 8.5 以上。在
\MacOSX\ 上和 \TL{} 的 Windows 分发中已经满足这个条件了。原有的
\texttt{-gui=perltk} 和 \texttt{-gui=wizard} 选项需要安装了编译进 XFT 支持的
- Perl/Tk 模块 (\url{http://tug.org/texlive/distro.html#perltk});
+ Perl/Tk 模块 (\url{https://tug.org/texlive/distro.html#perltk});
如果找不到 Perl/Tk,安装程序就会在文本模式下出现。
\item[-no-gui] 强制使用文本模式安装程序。
@@ -860,7 +864,7 @@
\htmlanchor{opt-in-place}
\item[-in-place] (补充说明:除非你清楚自己要做什么,否则不要使用这个选项。)
如果你已经有一份用 rsync, svn, 或者其他方式安装的
-\TL{} (参见 \url{http://tug.org/texlive/acquire-mirror.html}) 那
+\TL{} (参见 \url{https://tug.org/texlive/acquire-mirror.html}) 那
这个选项会使用现有的,只执行必要的安装后操作。注意 \filename{tlpkg/texlive.tlpdb}
文件会被覆盖,你需要自己备份它。另外,文件的删除必须手动完成。所以
只在你知道自己在干什么的情况下才用它。这个选项不能在安装程序界面中
@@ -882,7 +886,7 @@
比如你可以选择这样的一个 \CTAN\ 镜像:
\url{http://ctan.example.org/tex-archive/systems/texlive/tlnet/},
当然你应该把 |ctan.example.org/tex-archive| 替换为具体镜像的
-域名和特定的顶层 \CTAN\ 路径 (\url{http://ctan.org/mirrors})
+域名和特定的顶层 \CTAN\ 路径 (\url{https://ctan.org/mirrors})
维护了一个 \CTAN\ 的镜像列表)。
如果给定的地址在本地磁盘上 (或者是路径或者是 \texttt{file:/}
@@ -914,18 +918,18 @@
这样:
\begin{sverbatim}
-PATH=/usr/local/texlive/2019/bin/i386-linux:$PATH; export PATH
-MANPATH=/usr/local/texlive/2019/texmf-dist/doc/man:$MANPATH; export MANPATH
-INFOPATH=/usr/local/texlive/2019/texmf-dist/doc/info:$INFOPATH; export INFOPATH
+PATH=/usr/local/texlive/2020/bin/i386-linux:$PATH; export PATH
+MANPATH=/usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH; export MANPATH
+INFOPATH=/usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH; export INFOPATH
\end{sverbatim}
对于 csh 或者 tcsh,需要修改的文件通常是 \filename{$HOME/.cshrc},而
应该添加的内容类似:
\begin{sverbatim}
-setenv PATH /usr/local/texlive/2019/bin/i386-linux:$PATH
-setenv MANPATH /usr/local/texlive/2019/texmf-dist/doc/man:$MANPATH
-setenv INFOPATH /usr/local/texlive/2019/texmf-dist/doc/info:$INFOPATH
+setenv PATH /usr/local/texlive/2020/bin/i386-linux:$PATH
+setenv MANPATH /usr/local/texlive/2020/texmf-dist/doc/man:$MANPATH
+setenv INFOPATH /usr/local/texlive/2020/texmf-dist/doc/info:$INFOPATH
\end{sverbatim}
如果你已经在你的配置文件里写过了这样的路径设置,那就只需要
@@ -942,8 +946,8 @@
这个文件是否存在,如果有的话,添加下面这样的内容:
\begin{sverbatim}
-MANPATH_MAP /usr/local/texlive/2019/bin/i386-linux \
- /usr/local/texlive/2019/texmf-dist/doc/man
+MANPATH_MAP /usr/local/texlive/2020/bin/i386-linux \
+ /usr/local/texlive/2020/texmf-dist/doc/man
\end{sverbatim}
然后 2)~检查 \filename{/etc/environment} 是否定义了默认的搜索路径
@@ -968,7 +972,7 @@
从 \DVD{} 安装时会默认完成这一步,通过第~\ref{sec:options}~节介绍
的选项。
-如果自动镜像选择出现了问题,你可以从 \url{http://ctan.org/mirrors}
+如果自动镜像选择出现了问题,你可以从 \url{https://ctan.org/mirrors}
列表中自己指定一个 \CTAN\ 镜像。使用与上述一致的 \dirname{tlnet}
子目录路径。
@@ -980,7 +984,7 @@
在 Windows 下 \TL\ 提供的字体会自动为 \XeTeX\ 所用,只要通过字体名称就可以了。
在 \MacOSX\ 下如果需要按字体名称查找则需要额外的步骤,参见 Mac\TeX\ 网页
-(\url{http://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
+(\url{https://tug.org/mactex})。如果你在其他 Unix 系统中安装了 \filename{xetex}
软件包,需要把系统按如下配置一番 \XeTeX\ 才能找到随 \TL\ 安装的那些字体。
为了进行配置,\pkgname{xetex} 安装后 (不管是初始安装还是后来安装的) 都会在
@@ -1028,7 +1032,7 @@
并写入第一个可写东风路径。在读取时,最后找到的匹配会被优先选择。
要了解更多信息,参见
-\url{http://wiki.contextgarden.net/Running_Mark_IV}。
+\url{https://wiki.contextgarden.net/Running_Mark_IV}。
\subsubsection{集成本地与个人宏文件}
\label{sec:local-personal-macros}
@@ -1044,7 +1048,7 @@
你又得再改。
对于这两个目录树而言,文件都应该放到合适的 \TeX\ 目录结构 (\TDS)
-子目录中,参见 \url{http://tug.org/tds} 或者
+子目录中,参见 \url{https://tug.org/tds} 或者
\filename{texmf-dist/web2c/texmf.cnf} 文件。比如一个 \LaTeX{} 文档类或者宏包应该
放在 \dirname{TEXMFLOCAL/tex/latex} 或者 \dirname{TEXMFHOME/tex/latex}
目录下,要不然就是它们的一个子目录下。
@@ -1073,7 +1077,7 @@
\XeTeX\ 或 Lua\TeX\ 是可行的替代方案 (参见第~\ref{sec:tex-extensions}~节),
它们能让你使用操作系统的字体而不必将它安装到 \TeX 中。
-如果你非得这么做,参见 \url{http://tug.org/fonts/fontinstall.html},
+如果你非得这么做,参见 \url{https://tug.org/fonts/fontinstall.html},
这是我们对整个过程最好的描述。
\subsection{测试安装是否成功}
@@ -1083,10 +1087,10 @@
美的文档和字体。
你可能马上需要的是一个用来编辑文件的前端程序。\TL{} 在 Windows 下只安装了
-\TeX{}works (\url{http://tug.org/texworks}),而 Mac\TeX\ 则安装了 TeXShop
-(\url{http://pages.uoregon.edu/koch/texshop}。在其他 Unix 系统下,由你自己选择编
+\TeX{}works (\url{https://tug.org/texworks}),而 Mac\TeX\ 则安装了 TeXShop
+(\url{https://pages.uoregon.edu/koch/texshop}。在其他 Unix 系统下,由你自己选择编
辑器。当然,存在很多选择,有些在下一小节列出了;还可以参见
-\url{http://tug.org/interest.html#editors}。任何纯文本编辑器都可以,不需要专门为
+\url{https://tug.org/interest.html#editors}。任何纯文本编辑器都可以,不需要专门为
\TeX{} 设计的。
这个小节后面给出了一些测试系统是否正常工作的基本步骤。我们这里使用的是 Unix 命令,
@@ -1149,8 +1153,8 @@
> \Ucom{xpdf sample2e.pdf}
\end{alltt}
\cmdname{gv} 和 \cmdname{xpdf} 现在都不包含在 \TL{} 中,你
-必须单独安装它们。请分别参阅 \url{http://www.gnu.org/software/gv} 和
-\url{http://www.foolabs.com/xpdf}。(还有许多其他的 PDF 查看器。)
+必须单独安装它们。请分别参阅 \url{https://www.gnu.org/software/gv} 和
+\url{https://www.xpdfreader.com}。(还有许多其他的 PDF 查看器。)
Windows 下我们推荐 Sumatra PDF
(\url{https://www.sumatrapdfreader.org/free-pdf-reader.html})。
@@ -1185,42 +1189,42 @@
\subsection{其他可下载软件的链接}
如果你还是个 \TeX{} 新手,或者在编辑 \TeX{} 或 \LaTeX{} 文档时需要帮助,
-请访问 \url{http://tug.org/begin.html} 寻找引导性的资源。
+请访问 \url{https://tug.org/begin.html} 寻找引导性的资源。
这里是一些你可能会考虑安装的其他工具的链接。
\begin{description}
\item[Ghostscript] \url{https://ghostscript.com/}
-\item[Perl] \url{http://www.perl.org/} 与 CPAN 中的补充包,
- \url{http://www.cpan.org/}
-\item[ImageMagick] \url{http://www.imagemagick.com}, 用于图形处理和转换
-\item[NetPBM] \url{http://netpbm.sourceforge.net/}, 同样用于图形。
+\item[Perl] \url{https://perl.org/} 与 CPAN 中的补充包,
+ \url{https://cpan.org/}
+\item[ImageMagick] \url{https://imagemagick.org}, 用于图形处理和转换
+\item[NetPBM] \url{http://netpbm.sourceforge.net}, 同样用于图形。
\item[面向 \TeX\ 的编辑器] 有很广泛的选择,一般依用户个人的口味而定。这
里按字典序列出了一些 (部分是 Windows 才有的)。
\begin{itemize*}
\item \cmdname{GNU Emacs} 在 Windows 下也有原生版本,参见
- \url{http://www.gnu.org/software/emacs/emacs.html}。
+ \url{https://www.gnu.org/software/emacs/emacs.html}。
\item \cmdname{Emacs 的 Auc\TeX\ 包} 的 Windows 版本在 \CTAN\ 提供。
- AuC\TeX\ 的主页在 \url{http://www.gnu.org/software/auctex}。
+ AuC\TeX\ 的主页在 \url{https://www.gnu.org/software/auctex}。
\item \cmdname{SciTE} 在
- \url{http://www.scintilla.org/SciTE.html} 提供。
+ \url{https://www.scintilla.org/SciTE.html} 提供。
\item \cmdname{Texmaker} 是自由软件,在
- \url{http://www.xm1math.net/texmaker} 提供。
+ \url{https://www.xm1math.net/texmaker} 提供。
\item \cmdname{TeXstudio} 是 \cmdname{Texmaker} 的一个
- fork,引入了额外的功能;\url{http://texstudio.org}。
+ fork,引入了额外的功能;\url{https://texstudio.org}。
\item \cmdname{TeXnicCenter} 是自由软件,在
- \url{http://www.texniccenter.org} 提供,也随 pro\TeX{}t
+ \url{https://www.texniccenter.org} 提供,也随 pro\TeX{}t
发行版附带。
- \item \cmdname{TeXworks} 是自由软件,在 \url{http://tug.org/texworks} 提供,也
+ \item \cmdname{TeXworks} 是自由软件,在 \url{https://tug.org/texworks} 提供,也
作为 \TL{} 的一部分只在 Windows 被安装。
\item \cmdname{Vim} 是自由软件,在
- \url{http://www.vim.org} 提供。
+ \url{https://www.vim.org} 提供。
\item \cmdname{WinEdt} 是共享软件,在
- \url{http://tug.org/winedt} 或 \url{http://www.winedt.com} 提供。
- \item \cmdname{WinShell} 在 \url{http://www.winshell.de} 提供。
+ \url{https://tug.org/winedt} 或 \url{https://www.winedt.com} 提供。
+ \item \cmdname{WinShell} 在 \url{https://www.winshell.de} 提供。
\end{itemize*}
\end{description}
-关于这类软件包和程序,\url{http://tug.org/interest.html} 有一份更长的列表。
+关于这类软件包和程序,\url{https://tug.org/interest.html} 有一份更长的列表。
\section{特殊安装}
@@ -1313,18 +1317,19 @@
惯了原有的界面,我们仍然发行和维护 \prog{texconfig},现在但我们建议使用
\prog{tlmgr}。
-\subsection{\cmdname{tlmgr} 当前的 \GUI{} 界面}
+\subsection{\cmdname{tlmgr} 的 \GUI{} 界面}
\TL{} 包含多个 \prog{tlmgr} 的 \GUI{}。图~\ref{fig:tlshell} 展示了
\cmdname{tlshell},它是用 Tcl/Tk 编写的,在 Windows 和 \MacOSX{} 下直接就能用。
图~\ref{fig:tlcockpit} 展示了 \prog{tlcockpit},它需要 Java 版本~8 或者更高以及
JavaFX。这两个都是单独的安装包。
-\prog{tlmgr} 本身也可以用如下方法按 \GUI{} 模式执行 (图~\ref{fig:tlmgr-gui}):
+\prog{tlmgr} 还有一个原生的 \GUI{} 模式 (见图~\ref{fig:tlmgr-gui}):
\begin{alltt}
> \Ucom{tlmgr -gui}
\end{alltt}
-\GUI\ 扩展需要 Perl/Tk,而这个模块已经不再包含在 \TL\ 的 Windows Perl 分发中了。
+但是 \GUI\ 扩展需要 Perl/Tk,而这个模块已经不再包含在 \TL\ 的 Windows Perl 分发
+中了。
\subsection{\cmdname{tlmgr} 命令行使用示例}
@@ -1358,12 +1363,12 @@
install: xetex-def
...
running mktexlsr
-mktexlsr: Updating /usr/local/texlive/2019/texmf-dist/ls-R...
+mktexlsr: Updating /usr/local/texlive/2020/texmf-dist/ls-R...
...
running fmtutil-sys --missing
...
Transcript written on xelatex.log.
-fmtutil: /usr/local/texlive/2019/texmf-var/web2c/xetex/xelatex.fmt installed.
+fmtutil: /usr/local/texlive/2020/texmf-var/web2c/xetex/xelatex.fmt installed.
\end{fverbatim}
如你所见,\prog{tlmgr} 会安装所有依赖的包,也会处理所有包括刷新文件名
@@ -1385,7 +1390,7 @@
sizes: 657941k
\end{fverbatim}
-最后也是最重要的,查阅 \url{http://tug.org/texlive/tlmgr.html}
+最后也是最重要的,查阅 \url{https://tug.org/texlive/tlmgr.html}
这里的完整文档,或者:
\begin{alltt}
> \Ucom{tlmgr -help}
@@ -1400,11 +1405,9 @@
在 Windows 下,安装程序额外地做了以下一些事情:
\begin{description}
\item[菜单与快捷方式。] 在开始菜单上加入了新的`\TL{}'程序菜单,主要是一些
-\GUI{} 程序 (如 \prog{tlmgr}、\prog{texdoctk}、PS\_View (\prog{psv}),它是
-PostScript 预览程序) 和一些文档的菜单。
-\item[文件关联。] 如果启用,\prog{TeXworks}、\prog{Dviout}
-和 \prog{PS\_view} 会成为它们对应文件类型的默认程序,或者在
-这些文件类型的“用...打开”右键菜单中出现。
+\GUI{} 程序 (如 \prog{tlmgr}、\prog{texdoctk} 和一些文档的菜单。
+\item[文件关联。] 如果启用,\prog{TeXworks} 和 \prog{Dviout} 会成为它们对应文件
+类型的默认程序,或者在这些文件类型的“用...打开”右键菜单中出现。
\item[位图到 eps 转换器。] 许多位图格式会在它们的“用...打开”菜单中获得一个
\cmdname{bitmap2eps} 项目。Bitmap2eps 是一个使用 \cmdname{sam2p} 或
\cmdname{bmeps} 的简单脚本。
@@ -1430,14 +1433,6 @@
但它们不会通过环境变量和注册表设置来暴露所在的位置。它们不是完整的安装版,
也不会与任何 Perl 或 Ghostscript 系统安装程序冲突。
-\item[PS\_View。] 同时安装的还有 PS\_View,一款 \PS{} 和 PDF
-浏览器;见图~\ref{fig:psview}。
-
-\begin{figure}[tb]
-\centering \tlpng{psview}{.6\linewidth}
-\caption{PS\_View:可以获得很高的放大倍数!}\label{fig:psview}
-\end{figure}
-
\item[dviout。] 另外安装的还包括一款 DVI 预览程序 \prog{dviout}。
当你第一次使用 \cmdname{dviout} 预览文件时,因为没有安装屏幕显示字体,它
将生成字体。一段时间后,你所使用的大部分字体都将生成,随后,你将很少再看
@@ -1516,7 +1511,7 @@
你尝试处理一个包含大量字体的文档时可能会内存不足。
对 Cygwin,你可以按照 Cygwin 用户指南
-(\url{http://www.cygwin.com/cygwin-ug-net/setup-maxmem.html}) 中的办法
+(\url{https://cygwin.com/cygwin-ug-net/setup-maxmem.html}) 中的办法
增加可用内存量。
对 Windows,你必须创建一个文件,例如命名为 \code{moremem.reg},包含
@@ -1536,7 +1531,7 @@
\Webc{} 是一整套 \TeX{} 相关程序的集合:\TeX{} 本身、\MF{}、\MP{}、\BibTeX{},
等等。它是 \TL{} 的核心。\Webc{} 的主页及最新的手册等都在
-\url{http://tug.org/web2c}。
+\url{https://tug.org/web2c}。
我们简单的介绍一下它的历史:最早它是由 Tomas Rokicki 在 1987 年实现的,他开发了第一套
将 \TeX{} 系统的代码转换为 C 语言代码的系统,基于的是 Unix 下 change files
@@ -1581,11 +1576,15 @@
所有的程序都接受这些 \GNU 标准的选项:
\begin{ttdescription}
\item[-{}-help] 显示基本使用说明。
-\item[-{}-verbose] 显示详细的执行过程。
\item[-{}-version] 显示版本信息,然后退出。
\end{ttdescription}
-所有的 \Webc{} 程序均使用 \KPS{} (\url{http://tug.org/kpathsea}) 路径搜索库来查找文件,
+而大部分都接受:
+\begin{ttdescription}
+\item[-{}-verbose] 显示详细的执行过程。
+\end{ttdescription}
+
+所有的 \Webc{} 程序均使用 \KPS{} (\url{https://tug.org/kpathsea}) 路径搜索库来查找文件,
这套库结合环境变量和配置文件的
使用来优化大量 \TeX{} 文件的搜索。\Webc{} 可以在多于一套的目录树下执行查找,这可以方
便维护类似 \TeX{} 标准发行版和本地版本的扩展这样两套目录树。为了优化搜索的速度,每个目
@@ -1651,31 +1650,40 @@
\subsubsection{配置文件}
\KPS{} 读入\emph{运行时配置文件} \file{texmf.cnf} 来获得搜索路径和其他定义。
-而这个 \file{texmf.cnf} 存放的路径则是在 \envname{TEXMFCNF} 变量里定义的,
-但我们不建议设置这个 (或者任何) 环境变量。
+我们用 \envname{TEXMFCNF} 搜索路径来查找这些文件,但我们不建议设置这个 (或者任
+何) 环境变量来替代系统路径。
-作为代替,标准的安装将产生文件 \file{.../2019/texmf.cnf}。如果你必须修改缺省
+作为代替,标准的安装将产生文件 \file{.../2020/texmf.cnf}。如果你必须修改缺省
值 (一般不需要),这是修改的地方。主配置文件是
-\file{.../2019/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
+\file{.../2020/texmf-dist/web2c/texmf.cnf}。你不应该修改后者,因为在发行版本被更
新后会丢失修改。
+此外,如果只希望把一个个人目录加入特定的搜索路径,设置环境变量是合理的:
+\begin{verbatim}
+ TEXINPUTS=.:/my/macro/dir:
+\end{verbatim}
+为保证这个设计可以一直被维护和兼容,在末尾加入一个 \samp{:} (Windows 下用 \samp{;})
+来加入系统路径,而不是完全替代系统路径 (参见第~\ref{sec:default-expansion}~节)。
+另一个选项是使用 \envname{TEXMFHOME} 树 (参见第~\ref{sec:directories}~节)。
+
搜索路径里\emph{所有的} \file{texmf.cnf} 文件都会被读入,而先读入的优先级更高。
比如搜索路径是 \verb|.:$TEXMF|,那么文件 \file{./texmf.cnf} 里面的值要比
\verb|$TEXMF/texmf.cnf| 里边的优先。
\begin{itemize*}
\item
- 以 \code{\%} 表示单行注释。
+ 以 \code{\%},要么在行首,要么在空白后面,表示单行注释。
\item
忽略空行。
\item
行末的 \bs{} 作为连接符,即把下一行直接接上。但保留下一行行首的空白。
\item
- 所有剩余的行格式如下:
-\begin{alltt}
- \var{variable}[.\var{progname}] [=] \var{value}
-\end{alltt}%
- \samp{=} 号和空白都是可选的。
+ 所有剩余的行格式如下:\\
+ \hspace*{2em}\texttt{\var{variable} \textrm{[}.\var{progname}\textrm{]}
+ \textrm{[}=\textrm{]} \var{value}}\\[1pt]
+ \samp{=} 号和空白都是可选的。
+ (但如果 \var{value} 以 \samp{.} 起始,最好的办法是用 \samp{=} 来避免 \samp{.}
+ 被识别为程序名称。)
\item
\ttvar{variable} (变量) 允许包含任何字符,除空白、\samp{=}、\samp{.}
之外。不过只用 \samp{A-Za-z\_} 是最保险的。
@@ -1683,11 +1691,17 @@
如果 \samp{.\var{progname}} (程序名) 存在,则该定义只对正在运行的名叫
\texttt{\var{progname}} 或 \texttt{\var{progname}.exe}
的程序起作用。这可以让给不同种类的 \TeX{} 程序设置不同的搜索路径。
-\item \var{value} (值) 允许任何 \code{\%} 与 \samp{@} 之外的字符出现。
- 不支持在等号右侧使用 \code{\$\var{var}.\var{prog}} 这样的写法。
- 如果在 Unix 下,\var{value} 中的 \samp{;}\ 字符会被转换为
- \samp{:}。如果你希望让 Unix, MS-DOS 和 Windows 里都用同一个
- \file{texmf.cnf},这会很有用。
+\item 就像字符串一样,\var{value} 可以包含任何字符。但是,实际上大部分
+ \file{texmf.cnf} 的值都和路径展开有关,而因为展开会用到多种特殊字符
+ (参见第~\ref{sec:cnf-special-chars}~节),比如大括号和逗号,所以它们
+ 不能用作路径名称。
+
+ 在 Unix 下 \var{value} 里的 \samp{;} 会被转换为 \samp{:},这样同一份
+ \file{texmf.cnf} 可以同时支持 Unix 和 Windows
+ 系统。这个转换适用于任何值,不仅仅是搜索路径,不过实际上 \samp{;}
+ 也不会在其他值里用到。
+
+ \code{\$\var{var}.\var{prog}} 的功能在右侧无效,你必须多用一个变量才行。
\item
在读入所有定义后再开始展开,所以你可以引用后边才定义的变量。
\end{itemize*}
@@ -1703,7 +1717,7 @@
\subsubsection{路径展开}
\label{sec:path-expansion}
-和 Unix shell 类似,\KPS{} 能够识别搜索路径中的特殊字符。比如一个复杂的路径
+和 Unix shell 类似,\KPS{} 能够识别搜索路径中的特殊字符。比如路径
\verb+~$USER/{foo,bar}//baz+,将展开为这样的子目录:在 \texttt{\$USER}
的主目录下的 \file{foo} 或 \file{bar} 目录中,且包含 \file{baz}
文件或目录。这种展开将在下面解释。
@@ -1740,7 +1754,7 @@
大括号展开是一项有用的特性,其作用是把 \verb+v{a,b}w+ 这样的转换为
\verb+vaw:vbw+,允许嵌套使用。通过把 \code{\$TEXMF} 赋值为一个括号列表,
-可以构造出多套 \TeX{} 层级结构。例如在 \file{texmf.cnf} 里有下面的定义
+可以构造出多套 \TeX{} 层级结构。在分发的 \file{texmf.cnf} 里有下面的定义
(简化的例子):
\begin{verbatim}
TEXMF = {$TEXMFVAR,$TEXMFHOME,!!$TEXMFLOCAL,!!$TEXMFDIST}
@@ -1752,15 +1766,12 @@
%$
的时候,检查完当前目录后,依次检查的路径是
\code{\$TEXMFVAR/tex}, \code{\$TEXMF/tex}, \code{\$TEXMFLOCAL/tex}
-和 \code{\$TEXMF/tex} (后两个只在 \file{ls-R} 数据库中搜索)。这样维护
-两套并行的 \TeX{} 结构就很方便的,一套是``固定 (frozen)''的 (比如放在 \CD\ 上)
-而另一套是在新版本出现时就更新的。因为所有的定义里都用到了 \code{\$TEXMF},
-所以你可以确信时常更新的那个版本肯定是先被找到的。
+和 \code{\$TEXMFDIST/tex} (后两个只在 \file{ls-R} 数据库中搜索)。
\subsubsection{子目录展开}
\label{sec:subdirectory-expansion}
-在路径元素里的目录名称 \var{d} 后面接连使用两个或更多连续的斜杠,表示 \var{d} 的
+在路径元素里的目录名称 \var{d} 后面接连使用两个或更多连续的斜杠,表示 \var{d\/} 的
所有子目录:首先是直接处于 \var{d} 下的那些,然后是这些子目录的子目录,依此类推。
每层的目录出现的顺序是\emph{不一定}的。
@@ -1771,35 +1782,42 @@
可以在单个路径元素里使用多个 \samp{//},但出现在路径开头的 \samp{//}
将被忽略。
-\subsubsection{特殊字符与其意义:简要说明}
+\subsubsection{\file{texmf.cnf} 文件中的特殊字符简要说明}
+\label{sec:cnf-special-chars}
-下面的列表总结了 \KPS{} 配置文件中出现的特殊字符:
+下面的列表总结了 \KPS{} 配置文件中出现的特殊字符和构成:
% need a wider space for the item labels here.
\newcommand{\CODE}[1]{\makebox[3em][l]{\code{#1}}}
\begin{ttdescription}
-\item[\CODE{:}] 路径分隔符,在路径的前边或者末尾时表示默认的展开方式。\par
+\item[\CODE{:}] 路径分隔符,在路径的前边或者末尾,或者在中间重复出现时,
+表示默认的展开方式。\par
\item[\CODE{;}] 非 Unix 系统下的路径分隔符 (和 \code{:} 功能一样)。
\item[\CODE{\$}] 变量展开。
\item[\CODE{\string~}] 表示用户的个人主目录。
\item[\CODE{\char`\{...\char`\}}] Brace expansion.
+\item[\CODE{,}] 在路径展开时分隔项目。
\item[\CODE{//}] 子目录展开 (可以出现在除路径开头外的任意位置)。
\item[\CODE{\%}] 注释的起始。
-\item[\CODE{\bs}] 连接下一行的字符 (以支持跨行的设置项)。
+\item[\CODE{\bs}] 在行末连接下一行的字符,以支持跨行的设置项。
\item[\CODE{!!}] \emph{只}在数据库中搜索文件,\emph{不}搜寻磁盘。
\end{ttdescription}
+具体哪一个字符会被视为特殊字符还是不会,取决于它使用的上下文。这些规则在配置文件
+的多层的解析过程中都会体现 (包括解析、展开、搜索,\ldots),所以不能简短地说明。
+也没有通用的转义方法,尤其 \samp{\bs} 不是 \file{texmf.cnf} 文件中的“转义字符”。
+
+在选择安装使用的目录名时,避免使用这些字符里的任何一个最为保险。
\subsection{文件名数据库}
\label{sec:filename-database}
-\KPS{} 使用了一些方法来减少搜索时的磁盘访问次数。尽管如此,如果安装的文件足够多,在各
-个可能的目录下搜索某个文件仍然可能花上很长时间 (尤其是在必须遍历数百个字体目录的时候)。
-因此,\KPS{} 使用一个专门构建的纯文本``数据库''文件,这个文件叫做 \file{ls-R},它将
+\KPS{} 使用了一些方法来减少搜索时的磁盘访问次数。尽管如此,在 \TL{} 的标准安装,
+或者安装的文件足够多,在各个可能的目录下搜索某个文件仍然可能花上很长时间。因此,
+\KPS{} 使用一个专门构建的纯文本``数据库''文件,这个文件叫做 \file{ls-R},它将
文件和目录进行映射,避免对磁盘的大量搜索。
-第二个数据库 \file{aliases} 允许你给 \file{ls-R} 中的文件指定其他的名字。有助于
-帮助源文件符合 DOS 8.3 命名规范。
+第二个数据库 \file{aliases} 允许你给 \file{ls-R} 中的文件指定其他的名字。
\subsubsection{文件名数据库}
\label{sec:ls-R}
@@ -1850,7 +1868,7 @@
将查找的文件格式设置为 \ttvar{name}。默认情况下是通过文件名来猜测格式的。对于扩展名
有二义性的格式,比如 \MP{} 支持文件和 \cmdname{dvips} 配置文件,必须以 \KPS{} 已知
的名称指定格式,比如 \texttt{tex} 或 \texttt{enc files}。运行
- \texttt{kpsewhich -{}-help} 会显示格式的列表。
+ \texttt{kpsewhich -{}-help-formats} 会显示格式的列表。
\item[\texttt{-{}-mode=\var{string}}]\mbox{}\\
设置模式为 \ttvar{string},只影响 \samp{gf} 和 \samp{pk}
@@ -2123,9 +2141,41 @@
\texttt{hash\_extra} 是 \texttt{50000}。
\end{ttdescription}
-\noindent 当然,这项功能并非真正的动态内存和数组分配的替代,但考虑到动态分配在现在的 \TeX{}
+\noindent 这项功能并非真正的动态内存和数组分配的替代,但考虑到动态分配在现在的 \TeX{}
太难实现,才通过这些选项提供了一些灵活性。
+\htmlanchor{texmfdotdir}
+\subsection{\texttt{\$TEXMFDOTDIR}}
+\label{sec:texmfdotdir}
+
+在上述许多地方,我们使用了多个以 \code{.} 起始的搜索路径,以优先搜索当前路径,
+比如
+\begin{alltt}\small
+TEXINPUTS=.;$TEXMF/tex//
+\end{alltt}
+
+这是一种简化。我们在 \TL{} 分发的 \code{texmf.cnf} 文件使用的是
+\filename{$TEXMFDOTDIR} 而不是直接用 \samp{.},比如:
+\begin{alltt}\small
+TEXINPUTS=$TEXMFDOTDIR;$TEXMF/tex//
+\end{alltt}
+
+(在分发的文件中,第二个路径元素也比 \filename{$TEXMF/tex//} 稍微复杂一点。但
+差别不大;而且我们这里讨论的是 \filename{$TEXMFDOTDIR} 功能。)
+
+在路径定义中使用 \filename{$TEXMFDOTDIR} 而不是直接用 \samp{.} 的原因是让它可以
+被重新定义。比如一份复杂的文档可能由来自多个子目录的源文件组成。要支持这种情况
+你可以把 \filename{TEXMFDOTDIR} 设置为 \filename{.//},这样这些子目录就都会被
+搜索到。(警告:不要默认使用 \filename{.//};这个做法一般不常用,而且搜索任意文档
+的所有子目录有可能不够安全。)
+
+另一个例子是你可能完全不希望搜索当前路径,比如你安排所有的文件都通过具体的路径
+找到。那样你可以把 \filename{$TEXMFDOTDIR} 设置为如 \filename{/nonesuch} 这样
+不存在的目录。
+
+在我们的 \filename{texmf.cnf} 里设置的 \filename{$TEXMFDOTDIR} 的默认值就是
+\samp{.}。
+
\section{致谢}
\TL{} 是在几乎所有 \TeX{} 用户组织的协力下完成的。这个版本由 Karl Berry
@@ -2136,10 +2186,11 @@
\item 英国、德国、荷兰和波兰的 \TeX{} 用户组织
(分别为 TUG, DANTE e.V., NTG, 和 GUST),他们为所在
地区的 \TeX{} 社群提供了必备的技术和管理基础设施。请加入本地的 \TeX 用户组织!
-(参见 \url{http://tug.org/usergroups.html}。)
+(参见 \url{https://tug.org/usergroups.html}。)
-\item CTAN 团队,值得一提的是 Robin Fairbairns 和 Rainer Sch\"opf。他们负
-责分发 \TL{} 光盘镜像,为软件包更新提供支撑,\TL{} 正是基于这些软件包构建的。
+\item CTAN 团队 (\url{https://ctan.org}),值得一提的是 Robin Fairbairns 和
+Rainer Sch\"opf。他们负责分发 \TL{} 光盘镜像,为软件包更新提供支撑,\TL{} 正是
+基于这些软件包构建的。
\item Nelson Beebe,他为 \TL\ 提供了许多平台,自己也进行了详尽的测试,并在参考
文献上有无与伦比的贡献。
@@ -2162,14 +2213,16 @@
版本,年复一年。Eitan 于 2009 年 6 月过早地离开了我们,我们希望把这份文档
献给它,以志纪念。
-\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{http://pragma-ade.com}) 做了
-许多测试和修改,使之能够包含在 \TL{} 的框架下。
+\item Hans Hagen,他对 \ConTeXt\ 宏包 (\url{https://pragma-ade.com}) 做了
+许多测试和修改,使之能够包含在 \TL{} 的框架下,并持续推进 \TeX\ 的开发。
\item \Thanh, Martin Schr\"oder,和 pdf\TeX\ 团队,他们持续不断地改进 \TeX\
的功能。
\item Hartmut Henkel,他对 pdf\TeX\, Lua\TeX 等程序的开发起到了重要的贡献。
+\item Shunshaku Hirata,起始开发和坚持维护 DVIPDFM$x$。
+
\item Taco Hoekwater,他对 \MP{} 和 (Lua)\TeX\ (\url{http://luatex.org})
重要的开发使之焕发新的活力。他还参与了将 \ConTeXt\ 融入 \TL{}、给
Kpathsea 添加多线程功能,等等许多工作。
@@ -2187,7 +2240,9 @@
\item Jonathan Kew,他开发了非凡的 Xe\TeX{} 引擎并花了大量时间和精力集成到
\TL{} 中。以及 Mac\TeX 安装程序的早期版本,还有我们推荐的前端 \TeX{}works。
-\item Dick Koch 他维护了 Mac\TeX\ (\url{http://tug.org/mactex}) 这个和
+\item Hironori Kitagawa,对 p\TeX\ 和相关的支持进行了大量的工作。
+
+\item Dick Koch,他维护了 Mac\TeX\ (\url{https://tug.org/mactex}) 这个和
\TL{} 联系非常紧密的发行版本。
\item Reinhard Kotucha,他对 \TL{} 2008 的基础架构和安装程序起到了重要贡献,
@@ -2196,6 +2251,8 @@
\item Siep Kroonenberg,也因为他对 \TL{} 2008 基础架构和安装程序的重要贡献,
尤其是在 Windows 上。他还花了大量的时间更新手册,介绍了这些特性。
+\item Clerk Ma,对引擎的 bug 修正和扩展。
+
\item Mojca Miklavec, 为她在 \ConTeXt\ 上的工作、编译大量二进制文件和很多
其他的工作。
@@ -2203,6 +2260,9 @@
巨大的 \pkgname{pst-geo} 数据文件使我们得以包含它们,最重要的还是因为他在
\pkgname{hyperref} 宏包上优秀的工作。
+\item Phelype Oleinik,对 2020 年在多个引擎上实现组分隔的 \cs{input} 命令,以及
+更多的工作。
+
\item Petr Ol\v{s}ak,他非常认真地协调和检查所有的捷克语和斯洛伐克语资料。
\item Toshio Oshima,他提供了 Windows 下的 \cmdname{dviout} 预览工具。
@@ -2220,6 +2280,8 @@
\item Luigi Scarso,他坚持开发 MetaPost, Lua\TeX 等等许多。
+\item Andreas Scherer,他开发了 \texttt{cwebbin},\TL{} 使用的 CWEB 实现。
+
\item Tomasz Trzeciak,他为 Windows 开发提供了广泛的帮助。
\item Vladimir Volovich,他很大地帮助解决了许多移植和维护的问题,尤其是令我们能够
@@ -2235,6 +2297,10 @@
\item Graham Williams,他是 \TeX\ Catalogue 的发起者。
+\item Joseph Wright,他为让多个引擎获得相同的 primitive 功能进行了大量的工作。
+
+\item Hironobu Yamashita,对 p\TeX\ 和相关的支持进行了大量的工作。
+
\end{itemize*}
二进制版本的编译者:
@@ -2251,7 +2317,7 @@
\pkgname{i386-solaris}, \pkgname{x86\_64-solaris},
\pkgname{sparc-solaris}),
Norbert Preining (\pkgname{x86\_64-linux}).
-关于 \TL{} 编译进程的信息,请查阅 \url{http://tug.org/texlive/build.html}。
+关于 \TL{} 编译进程的信息,请查阅 \url{https://tug.org/texlive/build.html}。
这份手册的翻译者:
Denis Bitouzé \& Patrick Bideault (法语),
@@ -2263,7 +2329,7 @@
Boris Veytsman (俄语),
Zofia Walczak (波兰语),
Uwe Ziegenhagen (德语)。\TL{} 文档的主页是
-\url{http://tug.org/texlive/doc.html}。
+\url{https://tug.org/texlive/doc.html}。
当然,最重要的感谢应该致予 Donald Knuth,感谢他发明了 \TeX,也感谢他将
\TeX\ 赠与全世界。
@@ -2276,7 +2342,7 @@
1993 年末荷兰 \TeX{} 用户组开始为 MS-DOS 用户开发 4All\TeX{} \CD{} 时,
我们就开始了相关的讨论,并希望在此时为所有的操作系统提供一个单一的、合理的 \CD{}。当时
那是一个过于宏伟的目标,但的确滋生了非常成功的 4All\TeX{} \CD{},同时 TUG
-技术委员会工作组也开始设计 \emph{\TeX{} 目录结构} (\url{http://tug.org/tds}),
+技术委员会工作组也开始设计 \emph{\TeX{} 目录结构} (\url{https://tug.org/tds}),
以指明如何创建一套一致而可控的集合,囊括所有 \TeX{} 相关的文件。\TDS{} 的完整草案在 1995
年 12 月的 \textsl{TUGboat} 上出版,并初步确定期望的产品将是在 \CD{} 上出现的范例
结构。你现在使用的这个发行版正是工作组审议的直接结果。4All\TeX{} \CD{} 的成功也说明
@@ -2295,8 +2361,9 @@
在第 5 版 (2000 年 3 月) 中检查并修正了 \CD{} 的许多部分,更新了数百个软件包。软件
包的详细说明现在存放在 XML 文件中。不过 \TeX\ Live 5 的首要变化还是移除了所有的非自由软
-件。\TL{} 的所有部分现在都在向 Debian Free Software Guidelines 兼容的方向改进,
-我们尽最大努力检查了所有软件包的授权协议,欢迎为我们指出错误。
+件。\TL{} 的所有部分现在都在向 Debian Free Software Guidelines
+(\url{https://debian.org/intro/free}) 兼容的方向改进,我们尽最大努力检查了所有软
+件包的授权协议,欢迎为我们指出错误。
第 6 版 (2001 年 7 月) 更新了许多内容。最重大的一项是新的安装形式,用户可以更精确
地选择所需的软件集合。与语言相关的集合也重新组织过了,这样一来,选定某个语言集合时会自
@@ -2350,7 +2417,7 @@
目录下搜索,根据 \envname{ENCFONTS} 变量中的路径设置。如果遇到有问题的文
件,\cmdname{updmap} 会提出警告。
-关于这种搜索方式的其他信息,请参见 \url{http://tug.org/texlive/mapenc.html}。
+关于这种搜索方式的其他信息,请参见 \url{https://tug.org/texlive/mapenc.html}。
\item 因为有人可能更愿意使用 \MIKTEX\ 而非 \Webc{} 系统,\TK\
现在包含了一套基于 \MIKTEX\ 的可安装 \CD,参见第~\ref{sec:overview-tl}~节
@@ -2424,11 +2491,11 @@
\optname{-enc} 参数启用这一支持 \Dash \emph{前提是构建好了格式文件}。enc\TeX\
提供了对输入输出通用的重新编码功能,实现对 Unicode (以 UTF-8 编码的形式)
的完整支持。参见 \OnCD{texmf-dist/doc/generic/enctex/} 和
-\url{http://www.olsak.net/enctex.html}。
+\url{http://olsak.net/enctex.html}。
\item 提供了 Aleph 这套新的 \TeX{} 引擎,它将 \eTeX\ 和 \OMEGA\ 合并到了一起。
关于 Aleph 的部分信息可以在 \OnCD{texmf-dist/doc/aleph/base}
-和 \url{http://www.tex.ac.uk/cgi-bin/texfaq2html?label=aleph} 找到。Aleph
+和 \url{https://texfaq.org/FAQ-enginedev} 找到。Aleph
的 \LaTeX 格式文件称做 \textsf{lamed}。
\item 最新发布的 \LaTeX\ 包含了是新版的 LPPL 授权协议\Dash 这一协议已被
@@ -2436,12 +2503,12 @@
\filename{ltnews} 文件。
\item 包含了一个叫做 \cmdname{dvipng} 的新程序,用于将 DVI 转换为
-PNG 图像文件。参见 \url{http://www.ctan.org/pkg/dvipng}。
+PNG 图像文件。参见 \url{https://ctan.org/pkg/dvipng}。
\item 我们在作者 (Claudio Beccari) 的同意下,将 \pkgname{cbgreek} 包含的
字体数量减少到中等。去除了不可见、轮廓和透明版本的字体,这些字体几乎很少用到。而我们
的光盘镜像需要空间。完整版本当然还是在 CTAN 提供
-(\url{http://mirror.ctan.org/tex-archive/fonts/greek/cbfonts})。
+(\url{https://ctan.org/pkg/cbgreek-complete})。
\item 去掉了 \cmdname{oxdvi},改为只使用 \cmdname{xdvi}。
@@ -2518,11 +2585,11 @@
\subsubsection{2006--2007}
2006--2007 年,\TL{} 的一个重大变化是增加了 \XeTeX{},以 \texttt{xetex} 和
-\texttt{xelatex} 程序的形式提供。请参见 \url{http://scripts.sil.org/xetex}。
+\texttt{xelatex} 程序的形式提供。请参见 \url{https://scripts.sil.org/xetex}。
\MP{} 也有可观的更新,并计划在未来实现更多的改进
-(\url{http://tug.org/metapost/articles}),pdf\TeX{} 同样如此
-(\url{http://tug.org/applications/pdftex})。
+(\url{https://tug.org/metapost/articles}),pdf\TeX{} 同样如此
+(\url{https://tug.org/applications/pdftex})。
\TeX\ \filename{.fmt} (缓存格式) 文件和用于 MetaPost 和 \MF\ 的类似文件
现在存储在 \dirname{texmf/web2c} 的子目录中而不直接放在 \dirname{texmf/web2c}
@@ -2536,14 +2603,14 @@
仍然读取 \texttt{\%\&} 开头的行。)
当然,和往常一样,这一年里你能看到成百上千的宏包与程序得到更新。也和往常一样,
-进一步的更新请使用 CTAN (\url{http://mirror.ctan.org})。
+进一步的更新请使用 CTAN (\url{https://ctan.org})。
从内部角度上看,源代码树现在改为使用 Subversion 管理,并在我们的主页上提供了
到 Web 界面的链接,用于浏览代码树。我们希望它能成为未来几年中稳定的开发
平台。
末了,2006 年五月 Thomas Esser 宣布他将停止 te\TeX{}
-(\url{http://tug.org/tetex}) 的更新。这样一来,大家对 \TL{} 的兴趣大增,尤其是在
+(\url{https://tug.org/tetex}) 的更新。这样一来,大家对 \TL{} 的兴趣大增,尤其是在
\GNU/Linux 发行版中。(\TL{} 提供了一套新的 \texttt{tetex} 安装方案,
几乎和原有的 te\TeX{} 毫无二致。) 我们希望这些变化将最终转换为对整个 \TeX\
环境的改进,从而每个人都会受益。
@@ -2592,7 +2659,7 @@
升级。
最终 Donald Knuth 在他的 `\TeX\ tuneup of 2008' 中的更新也被包含在这次
-发布中。参见 \url{http://tug.org/TUGboat/Articles/tb29-2/tb92knut.pdf}。
+发布中。参见 \url{https://tug.org/TUGboat/Articles/tb29-2/tb92knut.pdf}。
\subsubsection{2009}
@@ -2607,18 +2674,18 @@
包含了新版本的 AMS \TypeI\ 字体,包括 Computer Modern:其中部分字形
随 Knuth 多年以来修改的 MetaFont 源代码更新,hinting 信息也更新了。
Euler 字体也整个由 Hermann Zapf 重新绘制了一遍 (参见
-\url{http://tug.org/TUGboat/Articles/tb29-2/tb92hagen-euler.pdf})。
+\url{https://tug.org/TUGboat/Articles/tb29-2/tb92hagen-euler.pdf})。
不过上述变化并没有改变字体的 metrics 文件。AMS 字体的主页在
-\url{http://www.ams.org/tex/amsfonts.html}。
+\url{https://www.ams.org/tex/amsfonts.html}。
现在 Windows 和 Mac\TeX\ 都包含了新的 \GUI{} 前端 \TeX{}works。至于其他
-的平台和更多的信息,请参见 \TeX{}works 的主页,\url{http://tug.org/texworks}。
+的平台和更多的信息,请参见 \TeX{}works 的主页,\url{https://tug.org/texworks}。
设计这个跨平台前端的灵感来自于 \MacOSX\ 下的 TeXShop 编辑器,目标就是
易用。
在许多平台下包含了 Asymptote 图形程序,它实现了一套与 MetaPost 约略
相似的文本图形描述语言,但包含了先进的 3D 支持等其他特性。它的主页在
-\url{http://asymptote.sourceforge.net}。
+\url{https://asymptote.sourceforge.net}。
单独的 \code{dvipdfm} 程序已被 \code{dvipdfmx} 所替代,如果以 \code{dvipdfm}
这个名字调用的时候,后者会以一种特殊的兼容性模式运行。\code{dvipdfmx}
@@ -2630,7 +2697,7 @@
另外这也是因为要编译出能在多种版本下都工作的二进制程序有些困难。
一些更不起眼的更新:我们现在使用 \pkgname{xz} 这套稳定的压缩方式来替代
-原有的 \pkgname{lzma} (\url{http://tukaani.org/xz/});在不和现有变量名
+原有的 \pkgname{lzma} (\url{https://tukaani.org/xz/});在不和现有变量名
冲突的情况下允许文件中使用 |$| 字符;Kpathsea 库现在支持多线程了 (其中
用到了 MetaPost);整个 \TL{} 的编译现在基于 Automake 了。
@@ -2650,7 +2717,7 @@
的 PDF 文件,但你也可以将 |\newcommand{\DoNotLoadEpstopdf}{}| (或
|\def...|) 放在 \cs{documentclass} 声明前以避免载入 \code{epstopdf}。
如果使用了 \pkgname{pst-pdf} 宏包,也不会载入它。要了解更多的细节,参
-见 \pkgname{epstopdf} 宏包的文档 (\url{http://ctan.org/pkg/epstopdf-pkg})。
+见 \pkgname{epstopdf} 宏包的文档 (\url{https://ctan.org/pkg/epstopdf-pkg})。
一个相关的变化是通过 \cs{write18} 特性从 \TeX\ 执行少量外部命令,现在
默认启用了。这些命令是 \code{repstopdf}, \code{makeindex}, \code{kpsewhich},
@@ -2673,16 +2740,16 @@
包含了这些新的程序:用于排版日文的 p\TeX\ 引擎和相关实用工具;支持了
Unicode \BibTeX\ 的 \BibTeX{}U 程序;\prog{chktex} 实用工具
-(\url{http://baruch.ev-en.org/proj/chktex})
+(\url{https://baruch.ev-en.org/proj/chktex})
用来检查 \AllTeX\ 文档;\prog{dvisvgm}
-(\url{http://dvisvgm.sourceforge.net}) 是 DVI 到 SVG 格式转换器。
+(\url{https://dvisvgm.de}) 是 DVI 到 SVG 格式转换器。
现在包含了这些新平台的可执行文件:\code{amd64-freebsd},
\code{amd64-kfreebsd}, \code{i386-freebsd}, \code{i386-kfreebsd},
\code{x86\_64-darwin}, \code{x86\_64-solaris}。
我们忘记注明的一个 \TL{} 2009 的修改是:许多 \TeX4ht 相关的可执行文件
-(\url{http://tug.org/tex4ht}) 被从二进制目录删除了。通用的 \code{mk4ht}
+(\url{https://tug.org/tex4ht}) 被从二进制目录删除了。通用的 \code{mk4ht}
程序可以用来运行这些 \code{tex4ht} 组合的任意一种。
最后,\TK\ \DVD\ 上的 \TL{} 发行不能再直接执行了 (听起来很奇怪)。
@@ -2767,7 +2834,7 @@
\cmdname{tlmgr}: 新的 \code{pinning} 操作以方便配置多个仓库;参见
\verb|tlmgr --help| 的对应章节,或者在线的
-\url{http://tug.org/texlive/doc/tlmgr.html#MULTIPLE-REPOSITORIES}。
+\url{https://tug.org/texlive/doc/tlmgr.html#MULTIPLE-REPOSITORIES}。
平台: \pkgname{armhf-linux}, \pkgname{mips-irix}, \pkgname{i386-netbsd}, 和
\pkgname{amd64-netbsd} 被重新加入;\pkgname{powerpc-aix} 被去除。
@@ -2784,10 +2851,10 @@
\cs{pdffakespace},它们可以帮助 PDF 文本重新排版 (reflowing),
Lua\TeX: 对于字体载入和断字 (hyphenation) 有明显的变化和修正。最大的增加时一个新
-的引擎,\code{luajittex} (\url{http://foundry.supelec.fr/projects/luajittex}) 和
-它的相关变体 \code{texluajit} 和 \code{texluajitc}。它使用的是一个即时编译的 Lua
-编译器 (在 \textsl{TUGboat} 文章 \url{http://tug.org/TUGboat/tb34-1/tb106scarso.pdf} 有详
-细介绍)。\code{luajittex} 还在开发中,所以并没有在所有平台提供,也比 \code{luatex}
+的引擎,\code{luajittex} 和它的相关变体 \code{texluajit} 和 \code{texluajitc}。
+它使用的是一个即时编译的 Lua 编译器 (在 \textsl{TUGboat} 文章
+\url{https://tug.org/TUGboat/tb34-1/tb106scarso.pdf} 有详细介绍)。\code{luajittex}
+还在开发中,所以并没有在所有平台提供,也比 \code{luatex}
要不稳定许多。我们及其作者都不建议使用它,除非为了试验 Lua 代码的即时编译 (JIT)
这样特殊的目的。
@@ -2854,14 +2921,14 @@
平台:\pkgname{*-kfreebsd} 被去除了,因为 \TeX\ Live 现在在这个平台下通过系统自
带的安装方式已经很容易获取了。
-部分额外平台提供了定制二进制包 (\url{http://tug.org/texlive/custom-bin.html})。
+部分额外平台提供了定制二进制包 (\url{https://tug.org/texlive/custom-bin.html})。
此外,为节省空间部分平台现在没有在 \DVD\ 中提供,但可以通过网络安装。
\subsubsection{2016}
Lua\TeX: 原生命令有大量改变,包括重命名和去除,还有一些节点结构的重整。这些修改
在 Han Hagen 的“Lua\TeX\ 0.90 对于 PDF 的后端改变及更多”
-(\url{http://tug.org/TUGboat/tb37-1/tb115hagen-pdf.pdf}) 一文中有详细的总结。如
+(\url{https://tug.org/TUGboat/tb37-1/tb115hagen-pdf.pdf}) 一文中有详细的总结。如
果要了解更多细节,参见 Lua\TeX\ 手册,
\OnCD{texmf-dist/doc/luatex/base/luatex.pdf}。
@@ -2905,8 +2972,8 @@
字体的用户提供了新的 \code{cjk-gs-integrate} 脚本。
基础架构:支持系统级别的 \code{tlmgr} 配置文件;校验包的完整性;如果有 GPG 还会
-校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。
-(如果没有 GPG 则跳过这一步。)
+校验网络更新的签名。安装程序和 \code{tlmgr} 都会作这些检查。如果没有 GPG 则跳过
+这一步。
平台:\code{alpha-linux} 和 \code{mipsel-linux} 被移除了。
@@ -2946,7 +3013,7 @@
(\code{updmap-sys}, \code{fmtutil-sys}, 或者 \code{-sys} 选项),还是用
户模式 (\code{updmap-user}, \code{fmtutil-user}, 或者 \code{-user} 选项)
的时候会给出警告。这是为了减少常见的不小心启用用户模式而导致系统更新无法
-生效。细节请参见 \url{http://tug.org/texlive/scripts-sys-user.html}。
+生效。细节请参见 \url{https://tug.org/texlive/scripts-sys-user.html}。
\code{install-tl}: Mac 下的个人路径,比如 \envname{TEXMFHOME},现在默认设置为和
Mac\TeX\ 一样的 (|~/Library/...|)。增加了新选项 \code{-init-from-profile}
@@ -2968,13 +3035,13 @@
Kpathsea: 对于非系统目录缺省进行大小写不敏感的文件名匹配;可以通过设置
\code{texmf.cnf} 或者将 \code{texmf\_casefold\_search} 环境变量设置为~\code{0}
-来禁用。详细信息见 Kpathsea 手册 (\url{http://tug.org/kpathsea})。
+来禁用。详细信息见 Kpathsea 手册 (\url{https://tug.org/kpathsea})。
ep\TeX, eup\TeX: 新的原语 \cs{epTeXversion}。
Lua\TeX: 准备在 2019 年升级到 Lua 5.3: 大部分平台下都提供了一个
\code{luatex53} 程序,但必须被改名为 \code{luatex} 才能使用。或者使用
-\ConTeXt\ Garden (\url{http://wiki.contextgarden.net}) 的文件;那里有
+\ConTeXt\ Garden (\url{https://wiki.contextgarden.net}) 的文件;那里有
更多的信息。
MetaPost: 对错误的路径方向、TFM 和 PNG 输出的修正。
@@ -3009,9 +3076,7 @@
\item Windows: 不再支持 XP。
\end{itemize*}
-\htmlanchor{news}
-\subsection{当前版本:2019}
-\label{sec:tlcurrent}
+\subsection{2019}
Kpathsea: 更一致的括号展开和路径拆分;用来替代 \code{.} 的 \code{TEXMFDOTDIR}
新变量,以方便子目录搜索 (见 \code{texmf.cnf} 中的注释)。
@@ -3066,17 +3131,75 @@
平台支持:去除了 \code{sparc-solaris}。
+\htmlanchor{news}
+\subsection{当前版本:2020}
+\label{sec:tlcurrent}
+
+通用的更新: \begin{itemize}
+\item 所有 \TeX\ 引擎,包括 \texttt{tex} 的 \cs{input} 原语,现在都支持以组分隔
+的文件名参数,作为跟系统有关的扩展。标准的用空格或者标识符分隔的文件名的使用完全
+不受影响。按组分隔的参数一开始是 Lua\TeX\ 先实现的;现在它被推广到所有的引擎中了。
+ASCII 双引号字符 (\texttt{"}) 一开始会被从文件名中去掉,但在输入后不变。这个改变
+目前不会影响 \LaTeX{} 的 \cs{input} 命令,因为那是对标准 \cs{input} 原语重新定义
+的宏。
+
+\item \texttt{kpsewhich}、\texttt{tex}、\texttt{mf} 以及所有其他引擎的的
+新选项 \texttt{--cnf-line}, \texttt{tex},以支持通过命令行指定任意配置文件。
+
+\item 今年和往年对多个引擎添加的许多原语是为了让所有引擎都拥有一系列共通的功能
+(见 \textsl{\LaTeX\ News \#31}, \url{https://latex-project.org/news})。
+
+\end{itemize}
+
+ep\TeX, eup\TeX: 新的原语 \cs{Uchar}, \cs{Ucharcat},
+\cs{current(x)spacingmode}, \cs{ifincsname};更新 \cs{fontchar??} 和
+\cs{iffontchar}。只针对 eup\TeX{} 的:\cs{currentcjktoken}。
+
+Lua\TeX: 与 HarfBuzz 库的集成,作为新引擎 \texttt{luahbtex} (被用于
+\texttt{lualatex}) 和 \texttt{luajithbtex} 提供。新的原语:
+\cs{eTeXgluestretchorder}, \cs{eTeXglueshrinkorder}。
+
+pdf\TeX: 新的原语 \cs{pdfmajorversion};这个命令只改变 PDF 输出的版本号;它对
+任何 PDF 内容没有影响。\cs{pdfximage} 等类似命令现在以和 \cs{openin} 相同的方式
+来搜索图像文件了。
+
+p\TeX: 新的 \cs{ifjfont}, \cs{iftfont} 原语,它们也包含在 ep\TeX,
+up\TeX, eup\TeX\ 里。
+
+Xe\TeX: 对 \cs{Umathchardef}, \cs{XeTeXinterchartoks}, \cs{pdfsavepos} 的修正。
+
+Dvips: 位图字体的输出编码,以更好的支持复制粘贴
+(\url{https://tug.org/TUGboat/tb40-2/tb125rokicki-type3search.pdf})。
+
+Mac\TeX: Mac\TeX\ 和 \texttt{x86\_64-darwin} 现在需要 10.13 或者更新的系统
+(High~Sierra, Mojave, 和 Catalina);
+\texttt{x86\_64-darwinlegacy} 支持 10.6 和更新的系统。Mac\TeX\ 已经被公证
+(notarized) 命令行程序使用强化的运行时环境,因为 Apple 现在要求安装包必须提
+供这些。BibDesk 和 \TeX\ Live Utility 不再是 Mac\TeX\ 的一部分,因为它们没有
+被公证,但提供的 \filename{README} 文件里列出了获取它们的链接。
+
+\code{tlmgr} 和基础架构: \begin{itemize*}
+\item 在软件包无法现在时,自动重试一次。
+\item 新选项 \texttt{tlmgr check texmfdbs}, 用来检查每个目录树 \texttt{ls-R} 文件和
+\texttt{!!} 配置的一致性。
+\item 软件包容器使用带版本号的文件名,比如
+\texttt{tlnet/archive/\textsl{pkgname}.rNNN.tar.xz};对用户应该没有影响,但对于
+分发来说会是一个明显的改变。
+\item \texttt{catalogue-date} 信息不在从 \TeX~Catalogue 获得了,因为它通常和软件
+包更新没有关系。
+\end{itemize*}
+
\subsection{未来}
\TL{} 并不完美,也永远不会达到完美。我们希望继续发行新的版本,也希望提供
更多的帮助文档、更多的实用程序、更多的安装程序,当然还有更多更新的宏包与
字体,以及其他一切和 \TeX\ 有关的东西。这个工作是由志愿者在其空闲时间完成的,
-所以总有更多值得做的地方。请参见 \url{http://tug.org/texlive/contribute.html}。
+所以总有更多值得做的地方。请参见 \url{https://tug.org/texlive/contribute.html}。
请把更正、建议或者提供帮助的意愿发送到:
\begin{quote}
\email{tex-live(a)tug.org} \\
-\url{http://tug.org/texlive}
+\url{https://tug.org/texlive}
\end{quote}
\medskip
@@ -3110,6 +3233,6 @@
2009 年的简体中文版本由 Jiang Jiang 和 Jinsong Zhao 翻译。
-2010 到 2019 年的简体中文版本都由 Jiang Jiang 翻译。
+2010 到 2020 年的简体中文版本都由 Jiang Jiang 翻译。
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj
--- old/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2019-03-21 02:24:33.000000000 +0100
+++ new/tlpkg/tlpobj/texlive-zh-cn.doc.tlpobj 2020-03-23 01:56:48.000000000 +0100
@@ -1,9 +1,9 @@
name texlive-zh-cn.doc
category TLCore
-revision 50478
+revision 54490
shortdesc doc files of texlive-zh-cn
relocated 1
-docfiles size=292
+docfiles size=302
RELOC/doc/texlive/texlive-zh-cn/Makefile
RELOC/doc/texlive/texlive-zh-cn/README-live.ZH-CN
RELOC/doc/texlive/texlive-zh-cn/tex-live-zh-cn.sty
++++++ texlive.infra.doc.tar.xz ++++++
++++ 3595 lines of diff (skipped)
++++++ texlive.infra.tar.xz ++++++
++++ 6267 lines of diff (skipped)
++++++ texloganalyser.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texloganalyser/README new/texmf-dist/doc/support/texloganalyser/README
--- old/texmf-dist/doc/support/texloganalyser/README 2014-11-14 23:47:22.000000000 +0100
+++ new/texmf-dist/doc/support/texloganalyser/README 2020-03-24 21:54:13.000000000 +0100
@@ -1,8 +1,25 @@
-This is texloganalyser (Perl script), version 0.9
- Copyright 2006-2014 Thomas van Oudenhove
- License: BSD
+This is texloganalyser (Perl script), version 0.11
+ Copyright 2006-2020 Thomas van Oudenhove
+ License: BSD
-Usage: texloganalyser [--help|--version|-efhioprstuvw] <TeX log>
- Displays selective infos of LaTeX logs
+Usage: texloganalyser [--help|--version|-acefhilastnoprstuvw] <TeX log>
+ Displays selective infos of LaTeX logs
+
+These flags may be used:
+ a: displays number of warnings about bad boxes
+ c: displays the boxes warning by size (at the end)
+ e: displays the end of the log
+ f: outputs the LaTeX Font Infos
+ h: outputs only warnings about horizontal boxes
+ i: displays 'images' (pdf, [e]ps, png, jpg) used
+ n: displays page numbers
+ o: outputs only warnings about overfull boxes
+ p: outputs the LaTeX Packages infos
+ r: displays warnings about references
+ s: displays .sty and .cls files used
+ t: displays .tex files used
+ u: outputs only warnings about underfull boxes
+ v: outputs only warnings about vertical boxes
+ w: displays all Warnings
More documentation is available with `perldoc texloganalyser`.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.doc.tlpobj new/tlpkg/tlpobj/texloganalyser.doc.tlpobj
--- old/tlpkg/tlpobj/texloganalyser.doc.tlpobj 2019-02-28 04:08:00.000000000 +0100
+++ new/tlpkg/tlpobj/texloganalyser.doc.tlpobj 2020-03-25 16:13:20.000000000 +0100
@@ -1,6 +1,6 @@
name texloganalyser.doc
category Package
-revision 35584
+revision 54526
shortdesc doc files of texloganalyser
docfiles size=1
texmf-dist/doc/support/texloganalyser/README
++++++ texloganalyser.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texloganalyser/texloganalyser new/texmf-dist/scripts/texloganalyser/texloganalyser
--- old/texmf-dist/scripts/texloganalyser/texloganalyser 2014-11-14 23:47:22.000000000 +0100
+++ new/texmf-dist/scripts/texloganalyser/texloganalyser 2020-03-24 21:54:13.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env perl
# This is texloganalyser, for parsing of TeX logs
-# Copyright (c) 2006-2014 Thomas van Oudenhove
+# Copyright (c) 2006-2020 Thomas van Oudenhove
# All rights reserved
# README - important notice:
@@ -38,8 +38,8 @@
use Getopt::Long;
Getopt::Long::Configure ("bundling");
-my $version = "0.9";
-my $copyright = "2006-2014";
+my $version = "0.11";
+my $copyright = "2006-2020";
my $opt = {
help => '',
version => '',
@@ -49,6 +49,7 @@
o => '',
u => '',
v => '',
+ c => '',
p => '',
f => '',
w => '',
@@ -65,6 +66,7 @@
'version' => \$opt->{version},
'last' => \$opt->{last},
'a' => \$opt->{a},
+ 'c' => \$opt->{c},
'h' => \$opt->{h},
'o' => \$opt->{o},
'u' => \$opt->{u},
@@ -105,8 +107,10 @@
sub analyze {
my $line;
+ my ($cbox, $chead);
my $output;
my $test = 0;
+ my $png = 0;
open my $source, "<", $texlog;
while (defined ($line = <$source>)) {
@@ -114,7 +118,9 @@
# default: display summary
summary($line);
# and page numbers ('n' option)
- pagenumber($line) if $opt->{n};
+ my $pn = pagenumber($line);
+ print '['.$pn.']' if ($opt->{n} and $pn);
+ $png = $pn if $pn;
if ($opt->{e}) {
if ($line =~ m/Here is how much/) {
@@ -124,7 +130,19 @@
$output .= $line if $test;
}
# look for boxes warnings
- if ($opt->{o} and $opt->{h}) {
+ if ($opt->{c} and $opt->{o} and $opt->{h}) {
+ if ($line =~ m/\\hbox/ and $line =~ m/Overfull/) {
+ $line =~ m/^Overfull \\hbox \((\d+\.\d+)pt too wide\) .*$/;
+ $cbox->{$1} = 'Page '.$png.': '.$line;
+ $chead = 'Overfull hboxes classified:';
+ }
+ } elsif ($opt->{c} and $opt->{u} and $opt->{h}) {
+ if ($line =~ m/\\hbox/ and $line =~ m/Underfull/) {
+ $line =~ m/^Underfull \\hbox \(badness (\d+)\) .*$/;
+ $cbox->{$1} = 'Page '.$png.': '.$line;
+ $chead = 'Underfull hboxes classified:';
+ }
+ } elsif ($opt->{o} and $opt->{h}) {
$output = $line if ($line =~ m/\\hbox/ and
$line =~ m/Overfull/);
} elsif ($opt->{u} and $opt->{h}) {
@@ -195,14 +213,21 @@
print "$output" if defined $output;
}
print "\n";
+ if ($opt->{c} and $opt->{h} and ($opt->{u} or $opt->{o})) {
+ print "$chead\n";
+ foreach my $key (sort {$a <=> $b} keys %{$cbox}) {
+ print $cbox->{$key};
+ }
+ print "\n";
+ }
print_abstract();
close $source;
}
sub pagenumber {
my $logline = shift;
- if ($logline =~ m/.*(\[[0-9]+)/) {
- print $1."]";
+ if ($logline =~ m/.*\[([0-9]+)(\]|$)/) {
+ return $1;
}
}
@@ -244,26 +269,28 @@
sub print_abstract {
print "The log contained ".$abstract->{warnings}." warnings";
- print " and $abstract->{badboxes} bad boxes" if $opt->{a};
- print ".\n";
+ print " and $abstract->{badboxes} bad boxes" if $opt->{a};
+ print ".\n";
}
sub printversion {
- print "This is texloganalyser, version $version\n";
+ print "This is texloganalyser (Perl script), version $version\n";
print "\t Copyright $copyright Thomas van Oudenhove\n";
+ print "\t License: BSD\n";
}
sub printhelp {
printversion();
- print "Usage: texloganalyser ".options()." <TeX log>\n";
+ print "\nUsage: texloganalyser ".options()." <TeX log>\n";
print "\t Displays selective infos of LaTeX logs\n";
- print "These flags may be used:\n";
+ print "\nThese flags may be used:\n";
print "\t a: displays number of warnings about bad boxes\n";
+ print "\t c: displays the boxes warning by size (at the end)\n";
print "\t e: displays the end of the log\n";
print "\t f: outputs the LaTeX Font Infos\n";
print "\t h: outputs only warnings about horizontal boxes\n";
print "\t i: displays 'images' (pdf, [e]ps, png, jpg) used\n";
- print "\t n: displays page numbers\n";
+ print "\t n: displays page numbers\n";
print "\t o: outputs only warnings about overfull boxes\n";
print "\t p: outputs the LaTeX Packages infos\n";
print "\t r: displays warnings about references\n";
@@ -271,8 +298,8 @@
print "\t t: displays .tex files used\n";
print "\t u: outputs only warnings about underfull boxes\n";
print "\t v: outputs only warnings about vertical boxes\n";
- print "\t w: displays all Warnings\n";
- print "You may want to have a look at `perldoc texloganalyser`.\n";
+ print "\t w: displays all Warnings\n\n";
+ print "More documentation is available with `perldoc texloganalyser`.\n";
}
__END__
@@ -288,7 +315,7 @@
=head2 SYNOPSIS
-texloganalyser [-aefhinoprstuvw] tex_log_file
+texloganalyser [-acefhinoprstuvw] tex_log_file
texloganalyser [--version]
@@ -310,6 +337,8 @@
=item B<-a>: counts number of badboxes.
+=item B<-c>: classify boxes warnings by size (needs h&o,u or v&o,u) at the end.
+
=item B<-e>: displays the end of the log, about the TeX's memory.
=item B<-f>: outputs the LaTeX Font Infos warnings and calculations.
@@ -350,10 +379,16 @@
Akim Demaille submitted a patch for 'last' option, June 2012.
+Paulo Ney de Souza had the idea of -c option to better handle hboxes, March 2020.
+
=head3 Changelog
=over
+=item v0.11: bug fix for -c option (regexp was too specific)
+
+=item v0.10: added option -c, to classify boxes warnings by size (Paulo Ney de Souza's idea).
+
=item v0.9: added option --last, if log file contains several compilations (Akim Demaille's patch).
=item v0.8: added options for page and bad boxes number (Markus Hennig's patch).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texloganalyser.tlpobj new/tlpkg/tlpobj/texloganalyser.tlpobj
--- old/tlpkg/tlpobj/texloganalyser.tlpobj 2019-02-28 04:08:00.000000000 +0100
+++ new/tlpkg/tlpobj/texloganalyser.tlpobj 2020-03-25 16:13:20.000000000 +0100
@@ -1,14 +1,13 @@
name texloganalyser
category Package
-revision 35584
+revision 54526
shortdesc Analyse TeX logs
-longdesc The perl script allows the user to extract (and display)
-longdesc elements of the log file
+longdesc This perl script allows the user to extract (and display)
+longdesc elements of the log file.
depend texloganalyser.ARCH
-runfiles size=3
+runfiles size=4
texmf-dist/scripts/texloganalyser/texloganalyser
catalogue-ctan /support/texloganalyser
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license bsd
catalogue-topics log-manip
-catalogue-version 0.9
+catalogue-version 0.11
++++++ texosquery.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texosquery/CHANGES new/texmf-dist/doc/support/texosquery/CHANGES
--- old/texmf-dist/doc/support/texosquery/CHANGES 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/doc/support/texosquery/CHANGES 2020-02-04 23:21:35.000000000 +0100
@@ -1,3 +1,12 @@
+1.7 (2020/02/04):
+
+ * Renamed scratch variable to avoid conflict.
+
+ * The default version is now texosquery-jre8 since Java 7 has long
+ passed its end of life.
+
+ * Modified bash scripts to improve cygwin support.
+
1.6 (2017/06/20):
* Added new command line options:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/support/texosquery/README.md new/texmf-dist/doc/support/texosquery/README.md
--- old/texmf-dist/doc/support/texosquery/README.md 2017-05-06 00:50:09.000000000 +0200
+++ new/texmf-dist/doc/support/texosquery/README.md 2020-02-04 23:21:35.000000000 +0100
@@ -2,6 +2,16 @@
Cross-platform Java application to query OS information designed for use in
TeX's shell escape mechanism.
+## Licence
+
+This material is subject to the LaTeX Project Public License.
+See http://www.ctan.org/license/lppl1.3
+for the details of that license.
+
+Copyright 2016-2020 Nicola Talbot
+
+## Description
+
The application can query the following:
- locale information
@@ -320,8 +330,8 @@
In addition to obeying `openin_any`, the file listing actions (such
as `--list`) for the JRE7 and 8 variants also prohibit listing the
-contents outside of the current working directory's path. This means
-that you can't, for example, list the contents of `..` (the current
+contents outside of the current working directory's path even if `openin_any=a`.
+This means that you can't, for example, list the contents of `..` (the current
working directory's parent) nor can you try walking the entire file
system. The `--walk` action additionally won't descend hidden
directories. This extra restriction is designed to prevent malicious
@@ -410,4 +420,3 @@
Author Home Page: http://www.dickimaw-books.com/
-License: LPPL 1.3+
Binary files old/texmf-dist/doc/support/texosquery/texosquery.pdf and new/texmf-dist/doc/support/texosquery/texosquery.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texosquery.doc.tlpobj new/tlpkg/tlpobj/texosquery.doc.tlpobj
--- old/tlpkg/tlpobj/texosquery.doc.tlpobj 2019-02-28 04:08:01.000000000 +0100
+++ new/tlpkg/tlpobj/texosquery.doc.tlpobj 2020-02-05 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name texosquery.doc
category Package
-revision 44656
+revision 53676
shortdesc doc files of texosquery
docfiles size=130
texmf-dist/doc/support/texosquery/CHANGES
++++++ texosquery.tar.xz ++++++
Binary files old/texmf-dist/scripts/texosquery/texosquery-jre5.jar and new/texmf-dist/scripts/texosquery/texosquery-jre5.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery-jre5.sh new/texmf-dist/scripts/texosquery/texosquery-jre5.sh
--- old/texmf-dist/scripts/texosquery/texosquery-jre5.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery-jre5.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre5.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -jar "$jarpath" "$@"
Binary files old/texmf-dist/scripts/texosquery/texosquery-jre8.jar and new/texmf-dist/scripts/texosquery/texosquery-jre8.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery-jre8.sh new/texmf-dist/scripts/texosquery/texosquery-jre8.sh
--- old/texmf-dist/scripts/texosquery/texosquery-jre8.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery-jre8.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery-jre8.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -Djava.locale.providers=CLDR,JRE -jar "$jarpath" "$@"
Binary files old/texmf-dist/scripts/texosquery/texosquery.jar and new/texmf-dist/scripts/texosquery/texosquery.jar differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/texosquery/texosquery.sh new/texmf-dist/scripts/texosquery/texosquery.sh
--- old/texmf-dist/scripts/texosquery/texosquery.sh 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/scripts/texosquery/texosquery.sh 2020-02-04 23:21:35.000000000 +0100
@@ -1,11 +1,15 @@
#!/bin/sh
-kernel=`uname -s`
-if test "${kernel#*CYGWIN}" != "$kernel"
-then
- jarpath=`cygpath -w $(kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar)`
-else
- jarpath=`kpsewhich --progname=texosquery --format=texmfscripts texosquery.jar`
+scriptname=`basename "$0" .sh`
+jar="$scriptname.jar"
+jarpath=`kpsewhich --progname="$scriptname" --format=texmfscripts "$jar"`
+
+kernel=`uname -s 2>/dev/null`
+if echo "$kernel" | grep CYGWIN >/dev/null; then
+ CYGWIN_ROOT=`cygpath -w /`
+ export CYGWIN_ROOT
+ jarpath=`cygpath -w "$jarpath"`
fi
+
java -jar "$jarpath" "$@"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.cfg new/texmf-dist/tex/latex/texosquery/texosquery.cfg
--- old/texmf-dist/tex/latex/texosquery/texosquery.cfg 2017-06-06 23:55:13.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.cfg 2020-02-04 23:21:35.000000000 +0100
@@ -18,27 +18,30 @@
% from your command line.
% * If the version number starts with "1.5" or "1.6" then
-% \TeXOSInvokerName must be texosquery-jre5
+% \TeXOSInvokerName must be texosquery-jre5
+% and \TeXOSQueryAllowRestricted must be commented out
%
% * If the version number starts with "1.7" then
-% \TeXOSInvokerName must be texosquery
+% \TeXOSInvokerName must be texosquery
+% and \TeXOSQueryAllowRestricted must be commented out
%
-% * If the version number starts with "1.8" then
-% \TeXOSInvokerName must be texosquery-jre8
+% * If the version number starts with "1.8" or above then
+% \TeXOSInvokerName must be texosquery-jre8
+% and \TeXOSQueryAllowRestricted should be uncommented if
+% texosquery-jre8 is on the restricted list. (This has been the
+% case since TeX Live 2017.)
% (bash users need to check that the .sh extension has been removed
% from the bash scripts.)
-\def\TeXOSInvokerName{texosquery}
+\def\TeXOSInvokerName{texosquery-jre8}
% 2. If the invoker name given in the definition above is on the
-% restricted list, uncomment the line below to allow it to be run
-% in restricted mode:
+% restricted list, the line below should be uncommented to allow it to be run
+% in restricted mode. Otherwise comment it out.
-%\TeXOSQueryAllowRestricted
+\TeXOSQueryAllowRestricted
-% Leave it commented out if the invoker name is not on the
-% restricted list.
\endinput
%%
%% End of file `texosquery.cfg'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.sty new/texmf-dist/tex/latex/texosquery/texosquery.sty
--- old/texmf-dist/tex/latex/texosquery/texosquery.sty 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.sty 2020-02-04 23:21:35.000000000 +0100
@@ -44,7 +44,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{texosquery}[2017/06/20 v1.6 (NLCT)]
+\ProvidesPackage{texosquery}[2020/02/04 v1.7 (NLCT)]
\input{texosquery}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/latex/texosquery/texosquery.tex new/texmf-dist/tex/latex/texosquery/texosquery.tex
--- old/texmf-dist/tex/latex/texosquery/texosquery.tex 2017-06-21 00:18:21.000000000 +0200
+++ new/texmf-dist/tex/latex/texosquery/texosquery.tex 2020-02-04 23:21:35.000000000 +0100
@@ -55,7 +55,7 @@
\@texosquery@restore@at
\expandafter\endinput
\fi
-\expandafter\def\csname ver(a)texosquery.tex\endcsname{2017/06/20 v1.6 (NLCT)}
+\expandafter\def\csname ver(a)texosquery.tex\endcsname{2020/02/04 v1.7 (NLCT)}
\ifx\@tracklang@pkgwarn\undefined
\ifx\PackageWarning\undefined
\def\@texosquery@warn#1{%
@@ -511,7 +511,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\TeXOSQueryInvoker{#2}}}\@texosquery@tmp
\fi
}
\def\TeXOSQueryFromFile#1#2{%
@@ -537,7 +537,7 @@
\catcode`\;=12\relax
\catcode`\%=12\relax
\everyeof{\noexpand}\relax
- \@texosquery@edef\x{\endgroup\def\noexpand#1{\texosquery@input #2 }}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{\texosquery@input #2 }}\@texosquery@tmp
\fi
}
\def\texosquerycurrency#1{%
@@ -1024,7 +1024,7 @@
\def\texosquerydefpattern#1#2{%
\begingroup
\@texosquery@pattern@shortcuts
- \@texosquery@edef\x{\endgroup\def\noexpand#1{#2}}\x
+ \@texosquery@edef\@texosquery@tmp{\endgroup\def\noexpand#1{#2}}\@texosquery@tmp
}
\def\texosqueryfmtdatetime#1{%
\def\@texosquery@fmt@dt@pattern{#1}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texosquery.tlpobj new/tlpkg/tlpobj/texosquery.tlpobj
--- old/tlpkg/tlpobj/texosquery.tlpobj 2019-02-28 04:08:01.000000000 +0100
+++ new/tlpkg/tlpobj/texosquery.tlpobj 2020-02-05 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name texosquery
category Package
-revision 44656
+revision 53676
shortdesc Cross-platform Java application to query OS information
longdesc This package provides a cross-platform Java application to
longdesc query OS information designed for use in TeX's shell escape
@@ -36,7 +36,6 @@
texmf-dist/tex/latex/texosquery/texosquery.tex
catalogue-contact-repository https://github.com/nlct/texosquery
catalogue-ctan /support/texosquery
-catalogue-date 2017-06-20 18:22:33 +0200
catalogue-license lppl1.3
catalogue-topics sys-supp
-catalogue-version 1.6
+catalogue-version 1.7
++++++ textcase.doc.tar.xz ++++++
Binary files old/doc/latex/textcase/textcase.pdf and new/doc/latex/textcase/textcase.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.doc.tlpobj new/tlpkg/tlpobj/textcase.doc.tlpobj
--- old/tlpkg/tlpobj/textcase.doc.tlpobj 2019-02-28 04:08:05.000000000 +0100
+++ new/tlpkg/tlpobj/textcase.doc.tlpobj 2019-09-15 01:55:00.000000000 +0200
@@ -1,8 +1,8 @@
name textcase.doc
category Package
-revision 15878
+revision 52092
shortdesc doc files of textcase
relocated 1
-docfiles size=43
+docfiles size=49
RELOC/doc/latex/textcase/README
RELOC/doc/latex/textcase/textcase.pdf
++++++ textcase.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textcase/textcase.sty new/tex/latex/textcase/textcase.sty
--- old/tex/latex/textcase/textcase.sty 2006-01-13 01:08:58.000000000 +0100
+++ new/tex/latex/textcase/textcase.sty 2019-09-14 23:37:06.000000000 +0200
@@ -7,16 +7,19 @@
%% textcase.dtx (with options: `package')
%%
%% Source File: textcase.dtx
-%% Copyright 1997 1998 David Carlisle
+%% Copyright 1997 1998 2019 David Carlisle
%%
%% This file may be distributed under the terms of the LPPL.
%% See 00readme.txt for details.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{textcase}
- [2004/10/07 v0.07 Text only upper/lower case changing (DPC)]
+ [2019/09/14 v1.00 Text only upper/lower case changing (DPC)]
\def\@uclcnotmath#1#2#3#4{\begingroup
#1%
\def\({$}\let\)\(%
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
\def\NoCaseChange##1{\noexpand\NoCaseChange{\noexpand##1}}%
\@nonchangecase\label
\@nonchangecase\ref
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textcase.tlpobj new/tlpkg/tlpobj/textcase.tlpobj
--- old/tlpkg/tlpobj/textcase.tlpobj 2019-02-28 04:08:05.000000000 +0100
+++ new/tlpkg/tlpobj/textcase.tlpobj 2019-09-15 01:55:00.000000000 +0200
@@ -1,6 +1,6 @@
name textcase
category Package
-revision 15878
+revision 52092
shortdesc Case conversion ignoring mathematics, etc
relocated 1
longdesc The textcase package offers commands \MakeTextUppercase and
@@ -15,7 +15,10 @@
longdesc ...\NoCaseChange{\end{foo}}...}
runfiles size=1
RELOC/tex/latex/textcase/textcase.sty
+catalogue-contact-bugs https://github.com/davidcarlisle/dpctex/issues
+catalogue-contact-repository https://github.com/davidcarlisle/dpctex
catalogue-ctan /macros/latex/contrib/textcase
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-09-14 18:41:18 +0200
catalogue-license lppl
catalogue-topics macro-supp
+catalogue-version 1.00
++++++ textpos.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/README new/doc/latex/textpos/README
--- old/doc/latex/textpos/README 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/README 2019-05-05 00:47:13.000000000 +0200
@@ -2,7 +2,7 @@
Textpos: absolute positioning of text on the LaTeX page
-------------------------------------------------------
-Version 1.8, 2016 June 7
+Version 1.9.1, 2019 April 15
This package facilitates placing boxes at absolute positions on the
LaTeX page. There are several reasons why this might be useful, but
@@ -17,6 +17,7 @@
For the change history, see textpos.html.
+The canonical CTAN URL for Textpos is <https://ctan.org/pkg/textpos>.
Textpos has a home page at <http://purl.org/nxg/dist/textpos>.
The source is hosted at bitbucket: <https://bitbucket.org/nxg/textpos>,
and there is an issues list there, for bug reports.
@@ -30,13 +31,12 @@
This package requires the services of Martin Schroeder's package
everyshi. You will need to download this package from CTAN first. See
-<http://www.tex.ac.uk/tex-archive/macros/latex/contrib/supported/ms/>
-or one of the other CTAN hosts.
+<https://www.ctan.org/pkg/everyshi>.
Licence
-------
-This software is copyright, 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray.
+This software is copyright, 1999-2019, Norman Gray.
It is released under the terms of the [LaTeX Project Public License][lppl],
which is included in the file LICENCE.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.8 new/doc/latex/textpos/VERSION-1.8
--- old/doc/latex/textpos/VERSION-1.8 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/VERSION-1.8 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-textpos-1.8, released 2016 June 7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/VERSION-1.9.1 new/doc/latex/textpos/VERSION-1.9.1
--- old/doc/latex/textpos/VERSION-1.9.1 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/textpos/VERSION-1.9.1 2019-05-05 00:47:13.000000000 +0200
@@ -0,0 +1 @@
+textpos-1.9.1, released 2019 April 15
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/examples/t1.tex new/doc/latex/textpos/examples/t1.tex
--- old/doc/latex/textpos/examples/t1.tex 2006-08-14 01:37:27.000000000 +0200
+++ new/doc/latex/textpos/examples/t1.tex 2019-05-05 00:47:13.000000000 +0200
@@ -14,6 +14,17 @@
\begin{document}
+\begin{textblock}{4}(0,0)
+ % make a grid on the page
+ \lineskip=0pt % abut boxes directly
+ \setbox1=\hbox to \TPHorizModule{\hfill \vrule height \TPVertModule}
+ \setbox0=\vbox to \TPVertModule{\noindent\copy1\copy1 \copy1 \vss\hrule}
+ \copy0
+ \copy0
+ \copy0
+ \copy0
+\end{textblock}
+
\begin{textblock}{3}(0,0)
\{3\}(0,0)
\end{textblock}
@@ -43,4 +54,13 @@
\{284.52756pt\}[0.5,0.5](50.0mm,2.5cm)
\end{textblock*}
+\TPReferencePosition{0.5,0.5}
+\begin{textblock}{1}(2,4)
+\{1\}(2,4)\hfil\break (refpos [0.5,0.5])
+\end{textblock}
+
+% The following is for testing the _experimental_ (in v1.9) discardcontent=true mode
+% \TPoptions{discardcontent=true}
+% Here is content
+
\end{document}
Binary files old/doc/latex/textpos/niepraschk-eso-pic.pdf and new/doc/latex/textpos/niepraschk-eso-pic.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos-example.tex new/doc/latex/textpos/textpos-example.tex
--- old/doc/latex/textpos/textpos-example.tex 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/textpos-example.tex 2019-05-05 00:47:13.000000000 +0200
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `example')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
+%%%% Copyright 1999-2019, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -22,14 +22,14 @@
%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
%%
%% This work consists of the files textpos.dtx and textpos.ins,
-%% and the derived file textpos.cls.
+%% and the derived file textpos.sty.
%%
%% Author: Norman Gray, norman(a)astro.gla.ac.uk.
%% Department of Physics and Astronomy, University of Glasgow, UK
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
+%% Mercurial ident: 09ee0efc21ac (1.9.1+0), 2019-04-15 22:14 +0100
%%
\documentclass{article}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/textpos/textpos.html new/doc/latex/textpos/textpos.html
--- old/doc/latex/textpos/textpos.html 2016-06-10 00:53:55.000000000 +0200
+++ new/doc/latex/textpos/textpos.html 2019-05-05 00:47:13.000000000 +0200
@@ -4,7 +4,7 @@
<title>Textpos</title>
<meta name="DC.subject" content="latex, textpos, absolute positioning"/>
<meta name="DC.title" content="Textpos"/>
-<meta name="DC.date" content="2016-06-07"/>
+<meta name="DC.date" content="2019-04-15"/>
<link rel="schema.DC" href="http://purl.org/dc/elements/1.1/"/>
<link href="https://nxg.me.uk/norman" rev="author"/>
<link type="text/css" rel="stylesheet" href="style.css"/>
@@ -20,7 +20,7 @@
<span class="distpage">The textpos home page is at
<a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>;</span>
please quote this URL rather than the URL it resolves to.</p>
-<p>Version 1.8, 2016 June 7.</p>
+<p>Version 1.9.1, 2019 April 15.</p>
</div>
<p>This package facilitates placing boxes at absolute positions on the
@@ -73,14 +73,34 @@
<p class="distpage">The <code>textpos</code> home page is at <a href="http://purl.org/nxg/dist/textpos"><code>http://purl.org/nxg/dist/textpos</code></a>, and there may be more up-to-date versions available there.</p>
<p><code>Textpos</code> is also available on CTAN:
-<a href="http://www.tex.ac.uk/tex-archive/macros/latex/contrib/textpos/">/tex-archive/macros/latex/contrib/textpos/</a></p>
+<a href="https://www.ctan.org/pkg/textpos">macros/latex/contrib/textpos/</a></p>
<h2>History</h2>
<dl>
-<dt><strong>1.8, 2016 June 5</strong></dt>
+<dt><strong>1.9.1, 2019 April 15</strong></dt>
+<dd>
+<ul>
+<li>Added the <code>\TPReferencePosition</code> command, to change the
+default reference position away from <code>[0,0]</code>.</li>
+<li>Added the <em>experimental</em>
+<code>\TPoptions{discardcontent=true}</code> option, to improve
+compatibility with TikZ
+(see <a href="https://bitbucket.org/nxg/textpos/issues/6/">issue 6 in the repository</a>).
+Note: <em>This option may change or disappear in future versions</em>, and the author would be
+particular interested to get feedback regarding it.</li>
+<li>Documentation: added discussion of the implementation difference
+between relative and absolute mode, and when one is preferable to the other.</li>
+<li>Documentation: note that the showboxes option is intended only as
+a basic aid to layout.</li>
+<li>(Version 1.9 was partially released, but it contained an
+attribution error which could be most easily fixed by a minor version bump).</li>
+</ul>
+</dd>
+
+<dt>1.8, 2016 June 5</dt>
<dd><ul>
<li>Added the <code>\TPoptions</code> command, to switch modes on and
off within the document. Various documentation tweaks.</li>
@@ -90,6 +110,8 @@
This has now been rationalised, but the change <em>may</em> change
documents which relied on the previous behaviour.
Thanks to Richard Schreiber for the detailed bug report.</li>
+<li>In this release, I switched to more conventional dotted-integer, n.m.r,
+version numbers, from the LaTeX-style model with intermediate releases denoted by letters.</li>
</ul></dd>
<dt>1.7j, 2014 January 3</dt>
@@ -225,7 +247,7 @@
<div class="signature">
<a href="http://nxg.me.uk">Norman Gray</a><br/>
-2016 June 7
+2019 April 15
</div>
</body>
Binary files old/doc/latex/textpos/textpos.pdf and new/doc/latex/textpos/textpos.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.doc.tlpobj new/tlpkg/tlpobj/textpos.doc.tlpobj
--- old/tlpkg/tlpobj/textpos.doc.tlpobj 2019-02-28 04:08:07.000000000 +0100
+++ new/tlpkg/tlpobj/textpos.doc.tlpobj 2019-05-05 01:39:07.000000000 +0200
@@ -1,12 +1,12 @@
name textpos.doc
category Package
-revision 41331
+revision 50988
shortdesc doc files of textpos
relocated 1
-docfiles size=96
+docfiles size=98
RELOC/doc/latex/textpos/LICENCE
RELOC/doc/latex/textpos/README
- RELOC/doc/latex/textpos/VERSION-1.8
+ RELOC/doc/latex/textpos/VERSION-1.9.1
RELOC/doc/latex/textpos/examples/README.examples
RELOC/doc/latex/textpos/examples/t1.tex
RELOC/doc/latex/textpos/examples/t10.tex
++++++ textpos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/textpos/textpos.sty new/tex/latex/textpos/textpos.sty
--- old/tex/latex/textpos/textpos.sty 2016-06-10 00:53:55.000000000 +0200
+++ new/tex/latex/textpos/textpos.sty 2019-05-05 00:47:13.000000000 +0200
@@ -7,7 +7,7 @@
%% textpos.dtx (with options: `package')
%% Textpos: absolute positioning of text on the page
%%%% File: textpos.dtx
-%%%% Copyright 1999, 2001-03, 2005-7, 2009-12, 2014-16., Norman Gray
+%%%% Copyright 1999-2019, Norman Gray
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -22,18 +22,18 @@
%% The Current Maintainer of this work is Norman Gray <http://nxg.me.uk>
%%
%% This work consists of the files textpos.dtx and textpos.ins,
-%% and the derived file textpos.cls.
+%% and the derived file textpos.sty.
%%
%% Author: Norman Gray, norman(a)astro.gla.ac.uk.
%% Department of Physics and Astronomy, University of Glasgow, UK
%%
%% See the file LICENCE for a copy of the LPPL.
%%
-%% Mercurial ident: 8aa202e2b283, 2016-06-07 23:52 +0100
+%% Mercurial ident: 09ee0efc21ac (1.9.1+0), 2019-04-15 22:14 +0100
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{textpos}[2016/06/07 v1.8]
-\typeout{Package: textpos 2016/06/07 1.8, absolute positioning of text on the page}
+\ProvidesPackage{textpos}[2019/04/15 v1.9.1]
+\typeout{Package: textpos 2019/04/15 1.9.1, absolute positioning of text on the page}
\newif\ifTPshowboxes
\TPshowboxesfalse
@@ -52,6 +52,9 @@
\TP@chattertrue
\DeclareOption{quiet}{\TP@chatterfalse}
\DeclareOption{verbose}{\TP@chattertrue}
+\newif\ifTP@displayholdbox
+ \TP@displayholdboxtrue
+\DeclareOption{discardcontent}{\TP@displayholdboxfalse}
\ProcessOptions
\ifTP@abspos
\RequirePackage{everyshi}
@@ -62,6 +65,8 @@
\define@key{tp}{verbose}{\csname TP@chatter#1\endcsname}
\define@key{tp}{showboxes}{\csname TPshowboxes#1\endcsname}
\define@key{tp}{showtext}{\csname TP@showtext#1\endcsname}
+\define@key{tp}{discardcontent}{\csname @tempswa#1\endcsname
+ \if@tempswa\TP@displayholdboxfalse\else\TP@displayholdboxtrue\fi}
\def\TPoptions{\setkeys{tp}}
\def\TP@xfloat#1[#2]{
\par\def\@captype{#1}%
@@ -77,7 +82,7 @@
\newbox\TP@textbox
\ifTP@abspos
\newbox\TP@holdbox % starts off void
- \AtEndDocument{\ifvoid\TP@holdbox \else \hbox{}\fi}
+ \AtEndDocument{\ifTP@displayholdbox\ifvoid\TP@holdbox \else \hbox{}\fi\fi}
\fi
\newdimen\TPHorizModule
\newdimen\TPVertModule
@@ -180,6 +185,8 @@
\globaldefs=0 }{}%
\global\let\TP@checkdummycolorpackage\relax % don't come here again
}
+\def\TP@referenceposition{0,0}
+\def\TPReferencePosition#1{\def\TP@referenceposition{#1}}
\def\textblock#1{%
\@tempdima=#1\TPHorizModule
\ifvmode\else
@@ -193,7 +200,7 @@
\par % force us back into vertical mode
\fi
\fi
- \@ifnextchar[{\TP@textblock}{\TP@textblock[0,0]}%] bracematch
+ \@ifnextchar[{\TP@textblock}{\expandafter\TP@textblock\expandafter[\TP@referenceposition]}%] bracematch
}
\def\TP@textblockstar#1{%
\setlength{\@tempdima}{#1}
@@ -205,7 +212,7 @@
Alignment may work out wrongly.}%
\par % force us back into vertical mode
\fi
- \@ifnextchar[{\TP@textblock}{\TP@textblock[0,0]}%] bracematch
+ \@ifnextchar[{\TP@textblock}{\expandafter\TP@textblock\expandafter[\TP@referenceposition]}%] bracematch
}
\expandafter\let\csname textblock*\endcsname\TP@textblockstar
\newtoks\TP@tbargs
@@ -345,19 +352,19 @@
}%
\ifTP@abspos
\ifTP@overlay
- \EveryShipout{%
+ \EveryShipout{\ifTP@displayholdbox
\global\setbox\@cclv\vbox{%
\vbox to 0pt{\ifvbox\@cclv \unvbox\@cclv \else \box\@cclv \fi \vss}%
\unvbox\TP@holdbox % TP@holdbox is now void
- }
- }%
+ }%
+ \fi}%
\else
- \EveryShipout{%
+ \EveryShipout{\ifTP@displayholdbox
\global\setbox\@cclv\vbox{%
\unvbox\TP@holdbox
\ifvbox\@cclv \unvbox\@cclv \else \box\@cclv \fi
}%
- }%
+ \fi}%
\fi
\textblockorigin{0pt}{0pt}%
\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/textpos.tlpobj new/tlpkg/tlpobj/textpos.tlpobj
--- old/tlpkg/tlpobj/textpos.tlpobj 2019-02-28 04:08:07.000000000 +0100
+++ new/tlpkg/tlpobj/textpos.tlpobj 2019-05-05 01:39:08.000000000 +0200
@@ -1,17 +1,20 @@
name textpos
category Package
-revision 41331
+revision 50988
shortdesc Place boxes at arbitrary positions on the LaTeX page
relocated 1
longdesc A package to facilitate placement of boxes at absolute
longdesc positions on the LaTeX page. There are several reasons why this
longdesc might be useful, an important one being to help the creation of
-longdesc large-format conference posters.
+longdesc large-format conference posters. The package depends on
+longdesc everyshi and keyval.
runfiles size=3
RELOC/tex/latex/textpos/textpos.sty
+catalogue-contact-bugs https://bitbucket.org/nxg/textpos/issues/
catalogue-contact-home http://purl.org/nxg/dist/textpos
+catalogue-contact-repository https://bitbucket.org/nxg/textpos/
catalogue-ctan /macros/latex/contrib/textpos
-catalogue-date 2017-04-18 05:31:40 +0200
+catalogue-date 2019-04-16 15:36:26 +0200
catalogue-license lppl1.3
catalogue-topics layout
-catalogue-version 1.8
+catalogue-version 1.9.1
++++++ texware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitype.1 new/texmf-dist/doc/man/man1/dvitype.1
--- old/texmf-dist/doc/man/man1/dvitype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvitype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH DVITYPE 1 "16 June 2015" "Web2C 2019"
+.TH DVITYPE 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/dvitype.man1.pdf and new/texmf-dist/doc/man/man1/dvitype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pooltype.1 new/texmf-dist/doc/man/man1/pooltype.1
--- old/texmf-dist/doc/man/man1/pooltype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pooltype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH POOLTYPE 1 "16 June 2015" "Web2C 2019"
+.TH POOLTYPE 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/pooltype.man1.pdf and new/texmf-dist/doc/man/man1/pooltype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/texware.doc.tlpobj new/tlpkg/tlpobj/texware.doc.tlpobj
--- old/tlpkg/tlpobj/texware.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/texware.doc.tlpobj 2020-03-04 23:53:58.000000000 +0100
@@ -1,6 +1,6 @@
name texware.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of texware
docfiles size=13
texmf-dist/doc/man/man1/dvitype.1
++++++ thaispec.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thaispec/README.md new/doc/latex/thaispec/README.md
--- old/doc/latex/thaispec/README.md 2018-03-11 21:27:11.000000000 +0100
+++ new/doc/latex/thaispec/README.md 2019-07-10 22:28:34.000000000 +0200
@@ -11,27 +11,11 @@
## Prerequisite
Thai national fonts, i.e., SIPAFonts (See https://github.com/epsilonxe/sipafonts)
-## Recommendation
-Install TeX Gyre font family (Possibly included with your TeX distribution)
-
## Usage
-If you already have TeX Gyre font family, just simply add the preamble
+Just simply add the preamble
```
\usepackage{thaispec}
```
-Otherwise
-```
-\usepackage[texgyrefont=false]{thaispec}
-```
-This package allows you to input Thai characters directly to ```.tex``` file,
-and choose any Thai fonts to be used in the document.
-In order to choose the font, please make sure that the font is system wide, then use
-```
-\usepackage[thaifont = <SYSTEM THAI FONT NAME>]{thaispec}
-```
-Moreover, the package give you options to choose any system wide fonts for
-`mainfont`, `sansfont` and `monofont` too
-
For additional usage or more options, see the documentation.
## Credits
@@ -40,7 +24,7 @@
(See http://pioneer.netserv.chula.ac.th/~wdittaya/)
## License
-Copyright 2018 Ratthaprom Promkam
+Copyright Ratthaprom Promkam
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/thaispec/thaispec.pdf and new/doc/latex/thaispec/thaispec.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thaispec.doc.tlpobj new/tlpkg/tlpobj/thaispec.doc.tlpobj
--- old/tlpkg/tlpobj/thaispec.doc.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thaispec.doc.tlpobj 2019-07-11 01:54:10.000000000 +0200
@@ -1,8 +1,8 @@
name thaispec.doc
category Package
-revision 46923
+revision 51598
shortdesc doc files of thaispec
relocated 1
-docfiles size=15
+docfiles size=22
RELOC/doc/latex/thaispec/README.md
RELOC/doc/latex/thaispec/thaispec.pdf
++++++ thaispec.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thaispec/thaispec.sty new/tex/latex/thaispec/thaispec.sty
--- old/tex/latex/thaispec/thaispec.sty 2018-03-11 21:27:11.000000000 +0100
+++ new/tex/latex/thaispec/thaispec.sty 2019-07-10 22:28:34.000000000 +0200
@@ -7,7 +7,7 @@
%% thaispec.dtx (with options: `thaispec.sty,package')
%%
%% thaispec.dtx
-%% Copyright 2018 Ratthaprom_Promkam
+%% Copyright 2019 Ratthaprom_Promkam
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -38,6 +38,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
+%% By default the package set \texttt{thaifont} to \texttt{TH Sarabun New},
+%% while set \texttt{mainfont}, \texttt{sansfont} and \texttt{monofont} to \TeX\ Gyre fonts.
+%% In case \TeX\ Gyre font family is not system wide installed, the package should be loaded
+%% with the following option:
+%% \begin{minted}[frame=single]{LaTeX}
+%% \usepackage[texgyrefont = false]{thaispec}
+%% \end{minted}
%%\begin{lstlisting}[style=tex,numbers=left]
%%\documentclass{article}
%%\usepackage{thaispec}
@@ -58,7 +65,7 @@
%%
%%\end{lstlisting}
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{thaispec}[2018/03/29 version 0.3 thaispec]
+\ProvidesPackage{thaispec}[2019/07/03 version 0.4 thaispec]
\RequirePackage{kvoptions}
\RequirePackage[no-math]{fontspec}
@@ -74,10 +81,8 @@
family=THL,
prefix=THL@
}
+
\DeclareStringOption[TH Sarabun New]{thaifont}[TH Sarabun New]
-\DeclareStringOption[TeX Gyre Termes]{mainfont}[TeX Gyre Termes]
-\DeclareStringOption[TeX Gyre Heros]{sansfont}[TeX Gyre Heros]
-\DeclareStringOption[TeX Gyre Cursor]{monofont}[TeX Gyre Cursor]
\DeclareVoidOption{math}{%
\RequirePackage{mathtools}
@@ -85,21 +90,19 @@
\RequirePackage{amsthm}
\RequirePackage{mathspec}
}
+
\DeclareVoidOption{thainum}{\renewcommand{\thesection}{\thainum{section}}}
-\DeclareBoolOption[true]{texgyrefont}
-\DeclareBoolOption[true]{thaithm}
\DeclareBoolOption[true]{sloppy}
\DeclareBoolOption[true]{thaispacing}
\DeclareBoolOption[true]{thaicaption}
+\DeclareBoolOption[false]{beamerthmcount}
\DeclareStringOption[default]{thmcount}[default]
\ProcessKeyvalOptions{THL}
-\newcommand{\testvar}{\THL@thmcount}
-
\XeTeXlinebreaklocale "th"
\XeTeXlinebreakskip = 0pt plus 0pt
\ifTHL@sloppy
@@ -107,13 +110,6 @@
\fi
\defaultfontfeatures{Mapping=tex-text}
-\ifTHL@texgyrefont
-\setmainfont{\THL@mainfont}
-\setsansfont{\THL@sansfont}
-\setmonofont{\THL@monofont}
-\else
-\setmainfont[Scale=1.23]{\THL@thaifont}
-\fi
\newfontfamily{\thaifont}[Scale=MatchUppercase,Mapping=tex-text]{\THL@thaifont}
@@ -130,14 +126,6 @@
\AtBeginDocument\captionsthai
\fi
-\@ifclassloaded{beamer}
-{}
-{%
-\ifTHL@thaispacing
-\onehalfspacing
-\fi
-}
-
\def\thaialph#1{\expandafter\thalph\csname c@#1\endcsname}
\def\thalph#1{%
\ifcase#1\or ก\or ข\or ค\or ง\or จ\or ฉ\or ช\or ซ\or
@@ -189,7 +177,45 @@
\def\today{\DTMfetchday{now}\ \dtmonth\ พ.ศ. \theyearbd}
}
-\ifTHL@thaithm
+\@ifclassloaded{beamer}
+{
+\let\theorem\relax
+\let\c@theorem\relax
+\let\lemma\relax
+\let\corollary\relax
+\let\definition\relax
+\let\example\relax
+\let\note\relax
+
+\ifTHL@beamerthmcount
+ \setbeamertemplate{theorems}[numbered]
+\fi
+
+}
+{%
+\ifTHL@thaispacing
+\onehalfspacing
+\fi
+}
+
+\@ifclassloaded{article}
+{
+\renewcommand{\THL@thmcount}{section}
+}
+{}
+
+\@ifclassloaded{book}
+{
+\renewcommand{\THL@thmcount}{chapter}
+}
+{}
+
+\@ifclassloaded{report}
+{
+\renewcommand{\THL@thmcount}{chapter}
+}
+{}
+
\@ifpackageloaded{amsthm}
{%
\IfStrEqCase{\THL@thmcount}{%
@@ -307,8 +333,8 @@
}%
}%
\xpatchcmd{\@thm}{\thm@headpunct{.}}{\thm@headpunct{}}{}{}
-}{}
-\fi
+}
+{}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thaispec.tlpobj new/tlpkg/tlpobj/thaispec.tlpobj
--- old/tlpkg/tlpobj/thaispec.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thaispec.tlpobj 2019-07-11 01:54:10.000000000 +0200
@@ -1,6 +1,6 @@
name thaispec
category Package
-revision 46923
+revision 51598
shortdesc Thai Language Typesetting in XeLaTeX
relocated 1
longdesc This package allows you to input Thai characters directly to
@@ -13,7 +13,7 @@
RELOC/tex/latex/thaispec/thaispec.sty
catalogue-contact-home https://github.com/epsilonxe/LaTeX/tree/master/Packages/thaispec
catalogue-ctan /language/thai/thaispec
-catalogue-date 2018-05-13 08:10:59 +0200
+catalogue-date 2019-07-10 16:26:41 +0200
catalogue-license lppl1.3
catalogue-topics thai xetex
-catalogue-version 0.3
+catalogue-version 0.4
++++++ thalie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/CHANGELOG.md new/doc/latex/thalie/CHANGELOG.md
--- old/doc/latex/thalie/CHANGELOG.md 2019-02-25 23:22:07.000000000 +0100
+++ new/doc/latex/thalie/CHANGELOG.md 2019-07-31 23:01:54.000000000 +0200
@@ -1,3 +1,9 @@
+* thalie 0.10b (2019-07-31)
+
+ * Minor fixes and updates of examples.
+
+ -- Louis Paternault <spalax+ctan(a)gresille.org>
+
* thalie 0.10a (2019-02-24)
* New translation: German (thanks Ekkart Kleinod).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thalie/README.md new/doc/latex/thalie/README.md
--- old/doc/latex/thalie/README.md 2019-02-25 23:22:07.000000000 +0100
+++ new/doc/latex/thalie/README.md 2019-07-31 23:01:54.000000000 +0200
@@ -5,12 +5,12 @@
to divide a play into acts and scenes, to automatically build the dramatis
personae, etc.
-- Version 0.10a (2019-02-24)
+- Version 0.10b (2019-07-31)
- Usage and installation instruction are available in the [documentation](http://mirrors.ctan.org/macros/latex/contrib/thalie/thalie.p….
- Examples
- - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.10a/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/cyrano.tex))
- - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.10a/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/domjuan.tex))
- - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.10a/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10a/examples/hamlet.tex))
+ - [French play, in verse](https://framagit.org/spalax/thalie/raw/v0.10b/examples/cyrano.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/cyrano.tex))
+ - [French play, in prose](https://framagit.org/spalax/thalie/raw/v0.10b/examples/domjuan.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/domjuan.tex))
+ - [English play, in prose](https://framagit.org/spalax/thalie/raw/v0.10b/examples/hamlet.pdf) ([source](https://framagit.org/spalax/thalie/raw/v0.10b/examples/hamlet.tex))
License
-------
Binary files old/doc/latex/thalie/thalie.pdf and new/doc/latex/thalie/thalie.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.doc.tlpobj new/tlpkg/tlpobj/thalie.doc.tlpobj
--- old/tlpkg/tlpobj/thalie.doc.tlpobj 2019-02-28 04:08:31.000000000 +0100
+++ new/tlpkg/tlpobj/thalie.doc.tlpobj 2019-08-01 05:19:05.000000000 +0200
@@ -1,6 +1,6 @@
name thalie.doc
category Package
-revision 50129
+revision 51789
shortdesc doc files of thalie
relocated 1
docfiles size=111
++++++ thalie.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thalie/thalie.sty new/tex/latex/thalie/thalie.sty
--- old/tex/latex/thalie/thalie.sty 2019-02-25 23:22:07.000000000 +0100
+++ new/tex/latex/thalie/thalie.sty 2019-07-31 23:01:54.000000000 +0200
@@ -23,7 +23,7 @@
%% and the derived file thalie.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{thalie}
- [2019/02/24 v0.10a A package to typeset drama plays]
+ [2019/07/31 v0.10b A package to typeset drama plays]
\RequirePackage{pgfkeys}
\RequirePackage{etoolbox}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thalie.tlpobj new/tlpkg/tlpobj/thalie.tlpobj
--- old/tlpkg/tlpobj/thalie.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thalie.tlpobj 2019-08-01 05:19:05.000000000 +0200
@@ -1,6 +1,6 @@
name thalie
category Package
-revision 50129
+revision 51789
shortdesc Typeset drama plays
relocated 1
longdesc The package provides tools to typeset drama plays. It defines
@@ -19,7 +19,7 @@
catalogue-contact-home https://framagit.org/spalax/thalie
catalogue-contact-repository https://framagit.org/spalax/thalie
catalogue-ctan /macros/latex/contrib/thalie
-catalogue-date 2019-02-24 23:46:17 +0100
+catalogue-date 2019-07-31 20:47:03 +0200
catalogue-license lppl1.3
catalogue-topics drama-script
-catalogue-version 0.10a
+catalogue-version 0.10b
++++++ theoremref.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.doc.tlpobj new/tlpkg/tlpobj/theoremref.doc.tlpobj
--- old/tlpkg/tlpobj/theoremref.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/theoremref.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name theoremref.doc
category Package
-revision 30640
+revision 54512
shortdesc doc files of theoremref
relocated 1
docfiles size=94
++++++ theoremref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/theoremref.tlpobj new/tlpkg/tlpobj/theoremref.tlpobj
--- old/tlpkg/tlpobj/theoremref.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/theoremref.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name theoremref
category Package
-revision 30640
+revision 54512
shortdesc References with automatic theorem names
relocated 1
longdesc The theoremref package provides variants of the \label and \ref
@@ -12,6 +12,5 @@
runfiles size=3
RELOC/tex/latex/theoremref/theoremref.sty
catalogue-ctan /macros/latex/contrib/theoremref
-catalogue-date 2018-01-06 12:14:59 +0100
-catalogue-license lpplgpl2
+catalogue-license lppl gpl2
catalogue-topics label-ref maths-theorem
++++++ thesis-ekf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-ekf/README new/doc/latex/thesis-ekf/README
--- old/doc/latex/thesis-ekf/README 2018-11-28 22:25:50.000000000 +0100
+++ new/doc/latex/thesis-ekf/README 2020-01-06 00:11:26.000000000 +0100
@@ -1,5 +1,5 @@
thesis-ekf class
-Copyright 2014-2018 by Tibor Tomacs
+Copyright 2014-2020 by Tibor Tomacs
This file may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either
@@ -22,15 +22,19 @@
=============================================================
Files TEXMF Installation folder
-------------------------------------------------------------
+ eszterhazy-logo-de.eps tex/latex/thesis-ekf/
+ eszterhazy-logo-de.pdf tex/latex/thesis-ekf/
eszterhazy-logo-en.eps tex/latex/thesis-ekf/
eszterhazy-logo-en.pdf tex/latex/thesis-ekf/
eszterhazy-logo-hu.eps tex/latex/thesis-ekf/
eszterhazy-logo-hu.pdf tex/latex/thesis-ekf/
- README doc/latex/thesis-ekf/
thesis-ekf.cls tex/latex/thesis-ekf/
+
+ README doc/latex/thesis-ekf/
+ thesis-ekf.pdf doc/latex/thesis-ekf/
+
thesis-ekf.dtx source/latex/thesis-ekf/
thesis-ekf.ins source/latex/thesis-ekf/
- thesis-ekf.pdf doc/latex/thesis-ekf/
=============================================================
Thesis class for Eszterhazy Karoly University (Eger, Hungary).
\ No newline at end of file
Binary files old/doc/latex/thesis-ekf/thesis-ekf.pdf and new/doc/latex/thesis-ekf/thesis-ekf.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj
--- old/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-ekf.doc.tlpobj 2020-02-06 01:55:07.000000000 +0100
@@ -1,8 +1,8 @@
name thesis-ekf.doc
category Package
-revision 49269
+revision 53685
shortdesc doc files of thesis-ekf
relocated 1
-docfiles size=69
+docfiles size=62
RELOC/doc/latex/thesis-ekf/README
RELOC/doc/latex/thesis-ekf/thesis-ekf.pdf
++++++ thesis-ekf.tar.xz ++++++
++++ 3429 lines of diff (skipped)
++++++ thesis-gwu.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/README.md new/doc/latex/thesis-gwu/README.md
--- old/doc/latex/thesis-gwu/README.md 2018-09-02 00:17:26.000000000 +0200
+++ new/doc/latex/thesis-gwu/README.md 2020-03-13 22:02:20.000000000 +0100
@@ -1,3 +1,6 @@
+Note: this README needs to be updated, as of 2020-03-02, but as of this commit, all LaTeX formatting is correct and confirmed by the GW library.
+
+
| Build Status | Latest Release | Version | Last Commit | Activity | CTAN | Citation |
| :--------------------------------------: | :--------------------------: | :----: | :------: | :------: | :----: | :-----: |
| [![Travis][travis_shield]][travis] | [![Github Release][release_shield]][github_release] | [![Github Version][version_shield]][github_version] | [![Github Last Commit][last_commit_shield]][github_last_commit] | [![Github commit activity][activity_shield]][github_activity] | [![CTAN][ctan_shield]][ctan] | [![DOI][ doi_shield ]][ doi ]
@@ -20,10 +23,14 @@
## [GWU Thesis](https://skulumani.github.io/2016/10/thesis-gwu)
-This is a [GWU SEAS](https://library.gwu.edu/seas) thesis template, it conforms to the University and SEAS formatting guidelines as of May 21 2018.
+This is a [GWU SEAS](https://library.gwu.edu/seas) thesis template, it conforms to the University and SEAS formatting guidelines as of March 3, 2020.
![screenshot](./doc/etd.png)
+### Overleaf
+
+The template is available on [Overleaf](https://www.overleaf.com/latex/templates/george-washington-univer….
+
### Installing
You can install this thesis class in one of two ways:
@@ -80,7 +87,7 @@
You also have total control over the various intricacies of LaTeX as it's on your system.
This also means you have the responsibility of ensuring it's working properly, and fixing it when it goes horribly wrong.
-Using and online service frees you from dealing with downloading, installing, updating, etc.
+Using an online service frees you from dealing with downloading, installing, updating, etc.
At the same time, you also are dependent on the internet and a working website in order to write your thesis.
If their website is compromised, crashes, gets DDoS'ed or the like, you may be in a difficult situation.
@@ -129,10 +136,11 @@
Simply, by removing the command or using the macros `\hidepreface` you can automatically remove them.
Your text can be included in individual `/tex/*.tex` files and included in the main document using `\include{./tex/chapter1.tex}`.
-This gives you the added benefit of using `\includeonly{chapter1.tex}` to compile only specific sections of your much larger thesis.
+This gives you the added benefit of using `\includeonly{chapter1.tex}` to compile only specific sections of your much larger thesis.
The class file already loads several common packages such as, `amsmath, graphicx, cleveref, hyperref` and others.
-You can add more packages but be aware that all package interactions **HAVE NOT** been tested.
+
+If you need to load other or more packages, we've split off a `required-packages.tex` file for you to edit; it gets `input`ted into the class file. However, be aware that all package interactions **HAVE NOT** been tested.
There is also some demonstration of typical commands, such as equations, figures, cross-referencing.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/appendix-ex.tex new/doc/latex/thesis-gwu/tex/appendix-ex.tex
--- old/doc/latex/thesis-gwu/tex/appendix-ex.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/appendix-ex.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,38 @@
+% !TEX root = ../thesis-sample.tex
+\appendix
+\doublespacing
+\chapter{Appendix}
+This is an example of an appendix.
+The only difference is the use of \verb+\appendix+ command at the start of this \texttt{tex} file.
+This automatically changes the chapter and section headings.
+
+\section{A section}
+The easiest method.
+
+\begin{equation}\label{eq:sum}
+ x_k = \frac{a_k+b_k}{2}
+\end{equation}
+
+\section{False Position}
+\lipsum[20]
+
+
+\section{Starting the Appendices}
+Actually, using appendices is quite simple. Immediately after the end
+of the last chapter and before the start of the first appendix, simply
+enter the command \verb|\appendix|. This will tell \LaTeX~to change
+how it interprets the commands \verb|\chapter|, \verb|\section|,
+\textit{etc.}
+
+Each appendix is actually a chapter, so once the \verb|\appendix|
+command has been called, start a new appendix by simply using the
+\verb|\chapter| command.
+
+Note that the \verb|\appendix| command should be called only
+once--not before the start of each appendix.
+
+All the fancy referencing and tools still work.
+You only need to add the appendix command and all will be as it should be.
+
+\chapter{Another Appendix}
+\lipsum[24]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/conclusion.tex new/doc/latex/thesis-gwu/tex/conclusion.tex
--- old/doc/latex/thesis-gwu/tex/conclusion.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/conclusion.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,4 @@
+
+\chapter{Conclusions: four contributions related to measuring trust in vaccines} \label{chap:conclusions}
+
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/discussion.tex new/doc/latex/thesis-gwu/tex/discussion.tex
--- old/doc/latex/thesis-gwu/tex/discussion.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/discussion.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,9 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Discussion} \label{chap:discussion}
+
+\section{Practical discussion: Potential for low-cost targeting and tailoring}
+
+\section{Theoretical discussion: how to increase validity for measure of complex constructs}
+
+\section{Limitations and future work: context, improve part 3, links to behavior}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/frontmatter.tex new/doc/latex/thesis-gwu/tex/frontmatter.tex
--- old/doc/latex/thesis-gwu/tex/frontmatter.tex 2018-02-03 00:05:44.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/frontmatter.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,52 +1,79 @@
% !TEX root = ../thesis-sample.tex
% --------- FRONT MATTER PAGES ---------------------
+
% Title of the thesis
-\title{Thesis GWU Example Dissertation}
+\title{What's the Title of Your Dissertation?}
+% capitalize significant words!
% Author name
-\author{Shankar Kulumani}
+\author{Your Name Here}
% Previous degrees
-\bsdepartment{Astronautical Engineering}
-\bsschool{US Air Force Academy}
-\bsgrad{May 2009}
-
-\msdepartment{Aeronautical and Astronautical Engineering}
-\msschool{Purdue University}
-\msgrad{May 2013}
-\showmsdegree % you can show or hide the MS degree line
+\bachelordegree{Your Bachelor's degree}
+\bsdepartment{Your old department}
+\bsschool{Your alma mater}
+\bsgrad{Month YYYY} % "month year"
+
+\masterdegree{M.S.}
+\msdepartment{Your graduate old department}
+\msschool{Your graduate alma mater}
+\msgrad{Month YYYY} % "month year"
+% you can show or hide the MS degree line
+\showmsdegree
% \hidemsdegree
% PhD degree commands
% Committee
\showcommitteepage % hide this page if you're doing a MS thesis
%\hidecommitteepage
-\committee{ %
-Taeyoung Lee, Associate Professor of Engineering and Applied Science,\\
-Dissertation Director\\ % remember to add a space between committee members
-Full Name, Title, \\
-Dissertation Director/Dissertation Co-Director/Committee Member
-}
+
+% define COMMITTEE information
+
+% in general, note that administrative titles are not used, instead use "professorial titles"?
% Chair must be entered separately for formatting reasons.
-\chair{Tayeoung Lee}
-\chairtitle{Associate Professor of Mechanical and Aerospace Engineering}
-% Department
-\department{Mechanical and Aerospace Engineering}
+\chair{Professor A. Person}
+\department{Insert Department}
+\chairtitle{Amazing Professor of \insertdepartment}
+
+\phdschool{The School of Engineering and Applied Science}
+
+\committee{
+% director first
+\insertchair, \insertchairtitle, Dissertation Director
+
+% remember to add a space between committee members
+\vspace{\baselineskip}
+
+% you shouldn't write "The George Washington University" every time
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
-\phdgrad{December 1, 2018}
-\defensedate{December 1, 2018}
+\vspace{\baselineskip}
+
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
+
+\vspace{\baselineskip}
+
+Full Name, Title, Dissertation Director/Dissertation Co-Director/Committee Member
+\vspace{\baselineskip}
+
+% external examiner
+Name of External Examiner, Professorial Title, Name of External University (or Name, Job Title, Name of External Company), Committee Member % include university or company of any external examiner! but still "committee member"
+}
+
+\phdgrad{March 8, 2020} % Month DD, YYYY
+\defensedate{December 18, 2019} % Month DD, YYYY
% Year of completion for copyright page and perhaps other places
-\year=2018
+\year=2020
% Copyright page
%\copyrightholder{Someone else}
% Dedication
\dedication{ %
-Include a fancy quote or dedication
+\emph{Include a fancy quote or dedication.}
}
% Acknowledgments
@@ -57,8 +84,8 @@
}
% -----------------------------------------------------------------
-% Typically only one of Preface/Foreward/Prologue would be in your thesis.
-% To choose one simply delete the others and they will automatically dissappear
+% Typically only one of Preface/Foreword/Prologue would be in your thesis.
+% To choose one simply delete the others and they will automatically disappear
% Preface
\preface{
@@ -69,14 +96,14 @@
}
\prologue{
- This is the prologe.
+ This is the prologue.
It's another front matter page that offers additional detail into your work.
Typically, only one (preface OR prologue OR foreword) is used.
You can remove the other sections by deleting them inside \texttt{tex/frontmatter.tex} or using the appropriate show or hide commands.
}
\foreword[2]{
- This is the forword.
+ This is the foreword.
It's another front matter page that offers additional detail into your work.
Typically, only one (preface OR prologue OR foreword) is used.
You can remove the other sections by deleting them inside \texttt{tex/frontmatter.tex} or using the appropriate show or hide commands.
@@ -91,11 +118,11 @@
\showdedication
\showacknowledgments
\showpreface
-\showprologue
-\showforeword
+\hideprologue
+\hideforeword
-% ------------ TABLE OF CONTENTS ----------------------
% Commands to hide or show lists of figures, tables, etc.
+\showtableofcontents
\showlistoffigures
\showlistoftables
\hidenomenclature
@@ -103,12 +130,13 @@
% --------- ACRONYMS and SYMBOLS ------------------------------
% TODO Deprecate the entire acronym package and switch to glossaries
-% You can either use the acronymn or glossaries package (both work)
+% You can either use the acronym or glossaries package (both work)
% Definition of any abbreviations used.
\abbreviations{
\acro{CRTBP}{Circular Restricted Three Body Problem}
\acro{NSA}{National Security Agency}
\acro{SSME}{Space Shuttle Main Engine}
+ \acro{HIDEME}{Hide the pages for One of These Abbreviation Systems; this is from abbreviations}
}
% call an abbreviation using \ac{abbrev}
@@ -117,9 +145,9 @@
\acro{J}{Moment of Inertia}
}
-% if you want acronymn (simpler) then change these to show
-\hidelistofabbreviations
-\hidelistofsymbols
+% if you want acronym (simpler) then change these to show
+\showlistofabbreviations
+\showlistofsymbols
% if you want glossaries (more powerful) then leave above as hide
% GLOSSARIES package options - automatically turns off front pages from acronym package
@@ -137,6 +165,8 @@
% acronyms defined in glossaries
\newabbreviation{crtbp}{CRTBP}{Circular Restricted Three Body Problem}
\newabbreviation{lidar}{LIDAR}{Light Detection and Ranging}
+\newabbreviation{hideme}{HIDEME}{Hide One of These Abbreviation Systems; this is from Glossaries}
+
% defining abbreviations like this allows for autocompletion
\newglossaryentry{filo}{
name={FILO},
@@ -172,6 +202,7 @@
sort=F,
description={External Force}
}
+
% Some abstract text
\abstract{
This is the abstract.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/intro-example.tex new/doc/latex/thesis-gwu/tex/intro-example.tex
--- old/doc/latex/thesis-gwu/tex/intro-example.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/intro-example.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,102 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Now we know what they mean by ``advanced'' tactical training.} \label{chap:intro}
+
+Here's an acronym \ac{CRTBP} and a symbol \ac{F}, followed by some random text.
+Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F}.
+Now what are the possibilities of warp drive? Cmdr Riker's nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That's why the transporter's biofilters couldn't extract it. The vertex waves show a K-complex corresponding to an REM state. The engineering section's critical. Destruction is imminent. Their robes contain ultritium, highly explosive, virtually undetectable by your transporter.
+
+Deflector power at maximum. Energy discharge in six seconds. Warp reactor core primary coolant failure. Fluctuate phaser resonance frequencies. Resistance is futile. Recommend we adjust shield harmonics to the upper EM band when proceeding. These appear to be some kind of power-wave-guide conduits which allow them to work collectively as they perform ship functions. Increase deflector modulation to upper frequency band.
+
+\section{Float environments}
+There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
+In addition, it offers the ability to ensure that this template actually follows the guidelines.
+
+\subsection{Figures}\label{ssec:figures}
+
+Here is a figure as shown in~\cref{fig:picard}.
+Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
+Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
+The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
+ \caption[Damage report!]{I'm afraid I still don't understand, sir.\label{fig:picard}}
+\end{figure}
+
+\subsection{Tables}\label{ssec:tables}
+
+Here's a table in~\cref{tab:table}
+
+\begin{table}
+\begin{center}
+ \begin{tabular}{ | l | l | l | p{5cm} |}
+ \hline
+ Day & Min Temp & Max Temp & Summary \\ \hline
+ Monday & 11C & 22C & A clear day with lots of sunshine.
+ However, the strong breeze will bring down the temperatures. \\ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ across most of Scotland and Northern Ireland,
+ but rain reaching the far northwest. \\ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning.
+ Conditions will improve by early afternoon and continue
+ throughout the evening. \\
+ \hline
+ \end{tabular}
+ \caption[Short caption for table]{Long caption for text \label{tab:table}}
+ \end{center}
+\end{table}
+
+\section{References and Citation}
+Here's we'll fill this section with some more interesting Star Trek text.
+Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
+
+Finally, we'll add a subfigure to demonstrate it's proper use.
+Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
+To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
+Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
+Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
+Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
+The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
+\begin{figure}[htbp]
+ \centering
+ \begin{subfigure}[htbp]{0.5\textwidth}
+ \includegraphics[width=\textwidth]{figures/file_extensions.png}
+ \caption{File Extensions} \label{fig:ext}
+ \end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
+ \begin{subfigure}[htbp]{0.5\textwidth}
+ \includegraphics[width=\textwidth]{figures/orbital_mechanics.png}
+ \caption{Kerbal Space Program} \label{fig:ksp}
+ \end{subfigure}
+ \caption[XKCD]{Some words of wisdom from Randall Munroe}
+ \label{fig:xkcd}
+\end{figure}
+
+\subsection{References}
+
+Lots of famous people tend to write famous papers~\cite{newton1999}.
+Were they famous because or in-spite of their papers?
+Regardless, they're famous now and we all should read them.
+Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
+
+\section{Math}
+
+Here are some nice equations~\cref{prob_def,prob_def_constrained}
+Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
+\begin{align}
+\label{prob_def}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
+\end{align}
+
+Unidentified vessel travelling at sub warp speed, bearing 235.7. Fluctuations in energy readings from it, Captain. All transporters off. A strange set-up, but I'd say the graviton generator is depolarized. The dark colourings of the scrapes are the leavings of natural rubber, a type of non-conductive sole used by researchers experimenting with electricity. The molecules must have been partly de-phased by the anyon beam.
+\begin{align}
+\label{prob_def_constrained}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
+\end{align}
+
+We're acquainted with the wormhole phenomenon, but this... Is a remarkable piece of bio-electronic engineering by which I see much of the EM spectrum ranging from heat and infrared through radio waves, et cetera, and forgive me if I've said and listened to this a thousand times. This planet's interior heat provides an abundance of geothermal energy. We need to neutralize the homing signal.
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/intro.tex new/doc/latex/thesis-gwu/tex/intro.tex
--- old/doc/latex/thesis-gwu/tex/intro.tex 2017-12-22 00:58:11.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/intro.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,102 +1,15 @@
% !TEX root = ../thesis-sample.tex
-\chapter{Now we know what they mean by ``advanced'' tactical training.} \label{chap:intro}
+\chapter{Introduction} \label{chap:intro}
Here's an acronym \ac{CRTBP} and a symbol \ac{F}, followed by some random text.
Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F}.
-Now what are the possibilities of warp drive? Cmdr Riker's nervous system has been invaded by an unknown microorganism. The organisms fuse to the nerve, intertwining at the molecular level. That's why the transporter's biofilters couldn't extract it. The vertex waves show a K-complex corresponding to an REM state. The engineering section's critical. Destruction is imminent. Their robes contain ultritium, highly explosive, virtually undetectable by your transporter.
-
-Deflector power at maximum. Energy discharge in six seconds. Warp reactor core primary coolant failure. Fluctuate phaser resonance frequencies. Resistance is futile. Recommend we adjust shield harmonics to the upper EM band when proceeding. These appear to be some kind of power-wave-guide conduits which allow them to work collectively as they perform ship functions. Increase deflector modulation to upper frequency band.
-
-\section{Float environments}
-There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
-In addition, it offers the ability to ensure that this template actually follows the guidelines.
-
-\subsection{Figures}\label{ssec:figures}
-
-Here is a figure as shown in~\cref{fig:picard}.
-Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
-Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
-The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
-
-\begin{figure}
- \centering
- \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
- \caption[Damage report!]{I'm afraid I still don't understand, sir.\label{fig:picard}}
-\end{figure}
-
-\subsection{Tables}\label{ssec:tables}
-
-Here's a table in~\cref{tab:table}
-
-\begin{table}
-\begin{center}
- \begin{tabular}{ | l | l | l | p{5cm} |}
- \hline
- Day & Min Temp & Max Temp & Summary \\ \hline
- Monday & 11C & 22C & A clear day with lots of sunshine.
- However, the strong breeze will bring down the temperatures. \\ \hline
- Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
- across most of Scotland and Northern Ireland,
- but rain reaching the far northwest. \\ \hline
- Wednesday & 10C & 21C & Rain will still linger for the morning.
- Conditions will improve by early afternoon and continue
- throughout the evening. \\
- \hline
- \end{tabular}
- \caption[Short caption for table]{Long caption for text \label{tab:table}}
- \end{center}
-\end{table}
-
-\section{References and Citation}
-Here's we'll fill this section with some more interesting Star Trek text.
-Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
-
-Finally, we'll add a subfigure to demonstrate it's proper use.
-Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
-To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
-Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
-Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
-Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
-The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
-\begin{figure}[htbp]
- \centering
- \begin{subfigure}[htbp]{0.5\textwidth}
- \includegraphics[width=\textwidth]{figures/file_extensions.png}
- \caption{File Extensions} \label{fig:ext}
- \end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
- \begin{subfigure}[htbp]{0.5\textwidth}
- \includegraphics[width=\textwidth]{figures/orbital_mechanics.png}
- \caption{Kerbal Space Program} \label{fig:ksp}
- \end{subfigure}
- \caption[XKCD]{Some words of wisdom from Randall Munroe}
- \label{fig:xkcd}
-\end{figure}
-
-\subsection{References}
-
-Lots of famous people tend to write famous papers~\cite{newton1999}.
-Were they famous because or in-spite of their papers?
-Regardless, they're famous now and we all should read them.
-Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
-
-\section{Math}
-
-Here are some nice equations~\cref{prob_def,prob_def_constrained}
-Run a manual sweep of anomalous airborne or electromagnetic readings. Radiation levels in our atmosphere have increased by 3,000 percent. Electromagnetic and subspace wave fronts approaching synchronization. What is the strength of the ship's deflector shields at maximum output? The wormhole's size and short period would make this a local phenomenon. Do you have sufficient data to compile a holographic simulation?
-\begin{align}
-\label{prob_def}
-&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
-&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
-\end{align}
-
-Unidentified vessel travelling at sub warp speed, bearing 235.7. Fluctuations in energy readings from it, Captain. All transporters off. A strange set-up, but I'd say the graviton generator is depolarized. The dark colourings of the scrapes are the leavings of natural rubber, a type of non-conductive sole used by researchers experimenting with electricity. The molecules must have been partly de-phased by the anyon beam.
-\begin{align}
-\label{prob_def_constrained}
-&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
-&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
-\end{align}
-
-We're acquainted with the wormhole phenomenon, but this... Is a remarkable piece of bio-electronic engineering by which I see much of the EM spectrum ranging from heat and infrared through radio waves, et cetera, and forgive me if I've said and listened to this a thousand times. This planet's interior heat provides an abundance of geothermal energy. We need to neutralize the homing signal.
-
+\section{Opinions of socio-technical systems can affect system success}
+asdf
+\section{Vaccination: urgent social failure of technology}
+asdf
+\section{Contributions}
+asdf
+\section{Layout}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/litreview.tex new/doc/latex/thesis-gwu/tex/litreview.tex
--- old/doc/latex/thesis-gwu/tex/litreview.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/litreview.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,26 @@
+% !TEX root = ../thesis-sample.tex
+\chapter{What can we learn from prior literature on measuring trust in vaccines on social media?}\label{chap:litreview}
+This section details four items in the literature that impact our contributions. First, it details the aspects of trust in vaccines that affect our contribution to measure it on social media; next it presents synergistic opportunity to incorporate surveys into social media monitoring; third it describes checklist of construct validity; last it shows gap in discriminant validity.
+\section{Trust in vaccines is complex but valuable to measure}
+asdf
+\section{Social media monitoring has speed, scale; surveys have construct validity}
+asdf
+\section{Combining two data sources to measure something involves a discussion of construct validity}
+
+Four steps relating to training data
+\subsection{Clear definition and operationalization}
+asdf
+\subsection{Reliability}
+asdf
+\subsection{Face validity}
+asdf
+\subsection{Content validity}
+asdf
+\subsection{Predictive and concurrent validity is well-understood in social media monitoring}
+asdf
+\subsection{Social media research often stops with convergent validity}
+sadf
+\subsection{Discriminant validity is a gap in social media monitoring}
+asdf
+\section{The literature contains three gaps:}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/manual-ex.tex new/doc/latex/thesis-gwu/tex/manual-ex.tex
--- old/doc/latex/thesis-gwu/tex/manual-ex.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/manual-ex.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,322 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Leveraging the household sector’s ideas} \label{chap:ECAST}
+
+\section{Introduction}
+A new paradigm of innovation recognizes the efforts of individuals within the general public, or “household sector” (von Hippel, 2017), who feel strongly enough about a problem to create and share their ideas for free. Scholars theorize that this process is highly personal or “local” (von Hippel, 2017, 2005). Individuals view—or formulate (Lüthje et al., 2005; Shah and Tripsas, 2007)—the problem through their perceptions and experiences. Their choice of knowledge to apply is also informed by their background (Franke et al., 2013; Jeppesen and Lakhani, 2010). The resulting combinations of formulations and knowledge can be valuable to those who cannot draw on the same material (Afuah and Tucci, 2012; Franke et al., 2013; Prahalad, 2004)—they are “distant” from it. Additionally, these individuals represent a significant portion of the general public (de Jong, 2016; von Hippel et al., 2012, 2011), contributing across a wide range of domains like baby products (Poetz and Schreier, 2012), mountain bikes (Lüthje et al., 2005), and medical devices (Lettl et al., 2009; von Hippel, 2017).
+
+Despite the household sector’s potential for capability and capacity, organizations have struggled to leverage them alongside their internal efforts. In fact, organizations judge most contributions from the innovative public to be of little value. For example, BP’s call for ideas after the Deepwater Horizon oil spill in the Gulf of Mexico received 120,000 contributions (Gulf Coast Ecosystem Restoration Council, 2010) to seal the well or clean up the affected waterways (Goldenberg, 2011). According to BP, however, the public’s effort “yielded very little in terms of results” (Goldenberg, 2011) and did not translate into a solution that went “all the way” (Alexy et al., 2012, p. 117) to implementation. These scenarios highlight the current inability to bridge the public-organization gap successfully. Organizations can prompt a large amount of free effort from the public. However, their efforts are wasted if the problem is mismatched for the public’s strengths, or their resulting contributions are not—or cannot—be translated into the organization’s context.
+
+This work is an attempt to bridge that gap. The literature has theorized that the public’s local knowledge (Afuah and Tucci, 2012; Franke et al., 2013; Jeppesen and Lakhani, 2010) and local formulation (Lüthje et al., 2005) of the problem are drivers for quality. Scholars have also explored how a contribution that is distant or lacks enough depth can be misjudged (di Gangi et al., 2010; di Gangi and Wasko, 2009; Piezunka and Dahlander, 2014), even if it solves the problem. In this paper, we studied how the constructs of local knowledge, local formulation, and depth influence the substance of the public’s contributions, based on their impact within the focal organization.
+
+To answer this question, we selected a setting where the public’s contributions to a problem were meaningful to the focal organization. National Aeronautics and Space Administration (NASA)’s Asteroid Initiative was a program tasked with consolidating asteroid activities in the agency, as well as engaging with individuals and entities outside of the NASA’s established planetary defense community. We observed this program and its events across several years. Here, our data captured NASA’s change in perception of public contributions over time. Our data also captured the public’s solving processes and contributions to a mission design problem in a citizen forum—an event that played a crucial role in the perception change. Our analysis linked these two: we connected the public’s solving dynamics to this change in perception by unpacking how and when the public created contributions that were deemed substantive by NASA.
+
+While current theory implies direct links between the public’s problem-solving strengths and the substance of their contribution, we find only partially support for these relationships. As anticipated by theory, an individual’s use of their local knowledge correlated directly to the substance of their contribution. In contrast, the impact of an individual’s local formulation was more nuanced. Local formulation—reformulating the NASA problem in their own terms—increased the substance of their contribution because it increased the depth of said contribution. That is, the relationship between substance and formulation was fully mediated by depth of the contribution. Lastly, the interaction of local knowledge and local formulation consistently reduced the likelihood of a substantive contribution.
+
+Our findings contribute to understanding how organizations can leverage the public’s problem-solving efforts alongside their own (Chatterji and Fabrizio, 2011; Goucher-Lambert and Cagan, 2019; Lifshitz-Assaf, 2018; Lüthje et al., 2005; Szajnfarber and Vrolijk, 2018). We unpacked how the public created their most valuable contributions (Acar, 2019; Stock et al., 2016) to a problem that the focal organization considered important. We also studied the interaction of problem-solving constructs that are rarely examined at the same time (Gralla et al., 2016). More broadly, this work is an existence proof that the free innovation paradigm can be directed.
+
+We organized this paper as follows: first, we review the literature on local knowledge, local formulation, and depth of contributions. Next, we describe our setting, the data stemming from it, as well as the methods used in our analysis. Then, we present our results, and discuss these in the context of our setting and the existing literature. We conclude by explaining the limitations of the study, as well as outlining potential areas of future work.
+
+
+
+\section{General Usage}
+The way to invoke usage of this template is to put
+\begin{verbatim}
+\documentclass{thesis-gwu.cls}
+\end{verbatim}
+at the beginning of your preamble.
+This can also work if the \texttt{thesis-gwu.cls} file is not in the same directory as your \texttt{.tex} file.
+To do so, just give the relative path.
+\begin{verbatim}
+\documentclass{./tex/thesis-gwu.cls}
+\end{verbatim}
+
+Much like a usual article or report in \LaTeX, the user specifies the primary information about the document in the preamble with commands like
+\begin{verbatim}
+\author{Shankar Kulumani}
+\chair{Taeyoung Lee}
+\end{verbatim}
+At the beginning of the document, the title page will automatically be created and inserted at the beginning of the document.
+If you forget to declare any of the required fields, it will generate a title page with a message such as ``Insert an author!''
+
+However, the template does a lot more in the preamble than just create a title page.
+The preamble (that is, whatever comes before \texttt{begin\{document\}} in the primary \texttt{.tex} file) is also the place for the user to specify a dedication, any acknowledgments, a foreword, \textit{etc.}
+This is done in a manner very similar manner to declaring the author, title, and so on. Suppose that someone wants to have a simple dedication ``To Mom'', the following command is all that is needed.
+\begin{verbatim}
+\dedication{To Mom}
+\end{verbatim}
+This will cause the document to have a dedication page with the
+corresponding text.
+If the \texttt{dedication} command is not present, there will not be a dedication page.
+All the work of either having or not having a dedication has been compressed into a single command!
+Things other than simple text \emph{are} allowed in the dedication, so feel free to put equations or whatever inside there.
+There are a few more commands that can be used to customize the appearance of the dedication page, and also for the other preamble text pages, but that is left to~\cref{ssec:dedication}.
+
+\section{Front Matter}
+The \LaTeX term ``frontmatter'' refers to all of the pages that occur before the beginning of the first chapter.
+It is usually made clear to the reader because the pages in the front matter are numbered with lower-case Roman numerals instead of Arabic numerals.
+
+The present template, \texttt{thesis-gwu.cls} attempts to remove as much work associated with the front matter as possible.
+The template inserts all of the front matter pages automatically, so that there is
+not even a need to use a command like \verb+\maketitle+.
+The first thing after \verb+\begin{document}+ should be the start of the first
+chapter.
+
+\subsection{Identifiers}
+The template is not able to read minds, of course, so there needs to be some way of inputting the relevant information.
+This section covers how to specify the author, title, and so on.
+For the most part, this works just like any other \LaTeX~document, but a dissertation has a few more identifiers than most documents (How many books or reports have a
+committee?).
+So there are a few extra commands provided by this template, and they work \emph{almost} exactly like the standard commands.
+
+\begin{table}
+ \caption{ \label{tab:identifiers}
+ List of all identifier commands}
+ \centering
+ \small
+ \begin{tabular}{l @{\hspace{16pt}} l @{\hspace{16pt}} p{6cm}}
+ \hline \hline
+ \textsc{Item} & \textsc{Usage} & \textsc{Comment} \\
+ \hline
+ Author & \verb|\author{...}|
+ & Works as in standard \LaTeX \\
+ Chair & \verb|\chair{...}|
+ & Name of chair \emph{without} any title or affiliation. This
+ appears only on the abstract page, and only if there is no
+ co-chair. \\
+ Co-chair & \verb|\cochair{...}|
+ & Names of all co-chairs \emph{without} any titles or
+ affiliations. This appears only on the abstract page. Note
+ that by convention, it is not chair \emph{and} co-chair, but
+ just two co-chairs. \\
+ Committee & \verb|\committee{...}|
+ & Formatted names of committee members \emph{with} the
+ appropriate titles and university names. This will appear
+ only on the title page. \\
+ Department & \verb|\department{...}|
+ & Title of department of student \\
+ Title & \verb|\title{...}|
+ & Works as in standard \LaTeX \\
+ Year & \verb|\year=2012|
+ & Year that dissertation will be \emph{completed} \\
+ \hline \hline
+ \end{tabular}
+\end{table}
+
+A full list of the identifiers is given in Table \cref{tab:identifiers}.
+You're free to adjust/delete these commands as desired.
+
+
+
+\subsection{Frontispiece and Copyright}
+
+By default, the template assumes that there should be a copyright page, and the copyright holder is the author.
+To prevent the copyright page from appearing, use the command \verb|\hidecopyright|.
+To assign the copyright to someone other than the author, use the following command.
+\begin{verbatim}
+\copyrightholder{Someone Else}
+\end{verbatim}
+
+
+\subsection{Text Pages} \label{ssec:dedication}
+The handling of the first few pages after the title page is one of the best features of this template.
+The pages that occur between the copyright page and the abstract page all consist of short pieces of text that are usually a single paragraph.
+The text for each of these pages is set up using a command of the same name.
+Generally, only one of the front matter pages is used.
+\begin{verbatim}
+\foreword{This is going to be the best dissertation ever.}
+\end{verbatim}
+Usually the contents of each of these pages will be longer than a single sentence, and thus it should be noted that each of these commands allows most types of \LaTeX~input.
+For example, the following is perfectly acceptable input--at least as far as the template is concerned.
+\begin{verbatim}
+\foreword{This is going to be the \emph{best}. \\
+ \begin{center} Really, really. \end{center}}
+\end{verbatim}
+
+As I mentioned before, a given page will appear in the document if and only if the corresponding command is used.
+The order in which the pages appear does not depend on the order the commands are used in the preamble.
+You can also prevent the pages from appearing by using commands like \verb|\hideforeword|.
+
+The style of each page can also be set by the user.
+By default, each page will appear with a bold, italic heading corresponding to the name
+of the page.
+However, there are five other formats, which can be controlled using an optional argument.
+For example, the following command creates a dedication page with no heading (\textit{i.e.}~it does not say ``Dedication'' on the page) but with lines above and below the dedication text.
+\begin{verbatim}
+\dedication[4]{To Mom}
+\end{verbatim}
+A complete list of the available styles is given in \cref{tab:fronstyle}.
+The style of each page can be set independently, but it is also possible to change which style is used by default.
+\begin{verbatim}
+\frontpagestyle{6}
+\end{verbatim}
+This would make all of the commands that were called without optional
+inputs to create pages using style 6.
+
+\begin{table}
+ \caption{ \label{tab:fronstyle}
+ List of styles for frontmatter text pages}
+ \centering
+ \begin{tabular}{c @{\hspace{16pt}} p{8cm}}
+ \hline \hline
+ \textsc{Style} & \textsc{Description} \\
+ \hline
+ 1 & Justified text with no header or lines \\
+ 2 & Justified text with bold italic header and no lines \\
+ 3 & Justified text, capitalized header, no lines \\
+ 4 & Justified text with lines and no header \\
+ 5 & Justified text with bold italic header and lines \\
+ 6 & Justified text with capitalized header and lines \\
+ other & Centered text with no header or lines \\
+ \hline \hline
+ \end{tabular}
+\end{table}
+
+
+
+\subsection{Lists of Things} \label{ssec:lists}
+Suffice it to say that this template handles the Table of Contents appropriately, but this section is also meant to address the List of Figures, List of Tables, \textit{etc}. According to the guidelines, a corresponding list must appear if there is more than one figure, table, map, program, illustration, or appendix.
+The template assumes that the dissertation will contain at least two figures and tables.
+If, for example, there is only one figure,
+\begin{verbatim}
+\hidelistoffigures
+\end{verbatim}
+must be put in the preamble.
+There are similar commands to hide/show all of the front matter pages.
+These can be used at will as desired.
+
+\subsection{Glossary of Terms}\label{ssec:glossary}
+Here is an example.
+\Gls{linux} is a computer operating system, and its completely free and open.
+
+A \gls{matrix}, denoted \gls{M}.
+Lots of \glspl{matrix}.
+\Glspl{matrix} are a rectangular array of quantities.
+No indexing, linking, or formatting: \glsentrytext{matrix}.
+The identity \gls{matrix}['s] diagonal consists of ones.
+
+First use: \gls{filo}.
+Next use: \gls{filo}.
+Full form: \acrfull{filo}.
+
+
+\subsection{Acronymns and Symbols}\label{ssec:acronymns}
+The other type of list that can occur is for abbreviations of various types.
+This is a somewhat convenient feature, particularly there are a lot of acronyms in the dissertation.
+This template utilizes the \texttt{acronym} or \texttt{glossaries} packages, but eventually I would like to migrate to the use of \texttt{glossaries} which is continuing to be supported and deprecate the use of \texttt{acronym}, for now both are supported.
+
+\subsubsection{\texttt{acronymn} usage - try to avoid using this as it's not the best}
+In the preamble put a command like the following.
+\begin{verbatim}
+\abbreviations{
+ \acro{CFD}{Computational Fluid Dynamics}
+ \acro{LOA}{List of Abbreviations}
+ \acro{H2O}[$\mathrm{H_2O}$]{water}}
+\end{verbatim}
+This will define a bunch of abbreviations that can be used.
+When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
+This will automatically spell out what the abbreviation stands for on the first use and only print out the abbreviation on subsequent uses.
+
+\subsubsection{\texttt{glossaries} usage - much improved and more powerful}
+In addition, you can utilize the much more powerful \texttt{glossaries} package.
+You can define symbols, acronymns, or full glossary entries as desired.
+Each acronymn is defined using the following:
+\begin{verbatim}
+\newacronym{crtb}{CRTBP}{Circular Restricted Three Body Problem}
+\end{verbatim}
+Here we can use an acronym, such as \gls{crtbp}.
+Or display the full name, \gls{crtbp}.
+
+\section{Float environments}
+There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
+In addition, it offers the ability to ensure that this template actually follows the guidelines.
+
+\subsection{Figures}\label{ssec:figures}
+
+Here is a figure as shown in~\cref{fig:picard}.
+Notice how we're using the fancy referencing offered by the \verb+cleveref+ package.
+Instead of using the normal~\verb+\ref+ command we instead use~\verb+\cref+.
+The magic of \LaTeX automatically figures out that the previous reference points to a figure while~\cref{ssec:figures} points to a section.
+
+\begin{figure}
+ \centering
+ \includegraphics[width=0.5\textwidth]{figures/picard_yes.jpg}
+
+ \caption[Damage report!]{Glad to have a thesis class\label{fig:picard}}
+\end{figure}
+
+Here's another figure that demonstrates the use of \texttt{tikz} and the externalization library.
+\begin{figure}
+ \centering
+ \begin{tikzpicture}
+ \begin{axis}[
+ xlabel={$x$},
+ ylabel={$y$},
+ ]
+ \addplot {x^2};
+ \end{axis}
+ \end{tikzpicture}
+ \caption{Externajhjhjhjjhi\label{fig:tikz}}
+\end{figure}
+
+\subsection{Tables}\label{ssec:tables}
+
+Here's a table in~\cref{tab:table}
+
+\begin{table}
+\begin{center}
+ \begin{tabular}{ | l | l | l | p{5cm} |}
+ \hline
+ Day & Min Temp & Max Temp & Summary \\ \hline
+ Monday & 11C & 22C & A clear day with lots of sunshine.
+ However, the strong breeze will bring down the temperatures. \\ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ across most of Scotland and Northern Ireland,
+ but rain reaching the far northwest. \\ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning.
+ Conditions will improve by early afternoon and continue
+ throughout the evening. \\
+ \hline
+ \end{tabular}
+ \caption[Short caption for table]{Long caption for text \label{tab:table}}
+ \end{center}
+\end{table}
+
+\section{References and Citation}
+Finally, we'll add a subfigure to demonstrate it's proper use.
+Many people use the package~\verb+subfigure+ but this is in fact, quite wrong.
+To begin, the~\verb+subfigure+ package has been deprecated, which one can check by going to \url{https://www.ctan.org/pkg/subfigure}{CTAN}.
+Instead, everyone should be using~\verb+subcaption+, just as this class file is already doing.
+Here, in~\cref{fig:xkcd}, we see two subfigures encapsulated in a larger figure environment.
+Luckily, with our fancy referencing we have access to both~\cref{fig:ext,fig:ksp} using the same commands.
+The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
+
+
+\subsection{References}
+
+Lots of famous people tend to write famous papers~\cite{newton1999}.
+Were they famous because or in-spite of their papers?
+Regardless, they're famous now and we all should read them.
+Certain people are so famous and do such great work that they invent a whole new field of study with a single paper~\cite{kalman1960,shannon1949}
+
+\section{Math}
+
+Here are some nice equations~\cref{prob_def,prob_def_constrained}
+\begin{align}
+\label{prob_def}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\max_{s\subset W}\ P_{tr}(s) = \prod_{i=1}^{l-1} P_{tr}(s_j, s_{j+1}) \nonumber
+\end{align}
+
+Here's another equation.
+\begin{align}
+\label{prob_def_constrained}
+&\min_{s\subset W}\ J(s) = \sum_{i=1}^{l-1} H(s_j, s_{j+1}) \\
+&\text{subject to} \ P_{tr}(s)>\epsilon_{tr} \nonumber
+\end{align}
+
+
+
+
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/manual.tex new/doc/latex/thesis-gwu/tex/manual.tex
--- old/doc/latex/thesis-gwu/tex/manual.tex 2018-07-10 23:07:37.000000000 +0200
+++ new/doc/latex/thesis-gwu/tex/manual.tex 2020-03-13 22:02:20.000000000 +0100
@@ -214,7 +214,7 @@
\acro{H2O}[$\mathrm{H_2O}$]{water}}
\end{verbatim}
This will define a bunch of abbreviations that can be used.
-When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
+When you want to use one of the acronyms within the text, simply use the \verb|\ac| command to refer to the abbreviation you want.
This will automatically spell out what the abbreviation stands for on the first use and only print out the abbreviation on subsequent uses.
\subsubsection{\texttt{glossaries} usage - much improved and more powerful}
@@ -224,9 +224,14 @@
\begin{verbatim}
\newacronym{crtb}{CRTBP}{Circular Restricted Three Body Problem}
\end{verbatim}
-Here we can use an acronym, such as \gls{crtbp}.
+Here we can use an acronym, such as \gls{crtbp}.
Or display the full name, \gls{crtbp}.
+Here's an \verb|\ac| acronym \ac{CRTBP}, followed by some random text, but \ac{HIDEME}
+
+
+Let's use an acronym from the \texttt{glossaries} package, \acrfull{crtbp} and \gls{F} but \acrfull{hideme}.
+
\section{Float environments}
There are many possible float enviornments, and this section will serve as an introduction and demonstration of some of them.
In addition, it offers the ability to ensure that this template actually follows the guidelines.
@@ -263,22 +268,25 @@
Here's a table in~\cref{tab:table}
\begin{table}
-\begin{center}
+ \centering
+ %\resizebox{\textwidth}{!}{
\begin{tabular}{ | l | l | l | p{5cm} |}
\hline
- Day & Min Temp & Max Temp & Summary \\ \hline
+ Day & Min Temp & Max Temp & Summary \\
+ \hline
Monday & 11C & 22C & A clear day with lots of sunshine.
- However, the strong breeze will bring down the temperatures. \\ \hline
- Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
+ However, the strong breeze will bring down the temperatures. \\
+ \hline
+ Tuesday & 9C & 19C & Cloudy with rain, across many northern regions. Clear spells
across most of Scotland and Northern Ireland,
- but rain reaching the far northwest. \\ \hline
- Wednesday & 10C & 21C & Rain will still linger for the morning.
+ but rain reaching the far northwest. \hfill \\
+ \hline
+ Wednesday & 10C & 21C & Rain will still linger for the morning. \hfill
Conditions will improve by early afternoon and continue
- throughout the evening. \\
+ throughout the evening.\\
\hline
\end{tabular}
\caption[Short caption for table]{Long caption for text \label{tab:table}}
- \end{center}
\end{table}
\section{References and Citation}
@@ -291,7 +299,7 @@
The key thing to note from~\cref{fig:ext} is that trustworthiness reaches a maximum for those using~\verb+.tex+.
\begin{figure}[htbp]
\centering
- \begin{subfigure}[htbp]{0.5\textwidth}
+ \begin{subfigure}[htbp]{0.4\textwidth}
\includegraphics[width=\textwidth]{figures/file_extensions.png}
\caption{File Extensions} \label{fig:ext}
\end{subfigure}~ %add desired spacing between images, e. g. ~, \quad, \qquad, \hfill etc. %(or a blank line to force the subfigure onto a new line)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/methods.tex new/doc/latex/thesis-gwu/tex/methods.tex
--- old/doc/latex/thesis-gwu/tex/methods.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/methods.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,10 @@
+\chapter{Methods: injecting construct validity into social media monitoring with a survey}\label{chap:methods}
+
+This study’s contribution achieves all items on the validity checklist on the construct of trust in vaccines. Our method involves three parts. First, we leverage a survey on social media annotation to establish a reliable measure of trust in vaccines of Twitter, that fulfills face, content, predictive, and concurrent validity. Second, we expand this measure to an NLP classifier, achieving predictive and concurrent validity at the scale of big data. Third, we evaluate our classifier using the principles of convergent and discriminant validity.
+
+\section{Survey for attitudes and annotations to establish a measure}
+asdf
+\section{Reliable measure to NLP classifier with concurrent validity}
+asdf
+\section{Convergent and discriminant validation vs. existing standards}
+asdf
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/prevmethods.tex new/doc/latex/thesis-gwu/tex/prevmethods.tex
--- old/doc/latex/thesis-gwu/tex/prevmethods.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/prevmethods.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,8 @@
+% !TEX root = ../thesis-sample.tex
+\chapter{Social media monitoring fails at measuring similar constructs without these methods. What can we learn?}\label{chap:prevmethods}
+
+\section{Traditional methods with NLP alone have succeeded in related but different problems}
+asdf
+\section{Lessons learned from attempts measuring similar constructs}
+asdf
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/results-example.tex new/doc/latex/thesis-gwu/tex/results-example.tex
--- old/doc/latex/thesis-gwu/tex/results-example.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/results-example.tex 2020-03-13 22:02:20.000000000 +0100
@@ -0,0 +1,19 @@
+% !TEX root = ../thesis-sample.tex
+
+\chapter{Another sample chapter}\label{chap:ipsum}
+
+This chapter has several paragraphs of random text.
+This ensures our table of contents is correct and demonstrates how to use a multi-file \LaTeX document.
+
+\lipsum[1]
+
+\section{A section}
+\lipsum[10]
+
+\subsection{A subsection}
+\lipsum[9]
+
+\subsubsection{A subsubsection}
+\lipsum[11]
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/tex/results.tex new/doc/latex/thesis-gwu/tex/results.tex
--- old/doc/latex/thesis-gwu/tex/results.tex 2017-12-22 00:58:11.000000000 +0100
+++ new/doc/latex/thesis-gwu/tex/results.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,19 +1,8 @@
-% !TEX root = ../thesis-sample.tex
-
-\chapter{Another sample chapter}\label{chap:ipsum}
-
-This chapter has several paragraphs of random text.
-This ensures our table of contents is correct and demonstrates how to use a multi-file \LaTeX document.
-
-\lipsum[1]
-
-\section{A section}
-\lipsum[10]
-
-\subsection{A subsection}
-\lipsum[9]
-
-\subsubsection{A subsubsection}
-\lipsum[11]
-
+\chapter{Results: we show a validated measure of trust in vaccines}\label{chap:results}
+\section{Establish a reliable measure with a survey, showing face-, content-, … through concurrent- validity}
+asdf
+\section{Extrapolate that reliable measure to big data, getting predictive and concurrent validity}
+asdf
+\section{Show convergence and divergence which compete our checklist of a valid measure}
+\section{Recap: Our measure obtains all items on our validity checklist}
Binary files old/doc/latex/thesis-gwu/thesis-sample.pdf and new/doc/latex/thesis-gwu/thesis-sample.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thesis-gwu/thesis-sample.tex new/doc/latex/thesis-gwu/thesis-sample.tex
--- old/doc/latex/thesis-gwu/thesis-sample.tex 2018-07-10 23:07:37.000000000 +0200
+++ new/doc/latex/thesis-gwu/thesis-sample.tex 2020-03-13 22:02:20.000000000 +0100
@@ -1,26 +1,21 @@
-\documentclass[thesis]{thesis-gwu}[2018/05/21]
+\documentclass[thesis]{thesis-gwu}[2020/02/03]
+
% this package is only used to generate some random text.
% it is not needed in a true document
\usepackage{lipsum}
-\input{tex/frontmatter}
-% this will speed up your tikz figures by building them once to another directory
-\usepackage{pgfplots}
-\usepgfplotslibrary{external}
-\tikzexternalize
-\tikzsetexternalprefix{cache/}
+\input{tex/frontmatter}
%% DOCUMENT AREA
\begin{document}
-
-\include{tex/manual}
-\include{tex/results}
+\include{tex/manual} % here is a manual on how to use the template
+\include{tex/results-example}
\bibliographystyle{plain}
\bibliography{thesis-bib}
% appendices must appear after
-\include{tex/appendix}
+\include{tex/appendix-ex}
\end{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-gwu.doc.tlpobj new/tlpkg/tlpobj/thesis-gwu.doc.tlpobj
--- old/tlpkg/tlpobj/thesis-gwu.doc.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-gwu.doc.tlpobj 2020-03-14 01:43:43.000000000 +0100
@@ -1,9 +1,9 @@
name thesis-gwu.doc
category Package
-revision 48537
+revision 54287
shortdesc doc files of thesis-gwu
relocated 1
-docfiles size=139
+docfiles size=152
RELOC/doc/latex/thesis-gwu/LICENSE.md
RELOC/doc/latex/thesis-gwu/README.md
RELOC/doc/latex/thesis-gwu/figures/data.png
@@ -11,10 +11,19 @@
RELOC/doc/latex/thesis-gwu/figures/orbital_mechanics.png
RELOC/doc/latex/thesis-gwu/figures/picard_yes.jpg
RELOC/doc/latex/thesis-gwu/figures/tumblr_lrvyd1GuNe1r3aueno1_400.jpg
+ RELOC/doc/latex/thesis-gwu/tex/appendix-ex.tex
RELOC/doc/latex/thesis-gwu/tex/appendix.tex
+ RELOC/doc/latex/thesis-gwu/tex/conclusion.tex
+ RELOC/doc/latex/thesis-gwu/tex/discussion.tex
RELOC/doc/latex/thesis-gwu/tex/frontmatter.tex
+ RELOC/doc/latex/thesis-gwu/tex/intro-example.tex
RELOC/doc/latex/thesis-gwu/tex/intro.tex
+ RELOC/doc/latex/thesis-gwu/tex/litreview.tex
+ RELOC/doc/latex/thesis-gwu/tex/manual-ex.tex
RELOC/doc/latex/thesis-gwu/tex/manual.tex
+ RELOC/doc/latex/thesis-gwu/tex/methods.tex
+ RELOC/doc/latex/thesis-gwu/tex/prevmethods.tex
+ RELOC/doc/latex/thesis-gwu/tex/results-example.tex
RELOC/doc/latex/thesis-gwu/tex/results.tex
RELOC/doc/latex/thesis-gwu/thesis-bib.bib
RELOC/doc/latex/thesis-gwu/thesis-sample.pdf
++++++ thesis-gwu.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thesis-gwu/thesis-gwu.cls new/tex/latex/thesis-gwu/thesis-gwu.cls
--- old/tex/latex/thesis-gwu/thesis-gwu.cls 2018-09-02 00:17:26.000000000 +0200
+++ new/tex/latex/thesis-gwu/thesis-gwu.cls 2020-03-13 22:02:20.000000000 +0100
@@ -50,13 +50,14 @@
%% 2011.04.09 @Derek Dalle : Convert rac.sty --> thesis.umich.cls
%% 2016.09.24 @Shankar Kulumani : First attempt to modify for GWU
%% 2018.01.20 @Shankar Kulumani : Setup titlesec for modifying headings
+%% 2020.02.26 @Michael Smith : 2020 update for GWU template
%% ---- HEADERS --------------------------------------------------------
% This prevents the compiler from running on old versions of LaTeX.
\NeedsTeXFormat{LaTeX2e}
-% This command gives the name of the class.
-\ProvidesClass{thesis-gwu}[2018/08/31 v1.6.1 GWU Thesis template]
+% This command gives the name of the class and dates it
+\ProvidesClass{thesis-gwu}[2020/02/26 v1.7.0 GWU Thesis template]
%% ---- OPTIONS PROCESSING ---------------------------------------------
% Define three switches for the the thesis format types.
@@ -115,6 +116,7 @@
% if you call debug option then use the thesis option but not report
\DeclareOption{debug}{\@gwu@debugtrue\@gwu@thesistrue}
+% \@gwu@debugtrue % uncomment for debug mode
% Declare an option for the index.
\DeclareOption{index}{\@gwu@indextrue}
@@ -140,124 +142,9 @@
\@gwu@indexfalse
\fi
-
%% ---- PACKAGE LOADING ------------------------------------------------
+\input{required-packages}
-% This class uses the geometry.sty package to set the margins.
-\if@gwu@debug
- % Show margins
- \RequirePackage[top=1in,bottom=1in,left=1.25in, right=1.25in,
- showframe]{geometry}
-\else
- % Use the standard margins for the thesis version.
- \RequirePackage[top=1in,bottom=1in,left=1.25in, right=1.25in]{geometry}
-\fi
-
-% Obsolete package check
-\RequirePackage[l2tabu,orthodox]{nag}
-
-% This loads the required math packages.
-\RequirePackage[binary-units=true]{siunitx}
-\RequirePackage{amsmath}
-\RequirePackage{amsfonts}
-\RequirePackage{amssymb}
-\RequirePackage{mathtools}
-\RequirePackage{amsthm}
-
-% This loads the proper graphics package.
-\RequirePackage{graphicx}
-
-% Better spacing for text
-\RequirePackage[utf8]{inputenc}
-\RequirePackage[T1]{fontenc}
-\RequirePackage{lmodern}
-\RequirePackage{microtype}
-\RequirePackage{bm}
-
-\RequirePackage{mathptmx}
-
-% Add package for managing section headings
-\RequirePackage[]{titlesec}
-
-% This is useful for complex figures.
-\RequirePackage{subcaption}
-
-% Compress multiple citations
-% \RequirePackage{cite}
-
-% This package allows the ability to create a 'code' environment.
-\RequirePackage{verbatim}
-
-% This hopefully tells verbatim to leave my damn quotes alone.
-% \RequirePackage{upquote}
-
-% This package enables the use of proper single quotes in text.
-% \RequirePackage{textcomp}
-
-% This package is used to set line spacing.
-\RequirePackage{setspace}
-
-% This package is used to make nomenclature tables that can span pages.
-% \RequirePackage{longtable}
-
-% This package allows conditional testing of varibles.
-\RequirePackage{ifthen}
-
-% This package is used for silly letter spacing
-\RequirePackage{soul}
-
-% This package is used to generate alternate environments.
-\RequirePackage{float}
-
-% This package is for the index, if it is to be used.
-\if@gwu@index
- \RequirePackage{makeidx}
- \makeindex
-\fi
-
-% This is the package for special headers and footers.
-\RequirePackage{fancyhdr}
-
-% some extra packages to help with debugging
-\if@gwu@debug
- \RequirePackage[final]{showlabels} % show labels for referencing
- \RequirePackage{refcheck} % check for unused references/labels
-\fi
-
-%% ---- HYPERREF ----------------------------------------------------------
-% This loads a package that allows extra colors for links.
-\RequirePackage[]{color}
-% Custom color for references.
-% \definecolor{DarkGreen}{rgb}{0,0.6,0}
-
-% This will make labels and references hyperlinks.
-\if@gwu@backref%
- % Use references in the bibliography.
- \RequirePackage[pagebackref=true]{hyperref}%
-\else%
- % Do not use back references.
- \RequirePackage{hyperref}%
-\fi
-
- \hypersetup{%
- unicode=false, % non-Latin characters in Acrobat’s bookmarks
- pdftoolbar=true, % show Acrobat’s toolbar?
- pdfmenubar=true, % show Acrobat’s menu?
- pdffitwindow=false, % window fit to page when opened
- pdfstartview={FitV}, % fits the width of the page to the window
- pdfnewwindow=true, % links in new PDF window
- colorlinks=false, % false: boxed links; true: colored links
- bookmarksdepth=3,
- bookmarksopen=true,
- }%
-
-% Cleveref referencing - must happen after hyperref
-\AtEndOfClass{\RequirePackage[noabbrev,capitalize]{cleveref}}%
-
-% Glossaries package - must come after hypperef
-% This package is used for the list of abbreviations
-\RequirePackage[printonlyused]{acronym}%
-\RequirePackage[abbreviations,symbols,shortcuts=none,automake]{glossaries-extra}%
%% ---- FORMATTING -----------------------------------------------------
% Set the page style to fancy.
\pagestyle{fancy}
@@ -321,6 +208,7 @@
}
%%-------- GLOSSARIES STYLES------------------------------------
+
% define a new glossary style for acronymns and symbols
\renewcommand*{\glossarysection}[2][]{%
{\centering\bfseries{#2}\par}%
@@ -338,18 +226,22 @@
\renewcommand*{\glossarypreamble}{\vspace{4ex}}%
\renewcommand*{\glossaryheader}{}%
}
+
%% ---- TITLE PAGE -----------------------------------------------------
% The fields to be used for the title page
\renewcommand{\@title}{Insert a Title!}
\renewcommand{\@author}{Insert an Author!}
-\newcommand{\@bsdepartment}{Insert a BS department name!}
-\newcommand{\@bsschool}{Insert BS school!}
-\newcommand{\@bsgrad}{BS Grad date!}
-
-\newcommand{\@msdepartment}{Insert a MS department name!}
-\newcommand{\@msschool}{Insert MS school!}
-\newcommand{\@msgrad}{MS Grad date!}
+% and other fields
+\newcommand{\@bachelordegree}{Insert a Bachelor's degree!}
+\newcommand{\@bsdepartment}{Insert a Bachelor's department name!}
+\newcommand{\@bsschool}{Insert Bachelor's school!}
+\newcommand{\@bsgrad}{Bachelor's Grad date!}
+
+\newcommand{\@masterdegree}{Insert a Master's degree!}
+\newcommand{\@msdepartment}{Insert a Master's department name!}
+\newcommand{\@msschool}{Insert Master's school!}
+\newcommand{\@msgrad}{Master's Grad date!}
\newcommand{\@degree}{Doctor of Philosophy}
\newcommand{\@department}{Insert a Department Name!}
@@ -358,12 +250,14 @@
\newcommand{\@chairtitle}{Professor of INSERT Title!}
\newcommand{\@cochair}{}
\newcommand{\@phdgrad}{PhD Grad date!}
+\newcommand{\@phdschool}{Insert PhD school}
\newcommand{\@defensedate}{Insert defense date!}
% Commands to set the titlepage fields
\renewcommand{\title}[1]{\renewcommand{\@title}{#1}\@gwu@titlepagetrue}
\renewcommand{\author}[1]{\renewcommand{\@author}{#1}}
+\newcommand{\bachelordegree}[1]{\renewcommand{\@bachelordegree}{#1}}
\newcommand{\bsdepartment}[1]{\renewcommand{\@bsdepartment}{#1}}
\newcommand{\bsschool}[1]{\renewcommand{\@bsschool}{#1}}
\newcommand{\bsgrad}[1]{\renewcommand{\@bsgrad}{#1}}
@@ -371,6 +265,7 @@
\newcommand{\showmsdegree}{\@gwu@msdegreetrue}
\newcommand{\hidemsdegree}{\@gwu@msdegreefalse}
+\newcommand{\masterdegree}[1]{\renewcommand{\@masterdegree}{#1}}
\newcommand{\msdepartment}[1]{\renewcommand{\@msdepartment}{#1}}
\newcommand{\msschool}[1]{\renewcommand{\@msschool}{#1}}
\newcommand{\msgrad}[1]{\renewcommand{\@msgrad}{#1}}
@@ -382,15 +277,18 @@
\newcommand{\chairtitle}[1]{\renewcommand{\@chairtitle}{#1}}
\newcommand{\cochair}[1]{\renewcommand{\@cochair}{#1}}
\newcommand{\phdgrad}[1]{\renewcommand{\@phdgrad}{#1}}
+\newcommand{\phdschool}[1]{\renewcommand{\@phdschool}{#1}}
\newcommand{\defensedate}[1]{\renewcommand{\@defensedate}{#1}}
% Commands for the user to be able to use the defined fields.
\newcommand{\inserttitle}{\@title}
\newcommand{\insertauthor}{\@author}
+\newcommand{\insertbachelordegree}{\@bachelordegree}
\newcommand{\insertbsdepartment}{\@bsdepartment}
\newcommand{\insertbsschool}{\@bsschool}
\newcommand{\insertbsgrad}{\@bsgrad}
+\newcommand{\insertmasterdegree}{\@masterdegree}
\newcommand{\insertmsdepartment}{\@msdepartment}
\newcommand{\insertmsschool}{\@msschool}
\newcommand{\insertmsgrad}{\@msgrad}
@@ -403,6 +301,7 @@
\newcommand{\insertcochair}{\@cochair}
\newcommand{\insertyear}{\number\year}
\newcommand{\insertphdgrad}{\@phdgrad}
+\newcommand{\insertphdschool}{\@phdschool}
\newcommand{\insertdefensedate}{\@defensedate}
% This redefines the title page to automatically have all of the
@@ -429,19 +328,19 @@
%\vfill %
% previous degrees
\if@gwu@msdegree
- B.S. in \insertbsdepartment, \insertbsgrad, \insertbsschool \\
- M.S. in \insertmsdepartment, \insertmsgrad, \insertmsschool \\[2\baselineskip]
+ \insertbachelordegree \space in \insertbsdepartment, \insertbsgrad, \insertbsschool \\
+ \insertmasterdegree \space in \insertmsdepartment, \insertmsgrad, \insertmsschool \\[2\baselineskip]
\else
- B.S. in \insertbsdepartment, \insertbsgrad, \insertbsschool \\[2\baselineskip]
+ \insertbachelordegree \space in \insertbsdepartment, \insertbsgrad, \insertbsschool \\[2\baselineskip]
\fi
% Text from guidelines
A Dissertation submitted to \\[3\baselineskip] %
The Faculty of \\
- The School of Engineering and Applied Science \\
+ \insertphdschool \\
of The George Washington University \\
in partial satisfaction of the requirements \\
for the degree of \insertdegree \\[3\baselineskip]
- \insertphdgrad \\[4\baselineskip]
+ \insertphdgrad \\[3\baselineskip]
% insert doctoral advisor
Dissertation directed by \\[1\baselineskip]
\insertchair \\
@@ -488,22 +387,22 @@
\frntpg
\begin{doublespace}
\noindent
- The School of Engineering and Applied Science of The George Washington
+ \insertphdschool \space of The George Washington
University certifies that \insertauthor~has passed the Final Examination for the
- degree of \insertdegree~as of \insertdefensedate. This is the
- final and approved form of the dissertation.
+ degree of \insertdegree~as of \insertdefensedate. This is the final and approved form of the dissertation.
\end{doublespace}
\begin{center}
\begin{singlespace}
- {\normalsize\bfseries\inserttitle} \\[1\baselineskip]
+ \vspace{\baselineskip}
+ {\normalsize\bfseries\inserttitle} \\[3\baselineskip]
\insertauthor \\[3\baselineskip]
\end{singlespace}
\end{center}
% Non-justified content
\begin{flushleft}
% Heading for the committee
- Dissertation Research Committee: \\[2ex] %
+ Dissertation Research Committee: \\[4ex] %
% Horizontal spacing
\hspace{5em} %
% Insert the committee (in a box).
@@ -571,18 +470,22 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{2}}{ %
% Style 2: Bold heading at top of page. Doublespacing for text
% Center on the page.
% Heading
- \begin{center}\textbf{\normalsize{#3}}\end{center}
+ \begin{center}\textbf{\normalsize{#3}}
+ \vspace{\baselineskip}
+ \end{center}
\begin{doublespace}
\par #1
\end{doublespace}
% Vertical rubber space
- \vspace*{\stretch{1}} %
+ % \vspace*{\stretch{1}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{3}}{ %
% Style 3: Spread caps heading
@@ -603,7 +506,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{4}}{ %
% Style 4: lined
@@ -626,7 +530,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ %\vspace*{\stretch{2}} %
+ \vspace{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{5}}{ %
% Style 5: bold italic heading with lines
@@ -653,7 +558,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ % \vspace*{\stretch{2}}
+ \vspace*{\baselineskip} %
}{ %
\ifthenelse{\equal{#2}{6}}{ %
% Style 6: lined with spread caps header
@@ -680,7 +586,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{2}} %
+ % \vspace*{\stretch{2}} %
+ \vspace*{\baselineskip} %
}{ %
% Default style: centered
% Vertical rubber space
@@ -694,7 +601,8 @@
\end{minipage} %
\end{center} %
% Vertical rubber space
- \vspace*{\stretch{1}} %
+ \vspace*{\baselineskip} %
+ % \vspace*{\stretch{2}} %
}}}}}} %
}
@@ -954,16 +862,36 @@
\newcommand{\hideglossariesglossaryofterms}{\@gwu@glossaryoftermsfalse\@gwu@tableofcontentsfalse}
%% ---- TABLE OF CONTENTS ----------------------------------------------
-% This sets the formatting for chapter entries in the table of contents.
-\renewcommand*\l@chapter[2]{ %
- % First add some vertical space.
- \vskip 1ex plus 1pt minus 1pt
- % Format the spacing and use dots between title and number.
- \(a)dottedtocline{1}{0em}{1.2em} %
- % This sets the formatting for the chapter name and page number.
- {\textbf{#1}}{\textbf{#2}} %
- % Add some space below, too.
- \vskip 1ex}
+% this overwrites the tocloft defaults.
+% definitely could be less hacky, but unsure of how to properly do this or respect the other formatting below
+% including [titles] when loading tocloft also turns off the indentation needed!
+\renewcommand{\cfttoctitlefont}{\hfill\normalsize\bfseries}
+\renewcommand{\cftbeforetoctitleskip}{-2ex}
+\renewcommand{\cftaftertoctitleskip}{5ex}
+\renewcommand{\contentsname}{Table of Contents}
+\renewcommand{\cftaftertoctitle}{\hfill}
+\renewcommand{\cftloftitlefont}{\newpage\hfill\bfseries\normalsize}
+\renewcommand{\cftafterloftitle}{\hfill}
+\renewcommand{\cftbeforeloftitleskip}{0ex}
+\renewcommand{\cftafterloftitleskip}{5ex}
+\renewcommand{\cftlottitlefont}{\newpage\hfill\bfseries\normalsize}
+\renewcommand{\cftafterlottitle}{\hfill}
+\renewcommand{\cftbeforelottitleskip}{0ex}
+\renewcommand{\cftafterlottitleskip}{5ex}
+% add 'chapter' preceding the section num in TOC
+\renewcommand{\cftchappresnum}{\chaptername\space}
+\renewcommand{\cftchapaftersnum}{:}
+\setlength{\cftchapnumwidth}{\widthof{Appendix AAA~ }}
+% but change "chapter" to 'appendix' by hacking the \appendix command
+% patching "appendix" per https://texfaq.org/FAQ-patch
+\let\OldAppendix\appendix
+\renewcommand{\appendix}{
+\OldAppendix
+\addtocontents{toc}{%
+ \protect\renewcommand{\protect\cftchappresnum}{\appendixname\space}
+ }
+}
+
% These lines set the spacing for other table of contents entries.
\renewcommand*{\l@section}{\@dottedtocline{2}{2.5em}{2em}}
@@ -988,7 +916,7 @@
% Add the title
\begin{center}{\normalsize\textbf{Table of Contents}}\end{center} %
% Add some space after the title.
- \vspace{2ex} %
+ \vspace{1ex} %
% Start the automatic table of contents features.
\begin{singlespace} %
\@starttoc{toc}\if@restonecol\twocolumn\fi %
@@ -1176,7 +1104,7 @@
%\begin{minipage}{0.8\textwidth} \vspace{1in} \end{minipage} \\ %
\fi %
% Add the title
- \begin{center}{\normalsize\textbf{List of Abbreviations}}\\[2\baselineskip] \end{center}%
+ \begin{center}{\normalsize\textbf{List of Abbreviations}}\\[3\baselineskip] \end{center}%
% Add some space after the title.
% \vspace{1ex} %
% Start the automatic abbreviations feature.
@@ -1403,7 +1331,7 @@
\let\@tex@bibliography\bibliography
% Change the bibliography header.
-\renewcommand*{\bibname}{\centerline{\normalsize Bibliography}}
+\renewcommand*{\bibname}{\centering{\normalsize Bibliography}}
% Create a new command for the bibliography.
\renewcommand*{\bibliography}[1]{ %
@@ -1551,5 +1479,4 @@
\twocolumn %
\fi %
}
-}
-
+}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thesis-gwu.tlpobj new/tlpkg/tlpobj/thesis-gwu.tlpobj
--- old/tlpkg/tlpobj/thesis-gwu.tlpobj 2019-02-28 04:08:32.000000000 +0100
+++ new/tlpkg/tlpobj/thesis-gwu.tlpobj 2020-03-14 01:43:43.000000000 +0100
@@ -1,6 +1,6 @@
name thesis-gwu
category Package
-revision 48537
+revision 54287
shortdesc Thesis class for George Washington University School of Engineering and Applied Science
relocated 1
longdesc This class is an attempt to create a standard format for GWU
@@ -14,7 +14,6 @@
catalogue-contact-home https://github.com/skulumani/thesis-gwu
catalogue-contact-repository https://github.com/skulumani/thesis-gwu
catalogue-ctan /macros/latex/contrib/thesis-gwu
-catalogue-date 2018-08-31 23:05:31 +0200
catalogue-license gpl3
catalogue-topics dissertation class
-catalogue-version 1.6.1
+catalogue-version 1.7.0
++++++ thmtools.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/README new/doc/latex/thmtools/README
--- old/doc/latex/thmtools/README 2008-02-18 01:22:07.000000000 +0100
+++ new/doc/latex/thmtools/README 2019-12-23 22:35:29.000000000 +0100
@@ -12,5 +12,11 @@
hyperref/autoref compatibility
a way of restating entire theorems with a single macro call
-License: LPPL 1.3a; maintained by ulmi(a)absatzen.de
+License: LPPL 1.3c
+
+Currently the package has no maintainer ... and is looking for one!
+
+Previous Maintainer was Ulrich M. Schwarz, ulmi(a)absatzen.de
+
+
$Id: README,v 1.1 2008/02/17 21:13:58 ulmi Exp ulmi $
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/VERSION.tex new/doc/latex/thmtools/VERSION.tex
--- old/doc/latex/thmtools/VERSION.tex 2014-04-22 23:16:07.000000000 +0200
+++ new/doc/latex/thmtools/VERSION.tex 2019-12-23 22:35:29.000000000 +0100
@@ -1 +1,2 @@
-\def\x #1-#2-#3 #4 v#5\@{\def\VERSION{#1/#2/#3 v#5}}\x 2014-04-21 20:11:26 +0200 v66\@
\ No newline at end of file
+% set by hand as I don't use CVS
+\def\x #1-#2-#3 #4 v#5\@{\def\VERSION{#1/#2/#3 v#5}}\x 2019-12-22 00:00:00 +0200 v68\@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thmtools/changes.txt new/doc/latex/thmtools/changes.txt
--- old/doc/latex/thmtools/changes.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/thmtools/changes.txt 2019-12-23 22:35:29.000000000 +0100
@@ -0,0 +1,6 @@
+2019-12-22 Frank Mittelbach <Frank.Mittelbach(a)latex-project.org>
+
+ * thm-kv.dtx:
+ removed dependency on etexcmds package
+
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.doc.tlpobj new/tlpkg/tlpobj/thmtools.doc.tlpobj
--- old/tlpkg/tlpobj/thmtools.doc.tlpobj 2019-02-28 04:08:34.000000000 +0100
+++ new/tlpkg/tlpobj/thmtools.doc.tlpobj 2019-12-24 01:55:05.000000000 +0100
@@ -1,12 +1,13 @@
name thmtools.doc
category Package
-revision 33624
+revision 53219
shortdesc doc files of thmtools
relocated 1
-docfiles size=75
+docfiles size=76
RELOC/doc/latex/thmtools/COPYING
RELOC/doc/latex/thmtools/README
RELOC/doc/latex/thmtools/TODO
RELOC/doc/latex/thmtools/VERSION.tex
+ RELOC/doc/latex/thmtools/changes.txt
RELOC/doc/latex/thmtools/thmtools-manual.tex
RELOC/doc/latex/thmtools/thmtools.pdf
++++++ thmtools.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/aliasctr.sty new/tex/latex/thmtools/aliasctr.sty
--- old/tex/latex/thmtools/aliasctr.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/aliasctr.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {aliasctr}[2014/04/21 v66]
+\ProvidesPackage {aliasctr}[2019/12/22 v68]
\def\aliasctr@f@llow#1#2\@nil#3{%
\ifx#1\@elt
\noexpand #3%
@@ -37,7 +36,7 @@
\let\@elt\relax
\expandafter\@cons\aliasctr@@truelist{{#1}}%
\egroup}
-\RequirePackage{remreset}
+\@ifundefined{@removefromreset}{\RequirePackage{remreset}}{}
\renewcommand*\@removefromreset[2]{\bgroup
\edef\aliasctr@@truelist{\aliasctr@follow{#2}}%
\expandafter\let\csname c@#1\endcsname\@removefromreset
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/parseargs.sty new/tex/latex/thmtools/parseargs.sty
--- old/tex/latex/thmtools/parseargs.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/parseargs.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {parseargs}[2014/04/21 v66]
+\ProvidesPackage {parseargs}[2019/12/22 v68]
\newtoks\@parsespec
\def\parse@endquark{\parse@endquark}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-amsthm.sty new/tex/latex/thmtools/thm-amsthm.sty
--- old/tex/latex/thmtools/thm-amsthm.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-amsthm.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-amsthm}[2014/04/21 v66]
+\ProvidesPackage {thm-amsthm}[2019/12/22 v68]
\providecommand\thmt@space{ }
\define@key{thmstyle}{spaceabove}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-autoref.sty new/tex/latex/thmtools/thm-autoref.sty
--- old/tex/latex/thmtools/thm-autoref.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-autoref.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-autoref}[2014/04/21 v66]
+\ProvidesPackage {thm-autoref}[2019/12/22 v68]
\RequirePackage{thm-patch, aliasctr, parseargs, keyval}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-beamer.sty new/tex/latex/thmtools/thm-beamer.sty
--- old/tex/latex/thmtools/thm-beamer.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-beamer.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-beamer}[2014/04/21 v66]
+\ProvidesPackage {thm-beamer}[2019/12/22 v68]
\newif\ifthmt@hasoverlay
\def\thmt@parsetheoremargs#1{%
\parse{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-kv.sty new/tex/latex/thmtools/thm-kv.sty
--- old/tex/latex/thmtools/thm-kv.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-kv.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-kv}[2014/04/21 v66]
+\ProvidesPackage {thm-kv}[2019/12/22 v68]
\let\@xa\expandafter
\let\@nx\noexpand
@@ -79,7 +78,7 @@
\unless \ifcsname KVS@#1@handler\endcsname
\kv@error@unknownkey {#1}{#2}%
\else
- \kv@handled@true
+ \kv@handled@true
\csname KVS@#1@handler\endcsname {#2}{#3}\relax
\ifkv@handled@ \else
\kv@error@unknownkey {#1}{#2}%
@@ -104,7 +103,7 @@
\csname @safe@activestrue\endcsname
\@xa\let\csname ifincsname\@xa\endcsname\csname iftrue\endcsname
\edef\KVS@temp{\endgroup
- \noexpand\KVS@ProcessorDefault{#1}{\etex@unexpanded{#2}}%
+ \noexpand\KVS@ProcessorDefault{#1}{\unexpanded{#2}}%
}%
\KVS@temp
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-listof.sty new/tex/latex/thmtools/thm-listof.sty
--- old/tex/latex/thmtools/thm-listof.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-listof.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-listof}[2014/04/21 v66]
+\ProvidesPackage {thm-listof}[2019/12/22 v68]
\let\@xa=\expandafter
\let\@nx=\noexpand
\RequirePackage{thm-patch,keyval,kvsetkeys}
@@ -83,6 +82,7 @@
\define@key{thmt-listof}{show}[\thmt@allenvs]{\showtheorems{#1}}
\define@key{thmt-listof}{ignoreall}[true]{\ignoretheorems{\thmt@allenvs}}
\define@key{thmt-listof}{showall}[true]{\showtheorems{\thmt@allenvs}}
+\define@key{thmt-listof}{title}{\def\listtheoremname{#1}}
\providecommand\thmt(a)listnumwidth{2.3em}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-llncs.sty new/tex/latex/thmtools/thm-llncs.sty
--- old/tex/latex/thmtools/thm-llncs.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-llncs.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-llncs}[2014/04/21 v66]
+\ProvidesPackage {thm-llncs}[2019/12/22 v68]
\@ifclasslater{llncs}{2010/04/15}{}{%
\PackageWarningNoLine{thmtools}{%
LLNCS.cls too old, not supported by thmtools
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-ntheorem.sty new/tex/latex/thmtools/thm-ntheorem.sty
--- old/tex/latex/thmtools/thm-ntheorem.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-ntheorem.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-ntheorem}[2014/04/21 v66]
+\ProvidesPackage {thm-ntheorem}[2019/12/22 v68]
\providecommand\thmt@space{ }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-patch.sty new/tex/latex/thmtools/thm-patch.sty
--- old/tex/latex/thmtools/thm-patch.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-patch.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-patch}[2014/04/21 v66]
+\ProvidesPackage {thm-patch}[2019/12/22 v68]
\RequirePackage{parseargs}
\newif\ifthmt@isstarred
@@ -56,7 +55,7 @@
\csname thmt@#1@postheadhook\endcsname
\thmt@generic@postheadhook
\thmt@local@postheadhook
- \let\@parsecmd\@empty
+ \let\@parsecmd\ignorespaces
}%
}%
}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thm-restate.sty new/tex/latex/thmtools/thm-restate.sty
--- old/tex/latex/thmtools/thm-restate.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thm-restate.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thm-restate}[2014/04/21 v66]
+\ProvidesPackage {thm-restate}[2019/12/22 v68]
\RequirePackage{thmtools}
\let\@xa\expandafter
\let\@nx\noexpand
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-mdframed.sty new/tex/latex/thmtools/thmdef-mdframed.sty
--- old/tex/latex/thmtools/thmdef-mdframed.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-mdframed.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-mdframed}[2014/04/21 v66]
+\ProvidesPackage {thmdef-mdframed}[2019/12/22 v68]
\define@key{thmdef}{mdframed}[{}]{%
\thmt@trytwice{}{%
\RequirePackage{mdframed}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-shaded.sty new/tex/latex/thmtools/thmdef-shaded.sty
--- old/tex/latex/thmtools/thmdef-shaded.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-shaded.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-shaded}[2014/04/21 v66]
+\ProvidesPackage {thmdef-shaded}[2019/12/22 v68]
\define@key{thmdef}{shaded}[{}]{%
\thmt@trytwice{}{%
\RequirePackage{shadethm}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmdef-thmbox.sty new/tex/latex/thmtools/thmdef-thmbox.sty
--- old/tex/latex/thmtools/thmdef-thmbox.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmdef-thmbox.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmdef-thmbox}[2014/04/21 v66]
+\ProvidesPackage {thmdef-thmbox}[2019/12/22 v68]
\define@key{thmdef}{thmbox}[L]{%
\thmt@trytwice{%
\let\oldproof=\proof
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/thmtools.sty new/tex/latex/thmtools/thmtools.sty
--- old/tex/latex/thmtools/thmtools.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/thmtools.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {thmtools}[2014/04/21 v66]
+\ProvidesPackage {thmtools}[2019/12/22 v68]
\DeclareOption{debug}{%
\def\thmt@debug{\typeout}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thmtools/unique.sty new/tex/latex/thmtools/unique.sty
--- old/tex/latex/thmtools/unique.sty 2014-04-22 23:16:07.000000000 +0200
+++ new/tex/latex/thmtools/unique.sty 2019-12-23 22:35:29.000000000 +0100
@@ -8,8 +8,7 @@
%% This is a generated file.
%%
%% This file is part of the `thmtools' package.
-%% The `thmtools' package has the LPPL maintenance status: maintained.
-%% Current Maintainer is Ulrich M. Schwarz, ulmi(a)absatzen.de
+%% The `thmtools' package has the LPPL maintenance status: unmaintained.
%%
%% Copyright (C) 2008-2014 by Ulrich M. Schwarz.
%%
@@ -20,7 +19,7 @@
%%
%%
\NeedsTeXFormat {LaTeX2e}
-\ProvidesPackage {unique}[2014/04/21 v66]
+\ProvidesPackage {unique}[2019/12/22 v68]
\DeclareOption{unq}{%
\newwrite\uniq@channel
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thmtools.tlpobj new/tlpkg/tlpobj/thmtools.tlpobj
--- old/tlpkg/tlpobj/thmtools.tlpobj 2019-02-28 04:08:34.000000000 +0100
+++ new/tlpkg/tlpobj/thmtools.tlpobj 2019-12-24 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name thmtools
category Package
-revision 33624
+revision 53219
shortdesc Extensions to theorem environments
relocated 1
longdesc The bundle provides several packages for commonly-needed
@@ -28,7 +28,6 @@
RELOC/tex/latex/thmtools/thmtools.sty
RELOC/tex/latex/thmtools/unique.sty
catalogue-ctan /macros/latex/exptl/thmtools
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics maths-theorem
-catalogue-version 66
+catalogue-license lppl1.3c
+catalogue-topics maths maths-theorem
+catalogue-version 68
++++++ thucoursework.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/Makefile new/doc/latex/thucoursework/Makefile
--- old/doc/latex/thucoursework/Makefile 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,71 +0,0 @@
-# Makefile for thucoursework
-
-# Compiling method: xelatex/pdflatex
-PACKAGE = thucoursework
-INSTALL_PACKAGE = install-tl-unx.tar.gz
-INSTALL_DIR = ./install-texlive
-# automatic configuration of mirror
-REMOTE_INSTALLER_URL = http://mirror.ctan.org/systems/texlive/tlnet
-# Set opts for latexmk if you use it
-LATEXMKOPTS = -xelatex -halt-on-error -interaction=nonstopmode
-
-
-.PHONY: doc all archive pre_install_dep install_dep after_install_dep clean test
-
-all: after_install_dep iihw.pdf ithw.pdf
-
-pre_install_dep: $(INSTALL_PACKAGE)
-
-after_install_dep: install_dep
- # tricky, to make variable assignment in recipe, and to execute shell command and assign the print result to a variable.
- $(eval PLATFORM1=`$(INSTALL_DIR)/install-tl --print-platform`)
- $(eval PLATFORM2=$(shell echo $(PLATFORM1)))
- $(eval PLATFORM3=$(shell pwd))
- $(eval export PATH :=$(PLATFORM3)/texlive/bin/$(PLATFORM2):$(PATH))
- echo $$PATH
- # to make tlmgr work, we need perl
- tlmgr install xkeyval matlab-prettifier caption doublestroke xcolor listings l3kernel l3packages ms ulem fontspec environ trimspaces booktabs moreenum mathtools oberdiek enumitem fmtcount etoolbox latex-bin
-install_dep: pre_install_dep
- mkdir -p $(INSTALL_DIR)
- tar -zxvf $(INSTALL_PACKAGE) -C $(INSTALL_DIR) --strip-components 1
- $(INSTALL_DIR)/install-tl -profile tl.profile
-
-$(INSTALL_PACKAGE):
- wget $(REMOTE_INSTALLER_URL)/$(INSTALL_PACKAGE)
-
-clean:
- rm -fr $(INSTALL_DIR)
- rm -f *.idx *.ilg *.glo *.gls *.hd *.ind *.log *.out *.synctex.gz *.toc *.aux
-
-iihw.pdf: iihw.tex after_install_dep
- pdflatex iihw.tex
-
-ithw.pdf: ithw.tex after_install_dep
- xelatex ithw.tex
-
-archive:
- # make tar.gz which is submitted to ctan.org
- # first copy the necessary files to the dist dir
- cp README.md iihw.pdf ithw.pdf iihw.tex ithw.tex matlabscript.m pdf_normal.eps thucoursework.dtx thucoursework.pdf Makefile thucoursework/
- # then tar it
- COPYFILE_DISABLE=1 tar -zcvf thucoursework.tar.gz thucoursework/
-doc : $(PACKAGE).pdf
-
-$(PACKAGE).pdf : $(PACKAGE).dtx
- #latexmk $(LATEXXMKOPTS) $(PACKAGE).dtx
- xelatex $(PACKAGE).dtx
- makeindex -s gind.ist -o $(PACKAGE).ind $(PACKAGE).idx
- makeindex -s gglo.ist -o $(PACKAGE).gls $(PACKAGE).glo
- xelatex $(PACKAGE).dtx
- xelatex -synctex=1 $(PACKAGE).dtx
-
-test:
- # first clear out root texlive bin dir
- $(eval export PATH := /bin:/usr/bin)
- echo $$PATH
- $(eval PLATFORM1=`$(INSTALL_DIR)/install-tl --print-platform`)
- $(eval PLATFORM2=$(shell echo $(PLATFORM1)))
- $(eval PLATFORM3=$(shell pwd))
- $(eval export PATH := $(PLATFORM3)/texlive/bin/$(PLATFORM2):$(PATH))
- echo $$PATH
- tlmgr --version
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/README.md new/doc/latex/thucoursework/README.md
--- old/doc/latex/thucoursework/README.md 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/README.md 2020-02-24 15:30:44.000000000 +0100
@@ -1,5 +1,6 @@
# THU coursework Template
-[![Build Status](https://www.travis-ci.org/zhaofeng-shu33/THU-coursework-template.sv…
+[![Build Status](https://travis-ci.com/zhaofeng-shu33/THU-coursework-template.svg?br…
+
LaTeX package for students in Tsinghua University to write coursework more efficiently, also can be used by students from other university.
Notice that the package itself does not import ctex package, to use it with Chinese writing, see example file `ithw.tex` for detail.
@@ -39,9 +40,9 @@
## Contributors
- TA xiangxiangxu revised this template, zhaofeng-shu33 made it a latex package.
+ [Xiangxiang Xu](https://xiangxiangxu.com/) revised this template, zhaofeng-shu33 made it a latex package.
## License
- see [LICENSE.md](LICENSE.md) for detail.
+ This project is licensed by The LaTeX Project Public License.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/dtx-style.sty new/doc/latex/thucoursework/dtx-style.sty
--- old/doc/latex/thucoursework/dtx-style.sty 2018-05-20 23:30:42.000000000 +0200
+++ new/doc/latex/thucoursework/dtx-style.sty 2020-02-24 15:30:44.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by zhaofeng-shu33 <616545598(a)qq.com>
+%% Copyright (C) 2020 by zhaofeng-shu33 <616545598(a)qq.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/thucoursework/iihw.pdf and new/doc/latex/thucoursework/iihw.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/thucoursework/iihw.tex new/doc/latex/thucoursework/iihw.tex
--- old/doc/latex/thucoursework/iihw.tex 2018-04-02 00:28:35.000000000 +0200
+++ new/doc/latex/thucoursework/iihw.tex 2020-02-24 15:30:44.000000000 +0100
@@ -9,7 +9,6 @@
\usepackage{moreenum}
\usepackage{mathtools}
\usepackage{url}
-\usepackage[outdir=./]{epstopdf}
\usepackage{graphicx}
\usepackage{subcaption}
\usepackage{booktabs} % toprule
@@ -36,7 +35,7 @@
\rule{\textwidth}{1pt}
\begin{itemize}
\item {\bf Acknowledgments: \/}
- This template takes some materials from course CSE 547/Stat 548 of Washington University: \small{\url{https://courses.cs.washington.edu/courses/cse547/17sp/index.html}}.
+ This template takes some materials from course CSE 547/Stat 548, University of Washington: \small{\url{https://courses.cs.washington.edu/courses/cse547/17sp/index.html}}.
If you refer to other materials in your homework, please list here.
\item {\bf Collaborators: \/}
@@ -120,7 +119,7 @@
\item You may need to add figure and source codes in your homework. Figure \ref{fig:1} is an example that compares the empirical distribution (histogram) and probability density function of the Gaussian random variable.
\begin{figure}[htbp]
\centering
- \includegraphics[width = 0.8\textwidth]{pdf_normal.eps}
+ \includegraphics[width = 0.8\textwidth]{pdf_normal.pdf}
\caption{Gaussian PDF and histogram of samples}
\label{fig:1}
\end{figure}
Binary files old/doc/latex/thucoursework/ithw.pdf and new/doc/latex/thucoursework/ithw.pdf differ
Binary files old/doc/latex/thucoursework/pdf_normal.pdf and new/doc/latex/thucoursework/pdf_normal.pdf differ
Binary files old/doc/latex/thucoursework/thucoursework.pdf and new/doc/latex/thucoursework/thucoursework.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thucoursework.doc.tlpobj new/tlpkg/tlpobj/thucoursework.doc.tlpobj
--- old/tlpkg/tlpobj/thucoursework.doc.tlpobj 2019-02-28 04:08:35.000000000 +0100
+++ new/tlpkg/tlpobj/thucoursework.doc.tlpobj 2020-02-25 01:54:55.000000000 +0100
@@ -1,10 +1,9 @@
name thucoursework.doc
category Package
-revision 47781
+revision 53891
shortdesc doc files of thucoursework
relocated 1
-docfiles size=179
- RELOC/doc/latex/thucoursework/Makefile
+docfiles size=154
RELOC/doc/latex/thucoursework/README.md
RELOC/doc/latex/thucoursework/dtx-style.sty
RELOC/doc/latex/thucoursework/iihw.pdf
@@ -13,5 +12,5 @@
RELOC/doc/latex/thucoursework/ithw.tex
RELOC/doc/latex/thucoursework/matlabscript.m
RELOC/doc/latex/thucoursework/pdf_normal.eps
- RELOC/doc/latex/thucoursework/thucoursework.hd
+ RELOC/doc/latex/thucoursework/pdf_normal.pdf
RELOC/doc/latex/thucoursework/thucoursework.pdf
++++++ thucoursework.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/thucoursework/iidef.sty new/tex/latex/thucoursework/iidef.sty
--- old/tex/latex/thucoursework/iidef.sty 2018-05-20 23:30:42.000000000 +0200
+++ new/tex/latex/thucoursework/iidef.sty 2020-02-24 15:30:44.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2018 by zhaofeng-shu33 <616545598(a)qq.com>
+%% Copyright (C) 2020 by zhaofeng-shu33 <616545598(a)qq.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -24,7 +24,7 @@
\NeedsTeXFormat{LaTeX2e}[1999/12/01]
\ProvidesClass{iidef}
-[2018/04/09 2.4 Tsinghua University Coursework Template]
+[2020/02/23 2.5.1 Tsinghua University Coursework Template]
%% configuration of nested enumerate env
\RequirePackage{enumitem}
%% set hwcount key-value option
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/thucoursework.tlpobj new/tlpkg/tlpobj/thucoursework.tlpobj
--- old/tlpkg/tlpobj/thucoursework.tlpobj 2019-02-28 04:08:35.000000000 +0100
+++ new/tlpkg/tlpobj/thucoursework.tlpobj 2020-02-25 01:54:55.000000000 +0100
@@ -1,6 +1,6 @@
name thucoursework
category Package
-revision 47781
+revision 53891
shortdesc Coursework template for Tsinghua University
relocated 1
longdesc A LaTeX package for students of Tsinghua University to write
@@ -14,7 +14,6 @@
catalogue-contact-development https://github.com/zhaofeng-shu33
catalogue-contact-repository https://github.com/zhaofeng-shu33/THU-coursework-template
catalogue-ctan /macros/latex/contrib/thucoursework
-catalogue-date 2018-05-20 08:52:27 +0200
catalogue-license lppl1.3
catalogue-topics doc-templ chinese
-catalogue-version 2.5
+catalogue-version 2.5.1
++++++ thuthesis.doc.tar.xz ++++++
++++ 43703 lines of diff (skipped)
++++++ thuthesis.tar.xz ++++++
++++ 7917 lines of diff (skipped)
++++++ tie.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/tie.1 new/texmf-dist/doc/man/man1/tie.1
--- old/texmf-dist/doc/man/man1/tie.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/tie.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH TIE 1 "7 April 2010" "Web2C 2019"
+.TH TIE 1 "7 April 2010" "Web2C 2020"
.\"=====================================================================
.SH NAME
tie \- merge or apply WEB change files
Binary files old/texmf-dist/doc/man/man1/tie.man1.pdf and new/texmf-dist/doc/man/man1/tie.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tie.doc.tlpobj new/tlpkg/tlpobj/tie.doc.tlpobj
--- old/tlpkg/tlpobj/tie.doc.tlpobj 2019-03-27 02:26:59.000000000 +0100
+++ new/tlpkg/tlpobj/tie.doc.tlpobj 2020-03-04 23:53:58.000000000 +0100
@@ -1,6 +1,6 @@
name tie.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of tie
docfiles size=6
texmf-dist/doc/man/man1/tie.1
++++++ tikz-dependency.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-dependency.doc.tlpobj new/tlpkg/tlpobj/tikz-dependency.doc.tlpobj
--- old/tlpkg/tlpobj/tikz-dependency.doc.tlpobj 2019-02-28 04:08:39.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-dependency.doc.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-dependency.doc
category Package
-revision 42454
+revision 54512
shortdesc doc files of tikz-dependency
relocated 1
docfiles size=212
++++++ tikz-dependency.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/tikz-dependency.tlpobj new/tlpkg/tlpobj/tikz-dependency.tlpobj
--- old/tlpkg/tlpobj/tikz-dependency.tlpobj 2019-02-28 04:08:39.000000000 +0100
+++ new/tlpkg/tlpobj/tikz-dependency.tlpobj 2020-03-24 02:04:07.000000000 +0100
@@ -1,6 +1,6 @@
name tikz-dependency
category Package
-revision 42454
+revision 54512
shortdesc A library for drawing dependency graphs
relocated 1
longdesc The package provides a library that draws together existing
@@ -14,7 +14,6 @@
RELOC/tex/latex/tikz-dependency/pgfmanual.prettyprinter.code.tex
RELOC/tex/latex/tikz-dependency/tikz-dependency.sty
catalogue-ctan /graphics/pgf/contrib/tikz-dependency
-catalogue-date 2018-02-07 16:05:00 +0100
-catalogue-license lpplgpl2
+catalogue-license lppl gpl2
catalogue-topics linguistic tree pgf-tikz
catalogue-version 1.2
1
0
Hello community,
here is the log from the commit of package texlive-specs-v for openSUSE:Factory checked in at 2020-05-29 21:19:21
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-v (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-v"
Fri May 29 21:19:21 2020 rev:44 rq:806932 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.changes 2019-11-07 23:12:13.996252632 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606/texlive-specs-v.changes 2020-05-29 21:32:59.937867940 +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:
----
spanish-mx.doc.tar.xz
spanish-mx.tar.xz
New:
----
soulpos.doc.tar.xz
soulpos.tar.xz
soulutf8.doc.tar.xz
soulutf8.tar.xz
spacingtricks.doc.tar.xz
spacingtricks.tar.xz
step.doc.tar.xz
step.tar.xz
stringenc.doc.tar.xz
stringenc.tar.xz
subdocs.doc.tar.xz
subdocs.tar.xz
subtext.doc.tar.xz
subtext.tar.xz
swrule.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-v.spec ++++++
++++ 13511 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-v/texlive-specs-v.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-v.new.3606/texlive-specs-v.spec
++++++ siunitx.doc.tar.xz ++++++
Binary files old/doc/latex/siunitx/siunitx.pdf and new/doc/latex/siunitx/siunitx.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/siunitx.doc.tlpobj new/tlpkg/tlpobj/siunitx.doc.tlpobj
--- old/tlpkg/tlpobj/siunitx.doc.tlpobj 2019-02-28 04:05:35.000000000 +0100
+++ new/tlpkg/tlpobj/siunitx.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,8 +1,8 @@
name siunitx.doc
category Package
-revision 47746
+revision 53914
shortdesc doc files of siunitx
relocated 1
-docfiles size=151
+docfiles size=158
RELOC/doc/latex/siunitx/README.md
RELOC/doc/latex/siunitx/siunitx.pdf
++++++ siunitx.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-abbreviations.cfg new/tex/latex/siunitx/siunitx-abbreviations.cfg
--- old/tex/latex/siunitx/siunitx-abbreviations.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-abbreviations.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -104,7 +104,7 @@
\DeclareSIUnit \ns { \nano \second }
\DeclareSIUnit \us { \micro \second }
\DeclareSIUnit \ms { \milli \second }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-binary.cfg new/tex/latex/siunitx/siunitx-binary.cfg
--- old/tex/latex/siunitx/siunitx-binary.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-binary.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -25,7 +25,7 @@
\DeclareBinaryPrefix \yobi { Yi } { 80 }
\DeclareSIUnit \bit { bit }
\DeclareSIUnit \byte { B }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx-version-1.cfg new/tex/latex/siunitx/siunitx-version-1.cfg
--- old/tex/latex/siunitx/siunitx-version-1.cfg 2018-03-12 22:49:57.000000000 +0100
+++ new/tex/latex/siunitx/siunitx-version-1.cfg 2020-01-15 22:49:08.000000000 +0100
@@ -727,7 +727,7 @@
\DeclareSIUnit \yb { \yocto \barn }
\NewDocumentCommand \requiresiconfigs { m }
{ \keys_set:nn { siunitx } { version-1-compatibility } }
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/siunitx/siunitx.sty new/tex/latex/siunitx/siunitx.sty
--- old/tex/latex/siunitx/siunitx.sty 2018-05-18 23:09:37.000000000 +0200
+++ new/tex/latex/siunitx/siunitx.sty 2020-02-25 23:06:27.000000000 +0100
@@ -13,11 +13,11 @@
%% See http://www.latex-project.org/lppl.txt
%% ---------------------------------------------------------------
%%
-\RequirePackage{expl3}[2015/09/11]
+\RequirePackage{expl3}[2020/01/12]
\RequirePackage{xparse}
-\ProvidesExplPackage {siunitx} {2018/05/17} {2.7s}
+\ProvidesExplPackage {siunitx} {2020/02/25} {2.8b}
{A comprehensive (SI) units package}
-\@ifpackagelater { expl3 } { 2015/11/15 }
+\@ifpackagelater { expl3 } { 2020/01/12 }
{ }
{
\PackageError { siunitx } { Support~package~expl3~too~old }
@@ -69,41 +69,7 @@
\bool_new:N \l__siunitx_error_bool
\AtBeginDocument {
\cs_if_free:cT { T@TS1 }
- {
- \DeclareFontEncoding { TS1 } { } { }
- \DeclareFontSubstitution { TS1 } { cmr } { m } { n }
- }
-}
-\DeclareTextSymbolDefault \c__siunitx_minus_tl { TS1 }
-\DeclareTextSymbol \c__siunitx_minus_tl { TS1 } { 61 }
-\AtBeginDocument {
- \@ifpackageloaded { fontspec }
- {
- \@ifpackageloaded { eulervm }
- { }
- {
- \int_const:Nn \c__siunitx_minus_int { 8722 }
- \tl_set:Nn \c__siunitx_minus_tl
- { \tex_char:D \c__siunitx_minus_int }
- }
- }
- { }
-}
-\DeclareTextSymbol \c__siunitx_mu_tl { TS1 } { 181 }
-\DeclareTextSymbolDefault \c__siunitx_mu_tl { TS1 }
-\AtBeginDocument {
- \@ifpackageloaded { fontspec }
- {
- \int_const:Nn \c__siunitx_mu_int { 181 }
- \tl_set:Nn \c__siunitx_mu_tl { \tex_char:D \c__siunitx_mu_int }
- }
- { }
-}
-\tl_new:N \g__siunitx_omega_tl
-\tl_gset:Nn \g__siunitx_omega_tl { \Omega }
-\AtBeginDocument {
- \cs_if_exist:NT \upOmega
- { \tl_set:Nn \g__siunitx_omega_tl { \upOmega } }
+ { \RequirePackage { textcomp } }
}
\cs_new_protected:Npn \__siunitx_tl_put_left_math:Nn #1#2
{ \tl_put_left:Nn #1 { \ensuremath {#2} } }
@@ -327,8 +293,8 @@
{
\tl_if_empty_p:f
{
- \token_get_prefix_spec:N #1
- \token_get_arg_spec:N #1
+ \cs_prefix_spec:N #1
+ \cs_argument_spec:N #1
}
}
{ \bool_not_p:n { \cs_if_exist_p:c { \cs_to_str:N #1 ~ } } }
@@ -354,7 +320,6 @@
\__siunitx_option_unchanged:Nnn \l__siunitx_qualifier_mode_tl
{ subscript } { brackets }
\keys_set:nn { siunitx } { mode = text }
- \tl_set:Nn \c__siunitx_minus_tl { \HCode { &\#x2212; } }
}
{ }
}
@@ -836,7 +801,7 @@
\cs_new_protected:Npn \__siunitx_print_text:
{
\tl_replace_all:Nnn \l__siunitx_print_arg_tl { - }
- { \c__siunitx_minus_tl }
+ { \textminus }
\__siunitx_print_text_aux:
\tl_replace_all:Nnn \l__siunitx_print_arg_tl { \mp }
{ \ensuremath { \mp } }
@@ -911,7 +876,7 @@
\cs_new_protected:Npn \__siunitx_print_text_super:n #1 {
\tl_set:Nn \l__siunitx_tmpa_tl {#1}
\tl_replace_all:Nnn \l__siunitx_tmpa_tl { - }
- { \c__siunitx_minus_tl }
+ { \textminus }
\tl_set:Nx \l__siunitx_tmpa_tl
{
\exp_not:N \ensuremath
@@ -2327,8 +2292,15 @@
{ \int_eval:n { \l__siunitx_tmpb_tl + 1 } }
\bool_if:NF \l__siunitx_round_half_up_bool
{
- \int_compare:nNnT
- { 0 \tl_tail:N \l__siunitx_tmpa_tl } = 0
+ \bool_lazy_and:nnT
+ {
+ \int_compare_p:nNn
+ { 0 \tl_head:N \l__siunitx_tmpa_tl } = 5
+ }
+ {
+ \int_compare_p:nNn
+ { 0 \tl_tail:N \l__siunitx_tmpa_tl } = 0
+ }
{
\int_if_odd:nT \l__siunitx_tmpb_tl
{
@@ -4063,9 +4035,15 @@
{ \__siunitx_number_output_single: }
}
\cs_new_protected:Npn \__siunitx_angle_print_astronomy_aux: {
- \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer }
+ \prop_get:NnNF \l__siunitx_number_out_prop { mantissa-sign }
\l__siunitx_tmpa_tl
- { \__siunitx_print:nV { number } \l__siunitx_tmpa_tl }
+ { \tl_clear:N \l__siunitx_tmpa_tl }
+ \prop_get:NnNT \l__siunitx_number_out_prop { mantissa-integer }
+ \l__siunitx_tmpb_tl
+ {
+ \tl_put_right:NV \l__siunitx_tmpa_tl \l__siunitx_tmpb_tl
+ \__siunitx_print:nV { number } \l__siunitx_tmpa_tl
+ }
\hbox_set:Nn \l__siunitx_angle_marker_box
{
\__siunitx_print:nn { number } { { \l__siunitx_output_decimal_tl } }
@@ -4383,7 +4361,7 @@
\cs_new_protected:Npn \__siunitx_protect_symbols:N #1 {
\cs_if_exist:NT #1
{
- \tl_if_empty:fT { \token_get_prefix_spec:N #1 }
+ \tl_if_empty:fT { \cs_prefix_spec:N #1 }
{ \cs_set_protected:Npx #1 { \exp_not:V #1 } }
}
}
@@ -4926,7 +4904,10 @@
\exp_not:N \PrintSuperscript
{
\__siunitx_unit_format_power_aux:n
- { \exp_not:V \l__siunitx_tmpa_tl }
+ {
+ \exp_after:wN \__siunitx_unit_format_power:w
+ \l__siunitx_tmpa_tl . . \q_stop
+ }
}
}
}
@@ -4942,10 +4923,19 @@
{
\tl_set:Nn \l__siunitx_tmpa_tl {#2}
\tl_replace_all:Nnn \l__siunitx_tmpa_tl { - }
- { \text { \c__siunitx_minus_tl } }
+ { \text { \textminus } }
\__siunitx_print:nV {#1} \l__siunitx_tmpa_tl
}
}
+\cs_new:Npn \__siunitx_unit_format_power:w #1 . #2 . #3 \q_stop
+ {
+ \exp_not:n {#1}
+ \tl_if_blank:nF {#2}
+ {
+ \exp_not:V \l__siunitx_output_decimal_tl
+ \exp_not:n {#2}
+ }
+ }
\cs_new_protected:Npn \__siunitx_unit_format_power_brackets: {
\tl_set:Nx \l__siunitx_tmpb_tl
{ bracket- \int_use:N \l__siunitx_unit_int }
@@ -6856,46 +6846,51 @@
{
\bool_if:NT \l__siunitx_redefine_symbols_bool
{
- \@ifpackageloaded { textcomp }
+ \@ifpackageloaded { fourier }
{
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl
- { { } ^ { \circ } }
- { \text { \textdegree } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl
- { \ensuremath { { } ^ { \circ } } }
- { \textdegree }
- \@ifpackageloaded { mathptmx }
- { }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl
- { \c__siunitx_mu_tl }
- { \textmu }
- \@ifpackageloaded { fourier }
- { }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
- { \ensuremath { \g__siunitx_omega_tl } }
- { \textohm }
- }
- }
- \str_if_eq:VnT \encodingdefault { OT1 }
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
- { \text { \AA } }
- { \text { \capitalring { A } } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
- { \AA }
- { \capitalring { A } }
- }
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
+ { \textohm }
+ { \text { \ensuremath { \l__siunitx_ohm_math_tl } } }
+ }
+ { }
+ \@ifpackageloaded { mathptmx }
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
+ { \textohm }
+ { \text { \ensuremath { \l__siunitx_ohm_math_tl } } }
+ }
+ { }
+ \str_if_eq:VnT \encodingdefault { OT1 }
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
+ { \text { \AA } }
+ { \text { \capitalring { A } } }
+ \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
+ { \AA }
+ { \capitalring { A } }
+ }
+ \@ifpackageloaded { unicode-math }
+ {
+ \exp_args:NNnx
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
+ { \text { \ensuremath { \Omega } } }
+ { \char_generate:nn { "03A9 } { 12 } }
}
{ }
\@ifpackageloaded { upgreek }
{
\__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
- { \text { \ensuremath { \g__siunitx_omega_tl } } }
- { \Upomega }
+ { \text { \ensuremath { \Omega } } }
+ { \text { \ensuremath { \Upomega } } }
+ }
+ {
+ \cs_if_exist:NT \upOmega
+ {
+ \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
+ { \text { \ensuremath { \Omega } } }
+ { \text { \ensuremath { \upOmega } } }
+ }
}
- { }
}
}
\keys_define:nn { siunitx } {
@@ -6911,10 +6906,10 @@
math-angstrom = \text { \AA },
math-arcminute = { } ^ { \prime },
math-arcsecond = { } ^ { \prime \prime },
- math-celsius = { } ^ { \circ } \kern - \scriptspace \__siunitx_unit_mathrm:n { C } ,
- math-degree = { } ^ { \circ },
- math-micro = \text { \c__siunitx_mu_tl },
- math-ohm = \text { \ensuremath { \g__siunitx_omega_tl } },
+ math-celsius = \text { \textdegree } \__siunitx_unit_mathrm:n { C } ,
+ math-degree = \text { \textdegree },
+ math-micro = \text { \textmu },
+ math-ohm = \text { \ensuremath { \Omega } },
}
\keys_define:nn { siunitx } {
text-angstrom .tl_set:N = \l__siunitx_angstrom_text_tl,
@@ -6929,11 +6924,10 @@
text-angstrom = \AA,
text-arcminute = \ensuremath { { } ^ { \prime } },
text-arcsecond = \ensuremath { { } ^ { \prime \prime } },
- text-celsius =
- \ensuremath { { } ^ { \circ } } \kern -\scriptspace C ,
- text-degree = \ensuremath { { } ^ { \circ } },
- text-micro = \c__siunitx_mu_tl ,
- text-ohm = \ensuremath { \g__siunitx_omega_tl },
+ text-celsius = \text { \textdegree } C,
+ text-degree = \text { \textdegree },
+ text-micro = \textmu ,
+ text-ohm = \textohm
}
\cs_new_protected:Npn \__siunitx_symbol_new:n #1
{
@@ -6942,7 +6936,7 @@
\use:c
{
l__siunitx_
- \str_fold_case:n {#1}
+ \str_foldcase:n {#1}
_
\mode_if_math:TF { math } { text }
_tl
@@ -6956,80 +6950,6 @@
\__siunitx_symbol_new:n { Degree }
\__siunitx_symbol_new:n { Micro }
\__siunitx_symbol_new:n { Ohm }
-\AtBeginDocument
- {
- \@ifpackageloaded { fontspec }
- {
- \int_const:Nn \c__siunitx_degree_int { 176 }
- \int_const:Nn \c__siunitx_micro_int { "000B5 }
- \int_const:Nn \c__siunitx_angstrom_int { "0212B }
- \int_const:Nn \c__siunitx_ohm_int { "003A9 }
- \sys_if_engine_xetex:T
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_math_tl
- { \text { \AA } }
- { \tex_char:D \c__siunitx_angstrom_int }
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_math_tl
- { { } ^ { \circ } \kern - \scriptspace C }
- {
- \tex_char:D \c__siunitx_degree_int
- C
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_math_tl
- { { } ^ { \circ } }
- { \tex_char:D \c__siunitx_degree_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_math_tl
- { \text { \c__siunitx_mu_tl } }
- { \tex_char:D \c__siunitx_micro_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_math_tl
- { \text { \ensuremath { \g__siunitx_omega_tl } } }
- { \tex_char:D \c__siunitx_ohm_int }
- \sys_if_engine_xetex:T
- {
- \__siunitx_option_unchanged:Nnn \l__siunitx_angstrom_text_tl
- { \AA }
- { \tex_char:D \c__siunitx_angstrom_int }
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_celsius_text_tl
- {
- \ensuremath
- { { } ^ { \circ } \kern - \scriptspace C }
- }
- {
- \tex_char:D \c__siunitx_degree_int
- C
- }
- \__siunitx_option_unchanged:Nnn \l__siunitx_degree_text_tl
- { \ensuremath { { } ^ { \circ } } }
- { \tex_char:D \c__siunitx_degree_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_micro_text_tl
- { \c__siunitx_mu_tl }
- { \tex_char:D \c__siunitx_micro_int }
- \__siunitx_option_unchanged:Nnn \l__siunitx_ohm_text_tl
- { \ensuremath { \g__siunitx_omega_tl } }
- { \tex_char:D \c__siunitx_ohm_int }
- }
- { }
- \@ifpackageloaded { unicode-math }
- {
- \int_const:Nn \c__siunitx_arcminute_int { 8242 }
- \int_const:Nn \c__siunitx_arcsecond_int { 8243 }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_math_tl
- { { } ^ { \prime } }
- { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_math_tl
- { { } ^ { \prime \prime } }
- { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcminute_text_tl
- { \ensuremath { { } ^ { \prime } } }
- { \ensuremath { \tex_char:D \c__siunitx_arcminute_int } }
- \__siunitx_option_unchanged:Nnn \l__siunitx_arcsecond_text_tl
- { \ensuremath { { } ^ { \prime \prime } } }
- { \ensuremath { \tex_char:D \c__siunitx_arcsecond_int } }
- }
- { }
- }
\clist_new:N \l__siunitx_pgf_link_clist
\cs_new_protected:Npn \__siunitx_pgf_link: {
\clist_clear:N \l__siunitx_pgf_link_clist
@@ -7405,7 +7325,7 @@
\cs_set:Npn \SIUnitSymbolCelsius { \textcelsius }
\cs_set:Npn \SIUnitSymbolDegree { \textdegree }
\cs_set:Npn \SIUnitSymbolMicro { \textmu }
- \cs_set:Npn \SIUnitSymbolOhm { [ohm] }
+ \cs_set:Npn \SIUnitSymbolOhm { \textohm }
}
\DeclareExpandableDocumentCommand \numInBookmark { o m } {#2}
\DeclareExpandableDocumentCommand \numrangeInBookmark { o m m }
@@ -7711,7 +7631,7 @@
{ \__siunitx_unit_create_functions: }
{ \__siunitx_unit_create_empty_functions: }
}
-%% Copyright (C) 2008-2018 by
+%% Copyright (C) 2008-2020 by
%% Joseph Wright <joseph.wright(a)morningstar2.co.uk>
%%
%% It may be distributed and/or modified under the conditions of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/siunitx.tlpobj new/tlpkg/tlpobj/siunitx.tlpobj
--- old/tlpkg/tlpobj/siunitx.tlpobj 2019-02-28 04:05:35.000000000 +0100
+++ new/tlpkg/tlpobj/siunitx.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name siunitx
category Package
-revision 47746
+revision 53914
shortdesc A comprehensive (SI) units package
relocated 1
longdesc Typesetting values with units requires care to ensure that the
@@ -23,7 +23,9 @@
longdesc handle all of the possible unit-related needs of LaTeX users.
longdesc The package relies on LaTeX 3 support from the l3kernel and
longdesc l3packages bundles.
-runfiles size=79
+depend l3kernel
+depend l3packages
+runfiles size=78
RELOC/tex/latex/siunitx/siunitx-abbreviations.cfg
RELOC/tex/latex/siunitx/siunitx-binary.cfg
RELOC/tex/latex/siunitx/siunitx-version-1.cfg
@@ -32,7 +34,6 @@
catalogue-contact-home https://www.texdev.net
catalogue-contact-repository https://github.com/josephwright/siunitx
catalogue-ctan /macros/latex/contrib/siunitx
-catalogue-date 2018-05-17 22:18:13 +0200
catalogue-license lppl1.3c
-catalogue-topics units scientific-docs
-catalogue-version 2.7s
+catalogue-topics units scientific-docs expl3
+catalogue-version 2.8b
++++++ skdoc.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skdoc/README new/doc/latex/skdoc/README
--- old/doc/latex/skdoc/README 2018-05-01 00:56:35.000000000 +0200
+++ new/doc/latex/skdoc/README 2019-09-29 23:14:38.000000000 +0200
@@ -1,6 +1,6 @@
%% skdoc documentation class
%%
-%% Copyright (C) 2012-2018 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% This work consists of the files skdoc.dtx
%% and the derived filebase skdoc.cls.
-This is version 1.5a of the skdoc document class. It is designed to
+This is version 1.5b of the skdoc document class. It is designed to
generate both documentation and derivative files using only LaTeX,
i.e. without using docstrip and ins/dtx files.
Binary files old/doc/latex/skdoc/skdoc.pdf and new/doc/latex/skdoc/skdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skdoc.doc.tlpobj new/tlpkg/tlpobj/skdoc.doc.tlpobj
--- old/tlpkg/tlpobj/skdoc.doc.tlpobj 2019-02-28 04:05:37.000000000 +0100
+++ new/tlpkg/tlpobj/skdoc.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,8 +1,8 @@
name skdoc.doc
category Package
-revision 47526
+revision 52211
shortdesc doc files of skdoc
relocated 1
-docfiles size=68
+docfiles size=73
RELOC/doc/latex/skdoc/README
RELOC/doc/latex/skdoc/skdoc.pdf
++++++ skdoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skdoc/skdoc.cls new/tex/latex/skdoc/skdoc.cls
--- old/tex/latex/skdoc/skdoc.cls 2018-05-01 00:56:35.000000000 +0200
+++ new/tex/latex/skdoc/skdoc.cls 2019-09-29 23:14:38.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% skdoc documentation class
%%
-%% Copyright (C) 2012-2018 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
+%% Copyright (C) 2012-2019 by Simon Sigurdhsson <sigurdhsson(a)gmail.com>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,7 +26,7 @@
%% and the derived filebase skdoc.cls.
\RequirePackage{expl3}
\ProvidesExplClass{skdoc}
- {2018/04/18}{1.5a}{skdoc documentation class}
+ {2019/09/29}{1.5b}{skdoc documentation class}
\PassOptionsToPackage{log-declarations=false}{xparse}
\LoadClass[ DIV7,
headings=big,
@@ -46,7 +46,7 @@
\RequirePackage[english=british]{csquotes}
\RequirePackage[font=small,labelfont=bf,textfont=it]{caption}
\RequirePackage{PTSerif,sourcecodepro}
- \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+ \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
\RequirePackage[babel]{microtype}
}
\msg_new:nnn{skdoc}{key-exists}{File~key~"#1"~already~declared!}
@@ -95,7 +95,7 @@
}
\prg_new_conditional:Nnn\__skdoc_if_shellescape:{T,F,TF}{
\if_cs_exist:N\pdf@shellescape
- \if_int_compare:w\pdf@shellescape=\c_one
+ \if_int_compare:w\pdf@shellescape=\c_one_int
\prg_return_true:
\else:
\prg_return_false:
@@ -352,7 +352,7 @@
\int_if_exist:cTF{skdoc@output@##1@line}{}{
\msg_critical:nnn{skdoc}{key-nexists}{##1}
}%
- \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero%
+ \int_compare:nNnT{\int_use:c{skdoc@output@##1@line}}=\c_zero_int%
{\int_gincr:c{skdoc@output@##1@line}}%
}
\__skdoc_if_print_code:T{
@@ -392,7 +392,7 @@
\begin{minipage}[c][1ex]{\textwidth}
\bool_if:nF{
\g__skdoc_in_example_bool &&
- !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one
+ !\int_compare_p:nNn{\clist_count:N\l__skdoc_keys}>\c_one_int
}{
\makebox[4ex]{%
\leavevmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skdoc.tlpobj new/tlpkg/tlpobj/skdoc.tlpobj
--- old/tlpkg/tlpobj/skdoc.tlpobj 2019-02-28 04:05:37.000000000 +0100
+++ new/tlpkg/tlpobj/skdoc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,6 +1,6 @@
name skdoc
category Package
-revision 47526
+revision 52211
shortdesc Documentation and extraction for packages and document classes
relocated 1
longdesc The class provides the functionality and implementation of
@@ -13,7 +13,7 @@
runfiles size=13
RELOC/tex/latex/skdoc/skdoc.cls
catalogue-ctan /macros/latex/contrib/skdoc
-catalogue-date 2019-01-12 10:17:10 +0100
+catalogue-date 2019-09-29 19:03:14 +0200
catalogue-license lppl1.3
catalogue-topics doc-supp class
-catalogue-version 1.5a
+catalogue-version 1.5b
++++++ skmath.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skmath/README new/doc/latex/skmath/README
--- old/doc/latex/skmath/README 2018-12-30 23:14:46.000000000 +0100
+++ new/doc/latex/skmath/README 2019-10-16 22:56:14.000000000 +0200
@@ -17,7 +17,7 @@
%% This work consists of the file skmath.tex
%% and the derived file skmath.sty.
-This is version 0.5 of the skmath package, a package which provides
+This is version 0.5a of the skmath package, a package which provides
improved and new math commands for superior typesetting with lower effort.
The following files are enclosed.
Binary files old/doc/latex/skmath/skmath.pdf and new/doc/latex/skmath/skmath.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skmath.doc.tlpobj new/tlpkg/tlpobj/skmath.doc.tlpobj
--- old/tlpkg/tlpobj/skmath.doc.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skmath.doc.tlpobj 2019-10-17 01:54:28.000000000 +0200
@@ -1,8 +1,8 @@
name skmath.doc
category Package
-revision 49550
+revision 52411
shortdesc doc files of skmath
relocated 1
-docfiles size=71
+docfiles size=76
RELOC/doc/latex/skmath/README
RELOC/doc/latex/skmath/skmath.pdf
++++++ skmath.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skmath/skmath.sty new/tex/latex/skmath/skmath.sty
--- old/tex/latex/skmath/skmath.sty 2018-12-30 23:14:46.000000000 +0100
+++ new/tex/latex/skmath/skmath.sty 2019-10-16 22:56:14.000000000 +0200
@@ -20,7 +20,7 @@
\RequirePackage{expl3,l3keys2e,xparse}
\ProvidesExplPackage{skmath}
- {2018/12/29}{0.5}{improved math commands}
+ {2019/10/15}{0.5a}{improved math commands}
\PassOptionsToPackage{intlimits,sumlimits,namelimits}{amsmath}
\RequirePackage{amssymb,mathtools,xfrac}
\msg_new:nnnn{skmath}{undefined-macro}{The~macro~`\token_to_str:N#1'~was~undefined!}
@@ -285,7 +285,7 @@
\RenewDocumentCommand\frac{mm}{\genfrac{}{}{}{}%
{\displaystyle #1}{\displaystyle #2}}
\prg_new_conditional:Npnn\__skmath_if_numerical:n#1{p,T,F,TF}{
- \str_case_x:nnTF{#1}{
+ \str_case_e:nnTF{#1}{
{0}{}
{1}{}
{2}{}
@@ -307,7 +307,7 @@
\clist_set:Nn\l_tmpa_clist{#1}
\clist_map_inline:Nn\l_tmpa_clist{
\seq_set_split:Nnn\l_tmpa_seq{^}{##1}
- \int_compare:nT{\seq_count:N\l_tmpa_seq<\c_two}{
+ \int_compare:nT{\seq_count:N\l_tmpa_seq<2}{
\seq_put_right:Nn\l_tmpa_seq{1}
}
\seq_get_right:NN\l_tmpa_seq\l_tmpb_tl
@@ -319,20 +319,20 @@
\tl_put_right:Nx\l_tmpa_tl{\tl_use:N\l_tmpb_tl}
}
}
- \int_compare:nT{\l_tmpa_int>\c_zero}{\int_use:N\l_tmpa_int}
+ \int_compare:nT{\l_tmpa_int>\c_zero_int}{\int_use:N\l_tmpa_int}
\bool_if:NF\l_tmpa_bool{
- \int_compare:nT{\l_tmpa_int>\c_zero}{+}
+ \int_compare:nT{\l_tmpa_int>\c_zero_int}{+}
\tl_use:N\l_tmpa_tl
}
}
\prg_new_conditional:Npnn\__skmath_pd_if_vars_sum_above_one:n#1{p,T,F,TF}{
\clist_set:Nn\l_tmpa_clist{#1}
- \int_compare:nTF{\clist_count:N\l_tmpa_clist>\c_one}{
+ \int_compare:nTF{\clist_count:N\l_tmpa_clist>\c_one_int}{
\prg_return_true:
}{
\clist_pop:NN\l_tmpa_clist\l_tmpa_tl
\seq_set_split:NnV\l_tmpa_seq{^}{\l_tmpa_tl}
- \int_compare:nTF{\seq_count:N\l_tmpa_seq<\c_two}{
+ \int_compare:nTF{\seq_count:N\l_tmpa_seq<2}{
\prg_return_false:
}{
\prg_return_true:
@@ -358,8 +358,8 @@
\clist_map_inline:Nn\l_tmpa_clist{
\seq_set_split:Nnn\l_tmpa_seq{^}{##1}
\seq_pop:NN\l_tmpa_seq\l_tmpa_tl
- \int_set:Nn\l_tmpa_int{\c_one}
- \int_compare:nT{\seq_count:N\l_tmpa_seq>\c_zero}{
+ \int_set:Nn\l_tmpa_int{\c_one_int}
+ \int_compare:nT{\seq_count:N\l_tmpa_seq>\c_zero_int}{
\seq_pop:NN\l_tmpa_seq\l_tmpb_tl
\int_set:Nn\l_tmpa_int{\tl_use:N\l_tmpb_tl}
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skmath.tlpobj new/tlpkg/tlpobj/skmath.tlpobj
--- old/tlpkg/tlpobj/skmath.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skmath.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,6 +1,6 @@
name skmath
category Package
-revision 49550
+revision 52411
shortdesc Extensions to the maths command repertoir
relocated 1
longdesc The package provides a selection of new maths commands and
@@ -8,7 +8,7 @@
runfiles size=4
RELOC/tex/latex/skmath/skmath.sty
catalogue-ctan /macros/latex/contrib/skmath
-catalogue-date 2018-12-29 23:02:23 +0100
+catalogue-date 2019-10-16 10:24:58 +0200
catalogue-license lppl1.3
catalogue-topics maths
-catalogue-version 0.5
+catalogue-version 0.5a
++++++ skrapport.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/skrapport/README new/doc/latex/skrapport/README
--- old/doc/latex/skrapport/README 2018-12-30 00:01:12.000000000 +0100
+++ new/doc/latex/skrapport/README 2019-10-16 22:56:31.000000000 +0200
@@ -26,7 +26,7 @@
%% * skrapport-size11pt.clo
%% * skrapport-size12pt.clo
-This is version 0.12i of the skrapport document class, intended for simple
+This is version 0.12k of the skrapport document class, intended for simple
reports submitted by the author at Chalmers University of Technology.
The following files are enclosed.
Binary files old/doc/latex/skrapport/skrapport.pdf and new/doc/latex/skrapport/skrapport.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skrapport.doc.tlpobj new/tlpkg/tlpobj/skrapport.doc.tlpobj
--- old/tlpkg/tlpobj/skrapport.doc.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skrapport.doc.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,8 +1,8 @@
name skrapport.doc
category Package
-revision 49540
+revision 52412
shortdesc doc files of skrapport
relocated 1
-docfiles size=67
+docfiles size=72
RELOC/doc/latex/skrapport/README
RELOC/doc/latex/skrapport/skrapport.pdf
++++++ skrapport.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/skrapport/skrapport.cls new/tex/latex/skrapport/skrapport.cls
--- old/tex/latex/skrapport/skrapport.cls 2018-12-30 00:01:12.000000000 +0100
+++ new/tex/latex/skrapport/skrapport.cls 2019-10-16 22:56:31.000000000 +0200
@@ -29,7 +29,7 @@
\RequirePackage{expl3,l3keys2e,xparse,xstring,etoolbox}
\ProvidesExplClass{skrapport}%
- {2018/12/29}{0.12i}{stylish report document class}
+ {2019/10/15}{0.12k}{stylish report document class}
\msg_new:nnnn{skrapport}{option-deprecated}{Option~`#1'~deprecated!}
{Please~use~`#2'~instead.}
\msg_new:nnnn{skrapport}{option-no-effect}{Option~`#1'~deprecated!}
@@ -394,7 +394,7 @@
}
{skdoc}{
\RequirePackage{PTSerif}
- \RequirePackage[defaultsans,osfigures,scale=0.95]{opensans}
+ \RequirePackage[defaultsans,oldstyle,scale=0.95]{opensans}
}
{word}{
\bool_if:nF{\sys_if_engine_luatex_p: || \sys_if_engine_xetex_p:}{
@@ -836,7 +836,7 @@
{~\__skrapport_and_word:{}~}{,~}{~\__skrapport_and_word:{}~}
}
\cs_new:Nn\__skrapport_email_list:{
- \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero}{
+ \int_compare:nT{\clist_count:N\g__skrapport_author_clist>\c_zero_int}{
\clist_use:Nnnn\g__skrapport_email_clist{\\}{\\}{\\}
}
}
@@ -1089,27 +1089,27 @@
#6
}
}
-\cs_generate_variant:Nn\__skrapport_pre_section:n{c}
-\cs_generate_variant:Nn\__skrapport_post_section:n{c}
-\cs_generate_variant:Nn\__skrapport_section_star:nnn{ccn}
-\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnccnn}
+\cs_generate_variant:Nn\__skrapport_pre_section:n{v}
+\cs_generate_variant:Nn\__skrapport_post_section:n{v}
+\cs_generate_variant:Nn\__skrapport_section_star:nnn{vvn}
+\cs_generate_variant:Nn\__skrapport_section_nostar:nnnnnn{nnvvnn}
\cs_set:Nn\__skrapport_generic_section:nnnnn{
- \__skrapport_pre_section:c{c__skrapport_#1_pre_skip}
+ \__skrapport_pre_section:v{c__skrapport_#1_pre_skip}
\IfBooleanTF#3{
- \__skrapport_section_star:ccn
+ \__skrapport_section_star:vvn
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
{#5}
}{
\IfNoValueTF{#4}{
- \__skrapport_section_nostar:nnccnn
+ \__skrapport_section_nostar:nnvvnn
{#1}{#2}
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
{#5}
{#5}
}{
- \__skrapport_section_nostar:nnccnn
+ \__skrapport_section_nostar:nnvvnn
{#1}{#2}
{c__skrapport_#1_indent_dim}
{__skrapport_#1_style:}
@@ -1117,7 +1117,7 @@
{#4}
}
}
- \__skrapport_post_section:c{c__skrapport_#1_post_skip}
+ \__skrapport_post_section:v{c__skrapport_#1_post_skip}
}
\skip_const:Nn\c__skrapport_section_pre_skip{-4ex~plus~1ex~minus~-1ex}
\skip_const:Nn\c__skrapport_section_post_skip{.5ex~plus~.5ex}
@@ -1235,7 +1235,7 @@
\DeclareDocumentCommand\em{}{\msg_error:nnnn{skrapport}{old-font-deprecated}{\em}{\emph}}
\cs_new:Nn\__skrapport_emphstyle:{
\itshape
- \dim_compare:nF{\fontdimen\c_one\font>\c_zero_dim}{\bfseries}
+ \dim_compare:nF{\fontdimen\c_one_int\font>\c_zero_dim}{\bfseries}
}
\DeclareDocumentCommand\emph{+m}{
\ifmmode
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skrapport.tlpobj new/tlpkg/tlpobj/skrapport.tlpobj
--- old/tlpkg/tlpobj/skrapport.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skrapport.tlpobj 2019-10-17 01:54:29.000000000 +0200
@@ -1,6 +1,6 @@
name skrapport
category Package
-revision 49540
+revision 52412
shortdesc 'Simple' class for reports, etc.
relocated 1
longdesc The class is intended for simple documents (e.g., reports
@@ -21,7 +21,7 @@
catalogue-contact-bugs https://github.com/urdh/skrapport/issues
catalogue-contact-repository https://github.com/urdh/skrapport
catalogue-ctan /macros/latex/contrib/skrapport
-catalogue-date 2018-12-29 22:01:02 +0100
+catalogue-date 2019-10-16 21:10:34 +0200
catalogue-license lppl1.3
catalogue-topics class
-catalogue-version 0.12i
+catalogue-version 0.12k
++++++ skull.tar.xz ++++++
Binary files old/fonts/tfm/public/skull/skull.tfm and new/fonts/tfm/public/skull/skull.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/skull.tlpobj new/tlpkg/tlpobj/skull.tlpobj
--- old/tlpkg/tlpobj/skull.tlpobj 2019-02-28 04:05:38.000000000 +0100
+++ new/tlpkg/tlpobj/skull.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,13 +1,14 @@
name skull
category Package
-revision 25608
+revision 51907
shortdesc A font to draw a skull
relocated 1
longdesc The font (defined in Metafont) defines a single character, a
longdesc black solid skull. A package is supplied to make this character
longdesc available as a symbol in maths mode.
-runfiles size=2
+runfiles size=3
RELOC/fonts/source/public/skull/skull.mf
+ RELOC/fonts/tfm/public/skull/skull.tfm
RELOC/tex/latex/skull/skull.sty
catalogue-ctan /fonts/skull
catalogue-date 2016-06-24 19:18:15 +0200
++++++ snapshot.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/snapshot/README new/doc/latex/snapshot/README
--- old/doc/latex/snapshot/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/snapshot/README 2019-09-18 23:56:20.000000000 +0200
@@ -0,0 +1,17 @@
+README for snapshot 2019/09/17
+https://www.ams.org/arc/resources/snapshot-about.html
+tech-support(a)ams.org
+
+The snapshot package helps the owner of a LaTeX document
+obtain a list of the external dependencies of the document, in a
+form that can be embedded at the top of the document. To put it
+another way, it provides a snapshot of the current processing
+context of the document, insofar as it can be determined from
+inside LaTeX.
+
+Originally written by Michael J. Downes, the snapshot package
+is currently maintained by the 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.
Binary files old/doc/latex/snapshot/snapshot.pdf and new/doc/latex/snapshot/snapshot.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/snapshot.doc.tlpobj new/tlpkg/tlpobj/snapshot.doc.tlpobj
--- old/tlpkg/tlpobj/snapshot.doc.tlpobj 2019-02-28 04:05:39.000000000 +0100
+++ new/tlpkg/tlpobj/snapshot.doc.tlpobj 2019-09-19 01:54:05.000000000 +0200
@@ -1,7 +1,8 @@
name snapshot.doc
category Package
-revision 15878
+revision 52115
shortdesc doc files of snapshot
relocated 1
-docfiles size=30
+docfiles size=49
+ RELOC/doc/latex/snapshot/README
RELOC/doc/latex/snapshot/snapshot.pdf
++++++ snapshot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/snapshot/snapshot.sty new/tex/latex/snapshot/snapshot.sty
--- old/tex/latex/snapshot/snapshot.sty 2006-01-13 01:07:16.000000000 +0100
+++ new/tex/latex/snapshot/snapshot.sty 2019-09-18 23:56:20.000000000 +0200
@@ -6,51 +6,70 @@
%%
%% snapshot.dtx
%%
-%%% ====================================================================
-%%% @LaTeX-doc-source-file{
-%%% filename = "snapshot.dtx",
-%%% version = "1.14",
-%%% date = "2002/03/05",
-%%% time = "15:29:00 EST",
-%%% checksum = "39090 807 3449 29761",
-%%% author = "American Mathematical Society",
-%%% copyright = "Copyright 2001 American Mathematical Society,
-%%% all rights reserved. Copying of this file is
-%%% authorized only if either:
-%%% (1) you make absolutely no changes to your copy,
-%%% including name; OR
-%%% (2) if you do make changes, you first rename it
-%%% to some other name.",
-%%% address = "American Mathematical Society,
-%%% Electronic Products and Services,
-%%% PO Box 6248,
-%%% Providence, RI 02940,
-%%% USA",
-%%% email = "tech-support(a)ams.org",
-%%% URL = "http://www.ams.org/",
-%%% supported = "yes",
-%%% keywords = "version, compatibility, dependencies, LaTeX",
-%%% abstract = "This package provides a way for a LaTeX
-%%% document to specify, for each external file
-%%% on which the document depends, which version
-%%% is required to guarantee output fidelity.",
-%%% docstring = "The checksum field above contains a CRC-16
-%%% checksum as the first value, followed by the
-%%% equivalent of the standard UNIX wc (word
-%%% count) utility output of lines, words, and
-%%% characters. This is produced by Robert
-%%% Solovay's checksum utility.",
-%%% }
-%%% ====================================================================
+%% Copyright 2001, 2004, 2006, 2007, 2010, 2012 American Mathematical Society.
+%%
+%% American Mathematical Society
+%% Technical Support
+%% Publications Technical Group
+%% 201 Charles Street
+%% Providence, RI 02904
+%% USA
+%% tel: (401) 455-4080
+%% (800) 321-4267 (USA and Canada only)
+%% fax: (401) 331-3842
+%% email: tech-support(a)ams.org
+%%
+%% 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
+%% http://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 American Mathematical
+%% Society.
+%%
\NeedsTeXFormat{LaTeX2e}[1994/12/01]
-\ProvidesPackage{snapshot}[2002/03/05 v1.14]
-\let\@xp\expandafter \let\@nx\noexpand
-\newcommand{\RequireVersions}[2][]{%
- \let\snap@check\snap@compare@versions
- \let\snap@selfcheck\snap@selfcheck@a
- \@ifnextchar *\snap@store@version\snap@store@error#2*{end}{}{}%
+\ProvidesPackage{snapshot}[2012/08/06 v2.13]
+\let\@xp=\expandafter \let\@nx=\noexpand
+\def\str@cmp#1#2\str@cmp#3{%
+ \if #1#3\else F\@car\fi \str@cmp#2\str@cmp
+}
+\def\string@equal#1#2{%
+ \str@cmp#1\relax\str@cmp#2{\relax\@gobbletwo}\@nil TT%
+}
+\newcommand{\RequireVersions}[2][]{}%
+\renewcommand{\RequireVersions}[1][]{%
+ \def\snap@check{\snap@compare@versions}%
+ \toks@{#1}\afterassignment\snap@storem
+ \let\@let@token=
+}
+\def\snap@storem{%
+ \ifx\@let@token\bgroup
+ \else
+ \PackageError{snapshot}{Expected a `\@charlb' character here}\@ehc
+ \@xp\@gobblefour
+ \fi
+ \futurelet\@let@token\snap@branch
}
\@onlypreamble\RequireVersions
+\let\snap@check\@gobble
+\def\snap@finish{\toks@\bgroup}
+\def\snap@branch{%
+ \ifx\@let@token\egroup
+ \@xp\snap@finish
+ \else\ifx\@let@token *%
+ \let\reserved@c\snap@store@version
+ \else\ifx\@let@token\@sptoken
+ \lowercase{\def\reserved@c} {\futurelet\@let@token\snap@branch}%
+ \else
+ \let\reserved@c\snap@store@error
+ \fi\fi\fi
+ \reserved@c
+}
\def\snap@store@error#1{%
\PackageError{snapshot}{Expected '*' here, not '#1'}\@ehc
}
@@ -59,34 +78,68 @@
\@xp\snap@store@b\csname snapx@#2\endcsname{#2}{#3}{#4}%
}
\@onlypreamble\snap@store@version
+\ifx\OmegaVersion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ {Omega}\space\space\space
+ {0000/00/00 v\OmegaVersion}%
+ }%
+\fi
+\ifx\eTeXversion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ {eTeX}\space\space\space\space
+ {0000/00/00 v\number\eTeXversion\eTeXrevision}%
+ }%
+\fi
+\ifx\pdftexversion\@@undefined
+\else
+ \edef\snapshotApplication{%
+ \ifx\eTeXversion\@@undefined
+ {pdfTeX}\space\space
+ \else
+ {pdfeTeX}\space
+ \fi
+ {0000/00/00 v0.\number\pdftexversion\pdftexrevision}%
+ }%
+\fi
+\@ifundefined{snapshotApplication}{%
+ \edef\snapshotApplication{%
+ {TeX}\space\space\space\space\space
+ {1990/03/25 v3.x}%
+ }%
+}{}
\def\@fmtextension{fmt}
\def\@tfmextension{tfm}
\edef\snapx@package{.\@pkgextension}
\edef\snapx@class{.\@clsextension}
\edef\snapx@format{.\@fmtextension}
\edef\snapx@tfm{.\@tfmextension}
-\long\def\snapx@application{}
-\let\snap@file=\@empty
+\long\def\snapx@ignore{}
+\let\snapx@application=\snapx@ignore
+\let\snapx@file=\@empty
\let\snapx@end\@@end
+\expandafter\let\csname snapx@-------\endcsname\snapx@end
\def\snap@store@b#1#2#3#4{%
\ifx#1\snapx@end
- \@xp\@gobblefour
+ \@xp\snap@finish
\else
\ifx#1\relax \let#1\@empty\fi
\def\@tempa##1 ##2 ##3\@nil{##1 ##2}%
\ifx#1\snapx@application
+ \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
\else
- \xdef\rqv@list{\rqv@list
- \ifx\@empty\rqv@list\else,\fi
- #3#1%
- }%
- \fi
- \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
- \ifx#1\snapx@format \snap(a)check{#3.fmt}%
- \else \snap(a)selfcheck{#3.sty}%
+ \xdef\rqv@list{\rqv@list{#3#1}}%
+ \@xp\xdef\csname rqv@#3#1\endcsname{\@tempa#4 v?.? ? \relax\@nil}%
+ \snap@intest{#3}{#1}%
+ \ifx#1\snapx@format \snap(a)check{#3.fmt}%
+ \else
+ \edef\@tempa{\@nx\string@equal{snapshot.sty}{#3#1}}%
+ \if\@tempa \snap@selfcheck \fi
+ \fi
\fi
\fi
- \@ifnextchar *\snap@store@version\snap@store@error
+ \futurelet\@let@token\snap@branch
}
\@onlypreamble\snap@store@b
\def\snap@write{\immediate\write\snap@out}
@@ -97,10 +150,8 @@
\DeclareOption{log}{%
\let\snap@write\typeout
}
-\let\snap@fake@b\relax
-\DeclareOption{test}{%
- \def\snap@fake@b{\endinput \futurelet\@let@token\snap@ignoline}%
-}
+\let\snap@intest=\@gobbletwo
+\DeclareOption{test}{\def\snap@intest{True}}
\DeclareOption{tfm}{%
\typeout{Option 'tfm' not implemented yet [1999/09/23]}%
}
@@ -108,17 +159,20 @@
\def\snap@mismatch{\snap@mismatch@warning}
\DeclareOption{error}{%
\def\snap@mismatch{\PackageError}%
+ \def\snap@selfcheck{\snap@selfcheck@a}%
\ifx\snap@select\@empty \let\snap@select\snap@select@all \fi
}
\DeclareOption{warning}{%
\def\snap@mismatch{\snap@mismatch@warning}%
+ \def\snap@selfcheck{\snap@selfcheck@a}%
\ifx\snap@select\@empty \let\snap@select\snap@select@all \fi
}
\def\snap@select@all#1#2 #3#4 #5\@nil{#1#2 #3#4}
\let\snap@select\@empty
-\DeclareOption{date}{%
- \def\snap@select#1#2 #3\@nil{#1#2}%
-}
+\def\snap@seldate#1#2 #3\@nil{#1#2}%
+\def\snap@selversion#1#2 #3{\snap@select@version #3}%
+\def\snap@selmajor#1#2 #3{\snap@select@major #3}%
+\DeclareOption{date}{\let\snap@select=\snap@seldate}
\def\snap@select@version#1{%
\ifodd 0#11 \@xp\snap@sva\@xp#1\else\@xp\snap@select@version\fi
}
@@ -127,13 +181,26 @@
\ifodd 0#11 \@xp\snap@svm\@xp#1\else\@xp\snap@select@major\fi
}
\def\snap@svm#1.#2\@nil{#1}
-\DeclareOption{version}{%
- \def\snap@select#1#2 #3{\snap@select@version #3}%
+\DeclareOption{version}{\let\snap@select\snap@selversion}
+\DeclareOption{major-version}{\let\snap@select\snap@selmajor}
+\def\snap@bbinfo{01}
+\DeclareOption{bbinfo}{\def\snap@bbinfo{00}}
+\let\snap@splitter=?
+\AtBeginDocument{%
+ \xdef\@filelist{\@filelist\snap@splitter}%
}
-\DeclareOption{major-version}{%
- \def\snap@select#1#2 #3{\snap@select@major #3}%
+\let\snap@selfcheck\@empty
+\let\snap@selfcheck@a\@empty
+\DeclareOption{self-warning}{%
+ \def\snap@selfcheck{%
+ \begingroup
+ \def\snap@mismatch{\snap@mismatch@warning}%
+ \snap@selfcheck@a
+ \endgroup
+ }
}
-\ProcessOptions\par
+\ExecuteOptions{warning}
+\ProcessOptions\relax
\edef\snap@restore@extensions{%
\def\@nx\@pkgextension{\@pkgextension}%
\def\@nx\@clsextension{\@clsextension}%
@@ -157,42 +224,29 @@
}%
\fi
\listfiles
-\def\@dofilelist{%
- \snap@restore@extensions
- \ifx\rqv@list\@empty
- \else \rqv@compare@lists
- \fi
- \ifx\snap@write\typeout
+\def\snap@doit#1{%
+ \begingroup
+ \ifx\delimiter#1\delimiter
\else
- \newwrite\snap@out
- \immediate\openout\snap(a)out=\jobname.dep \relax
- \fi
- \snap@write{\string\RequireVersions\@charlb}%
- \snap@write{\space\space *{application}{TeX}%
- \space\space\space\space\space{1990/03/25 v3.x}}%
- \@for\@currname:=\@filelist\do{%
- \filename@parse\@currname
+ \filename@parse{#1}%
+ \let\@tempd\@empty
\ifx\filename@ext\relax
- \def\@tempa{file}\def\@tempd{.tex}\def\filename@ext{tex}%
- \def\@tempb{~~~}%
+ \def\@tempa{file}\def\@tempb{~~~}%
\else\ifx\filename@ext\@pkgextension
- \def\@tempa{package}\let\@tempd\@empty
- \def\@tempb{}%
+ \def\@tempa{package}\let\@tempb\@empty
\else\ifx\filename@ext\@clsextension
- \def\@tempa{class}\let\@tempd\@empty
- \def\@tempb{~~}%
+ \def\@tempa{class}\def\@tempb{~~}%
\else\ifx\filename@ext\@fmtextension
- \def\@tempa{format}\let\@tempd\@empty
- \def\@tempb{~}%
+ \def\@tempa{format}\def\@tempb{~}%
\else\ifx\filename@ext\@tfmextension
- \def\@tempa{tfm}\let\@tempd\@empty
- \def\@tempb{~~~~}%
+ \def\@tempa{tfm}\def\@tempb{~~~~}%
\else
\def\@tempa{file}\edef\@tempd{.\filename@ext}%
\def\@tempb{~~~}%
\fi\fi\fi\fi\fi
\@xp\let\@xp\@tempe
- \csname ver@\filename@base.\filename@ext\endcsname
+ \csname ver@\filename@base %
+ \ifx\filename@ext\relax\else.\filename@ext\fi\endcsname
\ifx\@tempe\@empty \let\@tempe\relax \fi
\edef\@tempe{%
\ifx\@tempe\relax 0000/00/00 v0.0%
@@ -202,99 +256,161 @@
}%
\edef\@tempc{\filename@area\filename@base\@tempd}% full file name
\@xp\snap@pad\@tempc\space~~~~~~~~~~~~~~~~\@nil\@tempd
- \begingroup \let~\space
- \snap@write{\space\space *{\@tempa}\@tempb{\@tempc}\@tempd{\@tempe}}%
- \endgroup
+ \let~\space
+ \snap@write{\space\space *{\@tempa}\@tempb{\@tempc}\@tempd{\@tempe}}%
+ \fi
+ \aftergroup\snap@doit
+ \endgroup
+}%
+\def\snap@bracify#1#2,{%
+ \ifx\@empty#1\expandafter\@gobble\else {#1#2}\fi \snap@bracify
+}
+\def\snap@splitter@a{%
+ \iffalse{{\fi }}% close current file name, end definition
+ \xdef\specific@files{%
+ \iffalse}\fi
+ \specific@files
+ \expandafter\@gobble\string % discard one closing brace
+}
+\def\snap@fdcheck#1{%
+ \ifx\delimiter#1\@xp\@gobble
+ \else\snap@fda#1\@empty.fd\@empty ?\@nil
+ \fi
+ \snap@fdcheck
+}
+\def\snap@fda#1.fd\@empty#2#3\@nil{%
+ \if ?#2%
+ \xdef\specific@files{\specific@files {#1}}%
+ \else
+ \xdef\general@files{\general@files {#1.fd}}%
+ \fi
+}
+\let\general@files\@empty
+\let\specific@files\@empty
+\newcommand{\SpecialInput}[1]{%
+ \xdef\specific@files{\specific@files{#1}}%
+ \@@input#1\relax
+}
+\def\@dofilelist{%
+ \snap@restore@extensions
+ \xdef\general@files{\@xp\snap@bracify \@filelist \@empty,\@empty,}%
+ \let\snap@splitter\snap@splitter@a
+ \xdef\general@files{\general@files}%
+ \let\@tempa\specific@files \global\let\specific@files\@empty
+ \@xp\snap@fdcheck\@tempa{\delimiter}%
+ \ifx\rqv@list\@empty
+ \else \rqv@compare@lists
+ \fi
+ \ifx\snap@write\typeout
+ \else
+ \newwrite\snap@out
+ \immediate\openout\snap(a)out=\jobname.dep \relax
+ \fi
+ \snap@write{\string\RequireVersions\@charlb}%
+ \snap@write{\space\space *{application}%
+ \snapshotApplication
}%
+ \@xp\snap@doit\general@files{\delimiter\aftergroup\@gobble\@gobble}%
+ \ifx\specific@files\@empty
+ \else
+ \snap@specific
+ \fi
\snap@write{\@charrb}%
\ifx\snap@write\typeout
\else \immediate\closeout\snap@out
\typeout{Dependency list written on \jobname.dep.}%
\fi
}%
-\def\rqv@condense#1,{%
- \if ,#1,%
+\def\snap@specific{%
+ \snap@write{ \space *{-------}{Document-specific files:}{----}}%
+ \@xp\snap@doit\specific@files{\delimiter\aftergroup\@gobble\@gobble}%
+}
+\def\rqv@condense#1{%
+ \@xp\ifx\csname ver@#1\endcsname\N
\else
- \@xp\ifx\csname ver@#1\endcsname\N
- \else
- \edef\L{\L,#1}%
- \@xp\let\csname ver@#1\endcsname=\N
- \fi
+ \edef\L{\L{#1}}%
+ \@xp\let\csname ver@#1\endcsname=\N
\fi
\rqv@condense
}
-\def\rqv@compare@lists{%
- \begingroup
- \def\N{1}\let\L=\@gobble
- \@xp\rqv@condense \rqv@list,TeX,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \let\rqv@list=\L
- \let\L=\@gobble
- \@xp\rqv@condense \@filelist,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \@for\@currname:=\L\do{%
- \snap@mismatch{snapshot}{^^J%
- File \@currname\space loaded though not in
- \noexpand\RequireVersions list%
- }\@ehc
- }%
- \def\N{2}\let\L=\@gobble
- \@xp\rqv@condense\@filelist,TeX,{,\relax\@xp\@gobbletwo\@xp},%
- \let\L=\@gobble
- \@xp\rqv@condense\rqv@list,{,\relax\@xp\@gobbletwo\@xp},%
- \ifx\L\@gobble\let\L\@empty\fi
- \@for\@currname:=\L\do{%
- \snap@mismatch{snapshot}{^^J%
- File \@currname\space [\csname rqv@\@currname\endcsname]
- required but not loaded%
- }\@ehc
- }%
- \endgroup
+\def\rqv@condend{\endcsname ?\fi
+ \@xp\@xp\@xp\@gobbletwo\csname @xp\iftrue}
+\def\rqv@overloaded#1{%
+ \snap@mismatch{snapshot}{^^J%
+ File #1 loaded though not in \noexpand\RequireVersions list%
+ }\@ehc
}
-\begingroup \catcode\endlinechar=12\relax %
-\long\gdef\snap@ignoline#1
-{}\endgroup %
-\def\snap@fake@input#1#2#3#4{%
- \ifx#1\snapx@end
- \aftergroup\@@end \@xp\@gobblefour
- \else
- \ifx#1\snapx@format
- \else
- \message{^^J}%
- \@xp\snap@fake@b\@@input #3#1\relax
- \fi
- \fi
- \@ifnextchar *\snap@store@version\snap@store@error
+\def\rqv@notloaded#1{%
+ \snap@mismatch{snapshot}{^^J%
+ File #1 [\csname rqv@#1\endcsname] required but not loaded%
+ }\@ehc
}
-\newcommand{\rqvTest}[2][]{%
- \begingroup \catcode\endlinechar=12
- \catcode`\%=12 \catcode`\{=12 \catcode`\}=12\relax
- \let\snapx@application=\snapx@format \let\snapx@tfm=\snap@format
- \@ifnextchar *\snap@store@version\snap@store@error#2*{end}{}{}%
+\def\rqv@set#1{\@xp\let\csname ver@#1\endcsname\N \rqv@set}
+\def\rqv@test#1{\csname ver@#1\endcsname{#1}\rqv@test}
+\def\rqv@compare@lists{%
+ \begingroup
+ \def\N{1}\let\L\@empty
+ \@xp\rqv@condense\rqv@list\rqv@condend
+ \global\let\rqv@list=\L
+ \def\N{2}\let\L\@empty
+ \@xp\rqv@condense\general@files\rqv@condend
+ \global\let\general@files=\L
+ \def\T{\@firstoftwo{\endcsname\@empty\@gobbletwo}}%
+ \let\N\rqv@overloaded \@xp\rqv@set\general@files \T
+ \let\N\@gobble \@xp\rqv@set\rqv@list \T
+ \@xp\rqv@test\general@files{\endcsname\csname @gobbletwo}%
+ \let\N\rqv@notloaded \@xp\rqv@set\rqv@list \T
+ \let\N\@gobble \@xp\rqv@set\general@files \T
+ \@xp\rqv@test\rqv@list{\endcsname\csname @gobbletwo}%
\endgroup
}
-\@ifundefined{snap@fake@b}{}{%
- \let\snap@store@b\snap@fake@input
- \let\RequireVersions\rqvTest
-}
\AtBeginDocument{%
\@ifundefined{ver@amsgen}{}{%
\@xp\let\csname ver@amsgen.sty\@xp\endcsname
\csname ver@amsgen\endcsname
}%
}
-\let\snap@compare@versions\@gobble \let\snap@check\@gobble
-\let\snap@selfcheck\@gobble \let\snap@selfcheck@a\@gobble
-\ifx\snap@select\@empty \endinput \fi
-\begingroup \catcode`\.=11\relax
-\gdef\snap@selfcheck@b#1\rqv@snapshot.sty#2#3\@nil{T#2}
-\gdef\snap@selfcheck@a#1{%
- \if\@xp\snap@selfcheck@b\csname rqv@#1\endcsname T%
- \rqv(a)snapshot.sty F\@nil
- \snap@check{#1}%
+\def\ProvidesFile#1{%
+ \def\snap@checker{\snap@check{#1}}%
+ \begingroup
+ \aftergroup\snap@checker
+ \catcode`\ 10
+ \ifnum\endlinechar < 256
+ \ifnum \endlinechar>\m@ne
+ \catcode\endlinechar 10
+ \fi
+ \fi
+ \@makeother\/%
+ \@makeother\&%
+ \kernel@ifnextchar[{\snap@providesfile{#1}}{\snap@providesfile{#1}[]}%
+}
+\def\snap@graphic@test#1#2#3\@nil{r\if G#1#2\else X\fi}
+\def\snap@providesfile#1[#2]{%
+ \wlog{File: #1 #2}%
+ \if\snap@graphic@test#2@@\@nil
+ \snap@record@graphic#1\relax #2 (type ??)\@nil
+ \else
+ \expandafter\xdef\csname ver@#1\endcsname{#2}%
\fi
+ \endgroup
}
-\endgroup
+\def\snap@record@graphic#1\relax #2(type #3)#4\@nil{%
+ \expandafter\xdef\csname ver@#1\endcsname{%
+ Graphic%
+ \if\snap@bbinfo :bb=\Gin@llx/\Gin@lly/\Gin@urx/\Gin@ury\fi
+ \space v0.0%
+ }%
+}
+\def\@pr@videpackage [#1]{%
+ \expandafter\xdef\csname ver@\@currname.\@currext\endcsname{#1}%
+ \ifx\@currext\@clsextension
+ \typeout{Document Class: \@gtempa\space#1}%
+ \else
+ \wlog{Package: \@gtempa\space#1}%
+ \fi
+ \snap@check{\@currname.\@currext}%
+}
+\def\snap@selfcheck@a{\snap@check{snapshot.sty}}
\def\(a)nofmt#1.fmt.#2 {#1 }
\def\snap@mismatch@a#1#2#3{%
\snap@mismatch{snapshot}{^^J%
@@ -317,24 +433,82 @@
\fi
}%
\endgroup
+ \snap@test@abort
}
-\def\ProvidesFile#1{%
- \def\snap@checker{\snap@check{#1}}%
- \begingroup
- \aftergroup\snap@checker
- \catcode`\ 10\catcode\endlinechar 10 %
- \@makeother\/%
- \@makeother\&%
- \@ifnextchar[{\@providesfile{#1}}{\@providesfile{#1}[]}%
+\let\snap@test@abort=\@empty
+\ifx\snap@select\@empty
+ \let\snap@compare@versions\@gobble
+ \let\snap@check\@gobble
+\fi
+\providecommand{\controldates}[1]{}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\ifx\snap@intest\@gobbletwo \endinput \fi
+\def\restore@some@catcodes{}
+\def\save@some@catcodes{%
+ \edef\restore@some@catcodes{%
+ \catcode\number`\@=\number\catcode`\@
+ \catcode\number`\"=\number\catcode`\"
+ \catcode\number`\^=\number\catcode`\^
+ \catcode\number`\_=\number\catcode`\_
+ \relax
+ }%
}
-\def\@pr@videpackage[#1]{%
- \expandafter\xdef\csname ver@\@currname.\@currext\endcsname{#1}%
- \ifx\@currext\@clsextension
- \typeout{Document Class: \@gtempa\space#1}%
+\def\snap@intest#1#2{%
+ \message{^^J}%
+ \begingroup \edef\0{#1#2}\def\9{latex209.def}%
+ \ifx\0\9\global\@compatibilitytrue \fi
+ \ifx#2\snapx@format
+ \def\snap@test@abort{\endgroup}%
\else
- \wlog{Package: \@gtempa\space#1}%
+ \edef\N{%
+ \noexpand\snap@intest@b{#1#2}%
+ {#1}{\@xp\@gobble#2\@empty}%
+ {\csname rqv@#1#2\endcsname}}%
+ \expandafter\endgroup\N
\fi
- \snap@check{\@currname.\@currext}%
+}
+\def\snap@intest@b#1#2#3#4{%
+ \def\@currname{#2}\def\@currext{#3}%
+ \begingroup \lccode`\/=`\0\relax\lowercase{\endgroup
+ \ifnum\snap@seldate#4 00 0\@nil>\z@
+ }% matches \lowercase
+ \save@some@catcodes
+ \@@input #1 \relax
+ \restore@some@catcodes
+ \else
+ \snap@specialtest{#1}{#4}%
+ \fi
+}
+\def\snap@specialtest#1#2{%
+ \fake@input{#1}%
+}
+\def\fake@input#1{%
+ \begingroup
+ % Ensure that outer \foo or unmatched braces don't trip us up
+ \catcode`\\=12 \catcode`\{=12 \catcode`\}=12
+ \endinput
+ \def\G{\@car\endgroup}%
+ \expandafter\futurelet\expandafter\?\expandafter\G\@@input#1 \relax\@nil
+}
+\let\snap@test@abort=\endinput
+\let\snap@selfcheck=\@empty
+\def\snap@finish{%%
+ \endgroup \message{^^J}%
+ \def\X##1{##1,\X}%
+ \edef\@filelist{\@xp\X\rqv@list{\@gobbletwo}}%
+ \def\X##1,?{##1}\edef\@filelist{\@xp\X\@filelist ?}%
+ \@dofilelist
+ \@@end
+}%
+\def\snap@mismatch#1#2#3{}
+\renewcommand{\RequireVersions}[2][]{%
+ \begingroup
+ \makeatletter
+ \def\snap@check{\snap@compare@versions}%%
+ \let\snapx@tfm=\snap@ignore
+ \def\ProvidesLanguage##1{\ProvidesFile{##1.ldf}}%
+ \iffalse{\fi \futurelet\@let@token\snap@branch #2}%
+ \endgroup
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/snapshot.tlpobj new/tlpkg/tlpobj/snapshot.tlpobj
--- old/tlpkg/tlpobj/snapshot.tlpobj 2019-02-28 04:05:39.000000000 +0100
+++ new/tlpkg/tlpobj/snapshot.tlpobj 2019-09-19 01:54:05.000000000 +0200
@@ -1,6 +1,6 @@
name snapshot
category Package
-revision 15878
+revision 52115
shortdesc List the external dependencies of a LaTeX document
relocated 1
longdesc The snapshot package helps the owner of a LaTeX document obtain
@@ -16,12 +16,12 @@
longdesc DVI file from it, on the fly; or for someone wanting to shield
longdesc a document during the final stages of its production cycle from
longdesc unexpected side effects of routine upgrades to the TeX system.
-runfiles size=3
+runfiles size=4
RELOC/tex/latex/snapshot/snapshot.sty
catalogue-also bundledoc
-catalogue-contact-home http://www.ams.org/publications/authors/tex/snapshot
+catalogue-contact-home https://www.ams.org/arc/resources/snapshot-about.html
catalogue-ctan /macros/latex/contrib/snapshot
-catalogue-date 2018-04-11 14:09:31 +0200
-catalogue-license lppl
+catalogue-date 2019-09-17 21:40:12 +0200
+catalogue-license lppl1.3c
catalogue-topics file-mgmt
-catalogue-version 1.14
+catalogue-version 2.13
++++++ songs.doc.tar.xz ++++++
++++ 26079 lines of diff (skipped)
++++++ songs.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/songs/songs.sty new/tex/latex/songs/songs.sty
--- old/tex/latex/songs/songs.sty 2017-06-10 23:36:05.000000000 +0200
+++ new/tex/latex/songs/songs.sty 2019-06-27 23:00:23.000000000 +0200
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright (C) 2017 by Kevin W. Hamlen
+%% Copyright (C) 2018 by Kevin W. Hamlen
%%
%% This file may be distributed and/or modified under the conditions of
%% the LaTeX Project Public License, either version 1.3a of this license
@@ -22,7 +22,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{songs}
- [2017/06/05 v3.0 Songs package]
+ [2018/09/12 v3.1 Songs package]
\newif\ifSB@etex
\ifx\eTeXversion\undefined\else
\ifx\eTeXversion\relax\else
@@ -33,13 +33,15 @@
\fi
\fi
\newif\ifSB@pdf\SB@pdffalse
-\ifx\pdfoutput\undefined\else
- \ifx\pdfoutput\relax\else
- \ifnum\pdfoutput<\@ne\else
- \SB@pdftrue
+\IfFileExists{ifpdf.sty}{\RequirePackage{ifpdf}\ifpdf\SB@pdftrue\fi}{
+ \ifx\pdfoutput\undefined\else
+ \ifx\pdfoutput\relax\else
+ \ifnum\pdfoutput<\@ne\else
+ \SB@pdftrue
+ \fi
\fi
\fi
-\fi
+}
\newif\ifSB@preamble
\SB@preambletrue
\newif\ifSB@test
@@ -638,14 +640,10 @@
\SB@styppage%
\endgroup%
}
-\newcommand\SB@songlistbrk{}
-\def\SB@songlistbrk{brk}
-\newcommand\SB@songlistnc{}
-\def\SB@songlistnc{nextcol}
-\newcommand\SB@songlistcp{}
-\def\SB@songlistcp{sclearpage}
-\newcommand\SB@songlistcdp{}
-\def\SB@songlistcdp{scleardpage}
+\newcommand*\SB@songlistbrk{brk}
+\newcommand*\SB@songlistnc{nextcol}
+\newcommand*\SB@songlistcp{sclearpage}
+\newcommand*\SB@songlistcdp{scleardpage}
\newcommand\commitsongs{%
\ifpartiallist%
\ifnum\SB@numcols>\z@%
@@ -760,8 +758,7 @@
\newcommand\SB@lop[1]{\expandafter\SB@@lop\the#1\SB@@lop#1}
\newcommand\SB@@lop{}
\def\SB@@lop\\#1\\#2\SB@@lop#3#4{\global#3{\\#2}\global#4{#1}}
-\newcommand\SB@emptylist{}
-\def\SB@emptylist{\\}
+\newcommand*\SB@emptylist{\\}
\newcommand\SB@ifempty[3]{%
\edef\SB@temp{\the#1}%
\ifx\SB@temp\SB@emptylist#2\else#3\fi%
@@ -1355,12 +1352,9 @@
\newmarks\SB@nocmarkclass
}
\fi
-\newcommand\SB@cmark{}
-\def\SB@cmark{SB@cmark}
-\newcommand\SB@lastcmark{}
-\def\SB@lastcmark{SB@lastcmark}
-\newcommand\SB@nocmark{}
-\def\SB@nocmark{SB@nocmark}
+\newcommand*\SB@cmark{SB@cmark}
+\newcommand*\SB@lastcmark{SB@lastcmark}
+\newcommand*\SB@nocmark{SB@nocmark}
\newenvironment{chorus}{\beginchorus}{\SB@endchorus}
\newcommand\beginchorus{%
\ifSB@insong
@@ -2265,8 +2259,7 @@
}
\newcommand\SB@endcname{}
\let\SB@endcname\endgroup
-\newcommand\SB@nbsp{}
-\def\SB@nbsp{\nobreakspace{}}
+\newcommand*\SB@nbsp{\nobreakspace{}}
\newif\ifSB@firstchord\SB@firstchordtrue
\newcommand*\SB@@chord{}
\def\SB@@chord#1]{%
@@ -2758,7 +2751,9 @@
\sffamily\fontsize\@xpt\@xpt\selectfont#1%
}}
\newcommand\SB@onfret[1]{%
- \rlap{\hbox to\SB@fretwidth{\hfil\vrule\@height6\p@\hfil}}%
+ \kern.5\SB@fretwidth\kern-.2\p@%
+ \vrule\@height6\p@%
+ \kern-.2\p@\kern-.5\SB@fretwidth%
\hbox to\SB@fretwidth{\hfil#1\hfil}%
}
\newcommand\SB@atopfret[1]{%
@@ -2793,56 +2788,131 @@
\fontsize\@xpt\@xpt\selectfont\char14%
}%
}}
-\newcommand\SB@fretempty{\SB@onfret\relax}
-\newcommand\SB@frethit{\SB@onfret{%
- \hbox{%
+\newcommand\SB@do[1]{}
+\newcommand\SB@doify[2]{%
+ \SB@toks{}%
+ \edef#1{#2}%
+ \expandafter\SB@@doify#1\SB@@doify%
+ \edef#1{\the\SB@toks}%
+}
+\newcommand\SB@@doify[1]{%
+ \ifx#1\SB@@doify\else%
+ \SB@toks\expandafter{\the\SB@toks\SB@do{#1}}%
+ \expandafter\SB@@doify%
+ \fi%
+}
+\newcommand\SB@allbarres{}
+\newcommand\SB@dobarre{}
+\newcommand\SB@barreI{\noexpand\SB@barreI}
+\newcommand\SB@barreN{\noexpand\SB@barreN}
+\newcommand\SB@barreY{\noexpand\SB@barreY}
+\newcommand\SB@lowfret{%
+ \let\SB@dobarre\SB@@lowfret\SB@allbarres%
+ \SB@fretempty%
+}
+\newcommand\SB@@lowfret[3]{{%
+ \let\SB@barreI\SB@barreN%
+ \let\SB@barreY\SB@barreN%
+ \xdef#1{#1}%
+}}
+\newcommand\SB@bactivate[3]{{%
+ \let\SB@barreI\SB@barreY%
+ \xdef#1{#1}%
+}}
+\newcommand\SB@bbarre[1]{%
+ \xdef#1{\SB@barreI{\the\SB@cntii}#1}%
+}
+\newcommand\SB@ebarre[3]{%
+ \ifx#1\@empty%
+ \ifnum\SB@cnt=\@ne\SB@errebar#2#3\fi%
+ \else%
+ \expandafter\SB@@ebarre#1\SB@@ebarre#1%
+ \fi%
+}
+\newcommand\SB@@ebarre{}
+\def\SB@@ebarre#1#2#3\SB@@ebarre#4{{%
+ \gdef#4{#3}%
+ \let\SB@barreI\@gobble%
+ \let\SB@barreN\@gobble%
+ \let\SB@barreY\SB@barre%
+ #1{#2}%
+}}
+\newcommand\SB@barreson[3]{%
+ \def#2{\SB@bbarre#1}%
+ \def#3{\SB@ebarre#1#2#3}%
+}
+\newcommand\SB@barresoff[3]{\let#2\relax\let#3\relax}
+\newcommand\SB@fretempty{%
+ \advance\SB@cntii\@ne%
+ \SB@onfret\relax%
+}
+\newcommand\SB@fretdot{%
+ \advance\SB@cntii\@ne%
+ \let\SB@dobarre\SB@bactivate\SB@allbarres%
+ \SB@@fretdot%
+}
+\newcommand\SB@@fretdot{%
+ \SB@onfret{%
\fontencoding{OMS}\fontfamily{cmsy}%
\fontseries{m}\fontshape{n}%
\fontsize\@xiipt\@xiipt\selectfont\char15%
}%
+}
+\newcommand\SB@barre[1]{{%
+ \SB@dimen\SB@fretwidth%
+ \multiply\SB@dimen\SB@cntii%
+ \advance\SB@dimen-#1\SB@fretwidth%
+ \kern-\SB@dimen%
+ \SB@@fretdot%
+ \kern-.5\SB@fretwidth%
+ \advance\SB@dimen-\SB@fretwidth%
+ \raise.7pt\hbox{\vrule\@height4.6\p@\@width\SB@dimen}%
+ \kern-.5\SB@fretwidth%
+ \SB@@fretdot%
+}}
+\newcommand\SB@fretend{{%
+ \let\SB@barreI\@gobble%
+ \let\SB@barreN\@gobble%
+ \let\SB@barreY\SB@barre%
+ \def\SB@dobarre##1##2##3{##1\gdef##1{}}\SB@allbarres%
}}
+\newcommand*\SB@X{X}
+\newcommand*\SB@Z{0}
+\newcommand*\SB@O{O}
\newcommand\SB@finger[1]{%
- \SB@atopfret{\sffamily\fontsize\@vipt\@vipt\selectfont#1}%
+ \def\SB@temp{#1}%
+ \ifx\SB@temp\SB@X\SB@topempty\else%
+ \ifx\SB@temp\SB@Z\SB@topempty\else%
+ \ifx\SB@temp\SB@O\SB@topempty\else%
+ \SB@atopfret{\sffamily\fontsize\@vipt\@vipt\selectfont#1}%
+ \fi\fi\fi%
}
\newif\ifSB@gettabind\SB@gettabindfalse
\SB@newdimen\SB@tabindent
\newcommand\SB@targfret{}
\newcommand\SB@targstr{}
\newcommand\SB@targfing{}
-\newcommand\SB@csify[2]{%
- \SB@toks{}%
- \SB@cnt\z@%
- \SB@@csify#2\SB@@csify%
- \edef#1{\the\SB@toks}%
-}
-\newcommand\SB@@csify[1]{%
- \ifx#1\SB@@csify\else%
- \advance\SB@cnt\@ne%
- \SB@toks\expandafter{\the\SB@toks\csname#1\endcsname}%
- \expandafter\SB@@csify%
- \fi%
-}
-\newcommand\SB@gttop{%
- \let\X\SB@topX\let\0\SB@topO\let\O\0\let\1\SB@topempty%
- \let\2\1\let\3\1\let\4\1\let\5\1%
- \let\6\1\let\7\1\let\8\1\let\9\1%
-}
\newcommand\SB@gtinit{%
- \let\X\SB@fretempty\let\0\X\let\O\X\let\1\SB@frethit%
- \let\2\X\let\3\X\let\4\X\let\5\X%
- \let\6\X\let\7\X\let\8\X\let\9\X%
+ \def\SB@do##1{\csname##1\endcsname}%
+ \let\O\0%
+ \let\3\2\let\4\2\let\5\2\let\6\2%
+ \let\7\2\let\8\2\let\9\2%
}
\newcommand\SB@gtinc{%
+ \advance\SB@cnt\@ne%
\let\9\8\let\8\7\let\7\6\let\6\5\let\5\4%
- \let\4\3\let\3\2\let\2\1\let\1\0%
+ \let\4\3\let\3\2\let\2\1\let\1\SB@lowfret%
}
-\newcommand\SB@gtset[2]{%
- \let\X#1\let\0\X\let\O\X%
- \def\1{#21}\def\2{#22}\def\3{#23}%
- \def\4{#24}\def\5{#25}\def\6{#26}%
- \def\7{#27}\def\8{#28}\def\9{#29}%
+\newcommand\BarreDelims[2]{%
+ \expandafter\SB@bdelims\csname SB@bs@#1#2\expandafter\endcsname%
+ \csname#1\expandafter\endcsname\csname#2\endcsname%
+}
+\newcommand\SB@bdelims[3]{%
+ \newcommand*#1{}%
+ \SB@app\def\SB@allbarres{\SB@dobarre#1#2#3}%
}
-\newcommand\SB@gtmax[1]{\ifnum\SB@cnt<#1\SB@cnt#1\fi}
+\BarreDelims()
+\BarreDelims[]
\newcommand\gtab{\SB@begincname\SB@gtab}
\newcommand*\SB@gtab[1]{%
\SB@endcname%
@@ -2877,7 +2947,13 @@
\thinspace{\printchord{\transposehere{#1}\strut}}\thinspace%
}%
\setbox\SB@boxii\hbox{\SB@fretnum{\SB@targfret}}%
- \setbox\SB@boxiii\hbox{{\SB@gttop\SB@targstr}}%
+ \setbox\SB@boxiii\hbox{{%
+ \let\X\SB@topX\let\0\SB@topO%
+ \let\1\SB@topempty\let\2\1%
+ \SB@gtinit%
+ \let\SB@dobarre\SB@barresoff\SB@allbarres%
+ \SB@targstr%
+ }}%
\hsize\wd\SB@box%
\ifSB@gettabind%
\global\SB@tabindent\wd\SB@boxii%
@@ -2902,18 +2978,20 @@
\vtop{%
\SB@dimen\wd\SB@boxiii%
\box\SB@boxiii%
- \SB@cnt\minfrets%
- \SB@gtset\relax\SB@gtmax\SB@targstr%
+ \let\X\SB@fretempty\let\0\X%
+ \let\1\SB@fretdot\def\2{\SB@fretempty\global\SB@testtrue}%
\SB@gtinit%
+ \let\SB@dobarre\SB@barreson\SB@allbarres%
+ \SB@cnt\@ne%
\loop%
- \SB@fretbar\hbox{\SB@targstr}%
- \advance\SB@cnt\m@ne%
- \ifnum\SB@cnt>\z@\SB@gtinc\repeat%
+ \SB@testfalse%
+ \SB@fretbar\hbox{\SB@cntii\z@\SB@targstr\SB@fretend}%
+ \ifnum\SB@cnt<\minfrets\SB@testtrue\fi%
+ \ifSB@test\SB@gtinc\repeat%
\SB@fretbar%
\ifx\SB@targsfing\@empty\else%
\kern1.5\p@%
- \SB@gtset\SB@topempty\SB@finger%
- \hbox{\SB@targfing}%
+ \hbox{\let\SB@do\SB@finger\SB@targfing}%
\fi%
}%
\hfil%
@@ -2927,23 +3005,24 @@
\def\SB@tabargs#1:#2:#3:#4\SB@tabargs{%
\def\SB@temp{#4}%
\ifx\SB@temp\@empty%
- \SB@csify\SB@targstr{#1}%
+ \SB@doify\SB@targstr{#1}%
\else\ifx\SB@temp\SB@ctoken%
- \SB@csify\SB@targstr{#1}%
- \ifnum\SB@cnt>\@ne%
- \SB@cntii\SB@cnt%
- \SB@csify\SB@targfing{#2}%
- \SB@cnt\SB@cntii%
- \else%
+ \SB@@tabargs#1\SB@@tabargs%
+ \ifx\SB@temp\@empty%
\def\SB@targfret{#1}%
- \SB@csify\SB@targstr{#2}%
+ \SB@doify\SB@targstr{#2}%
+ \else%
+ \SB@doify\SB@targfing{#2}%
+ \SB@doify\SB@targstr{#1}%
\fi%
\else%
\def\SB@targfret{#1}%
- \SB@csify\SB@targfing{#3}%
- \SB@csify\SB@targstr{#2}%
+ \SB@doify\SB@targfing{#3}%
+ \SB@doify\SB@targstr{#2}%
\fi\fi%
}
+\newcommand\SB@@tabargs{}
+\def\SB@@tabargs#1#2\SB@@tabargs{\def\SB@temp{#2}}
\newcommand\songchapter{%
\let\SB@temp\@seccntformat%
\def\@seccntformat##1{}%
@@ -3670,10 +3749,10 @@
d \protect\endverse, or between \protect\beginchorus\space%
and \protect\endchorus.}%
}
-\newcommand\SB@errtab{%
- \SB@Error{Invalid argument to \protect\gtab\space macro. R%
- eplacing it with \protect\0.}{Valid arguments consist onl%
- y of: X, O, 0, 1, 2, 3, or 4.}%
+\newcommand\SB@errebar[2]{%
+ \SB@Error{Ignoring unbalanced \expandafter\@gobble\string#2 i%
+ n \protect\gtab}{Found no \expandafter\@gobble\string#1 to ma%
+ tch the \expandafter\(a)gobble\string#2.}%
}
\newcommand\SB@errnoidx[1]{%
\SB@Error{Unknown index identifier: #1}{This index identifie%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/songs.tlpobj new/tlpkg/tlpobj/songs.tlpobj
--- old/tlpkg/tlpobj/songs.tlpobj 2019-02-28 04:05:41.000000000 +0100
+++ new/tlpkg/tlpobj/songs.tlpobj 2019-06-28 01:53:53.000000000 +0200
@@ -1,6 +1,6 @@
name songs
category Package
-revision 44553
+revision 51494
shortdesc Produce song books for church or fellowship
relocated 1
longdesc The package provides a means of producing beautiful song books
@@ -17,7 +17,7 @@
catalogue-contact-home http://songs.sourceforge.net
catalogue-contact-repository https://sourceforge.net/projects/songs
catalogue-ctan /macros/latex/contrib/songs
-catalogue-date 2017-06-13 07:48:52 +0200
+catalogue-date 2019-06-26 22:33:40 +0200
catalogue-license gpl2
catalogue-topics music chords
-catalogue-version 3.0
+catalogue-version 3.1
++++++ sourcecodepro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sourcecodepro/README.md new/doc/latex/sourcecodepro/README.md
--- old/doc/latex/sourcecodepro/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/sourcecodepro/README.md 2019-05-19 23:10:57.000000000 +0200
@@ -0,0 +1,30 @@
+Source Code Pro v2.7
+====================
+This package provides the Source Code Pro typeface as a LaTeX package.
+Full documentation and revision history in `sourcecodepro.pdf`.
+
+Options
+-------
+The following options can be used:
+
+* `oldstyle, osf`: use old style numbers.
+* `lining, nf, lf`: use lining numbers.
+* `black`: `\bfseries` is black.
+* `semibold`: `\bfseries` is semibold.
+* `bold`: `\bfseries` is bold.
+* `light`: `\mdseries` is light.
+* `extralight`: `\mdseries` is extra light.
+* `regular`: `\mdseries` is regular.
+* `scale, scaled`: set scaling for the font, eg: `scale=.5`
+* `ligatures`: change the ligatures used. eg: `ligatures=TeX`
+* `default`: Source Code Pro is set as default font family.
+* `nottdefault`: Source Code Pro is not set as monospaced family.
+* `type1, t1`: override detection and load the Type1 font family.
+* `opentype, otf`: override detection and load the OpenType font family.
+
+License
+-------
+Fonts are provided under the SIL Open Font License 1.1.
+LaTeX source is licensed under the LPPL.
+
+Enjoy!
Binary files old/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf and new/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf differ
Binary files old/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf and new/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf differ
Binary files old/doc/latex/sourcecodepro/sourcecodepro.pdf and new/doc/latex/sourcecodepro/sourcecodepro.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sourcecodepro/sourcecodepro.tex new/doc/latex/sourcecodepro/sourcecodepro.tex
--- old/doc/latex/sourcecodepro/sourcecodepro.tex 2016-04-18 23:49:56.000000000 +0200
+++ new/doc/latex/sourcecodepro/sourcecodepro.tex 2019-05-19 23:10:57.000000000 +0200
@@ -1,5 +1,5 @@
\documentclass[10pt,a4paper,english]{article}
-\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol}
+\usepackage{geometry,hologo,hyperref,babel,mdwlist,array,multicol,graphicx}
\usepackage[default,osf]{sourcesanspro}
\usepackage[scaled=.95]{sourcecodepro}
\hypersetup{
@@ -16,7 +16,7 @@
\Large Adobe's Source Code Pro typeface for \LaTeX
}
\author{Silke Hofstra, \href{mailto:tex@slxh.nl}{tex@slxh.nl}}
-\date{Documentation for sourcecodepro v2.6.\\ \today}
+\date{Documentation for sourcecodepro v2.7.\\ \today}
\begin{document}
\maketitle
@@ -37,6 +37,7 @@
\item \textbf{extralight}: \texttt{\textbackslash mdseries} is extra light.
\item \textbf{regular}: \texttt{\textbackslash mdseries} is regular.
\item \textbf{scale, scaled}: Change the scaling with a factor. For example: \texttt{scale=.5}
+ \item \textbf{ligatures}: Change the ligatures used. For example: \texttt{ligatures=TeX}
\item \textbf{default}: Source Code Pro is set as the default font family and as the monotype family.
\item \textbf{nottdefault}: Source Code Pro is not set as monospaced family.
\item \textbf{type1, t1}: Override automatic detection and use the Type 1 fonts.
@@ -64,30 +65,11 @@
\section{OpenType}
The OpenType fonts have many features, including old style numerals (\texttt{\oldstylenums{1 6 9}})
-%, ligatures (\texttt{fi fl})
and stylistic alternatives (\texttt{{\addfontfeature{Style=Alternate}a g}}).
\subsection{Features}
A complete list of available font features is available on page \pageref{sec:otfinfo}. More information on how to use font features can be found in the \href{http://mirror.ctan.org/macros/latex/contrib/fontspec/fontspec.pdf}{fontspec documentation}.
-\subsection{Files}
-\begin{itemize*}
- \item SourceCodePro-ExtraLight.otf
- \item SourceCodePro-ExtraLightIt.otf
- \item SourceCodePro-Light.otf
- \item SourceCodePro-LightIt.otf
- \item SourceCodePro-Regular.otf
- \item SourceCodePro-RegularIt.otf
- \item SourceCodePro-Medium.otf
- \item SourceCodePro-MediumIt.otf
- \item SourceCodePro-Semibold.otf
- \item SourceCodePro-SemiboldIt.otf
- \item SourceCodePro-Bold.otf
- \item SourceCodePro-BoldIt.otf
- \item SourceCodePro-Black.otf
- \item SourceCodePro-BlackIt.otf
-\end{itemize*}
-
\section{Type1}
The following Type1 font families are included:
\begin{itemize*}
@@ -97,6 +79,13 @@
With series ‘el’, ‘l’, ‘m’, ‘mb’, ‘sb’, ‘b’, ‘k’ and shapes ‘n’ and ‘i’.
\section{Version history}
+\subsection*{2.7}
+\begin{itemize*}
+ \item Make the ligatures for the OpenType fonts configurable with the \texttt{ligatures} option.
+ \item Update the fonts to Roman v2.030 and Italic v1.050.
+ \item Generate fonts without f-ligatures.
+\end{itemize*}
+
\subsection*{2.6}
\begin{itemize*}
\item Modified the \texttt{\textbackslash liningnums} to accomodate for the missing \texttt{lnum} feature.
@@ -197,6 +186,7 @@
cv14 & Character Variants 14 - typographic hyphen [-] \\
cv15 & Character Variants 15 - typographic asterisk [*] \\
cv16 & Character Variants 16 - slashed dollar sign [\$]\\
+ cv17 & Character Variants 17 - alternate numeral one [1] \\
dnom & Denominators \\
frac & Fractions \\
mark & Mark Positioning \\
@@ -213,6 +203,7 @@
ss04 & Stylistic Set 4 - serifed i \\
ss05 & Stylistic Set 5 - Sami \symbol{"014A}, cursive \symbol{"03C6} \\
ss06 & Stylistic Set 6 - slashed dollar sign [\$] \\
+ ss07 & Stylistic Set 7 - alternate numeral one [1] \\
subs & Subscript \\
sups & Superscript \\
zero & Slashed Zero
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcecodepro.doc.tlpobj new/tlpkg/tlpobj/sourcecodepro.doc.tlpobj
--- old/tlpkg/tlpobj/sourcecodepro.doc.tlpobj 2019-02-28 04:05:42.000000000 +0100
+++ new/tlpkg/tlpobj/sourcecodepro.doc.tlpobj 2020-03-24 02:03:39.000000000 +0100
@@ -1,10 +1,11 @@
name sourcecodepro.doc
category Package
-revision 40597
+revision 54512
shortdesc doc files of sourcecodepro
relocated 1
-docfiles size=229
+docfiles size=277
RELOC/doc/latex/sourcecodepro/LICENSE.txt
+ RELOC/doc/latex/sourcecodepro/README.md
RELOC/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.pdf
RELOC/doc/latex/sourcecodepro/sourcecodepro-otf-specimen.tex
RELOC/doc/latex/sourcecodepro/sourcecodepro-type1-specimen.pdf
++++++ sourcecodepro.tar.xz ++++++
++++ 9461 lines of diff (skipped)
++++++ sourcesanspro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcesanspro.doc.tlpobj new/tlpkg/tlpobj/sourcesanspro.doc.tlpobj
--- old/tlpkg/tlpobj/sourcesanspro.doc.tlpobj 2019-02-28 04:05:44.000000000 +0100
+++ new/tlpkg/tlpobj/sourcesanspro.doc.tlpobj 2020-03-24 02:03:41.000000000 +0100
@@ -1,6 +1,6 @@
name sourcesanspro.doc
category Package
-revision 42852
+revision 54512
shortdesc doc files of sourcesanspro
relocated 1
docfiles size=228
++++++ sourcesanspro.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourcesanspro.tlpobj new/tlpkg/tlpobj/sourcesanspro.tlpobj
--- old/tlpkg/tlpobj/sourcesanspro.tlpobj 2019-02-28 04:05:44.000000000 +0100
+++ new/tlpkg/tlpobj/sourcesanspro.tlpobj 2020-03-24 02:03:42.000000000 +0100
@@ -1,6 +1,6 @@
name sourcesanspro
category Package
-revision 42852
+revision 54512
shortdesc Use SourceSansPro with TeX(-alike) systems
relocated 1
longdesc The font is an open-source Sans-Serif development from Adobe.
@@ -1532,7 +1532,6 @@
RELOC/tex/latex/sourcesanspro/sourcesanspro-type1-autoinst.sty
RELOC/tex/latex/sourcesanspro/sourcesanspro.sty
catalogue-ctan /fonts/sourcesanspro
-catalogue-date 2017-01-03 15:01:48 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font-sans font-type1 font-otf font-t1enc
catalogue-version 2.6
++++++ sourceserifpro.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourceserifpro.doc.tlpobj new/tlpkg/tlpobj/sourceserifpro.doc.tlpobj
--- old/tlpkg/tlpobj/sourceserifpro.doc.tlpobj 2019-02-28 04:05:48.000000000 +0100
+++ new/tlpkg/tlpobj/sourceserifpro.doc.tlpobj 2020-03-24 02:03:45.000000000 +0100
@@ -1,6 +1,6 @@
name sourceserifpro.doc
category Package
-revision 49120
+revision 54512
shortdesc doc files of sourceserifpro
relocated 1
docfiles size=261
++++++ sourceserifpro.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sourceserifpro.tlpobj new/tlpkg/tlpobj/sourceserifpro.tlpobj
--- old/tlpkg/tlpobj/sourceserifpro.tlpobj 2019-02-28 04:05:49.000000000 +0100
+++ new/tlpkg/tlpobj/sourceserifpro.tlpobj 2020-03-24 02:03:46.000000000 +0100
@@ -1,6 +1,6 @@
name sourceserifpro
category Package
-revision 49120
+revision 54512
shortdesc Use SourceSerifPro with TeX(-alike) systems
relocated 1
longdesc This package provides Source Serif Pro for LaTeX. It includes
@@ -1056,7 +1056,6 @@
catalogue-contact-bugs https://github.com/silkeh/latex-sourceserifpro/issues
catalogue-contact-repository https://github.com/silkeh/latex-sourceserifpro
catalogue-ctan /fonts/sourceserifpro
-catalogue-date 2018-11-10 20:37:11 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-serif font-type1 font-otf font-t1enc font-proportional
catalogue-version 1.4
++++++ spark-otf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/Changes new/doc/fonts/spark-otf/Changes
--- old/doc/fonts/spark-otf/Changes 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/Changes 2019-05-05 20:03:57.000000000 +0200
@@ -1,3 +1,4 @@
+0.05 2019-04-13 - fix for new fontnames and more styles
0.04 2017-09-26 - fix for filenames
- added short form ! for marks
- added char sets for the documentation
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/README.md new/doc/fonts/spark-otf/README.md
--- old/doc/fonts/spark-otf/README.md 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/README.md 2019-05-05 20:03:57.000000000 +0200
@@ -1,16 +1,14 @@
# README #
Package spark-otf supports the free fonts from
"After the Flood" which are available from the
-website http://aftertheflood.co/projects/atf-spark
+website https://aftertheflood.com/projects/sparks/
+or from https://github.com/aftertheflood/spark
Following font files are supported:
-- Spark - Bar - Medium.otf
-- Spark - Bar - Narrow.otf
-- Spark - Bar - Thin.otf
-- Spark - Dot-line - Medium.otf
-- Spark - Dot - Medium.otf
-- Spark - Dot - Small.otf
+- Sparks-Bar-???.otf
+- Sparks-Dotline-???.otf
+- Sparks-Dot-???.otf
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/spark-otf-doc.bib new/doc/fonts/spark-otf/spark-otf-doc.bib
--- old/doc/fonts/spark-otf/spark-otf-doc.bib 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/spark-otf-doc.bib 2019-05-05 20:03:57.000000000 +0200
@@ -40,6 +40,6 @@
title = {AtF Spark},
subtitle = {Our new typeface for code-free sparklines},
Organisation = {After the flood},
-url = {http://aftertheflood.co/projects/atf-spark},
+url = {https://aftertheflood.com/projects/sparks/},
}
Binary files old/doc/fonts/spark-otf/spark-otf-doc.pdf and new/doc/fonts/spark-otf/spark-otf-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/spark-otf/spark-otf-doc.tex new/doc/fonts/spark-otf/spark-otf-doc.tex
--- old/doc/fonts/spark-otf/spark-otf-doc.tex 2017-10-06 22:18:55.000000000 +0200
+++ new/doc/fonts/spark-otf/spark-otf-doc.tex 2019-05-05 20:03:57.000000000 +0200
@@ -1,10 +1,10 @@
-%% $Id: spark-otf-doc.tex 584 2017-09-26 18:27:43Z herbert $
+%% $Id: spark-otf-doc.tex 1047 2019-04-12 17:22:07Z herbert $
%
\listfiles
\documentclass[fontsize=11pt,DIV=14,parskip=half-]{scrartcl}
\usepackage{fontspec}
\usepackage{graphicx}
-\usepackage{multido}
+\usepackage{multido,showexpl}
\usepackage[%usefilenames,
TT={Scale=0.88,FakeStretch=0.9},
SS={Scale=0.9},
@@ -56,27 +56,50 @@
the fonts will be found by the system.
\begin{verbatim}
--rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
--rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
--rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
--rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
--rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
--rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
-\end{verbatim}
+Sparks-Bar-Extranarrow.otf
+Sparks-Bar-Extrawide.otf
+Sparks-Bar-Medium.otf
+Sparks-Bar-Narrow.otf
+Sparks-Bar-Wide.otf
+Sparks-Dot-Extralarge.otf
+Sparks-Dot-Extrasmall.otf
+Sparks-Dot-Large.otf
+Sparks-Dot-Medium.otf
+Sparks-Dot-Small.otf
+Sparks-Dotline-Extrathick.otf
+Sparks-Dotline-Extrathin.otf
+Sparks-Dotline-Medium.otf
+Sparks-Dotline-Thick.otf
+Sparks-Dotline-Thin.otf
+\end{verbatim}
+%-rw-r--r-- 1 voss voss 24708 Sep 15 11:20 Spark - Bar - Medium.otf
+%-rw-r--r-- 1 voss voss 24696 Sep 15 11:20 Spark - Bar - Narrow.otf
+%-rw-r--r-- 1 voss voss 24680 Sep 15 11:20 Spark - Bar - Thin.otf
+%-rw-r--r-- 1 voss voss 22140 Sep 15 11:20 Spark - Dot-line - Medium.otf
+%-rw-r--r-- 1 voss voss 24616 Sep 15 11:20 Spark - Dot - Medium.otf
+%-rw-r--r-- 1 voss voss 24580 Sep 15 11:20 Spark - Dot - Small.otf
The package defines the following font macros (using symbol names):
\small
\begin{verbatim}
-\newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarMedium{Spark-Bar-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarNarrow{Spark-Bar-Narrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtranarrow{Spark-Bar-Extranarrow}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarWide{Spark-Bar-Wide}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkBarExtrawide{Spark-Bar-Extrawide}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineMedium{Spark-Dotline-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThick{Spark-Dotline-Thick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathick{Spark-Dotline-Extrathick}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineThin{Spark-Dotline-Thin}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotLineExtrathin{Spark-Dotline-Extrathin}[RawFeature=+calt,\spark@DefaultFeatures]
%
-\newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-\newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotMedium{Spark-Dot-Medium}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotSmall{Spark-Dot-Small}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtralarge{Spark-Dot-Extralarge}[RawFeature=+calt,\spark@DefaultFeatures]
+\newfontface\sparkDotExtrasmall{Spark-Dot-Extrasmall}[RawFeature=+calt,\spark@DefaultFeatures]
\end{verbatim}
\normalsize
@@ -86,12 +109,16 @@
\begin{verbatim}
\sparkBar[<Type>][<No>]{values}[<No>]
\sparkDot[<Type>][<No>]{values}[<No>]
+\sparkDotline[<Type>][<No>]{values}[<No>]
\sparkBar*[<Type>][<No>]{values}[<No>]
\sparkDot*[<Type>][<No>]{values}[<No>]
+\sparkDotline*[<Type>][<No>]{values}[<No>]
\sparkBar[<Type>]{!value,values,...,!value}
\sparkDot[<Type>]{!value,values,...,!value}
+\sparkDotline[<Type>]{!value,values,...,!value}
\sparkBar*[<Type>]{!value,values,...,!value}
\sparkDot*[<Type>]{!value,values,...,!value}
+\sparkDotline*[<Type>]{!value,values,...,!value}
\end{verbatim}
If \texttt{[<Type>]} is missing, \texttt{Medium} is assumed. The type is mandatory if you use
@@ -99,7 +126,7 @@
can be of any interval. They will be changed to the allowed interval:
\begin{itemize}
-\item for \cs{sparkDot[Line]}: $[0,9]$
+\item for \cs{sparkDotline}: $[0,9]$
\item for all other: $[0,100]$
\end{itemize}
@@ -113,195 +140,172 @@
\subsection{Bars}
+\typeout{Bar-Medium}%
\subsubsection{Bar-Medium}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
+\begin{LTXexample}[pos=t]
+Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
-Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
-\end{verbatim}
-
-\normalsize
-Text \sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\hfill
- {\huge\sparkBar{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}}\\
-Text \sparkBar[Medium]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92} Text\\
-Text \sparkBar[Medium][14]{14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,92}[92] Text\\
-Text \sparkBar[Medium]{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+Text \sparkBar{!14,95,68,9,19,41,91,1,81,97,79,45,96,76,17,65,8,!92} Text
+\end{LTXexample}
\subsubsection{Bar-Narrow}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
-Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
-Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
-\end{verbatim}
+Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\normalsize
-Text \sparkBar[Narrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
-Text \sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}\\
-Text \sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\hfill
- {\huge\sparkBar[Narrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8}}
-\subsubsection{Bar-Thin}
+\subsubsection{Bar-Extranarrow}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extranarrow]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,8} Text\\
+Text \sparkBar[Extranarrow][19]{19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text\\
+Text \sparkBar[Extranarrow]{!19,32,93,4,95,46,13,23,50,86,94,68,58,41,89,57,74,!8} Text
+\end{LTXexample}
-\normalsize
-Text \sparkBar[Thin]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
-Text \sparkBar[Thin]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\subsubsection{Bar-Wide}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Wide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Wide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\subsection{Dots}
-\subsubsection{Dot-Medium}
+\subsubsection{Bar-Extrawide}
-\footnotesize
-\begin{verbatim}
-Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
-Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
-Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkBar[Extrawide]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide][13]{13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22}[22] Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,22} Text\\
+Text \sparkBar[Extrawide]{!13,15,59,73,42,1,41,51,4,97,35,55,37,24,89,21,30,!22} Text
+\end{LTXexample}
-\normalsize
-Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\hfill
- {\huge\sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}}\\
-Text \sparkDot[Medium]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
-Text \sparkDot[Medium]{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+
+
+\subsection{Dots}
+
+\subsubsection{Dot-Medium -- the default}
+
+\begin{LTXexample}[pos=t]
+Text \sparkDot{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1} Text\\
+Text \sparkDot[Medium][54]{54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,1}[1] Text\\
+Text \sparkDot{!54,39,26,65,29,58,36,99,16,56,76,69,71,77,7,40,79,!1} Text
+\end{LTXexample}
\subsubsection{Dot-Small}
-\footnotesize
-\begin{verbatim}
+\begin{LTXexample}[pos=t]
Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
-\end{verbatim}
+\end{LTXexample}
-\normalsize
-Text \sparkDot[Small]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Small][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
-Text \sparkDot[Small]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\subsubsection{Dot-Extrasmall}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extrasmall]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extrasmall][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extrasmall]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\subsection{Dot-Line}
+\subsubsection{Dot-Extralarge}
+\begin{LTXexample}[pos=t]
+Text \sparkDot[Extralarge]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDot[Extralarge][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDot[Extralarge]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\footnotesize
-\begin{verbatim}
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
- {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
-\end{verbatim}
-\normalsize
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot[Line][9]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}[8] Text\hfill
- {\huge\sparkDot[Line]{!9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,!8}}
+\subsection{Dotline}
+\subsubsection{Dotline-Thin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\section{Examples for Lua\protect\LaTeX}
-The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
+\subsubsection{Dotline-Extrathin}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathin]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathin][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathin]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\subsection{Bars}
-\footnotesize
-\begin{verbatim}
-Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\subsubsection{Dotline-Medium -- the default}
-\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
-\end{verbatim}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Medium][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
+\subsubsection{Dotline-Thick}
-\normalsize\noindent
-Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Thick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Thick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Thick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\huge
-\sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}
+\subsubsection{Dotline-Extrathick}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline[Extrathick]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline[Extrathick][1]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}[76] Text\\
+Text \sparkDotline[Extrathick]{!1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,!76} Text
+\end{LTXexample}
-\normalsize
-\subsection{Dots}
+\section{Examples for Lua\protect\LaTeX}
+The current version of \texttt{spark-otf} supports only star versions for Lua\LaTeX.
-\footnotesize
-\begin{verbatim}
-Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
-Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
-\huge
-\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
-\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
-\end{verbatim}
+\subsection{Bars}
-\normalsize
-Text \sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
-Text \sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
-Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
-Text \sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
+\begin{LTXexample}[pos=t]
+Text \sparkBar*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkBar*{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkBar*[Narrow]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176} Text\\
+\end{LTXexample}
-\huge
-\sparkDot*[Line]{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76}\\
-\sparkDot[Line]{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8}\\
-\sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88]\\
-\sparkDot*[Line][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176]
+
+\subsection{Dots}
+\begin{LTXexample}[pos=t]
+Text \sparkDotline*{1,79,88,46,54,77,91,24,70,22,27,29,40,33,31,95,26,76} Text\\
+Text \sparkDotline{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDotline+{9,4,2,1,6,7,3,8,3,7,1,4,9,2,8,5,1,8} Text\\
+Text \sparkDot*[Medium][19]{19,114,12,111,16,17,113,118,113,67,61,74,39,52,38,55,111,88}[88] Text\\
+Text \sparkDotline*[Medium][111]{111,179,188,146,154,177,191,124,170,122,127,129,140,133,131,195,126,176}[176] Text
+\end{LTXexample}
-\normalsize
\section{Using color}
It is possible to mark single or some values with a specific color, which must
be given in binary notation, e.g. \verb|ff0000| for red (R-G-B). The macro \verb|\setSparkColor|
\emph{should} include the (last) comma after the value:
-\begin{verbatim}
-Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
- \sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
-
-Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
- \sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
-\end{verbatim}
-
-\noindent
+\begin{LTXexample}[pos=t]
Text \sparkBar{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
\sparkBar{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
@@ -309,9 +313,10 @@
\noindent
Text \sparkDot{14,95,68,9,19,41,\setSparkColor{ff0000}{91,}1,81,97,79,45,96,76,17,65,8,92} Text
\sparkDot{!14,95,68,9,19,41,\setSparkColor{ff0000}{91,1,81,97,79,}45,96,76,17,65,8,!92} Text
+\end{LTXexample}
Coloring does \emph{not} work for the star version of the macro and \emph{not} for
-\verb|\sparkDot[Line]|.
+\verb|\sparkDotline|.
\section{The charsets}
@@ -353,6 +358,9 @@
\usebox\ZBox\\\fi}
}
+
+\iffalse
+
\subsection*{Spark-BarThin}
{\sparkBarThin
@@ -413,6 +421,8 @@
}
+\fi
+
\nocite{*}
\printbibliography
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spark-otf.doc.tlpobj new/tlpkg/tlpobj/spark-otf.doc.tlpobj
--- old/tlpkg/tlpobj/spark-otf.doc.tlpobj 2019-02-28 04:05:53.000000000 +0100
+++ new/tlpkg/tlpobj/spark-otf.doc.tlpobj 2019-05-06 01:39:02.000000000 +0200
@@ -1,9 +1,9 @@
name spark-otf.doc
category Package
-revision 45483
+revision 51005
shortdesc doc files of spark-otf
relocated 1
-docfiles size=29
+docfiles size=33
RELOC/doc/fonts/spark-otf/Changes
RELOC/doc/fonts/spark-otf/README.md
RELOC/doc/fonts/spark-otf/spark-otf-doc.bib
++++++ spark-otf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/spark-otf/spark-otf.sty new/tex/latex/spark-otf/spark-otf.sty
--- old/tex/latex/spark-otf/spark-otf.sty 2017-09-28 01:01:58.000000000 +0200
+++ new/tex/latex/spark-otf/spark-otf.sty 2019-05-05 20:03:57.000000000 +0200
@@ -1,4 +1,4 @@
-%% $Id: spark-otf.sty 582 2017-09-25 06:27:35Z herbert $
+%% $Id: spark-otf.sty 1047 2019-04-12 17:22:07Z herbert $
%%
%% This file is distributed under the terms of the LaTeX Project Public
%% License from CTAN archives in directory macros/latex/base/lppl.txt.
@@ -6,9 +6,9 @@
%%
% Copyright 2017 Herbert Voss hvoss(a)tug.org
%%
-\def\spark(a)version{0.04}
+\def\spark(a)version{0.05}
\ProvidesPackage{spark-otf}[%
- 2017/09/26 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
+ 2019/04/12 v. \spark@version~(Herbert Voss) Supports spark OpenType for lualatex/xelatex.]
%
\RequirePackage{ifxetex,ifluatex,xkeyval}
%
@@ -24,7 +24,7 @@
\@latex@error{This package can only be used with "XeLaTeX" or "LuaLaTeX"!%
\MessageBreak "pdfLaTeX" or any other "TeX" version are _not_ possible!}%
\fi\fi
-\RequirePackage{fontspec,xparse}
+\RequirePackage{luaotfload,xparse}
\ifluatex\RequirePackage{luacode}\fi
@@ -35,26 +35,42 @@
\ifspark@usefilenames
\typeout {Using file names for the spark font}%
%----------------------------------------- file names ----------------------------
- \font\sparkBarMedium="file:Spark - Bar - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkBarNarrow="file:Spark - Bar - Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkBarThin="file:Spark - Bar - Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
-%
- \font\sparkDotLine="file:Spark - Dot-line - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
-%
- \font\sparkDotMedium="file:Spark - Dot - Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
- \font\sparkDotSmall="file:Spark - Dot - Small.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarMedium ="file:Sparks-Bar-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow ="file:Sparks-Bar-Narrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow="file:Sparks-Bar-Extranarrow.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide ="file:Sparks-Bar-Wide.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide ="file:Sparks-Bar-Extrawide.otfmode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotlineMedium ="file:Sparks-Dotline-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick ="file:Sparks-Dotline-Thick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick="file:Sparks-Dotline-Extrathick.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin ="file:Sparks-Dotline-Thin.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin ="file:Sparks-Dotline-Extrathin.otf:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotMedium ="file:Sparks-Dot-Medium.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall ="file:Sparks-Dot-Small.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge="file:Sparks-Dot-Extralarge.otf:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall="file:Sparks-Dot-Extrasmall.otf:mode=node;+calt;\spark@DefaultFeatures"
%
\else
\typeout {Using symbolic names for the spark font}%
%----------------------------------------- symbolic names ----------------------------
- \newfontface\sparkBarMedium{Spark-BarMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarNarrow{Spark-BarNarrow}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkBarThin{Spark-BarThin}[RawFeature=+calt,\spark@DefaultFeatures]
-%
- \newfontface\sparkDotLine{Spark-Dot-lineMedium}[RawFeature=+calt,\spark@DefaultFeatures]
-%
- \newfontface\sparkDotMedium{Spark-DotMedium}[RawFeature=+calt,\spark@DefaultFeatures]
- \newfontface\sparkDotSmall{Spark-DotSmall}[RawFeature=+calt,\spark@DefaultFeatures]
+ \font\sparkBarMedium = "name:Sparks Bar Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarNarrow = "name:Sparks Bar Narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtranarrow= "name:Sparks Bar Extra-narrow:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarWide = "name:Sparks Bar Wide:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkBarExtrawide = "name:Sparks Bar Extra-wide:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotlineMedium = "name:Sparks Dot-line Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThick = "name:Sparks Dot-line Thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathick= "name:Sparks Dot-line Extra-thick:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineThin = "name:Sparks Dot-line Thin:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotlineExtrathin = "name:Sparks Dot-line Extra-thin:mode=node;+calt;\spark@DefaultFeatures"
+%
+ \font\sparkDotMedium = "name:Sparks Dot Medium:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotSmall = "name:Sparks Dot Small:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtralarge= "name:Sparks Dot Extra-large:mode=node;+calt;\spark@DefaultFeatures"
+ \font\sparkDotExtrasmall= "name:Sparks Dot Extra-small:mode=node;+calt;\spark@DefaultFeatures"
\fi
%
%
@@ -102,7 +118,7 @@
end
end
\end{luacode}
- \def\spark@line{Line}% 12 3 45
+% 12 3 45
\NewDocumentCommand\sparkBar{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
@@ -114,12 +130,17 @@
\NewDocumentCommand\sparkDot{sO{Medium}O{}mO{}}{{%
\check@list@values{#4}%
\IfBooleanTF{#1}%
- {\def\spark@arg{#2}%
- \ifx\spark@line\spark@arg \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},9)}}%
- \else \edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}%
- \fi}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
+ {\let\spark@values@ii\spark@values@i}%
+ \@nameuse{sparkDot#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
+ }}
+% 12 3 45
+ \NewDocumentCommand\sparkDotline{sO{Medium}O{}mO{}}{{%
+ \check@list@values{#4}%
+ \IfBooleanTF{#1}%
+ {\edef\spark@values@ii{\directlua{RelativeValues({\spark@values@i},100)}}}%
{\let\spark@values@ii\spark@values@i}%
- \@nameuse{sparkDot#2}\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last%
+ \@nameuse{sparkDotline#2}#3\spark@mark@first\string{\spark@values@ii\string}\spark@mark@last#5%
}}
\else %% XeLaTeX% 1 2 34
\NewDocumentCommand\sparkBar{O{Medium}O{}mO{}}{{%
@@ -129,7 +150,12 @@
\NewDocumentCommand\sparkDot{O{Medium}O{}mO{}}{{%
\check@list@values{#3}%
\@nameuse{sparkDot#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
+ }}%
+ \NewDocumentCommand\sparkDotline{O{Medium}O{}mO{}}{{%
+ \check@list@values{#3}%
+ \@nameuse{sparkDotline#1}\spark@mark@first\string{\spark@values@i\string}\spark@mark@last%
}}
\fi
%%
\endinput
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/spark-otf.tlpobj new/tlpkg/tlpobj/spark-otf.tlpobj
--- old/tlpkg/tlpobj/spark-otf.tlpobj 2019-02-28 04:05:54.000000000 +0100
+++ new/tlpkg/tlpobj/spark-otf.tlpobj 2019-05-06 01:39:02.000000000 +0200
@@ -1,6 +1,6 @@
name spark-otf
category Package
-revision 45483
+revision 51005
shortdesc Support OpenType Spark fonts
relocated 1
longdesc The package supports the free fonts from "After the Flood"
@@ -11,7 +11,7 @@
runfiles size=2
RELOC/tex/latex/spark-otf/spark-otf.sty
catalogue-ctan /fonts/spark-otf
-catalogue-date 2017-10-08 09:13:25 +0200
+catalogue-date 2019-04-13 10:06:36 +0200
catalogue-license lppl1.3
catalogue-topics font-absent font-symbol font-otf font-use
-catalogue-version 0.04
+catalogue-version 0.05
++++++ srdp-mathematik.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/srdp-mathematik/README.txt new/doc/latex/srdp-mathematik/README.txt
--- old/doc/latex/srdp-mathematik/README.txt 2019-01-14 23:08:11.000000000 +0100
+++ new/doc/latex/srdp-mathematik/README.txt 2020-04-12 00:53:26.000000000 +0200
@@ -2,9 +2,9 @@
The
srdp-mathematik package
- v1.2
+ v1.6
- 2019/01/14
+ 2020/04/03
___________________________________
Maintainer: Christoph Weberndorfer
@@ -21,6 +21,8 @@
----------------------------------------------------------------------
-Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der österreichischen, standardisierten Reife- und Diplomprüfung (sRDP) in Mathematik.
-Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen. Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen.
+Dieses Paket bietet grundlegende Befehle für die vorgegebenen Formate der österreichischen, standardisierten
+Reife- und Diplomprüfung (sRDP) in Mathematik.
+Es bietet darüber hinaus die Möglichkeit, Antworten in die tex Datei zu implentieren und diese bei Bedarf in der pdf Datei anzuzeigen.
+Außerdem können die eingegeben Antwortmöglichkeiten variiert werden, um mehrere Gruppe für zum Beispiel Schularbeiten einfach zu erstellen.
Binary files old/doc/latex/srdp-mathematik/srdp-mathematik.pdf and new/doc/latex/srdp-mathematik/srdp-mathematik.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/srdp-mathematik/srdp-mathematik.tex new/doc/latex/srdp-mathematik/srdp-mathematik.tex
--- old/doc/latex/srdp-mathematik/srdp-mathematik.tex 2019-01-14 23:08:11.000000000 +0100
+++ new/doc/latex/srdp-mathematik/srdp-mathematik.tex 2020-04-12 00:53:26.000000000 +0200
@@ -8,7 +8,7 @@
\usepackage[T1]{fontenc}
\usepackage{eurosym}
\usepackage{setspace}
-\usepackage[latin1]{inputenc}
+\usepackage[utf8]{inputenc}
\usepackage{graphicx}
\usepackage[ngerman]{babel}
\usepackage{srdp-mathematik}
@@ -25,17 +25,17 @@
\newcommand{\Monat}{%
\ifcase\month
- Monat 0 \or Januar \or Februar \or M�rz \or April \or Mai \or Juni \or Juli%
+ Monat 0 \or Januar \or Februar \or März \or April \or Mai \or Juni \or Juli%
\or August \or September \or Oktober \or November \or Dezember
\fi}
-\setcounter{Antworten}{1} %0 = Angaben ohne L�sungen
- %1 = Angaben MIT L�sungen
+\setcounter{Antworten}{1} %0 = Angaben ohne Lösungen
+ %1 = Angaben MIT Lösungen
\pagestyle{plain} %PAGESTYLE: empty, plain, fancy
\onehalfspacing %Zeilenabstand
\setcounter{Zufall}{0}
-%\setcounter{secnumdepth}{1} % keine Nummerierung der �berschriften
+%\setcounter{secnumdepth}{1} % keine Nummerierung der Überschriften
%
%
%
@@ -53,10 +53,10 @@
\begin{center}
\vfill
-\Huge The \textit{srdp-mathematik} package \\[1cm]
+\Huge The \textit{srdp-mathematik} package v1.6\\[1cm]
+
+Documentation \\ [1cm]
-Documentation \\
-\vfill
\flushright
\textsc{\large Christoph Weberndorfer} \\[-0.5cm]
\textsc{\large \Monat~\the\year} \\
@@ -64,9 +64,8 @@
\centering
\normalsize
-Befehle und Unterst�tzung zur Erstellung von Beispielformaten im Rahmen der standardisierten schriftlichen Reifepr�fung (SRP) in Mathematik, gem�� den Vorlagen des Bundesinstituts f�r Bildungsforschung, Innovation \& Entwicklung des �sterreichischen Schulwesens (bifie).
-
-\vfill
+Befehle und Unterstützung zur Erstellung von Beispielformaten im Rahmen der standardisierten schriftlichen Reife und Diplomprüfung (sRDP) in Mathematik, gemäß den Vorlagen des Bundesministeriums für Bildung, Wissenschaft und Forschung (bmbwf).
+\vfill
\begingroup
\let\cleardoublepage\relax
@@ -79,40 +78,22 @@
\end{center}
-\vfill
-
-
-\flushleft
-
-Weitere Hilfe (\LaTeX-Grundlagen): \scriptsize
-\begin{verbatim}
-http://www.fernuni-hagen.de/imperia/md/content/zmi_2010/a026_latex_einf.pdf
-
-http://www.asc.tuwien.ac.at/compmath/2012/latex_total2011.pdf
-
-http://latex.tugraz.at/latex/warum
-\end{verbatim}
-
-
-
-
\end{titlepage}
\section{Allgemeine Befehle}
-
-Die \textit{allgemeinen Befehle} erleichtern das Erstellen von Tests, Schularbeiten Pr�fungen mithilfe einiger wichtigen Strukturen. Sie sollten stets verwendet werden, um die volle Funktionsf�higkeit dieses Pakets auszunutzen.
+Die \textit{allgemeinen Befehle} erleichtern das Erstellen von Tests, Schularbeiten Prüfungen mithilfe einiger wichtigen Strukturen. Sie sollten stets verwendet werden, um die volle Funktionsfähigkeit dieses Pakets auszunutzen.
\vspace{1cm}
\subsection{Beispielumgebungen}
-Jedes Beispiel sollte innerhalb einer Beispielumgebung gesetzt werden, welche bei der Formatierung und der Verarbeitung der Punkte unterst�tzt. Dabei werden zwei Beispiel-Typen unterschieden: \texttt{beispiel} und \texttt{langesbeispiel}.
+Jedes Beispiel sollte innerhalb einer Beispielumgebung gesetzt werden, welche bei der Formatierung und der Verarbeitung der Punkte unterstützt. Dabei werden zwei Beispiel-Typen unterschieden: \texttt{beispiel} und \texttt{langesbeispiel}.
\vspace{1cm}
\subsubsection{\texttt{beispiel}-Umbgebung}
-Die \texttt{beispiel}-Umgebung dient zur Erstellung eines Beispiels einer Schularbeit, einer Pr�fung, usw. Dabei sind praktisch alle Funktionen von \LaTeX, wie Text, Formeln oder Grafiken m�glich. Diese Umgebung erlaubt jedoch keinen Seitenumbruch! Die Beispiele werden automatisch nummeriert.
+Die \texttt{beispiel}-Umgebung dient zur Erstellung eines Beispiels einer Schularbeit, einer Prüfung, usw. Dabei sind praktisch alle Funktionen von \LaTeX, wie Text, Formeln oder Grafiken möglich. Diese Umgebung erlaubt jedoch keinen Seitenumbruch! Die Beispiele werden automatisch nummeriert.
\leer
@@ -122,7 +103,7 @@
In diesen Bereich kommt das Beispiel. Dabei kann ein beliebig langer Text
(ohne Seitenumbruch) geschrieben werden. Die Spalte mit den Punkten wird
-dabei immer frei gehalten. Aber auch mathematische Formeln sind m�glich:
+dabei immer frei gehalten. Aber auch mathematische Formeln sind möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{beispiel}
@@ -135,17 +116,18 @@
\begin{beispiel}{6} %PUNKTE DES BEISPIELS
In diesen Bereich kommt das Beispiel. Dabei kann ein beliebig langer Text
(ohne Seitenumbruch) geschrieben werden. Die Spalte mit den Punkten wird dabei
-immer frei gehalten. Aber auch mathematische Formeln sind m�glich:
+immer frei gehalten. Aber auch mathematische Formeln sind möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$
\end{beispiel}
+
\vspace{1cm}
\subsubsection{\texttt{langesbeispiel}-Umbgebung}
-Die \texttt{langesbeispiel}-Umgebung dient ebenso zur Erstellung eines Beispiels, funktioniert analog, erlaubt aber im Gegensatz zur \texttt{beispiel}-Umgebung Seitenumbr�che. Auch lange Beispiele werden weiterf�hrend nummeriert.
+Die \texttt{langesbeispiel}-Umgebung dient ebenso zur Erstellung eines Beispiels, funktioniert analog, erlaubt aber im Gegensatz zur \texttt{beispiel}-Umgebung Seitenumbrüche. Auch lange Beispiele werden weiterführend nummeriert.
\leer
@@ -154,9 +136,9 @@
\begin{langesbeispiel} \item[8] %PUNKTE DES BEISPIELS
In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur
-beispiel-Umgebung. Ist das Beispiel jedoch l�nger als eine Seite (z.B bei
-Typ-2 Aufgaben), werden Seitenumbr�che automatisch gemacht. Auch hier sind
-mathematische Formeln m�glich:
+beispiel-Umgebung. Ist das Beispiel jedoch länger als eine Seite (z.B bei
+Typ-2 Aufgaben), werden Seitenumbrüche automatisch gemacht. Auch hier sind
+mathematische Formeln möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{langesbeispiel}
@@ -168,14 +150,16 @@
\begin{langesbeispiel} \item[8] %PUNKTE DES BEISPIELS
-In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur beispiel-Umgebung. Ist das Beispiel jedoch l�nger als eine Seite (z.B bei Typ-2 Aufgaben), werden Seitenumbr�che automatisch gemacht. Auch hier sind mathematische Formeln m�glich:
+In diesen Bereich kommt das Beispiel und funktioniert praktisch analog zur beispiel-Umgebung. Ist das Beispiel jedoch länger als eine Seite (z.B bei Typ-2 Aufgaben), werden Seitenumbrüche automatisch gemacht. Auch hier sind mathematische Formeln möglich:
$\frac{x^2+x+5}{\sqrt{x^3}}$.
\end{langesbeispiel}
-\subsubsection{Notenschl�ssel}
-Werden f�r alle Beispiele die \texttt{beispiel}- oder die \texttt{langesbeispiel}-Umgebung verwendet, wird die Gesamtpunktezahl sowie der Notenschl�ssel automatisch berechnet. Die Werte in Klammer geben dabei den prozentualen Notenschl�ssel vor und k�nnen beliebig variiert werden:
+
+\subsubsection{Notenschlüssel}
+
+Werden für alle Beispiele die \texttt{beispiel}- oder die \texttt{langesbeispiel}-Umgebung verwendet, wird die Gesamtpunktezahl sowie der Notenschlüssel automatisch berechnet. Die Werte in Klammer geben dabei den prozentualen Notenschlüssel vor und können beliebig variiert werden:
\vspace{0.4cm}
@@ -192,9 +176,36 @@
\normalsize
-\subsection{L�sungseingabe -- Option: \texttt{[solution\_on/off]}}
+\subsubsection{Beurteilungsraster}
+
+Der Befehl \texttt{beurteilungsraster} entspricht der aktuellen Vorgabe der Beurteilung der standardisierten Reifeprüfung (Stand 2019). Dabei müssen die Punkte für Teil 1, Ausgleichspunkte und Teil 2 angegeben werden. Die in Klammer angegebenen Werte entsprechen der bei der Reifeprüfung verwendeten prozentuellen Notenverteilung, können jedoch jederzeit verändert werden. \leer
+
+
+\textsc{Eingabe:}
+\begin{verbatim}
+\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
+ T1={24}, % Punkte im Teil 1
+ AP={4}, % Ausgleichspunkte aus Teil 2
+ T2={20}, % Punkte im Teil 2
+ }
+
+\end{verbatim}
+\textsc{Ausgabe:}\leer
+
+siehe nächste Seite \newpage
-Es besteht die M�glichkeit, die L�sung in der erstellten \texttt{tex}-Datei zu implementieren und diese bei Bedarf in der \texttt{PDF}-Datei ein- bzw. auszublenden. Um diese Funktion nutzen zu k�nnen, muss die \texttt{solution\_on/off} Option im \texttt{srdp-mathematik}-Paket geladen werden. Diese kann durch hinzuf�gen durch "`\texttt{solution\_on}"' bzw. "`\texttt{solution\_off}"' aktiviert bzw. deaktiviert werden. Also:
+
+\beurteilungsraster{0.85}{0.68}{0.5}{1/3}{ % Prozentschluessel
+ T1={24}, % Punkte im Teil 1
+ AP={4}, % Ausgleichspunkte aus Teil 2
+ T2={20}, % Punkte im Teil 2
+ }
+
+\newpage
+
+\subsection{Lösungseingabe -- Option: \texttt{[solution\_on/off]}}
+
+Es besteht die Möglichkeit, die Lösung in der erstellten \texttt{tex}-Datei zu implementieren und diese bei Bedarf in der \texttt{PDF}-Datei ein- bzw. auszublenden. Um diese Funktion nutzen zu können, muss die \texttt{solution\_on/off} Option im \texttt{srdp-mathematik}-Paket geladen werden. Diese kann durch hinzufügen durch "`\texttt{solution\_on}"' bzw. "`\texttt{solution\_off}"' aktiviert bzw. deaktiviert werden. Also:
\begin{verbatim}
\usepackage[solution_on]{srdp-mathematik}
@@ -207,20 +218,20 @@
\end{verbatim}
-Die korrekte L�sungseingabe der vorformatierten Typ1-Aufgaben wird bei den entsprechenden Befehlen direkt erkl�rt. Unabh�ngig davon, gibt es die M�glichkeit mithilfe des \texttt{antwort}-Befehls, beliebige Abschnitte als \textit{Antwort} zu deklarieren.
+Die korrekte Lösungseingabe der vorformatierten Typ-1-Aufgaben wird bei den entsprechenden Befehlen direkt erklärt. Unabhängig davon, gibt es die Möglichkeit mithilfe des \texttt{antwort}-Befehls, beliebige Abschnitte als \textit{Antwort} zu deklarieren. (verwendeter counter: \texttt{Antworten=0, 1})
\subsubsection{\texttt{antwort}-Befehl}
-F�r offene Antworten kann der \texttt{\textbackslash antwort\{\}}-Befehl verwendet werden. Darin k�nnen Textpassagen, mathematische Formeln oder Grafiken angegeben werden, die ausschlie�lich bei aktivierter L�sung (\texttt{[solution\_on]}) und in \textcolor[rgb]{1,0,0}{rot} angegeben werden. \leer
+Für offene Antworten kann der \texttt{\textbackslash antwort\{\}}-Befehl verwendet werden. Darin können Textpassagen, mathematische Formeln oder Grafiken angegeben werden, die ausschließlich bei aktivierter Lösung (\texttt{[solution\_on]}) und in \textcolor[rgb]{1,0,0}{rot} angegeben werden. \leer
\subsubsection{Zusatz: Optionales Argument}
-Der \texttt{antwort}-Befehl erlaubt ein optionales Argument. Es k�nnen dadurch zus�tzliche Textpassagen angegeben werden, die \underline{ausschlie�lich} angezeigt werden, wenn die L�sungsanzeige deaktiviert (\texttt{[solution\_off])} ist. Das hei�t: \leer
+Der \texttt{antwort}-Befehl erlaubt ein optionales Argument. Es können dadurch zusätzliche Textpassagen angegeben werden, die \underline{ausschließlich} angezeigt werden, wenn die Lösungsanzeige deaktiviert (\texttt{[solution\_off])} ist. Das heißt: \leer
\textsc{Eingabe:}
\begin{verbatim}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn 'solution_off' gew�hlt
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn 'solution_off' gewählt
wird.]
{Dies ist die notwendige Angabe und wird in rot angezeigt und nur wenn
'solution_on' eingestellt ist.}
@@ -230,7 +241,7 @@
\textsc{Ausgabe}, wenn \texttt{\textbackslash usepackage[solution\_off]\{srdp-mathematik\}} eingestellt ist: \\
\setcounter{Antworten}{0}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gew�hlt wird.]
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gewählt wird.]
{Dies ist die notwendige Angabe und wird in rot angezeigt und nur wenn
\textttt{'solution\_on'} eingestellt ist.}
\leer
@@ -238,21 +249,31 @@
\textsc{Ausgabe}, wenn \texttt{\textbackslash usepackage[solution\_on]\{srdp-mathematik\}} eingestellt ist:\\
\setcounter{Antworten}{1}
-\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gew�hlt wird.]
+\antwort[Optionale Eingabe, die nur angezeigt wird, wenn \texttt{'solution\_off'} gewählt wird.]
{Dies ist die notwendige Eingabe und wird in rot angezeigt und nur wenn
\texttt{'solution\_on'} eingestellt ist.}
-\subsection{Erstellung von Gruppen}
-Das \texttt{srdp-mathematik}-Paket erm�glicht auch die automatische Erstellung von Gruppen f�r Schularbeiten, durch Vertauschung der Antwortm�glichkeiten aller Typ1-Aufgaben. Dazu muss im Preamble (Bereich vor \texttt{\textbackslash begin\{document\}}) folgender Befehl eingef�gt werden:\\
+\subsection{Erstellung von Gruppen -- Option: \texttt{[random=0,1,2,\ldots]}}
+Das \texttt{srdp-mathematik}-Paket ermöglicht auch die automatische Erstellung von Gruppen für Schularbeiten, durch Vertauschung der Antwortmöglichkeiten aller Typ-1-Aufgaben. Dazu kann die \texttt{random}-Option im \texttt{srdp-mathematik}-Paket eingebunden geladen werden. Also:
-\texttt{\textbackslash setcounter\{Zufall\}\{0\}} \leer
+\begin{verbatim}
+\usepackage[random=0]{srdp-mathematik}
+\end{verbatim}
-Die Zahl "`0"' bedeutet dabei, dass keine Vertauschung stattfindet und somit die Antwortm�glichkeiten in der Reihenfolge angezeigt werden, in der sie in der \texttt{tex}-Datei eingegeben wurden.
+oder
-Durch das Ersetzen der Zahl "`0"' durch die Zahlen $1, 2, 3, \ldots$ (und anschlie�endem Kompilieren) werden die Antwortm�glichkeiten bei \textbf{allen} Typ1-Formaten der Datei in einer zuf�lligen Reihenfolge vertauscht. Es k�nnen somit in kurzer Zeit mehrere Gruppen der selben Schularbeit erstellt werden. Die eingegebenen L�sungen werden gleicherma�en �bernommen. \leer
+\begin{verbatim}
+\usepackage[random=1]{srdp-mathematik}
+\end{verbatim}
+
+usw.
-Die Erstellung der Gruppen ist dabei reproduzierbar. Die Reihenfolge der Antwortm�glichkeiten einer Gruppe bleibt daher immer gleich. Mithilfe des Befehls \texttt{\textbackslash Gruppe} kann die Gruppennummer innerhalb der \texttt{PDF}-Datei (z.B. am Deckblatt) angezeigt werden.
+Die Zahl "`0"' bedeutet dabei, dass keine Vertauschung stattfindet und somit die Antwortmöglichkeiten in der Reihenfolge angezeigt werden, in der sie in der \texttt{tex}-Datei eingegeben wurden.
+
+Durch das Ersetzen der Zahl "`0"' durch die Zahlen $1, 2, 3, \ldots$ (und anschließendem Kompilieren) werden die Antwortmöglichkeiten bei \textbf{allen} Typ1-Formaten der Datei in einer zufälligen Reihenfolge vertauscht. Es können somit in kurzer Zeit mehrere Gruppen der selben Schularbeit erstellt werden. Die eingegebenen Lösungen werden gleichermaßen übernommen. \leer
+
+Die Erstellung der Gruppen ist dabei reproduzierbar. Die Reihenfolge der Antwortmöglichkeiten einer Gruppe bleibt daher immer gleich. Mithilfe des Befehls \texttt{\textbackslash Gruppe} kann die Gruppennummer innerhalb der \texttt{PDF}-Datei (z.B. am Deckblatt) angezeigt werden. (verwendeter counter: \texttt{Zufall=0, 1, 2, \ldots})
%Dieses Prinzip wird exemplarisch am Multiplechoice-Format gezeigt:\leer
%
@@ -339,85 +360,94 @@
%A4=0, % 4. Antwort
%A5=0, % 5. Antwort
%}
+
+\subsection{Informationseingabe -- Option: \texttt{[info\_on/off]}}
+Es ist darüber hinaus möglich zusätzliche Informationen (Erläuterungen, Hilfestellungen, \ldots) hinzuzufügen und einzublenden. Dazu kann die Option \texttt{info\_on/off} im \texttt{srdp-mathematik}-Paket eingebunden werden. Die Infos werden in \textcolor[rgb]{0,0,1}{blau} angegeben und nur dann angezeigt, wenn die Option \texttt{info\_on} gewählt wurde (verwendeter counter: \texttt{info=0,1}). Also:
+
+
+\begin{verbatim}
+\usepackage[info_on]{srdp-mathematik}
+\end{verbatim}
+
+oder
+
+\begin{verbatim}
+\usepackage[info_off]{srdp-mathematik}
+\end{verbatim}
+
-\subsubsection{Weitere allgemeine Befehle}
-Dar�ber hinaus gibt es noch weitere Befehle, die die Formatierung erleichtern.
+\subsection{Weitere allgemeine Befehle}
+Außerdem gibt es noch weitere Befehle, die die Formatierung erleichtern.
\subsubsection*{\texttt{\textbackslash leer} - Befehl}
Eine Leerzeile, etwa zwischen zwei Beispielen. \\
-(Nach dem Befehl \texttt{\textbackslash leer} muss in der \texttt{.tex}-Datei ein Leerzeile eingef�gt werden!)
+(Nach dem Befehl \texttt{\textbackslash leer} muss in der \texttt{.tex}-Datei ein Leerzeile eingefügt werden!)
\leer
\subsubsection*{\texttt{\textbackslash meinlr} - Befehl}
\begin{verbatim}
-\meinlr{Dieser Teil steht links. Wenn dieser Text l�nger sein sollte,
-geht er automatisch in der n�chsten Zeile weiter ohne auf die andere
-Seite �ber zu gehen.}{Dieser Teil steht rechts.}
+\meinlr{Dieser Teil steht links. Wenn dieser Text länger sein sollte,
+geht er automatisch in der nächsten Zeile weiter ohne auf die andere
+Seite über zu gehen.}{Dieser Teil steht rechts.}
\end{verbatim}
-Teilt die Seite in zwei gleich gro�e Seiten.
+Teilt die Seite in zwei gleich große Seiten.
\leer
\textsc{Ausgabe:}
-\meinlr{Dieser Teil steht links. Wenn dieser Text l�nger sein sollte,
-geht er automatisch in der n�chsten Zeile weiter ohne auf die andere
-Seite �ber zu gehen.}{Dieser Teil steht rechts.}
+\meinlr{Dieser Teil steht links. Wenn dieser Text länger sein sollte,
+geht er automatisch in der nächsten Zeile weiter ohne auf die andere
+Seite über zu gehen.}{Dieser Teil steht rechts.}
\subsubsection*{Zusatz: Variable Spaltenbreiten bei \texttt{\textbackslash meinlr}}
-Der Befehl \texttt{\textbackslash meinlr} erlaubt durch die optionale Eingabe eine Ab�nderung der beiden Spaltenbreiten. Durch die Eingabe zwischen ca. -0.3 und 0.3 kann die Spaltenmitte nach links oder rechts verschoben und somit die Spaltenbreite variiert werden.
+Der Befehl \texttt{\textbackslash meinlr} erlaubt durch die optionale Eingabe eine Abänderung der beiden Spaltenbreiten. Durch die Eingabe zwischen ca. -0.3 und 0.3 kann die Spaltenmitte nach links oder rechts verschoben und somit die Spaltenbreite variiert werden.
\textsc{Eingabe:}
\begin{verbatim}
\meinlr[-0.15]{Mit einem negativen Wert wird die linke Spalte verkleinert.}
-{Die rechte Spalte wird damit automatisch vergr��ert. Dadurch ist es m�glich,
+{Die rechte Spalte wird damit automatisch vergrößert. Dadurch ist es möglich,
die Spaltenbreiten nach Belieben zu variieren.}
\end{verbatim}
\textsc{Ausgabe:}
\meinlr[-0.15]{Mit einem negativen Wert wird die linke Spalte verkleinert.}
-{Die rechte Spalte wird damit automatisch vergr��ert. Dadurch ist es m�glich,
+{Die rechte Spalte wird damit automatisch vergrößert. Dadurch ist es möglich,
die Spaltenbreiten nach Belieben zu variieren.}
\leer
\subsubsection*{\texttt{\textbackslash meinlcr} - Befehl}
\begin{verbatim}
-\meinlcr{Text ganz links}{Text in der Mitte. Auch hier sind l�ngere Texte
-m�glich.}{Text auf der rechten Seite.}
+\meinlcr{Text ganz links}{Text in der Mitte. Auch hier sind längere Texte
+möglich.}{Text auf der rechten Seite.}
\end{verbatim}
-Teilt die Seite in drei gleich gro�e Teile
+Teilt die Seite in drei gleich große Teile
\leer
\textsc{Ausgabe:}
-\meinlcr{Text ganz links. Was passiert hier wenn dieser Teil l�nger ist?}{Text in der Mitte. Auch hier sind l�ngere Texte m�glich.}{Text auf der rechten Seite.}
+\meinlcr{Text ganz links. Was passiert hier wenn dieser Teil länger ist?}{Text in der Mitte. Auch hier sind längere Texte möglich.}{Text auf der rechten Seite.}
\leer
-
-\newpage
\section{Typ-1-Aufgaben}
-Das \texttt{srdp-mathematik}-Paket erm�glicht die Verwendung vorgefertigter Aufgabenformate, die bei der �sterreichischen, standardisierten Reifepr�fung Anwendung finden.
-
-
-
-
+Das \texttt{srdp-mathematik}-Paket ermöglicht die Verwendung vorgefertigter Aufgabenformate, die bei der österreichischen, standardisierten Reifeprüfung Anwendung finden.
\subsection{\texttt{multiplechoice}-Befehl}
-Dieser Befehl liefert eine vollst�ndige Formatierung f�r eine Multiplechoice-Aufgabe. Die Anzahl der Antwortm�glichkeiten kann dabei frei (max. 9) gew�hlt werden. Als Standard ist dabei das Format mit f�nf Antwortm�glichkeiten eingestellt. \leer
+Dieser Befehl liefert eine vollständige Formatierung für eine Multiplechoice-Aufgabe. Die Anzahl der Antwortmöglichkeiten kann dabei frei (max. 9) gewählt werden. Als Standard ist dabei das Format mit fünf Antwortmöglichkeiten eingestellt. \leer
-Die korrekten Antworten der Multiplechoice-Aufgabe werden dabei bei A1, A2, \ldots, A5 angegeben. Sollte beispielsweise die 1., die 4. und 5. Antwortm�glichkeit korrekt sein, muss je eine "`0"' durch 1, 4, und 5 ersetzt werden -- Die Reihenfolge dabei ist nicht relevant. Also: \\
+Die korrekten Antworten der Multiplechoice-Aufgabe werden dabei bei A1, A2, \ldots, A5 angegeben. Sollte beispielsweise die 1., die 4. und 5. Antwortmöglichkeit korrekt sein, muss je eine "`0"' durch 1, 4, und 5 ersetzt werden -- Die Reihenfolge dabei ist nicht relevant. Also: \\
\textsc{Eingabe:}
@@ -425,7 +455,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -450,7 +480,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -473,7 +503,7 @@
\multiplechoice[5]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Hier}, %1. Antwortmoeglichkeit
L2={werden}, %2. Antwortmoeglichkeit
- L3={die m�glichen}, %3. Antwortmoeglichkeit
+ L3={die möglichen}, %3. Antwortmoeglichkeit
L4={Antworten}, %4. Antwortmoeglichkeit
L5={eingetragen}, %5. Antwortmoeglichkeit
L6={}, %6. Antwortmoeglichkeit
@@ -492,9 +522,9 @@
\leer
-Die Zahl in eckigen Klammern gibt dabei die gew�nschte Anzahl von Antwortm�glichkeiten an. Somit sind beispielsweise drei oder sieben Antwortm�glichkeiten einstellbar. \leer
+Die Zahl in eckigen Klammern gibt dabei die gewünschte Anzahl von Antwortmöglichkeiten an. Somit sind beispielsweise drei oder sieben Antwortmöglichkeiten einstellbar. \leer
-Wichtig zu erw�hnen ist dabei, dass ausschlie�lich die Zahl in eckigen Klammern die Anzahl der Antwortm�glichkeiten angibt. Werden anschlie�end zu wenige oder zu viele Antwortm�glichkeiten angegeben, werden Leerzeilen erzeugt oder die Eingabe wird in der Ausgabe nicht ber�cksichtigt.
+Wichtig zu erwähnen ist dabei, dass ausschließlich die Zahl in eckigen Klammern die Anzahl der Antwortmöglichkeiten angibt. Werden anschließend zu wenige oder zu viele Antwortmöglichkeiten angegeben, werden Leerzeilen erzeugt oder die Eingabe wird in der Ausgabe nicht berücksichtigt.
\leer
@@ -528,8 +558,6 @@
A5=0, % 5. Antwort
}
-\newpage
-
\textsc{Eingabe:}
@@ -537,9 +565,9 @@
\multiplechoice[7]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Das Gleiche}, %1. Antwort
L2={passiert beim Eintragen von}, %2. Antwort
- L3={sieben M�glichkeiten.}, %3. Antwort
+ L3={sieben Möglichkeiten.}, %3. Antwort
L4={Dabei werden immer 7 Antworten}, %4. Antwort
- L5={angezeigt, unabh�ngig ob sie ausgef�llt}, %5. Antwort
+ L5={angezeigt, unabhängig ob sie ausgefüllt}, %5. Antwort
L6={sind oder nicht!}, %6. Antwort
L7={}, %7. Antwort
L8={}, %8. Antwort
@@ -560,9 +588,9 @@
\multiplechoice[7]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={Das Gleiche}, %1. Antwort
L2={passiert beim Eintragen von}, %2. Antwort
- L3={sieben M�glichkeiten.}, %3. Antwort
+ L3={sieben Möglichkeiten.}, %3. Antwort
L4={Dabei werden immer 7 Antworten}, %4. Antwort
- L5={angezeigt, unabh�ngig ob sie ausgef�llt}, %5. Antwort
+ L5={angezeigt, unabhängig ob sie ausgefüllt}, %5. Antwort
L6={sind oder nicht!}, %6. Antwort
L7={}, %7. Antwort
L8={}, %8. Antwort
@@ -582,13 +610,16 @@
\leer
+
+
+
\textsc{Eingabe:}
\begin{verbatim}
\multiplechoice{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={In diesem}, %1. Antwort
L2={Fall wird der}, %2. Antwort
L3={Standard von}, %3. Antwort
- L4={f�nf Antwortm�glichkeiten}, %4. Antwort
+ L4={fünf Antwortmöglichkeiten}, %4. Antwort
L5={angenommen}, %5. Antwort
L6={}, %6. Antwort
L7={}, %7. Antwort
@@ -603,7 +634,7 @@
L1={In diesem}, %1. Antwort
L2={Fall wird der}, %2. Antwort
L3={Standard von}, %3. Antwort
- L4={f�nf Antwortm�glichkeiten}, %4. Antwort
+ L4={fünf Antwortmöglichkeiten}, %4. Antwort
L5={angenommen}, %5. Antwort
L6={}, %6. Antwort
L7={}, %7. Antwort
@@ -616,7 +647,7 @@
\subsubsection{Add-on: \texttt{langmultiplechoice}-Befehl}
-Der \texttt{langmultiplechoice}-Befehl ist analog zum \texttt{multiplechoice}-Befehl zu verwenden. Der Unterschied besteht darin, dass Antwortm�glichkeiten auf zwei Spalten aufgeteilt werden. Dies ist vor allem dann sinnvoll, wenn Geogebra-Grafiken importiert werden, um eine bessere Lesbarkeit zu erm�glichen.
+Der \texttt{langmultiplechoice}-Befehl ist analog zum \texttt{multiplechoice}-Befehl zu verwenden. Der Unterschied besteht darin, dass Antwortmöglichkeiten auf zwei Spalten aufgeteilt werden. Dies ist vor allem dann sinnvoll, wenn Geogebra-Grafiken importiert werden, um eine bessere Lesbarkeit zu ermöglichen.
\langmultiplechoice[6]{ %Anzahl der Antwortmoeglichkeiten, Standard: 5
L1={\resizebox{0.7\linewidth}{!}{\newrgbcolor{zzttqq}{0.6 0.2 0}
@@ -736,20 +767,20 @@
\newpage
\subsection{\texttt{lueckentext}-Befehl}
-Dieser Befehl dient zur Erstellung eines L�ckentexts, basierend auf dem standardisierten Format des BIFIE. Der einleitenden Satz: \textit{"`Erg�nze die Textl�cken im folgenden Satz durch Ankreuzen der jeweils richtigen Satzteile so, dass eine mathematisch korrekte Aussage entsteht!"'} wird als Standard angenommen und automatisch angegeben. Im Bereich \texttt{\textbackslash text=\{\}} wird der L�ckentext angegeben, wobei die L�cken immer mit \texttt{\textbackslash gap} eingef�gt werden und automatisch nummeriert werden. Analog zu den L�sungsangaben der Multiplechoice-Aufgabe, werden die korrekten Antworten bei A1, A2 oder A3 mit 1,2 oder 3 angegeben. (hier: L�sung links: 3 und rechts: 2)
+Dieser Befehl dient zur Erstellung eines Lückentexts, basierend auf dem standardisierten Format des BIFIE. Der einleitenden Satz: \textit{"`Ergänze die Textlücken im folgenden Satz durch Ankreuzen der jeweils richtigen Satzteile so, dass eine mathematisch korrekte Aussage entsteht!"'} wird als Standard angenommen und automatisch angegeben. Im Bereich \texttt{\textbackslash text=\{\}} wird der Lückentext angegeben, wobei die Lücken immer mit \texttt{\textbackslash gap} eingefügt werden und automatisch nummeriert werden. Analog zu den Lösungsangaben der Multiplechoice-Aufgabe, werden die korrekten Antworten bei A1, A2 oder A3 mit 1,2 oder 3 angegeben. (hier: Lösung links: 3 und rechts: 2)
\vspace{0.35cm}
\textsc{Eingabe:}
\begin{verbatim}
\lueckentext{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
L1={Hier schreibt}, %1.Moeglichkeit links
- L2={man die Antwortm�glichkeiten}, %2.Moeglichkeit links
- L3={f�r die erste L�cke}, %3.Moeglichkeit links
+ L2={man die Antwortmöglichkeiten}, %2.Moeglichkeit links
+ L3={für die erste Lücke}, %3.Moeglichkeit links
R1={und hier jene}, %1.Moeglichkeit rechts
- R2={f�r die M�glichkeiten}, %2.Moeglichkeit rechts
- R3={der zweiten L�cke. Theoretisch k�nnte dieser Text
+ R2={für die Möglichkeiten}, %2.Moeglichkeit rechts
+ R3={der zweiten Lücke. Theoretisch könnte dieser Text
auch zweizeilig sein.}, %3.Moeglichkeit rechts
%% LOESUNG: %%
A1=3, % Antwort links
@@ -759,14 +790,14 @@
\textsc{Ausgabe:}
\lueckentext{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
L1={Hier schreibt}, %1.Moeglichkeit links
- L2={man die Antwortm�glichkeiten}, %2.Moeglichkeit links
- L3={f�r die erste L�cke}, %3.Moeglichkeit links
+ L2={man die Antwortmöglichkeiten}, %2.Moeglichkeit links
+ L3={für die erste Lücke}, %3.Moeglichkeit links
R1={und hier jene}, %1.Moeglichkeit rechts
- R2={f�r die M�glichkeiten}, %2.Moeglichkeit rechts
- R3={der zweiten L�cke. Theoretisch k�nnte dieser Text
+ R2={für die Möglichkeiten}, %2.Moeglichkeit rechts
+ R3={der zweiten Lücke. Theoretisch könnte dieser Text
auch mehrzeilig sein.}, %3.Moeglichkeit rechts
%% LOESUNG: %%
A1=3, % Antwort links
@@ -776,19 +807,19 @@
\subsubsection{Zusatz: Variable Breiten der Boxen}
-Der \texttt{lueckentext}-Befehl erlaubt ein optionales Argument, um die Gr��en der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Ver�nderung der linken Box (�nderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergr��ern, gilt:\leer
+Der \texttt{lueckentext}-Befehl erlaubt ein optionales Argument, um die Größen der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Veränderung der linken Box (Änderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergrößern, gilt:\leer
\textsc{Eingabe:}
\begin{verbatim}
\lueckentext[0.25]{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
- L1={In manchen F�llen sind die Antworten einer L�cke},
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ L1={In manchen Fällen sind die Antworten einer Lücke},
%1.Moeglichkeit links
- L2={viel l�nger als die der zweite. In diesem Fall kann man},
+ L2={viel länger als die der zweite. In diesem Fall kann man},
%2.Moeglichkeit links
- L3={die Gr��en der Boxen manuell variieren. Die Eingabe ist optional. },
+ L3={die Größen der Boxen manuell variieren. Die Eingabe ist optional. },
%3.Moeglichkeit links
R1={Sehr}, %1.Moeglichkeit rechts
R2={kurze}, %2.Moeglichkeit rechts
@@ -804,11 +835,11 @@
\lueckentext[0.25]{
- text={Hier wird der Text geschrieben. Die L�cke eins hat dabei
-die \gap, die L�cke zwei hat die \gap.}, %Lueckentext Luecke=\gap
- L1={In manchen F�llen sind die Antworten einer L�cke}, %1.Moeglichkeit links
- L2={viel l�nger als die der zweite. In diesem Fall kann man}, %2.Moeglichkeit links
- L3={die Gr��en der Boxen manuell variieren. Die Eingabe ist optional. }, %3.Moeglichkeit links
+ text={Hier wird der Text geschrieben. Die Lücke eins hat dabei
+die \gap, die Lücke zwei hat die \gap.}, %Lueckentext Luecke=\gap
+ L1={In manchen Fällen sind die Antworten einer Lücke}, %1.Moeglichkeit links
+ L2={viel länger als die der zweite. In diesem Fall kann man}, %2.Moeglichkeit links
+ L3={die Größen der Boxen manuell variieren. Die Eingabe ist optional. }, %3.Moeglichkeit links
R1={Sehr}, %1.Moeglichkeit rechts
R2={kurze}, %2.Moeglichkeit rechts
R3={Antworten}, %3.Moeglichkeit rechts
@@ -819,17 +850,17 @@
\end{minipage}
-Analog funktioniert die Verkleinerung der linken Box. Dazu m�ssen Werte kleiner 0 angegeben
+Analog funktioniert die Verkleinerung der linken Box. Dazu müssen Werte kleiner 0 angegeben
werden.
-\subsubsection{\texttt{Zusatz}: Englischer L�ckentext}
-Der Befehl \texttt{englueckentext} ist analog zum \texttt{lueckentext}-Befehl zu verwenden. Jedoch wird der als Standard angenommene, einleitende Satz bei L�ckentextaufgaben in Englisch angezeigt.
+\subsubsection{\texttt{Zusatz}: Englischer Lückentext}
+Der Befehl \texttt{englueckentext} ist analog zum \texttt{lueckentext}-Befehl zu verwenden. Jedoch wird der als Standard angenommene, einleitende Satz bei Lückentextaufgaben in Englisch angezeigt.
\textsc{Eingabe:}
\begin{verbatim}
\englueckentext{
- text={Hier wird der Text einer englischen Aufgabe geschrieben. Die L�cken
- \gap und \gap k�nnen analog angegeben werden.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text einer englischen Aufgabe geschrieben. Die Lücken
+ \gap und \gap können analog angegeben werden.}, %Lueckentext Luecke=\gap
L1={Auch}, %1.Moeglichkeit links
L2={der}, %2.Moeglichkeit links
L3={Rest}, %3.Moeglichkeit links
@@ -844,7 +875,7 @@
\textsc{Ausgabe:}
\englueckentext{
- text={Hier wird der Text einer englischen Aufgabe geschrieben. Die L�cken \gap und \gap k�nnen analog angegeben werden.}, %Lueckentext Luecke=\gap
+ text={Hier wird der Text einer englischen Aufgabe geschrieben. Die Lücken \gap und \gap können analog angegeben werden.}, %Lueckentext Luecke=\gap
L1={Auch}, %1.Moeglichkeit links
L2={der}, %2.Moeglichkeit links
L3={Rest}, %3.Moeglichkeit links
@@ -857,8 +888,8 @@
}
\subsection{\texttt{zuordnen}-Befehl}
-Dieser Befehl dient zum Erstellen des Zuordnungsformats von vier aus sechs M�glichkeiten.
-Die korrekten Antworten k�nnen hier frei als Buchstaben eingegeben werden. (hier: F, C, A, D)
+Dieser Befehl dient zum Erstellen des Zuordnungsformats von vier aus sechs Möglichkeiten.
+Die korrekten Antworten können hier frei als Buchstaben eingegeben werden. (hier: F, C, A, D)
\leer
@@ -867,14 +898,14 @@
\zuordnen{
R1={Hier sind die vier}, % Response 1
R2={Antworten, zu}, % Response 2
- R3={denen die M�glichkeiten der rechten Box richtig}, % Response 3
+ R3={denen die Möglichkeiten der rechten Box richtig}, % Response 3
R4={zuzuordnen sind}, % Response 4
%% Moegliche Zuordnungen: %%
- A={Hier tr�gt}, %Moeglichkeit A
+ A={Hier trägt}, %Moeglichkeit A
B={man den Text}, %Moeglichkeit B
C={oder die Formeln}, %Moeglichkeit C
- D={f�r die sechs}, %Moeglichkeit D
- E={M�glichkeiten, die man zuordnen muss}, %Moeglichkeit E
+ D={für die sechs}, %Moeglichkeit D
+ E={Möglichkeiten, die man zuordnen muss}, %Moeglichkeit E
F={ein.}, %Moeglichkeit F
%% LOESUNG: %%
A1={F}, % 1. richtige Zuordnung
@@ -890,14 +921,14 @@
\zuordnen{
R1={Hier sind die vier}, % Response 1
R2={Antworten, zu}, % Response 2
- R3={denen die M�glichkeiten der rechten Box richtig}, % Response 3
+ R3={denen die Möglichkeiten der rechten Box richtig}, % Response 3
R4={zuzuordnen sind}, % Response 4
%% Moegliche Zuordnungen: %%
- A={Hier tr�gt}, %Moeglichkeit A
+ A={Hier trägt}, %Moeglichkeit A
B={man den Text}, %Moeglichkeit B
C={oder die Formeln}, %Moeglichkeit C
- D={f�r die sechs}, %Moeglichkeit D
- E={M�glichkeiten, die man zuordnen muss}, %Moeglichkeit E
+ D={für die sechs}, %Moeglichkeit D
+ E={Möglichkeiten, die man zuordnen muss}, %Moeglichkeit E
F={ein.}, %Moeglichkeit F
%% LOESUNG: %%
A1={F}, % 1. richtige Zuordnung
@@ -908,15 +939,15 @@
\subsubsection{Zusatz: Variable Breiten der Boxen}
-Der \texttt{zuordnen}-Befehl erlaubt ein optionales Argument, um die Gr��en der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Ver�nderung der linken Box (�nderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergr��ern, gilt:
+Der \texttt{zuordnen}-Befehl erlaubt ein optionales Argument, um die Größen der beiden Boxen zu variieren. Dabei werden in den eckigen Klammern $[~]$ die Veränderung der linken Box (Änderung ca. zwischen -0.3 und 0.3) angegeben und die rechte Box wird automatisch angepasst. Will man etwa die linke Box vergrößern, gilt:
\textsc{Eingabe:}
\begin{small}
\begin{verbatim}
\zuordnen[0.25]{
-R1={Dabei wird die linke Box vergr��ert.}, % Response 1
+R1={Dabei wird die linke Box vergrößert.}, % Response 1
R2={Dies dient vor allem dazu,}, % Response 2
- R3={wenn eine Seite viel Text enth�lt, die andere hingegen}, % Response 3
+ R3={wenn eine Seite viel Text enthält, die andere hingegen}, % Response 3
R4={nur ganz wenig. Wird die [ ] nicht angegeben dann wird der Standardwert
0 angenommen.}, % Response 4
%% Moegliche Zuordnungen: %%
@@ -925,7 +956,7 @@
C={eher}, %Moeglichkeit C
D={kurze}, %Moeglichkeit D
E={Antworten}, %Moeglichkeit E
- F={m�glich}, %Moeglichkeit F
+ F={möglich}, %Moeglichkeit F
%% LOESUNG: %%
A1={}, % 1. richtige Zuordnung
A2={}, % 2. richtige Zuordnung
@@ -939,9 +970,9 @@
\textsc{Ausgabe:}
\zuordnen[0.25]{
- R1={Dabei wird die linke Box vergr��ert.}, % Response 1
+ R1={Dabei wird die linke Box vergrößert.}, % Response 1
R2={Dies dient vor allem dazu,}, % Response 2
- R3={wenn eine Seite viel Text enth�lt, die andere hingegen}, % Response 3
+ R3={wenn eine Seite viel Text enthält, die andere hingegen}, % Response 3
R4={nur ganz wenig. Wird die $[~]$ nicht angegeben dann wird der Standardwert 0 angenommen.}, % Response 4
%% Moegliche Zuordnungen: %%
A={Hier}, %Moeglichkeit A
@@ -949,7 +980,7 @@
C={eher}, %Moeglichkeit C
D={kurze}, %Moeglichkeit D
E={Antworten}, %Moeglichkeit E
- F={m�glich}, %Moeglichkeit F
+ F={möglich}, %Moeglichkeit F
%% LOESUNG: %%
A1={}, % 1. richtige Zuordnung
A2={}, % 2. richtige Zuordnung
@@ -958,32 +989,114 @@
}
\end{small}
-Analog funktioniert die Verkleinerung der linken Box. Dazu m�ssen Werte kleiner 0 angegeben werden.
+Analog funktioniert die Verkleinerung der linken Box. Dazu müssen Werte kleiner 0 angegeben werden.
+
+
+\section{Typ-2-Aufgaben}
+Um die Struktur der Teil-2-Aufgaben ähnlich jener bei der standardisierten Reifeprüfung einhalten zu können, beinhaltet das Paket einige Befehle, die die Erstellung von Typ-2-Aufagben erleichtern.
+
+\subsection{\texttt{aufgabenstellung}-Umgebung}
+Typ-2-Aufgaben sollten innerhalb einer Prüfung mithilfe der \texttt{langesbeispiel}-Umgebung eingegeben werden, um die volle Funktionalität (wie \texttt{notenschluessel}) des Pakets zu ermöglichen. Der einleitenden Aufgabentext kann dann eingegeben werden. Für die Eingabe der Aufgabenstellung kann dann die \texttt{aufgabenstellung}-Umgebung verwendet werden.\leer
+
+\subsubsection{\texttt{\textbackslash item} und \texttt{\textbackslash Subitem\{\}}}
+Innerhalb dieser Umgebung können dann mithilfe von \texttt{\textbackslash item} (nummeriert mit a), b) ,c), \ldots) und \texttt{\textbackslash Subitem\{\}} (nummeriert mit 1), 2), \ldots) die jeweiligen Items und Subitems der Aufgabe eingegeben werden. \leer
+
+\subsubsection{Ausgleichspunkte}
+Um die notwendigen Ausgleichspunkte in den Typ-2-Aufgaben zu markieren, können die Befehle \texttt{item} und \texttt{Subitem} durch \texttt{\textbackslash Aitem} und \texttt{\textbackslash ASubitem\{\}} ersetzt werden. Dabei wird vor den geschriebenen Text noch ein \fbox{A} eingefügt -- die Nummerierung wird aber wie gewohnt fortgesetzt.
+
+\subsection{\texttt{loesung}-Umgebung}
+Mithilfe der \texttt{loesung}-Umgebung kann die Lösungserwartung sowie der Lösungsschlüssel eingegeben werden. Analog zur Aufgabenstellung können \texttt{\textbackslash item} und \texttt{\textbackslash Subitem\{\}} verwendet werden. Die Eingabe innerhalb der \texttt{loesung}-Umgebung werden nur dann angezeigt, wenn die Lösungsanzeige aktiviert wurde. Die Nummerierung der Subitems kann man mit folgender Eingabe zurücksetzen: \texttt{\textbackslash setcounter{subitemcounter}{0}}.\leer
+
+Eine vollständige Typ-2-Aufgabe könnte also wie folgt aussehen:
+
+\textsc{Eingabe:}
+
+\begin{verbatim}
+\begin{langesbeispiel} \item[0] %PUNKTE DES BEISPIELS
+Hier steht der einleitende Text der Typ-2-Aufgabe.
+
+\begin{aufgabenstellung}
+\item Hier steht der Aufgabentext des ersten Items.
+
+\Subitem{Aufgabentext des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Aufgabentext des zweiten Unterpunkts} %Unterpunkt2
+
+\end{aufgabenstellung}
+\begin{loesung}
+\item \subsection{Lösungserwartung:}
+
+\Subitem{Lösungserwartung des ersten Unterpunkts} %Lösung von Unterpunkt1
+\Subitem{Lösungserwartung des zweiten Unterpunkts} %%Lösung von Unterpunkt2
+
+\setcounter{subitemcounter}{0}
+\subsection{Lösungsschlüssel:}
+
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Unterpunkt2
+\end{loesung}
+
+\end{langesbeispiel}
+\end{verbatim}
+\newpage
+
+\textsc{Ausgabe:}
+\setcounter{Antworten}{1}
+\setcounter{secnumdepth}{-1}
+\setcounter{number}{0}
+\begin{langesbeispiel} \item[0] %PUNKTE DES BEISPIELS
+Hier steht der einleitende Text der Typ-2-Aufgabe.
+
+\addtocontents{toc}{\setcounter{tocdepth}{-10}}
+\begin{aufgabenstellung}
+\item Hier steht der Aufgabentext des ersten Items.
+
+\Subitem{Aufgabentext des ersten Unterpunkts} %Unterpunkt1
+\Subitem{Aufgabentext des zweiten Unterpunkts} %Unterpunkt2
+
+\end{aufgabenstellung}
+
+\begin{loesung}
+\item \subsection*{Lösungserwartung:}
+
+\Subitem{Lösungserwartung des ersten Unterpunkts} %Lösung von Unterpunkt1
+\Subitem{Lösungserwartung des zweiten Unterpunkts} %%Lösung von Unterpunkt2
+
+\setcounter{subitemcounter}{0}
+\subsection*{Lösungsschlüssel:}
+
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Lösungschlüssel von Unterpunkt1
+\Subitem{Lösungsschlüssel des ersten Unterpunkts} %Lösungschlüssel von Unterpunkt2
+
+\end{loesung}
+
+\end{langesbeispiel}
+\addtocontents{toc}{\setcounter{tocdepth}{1}}
+
-\section{Einf�gen von GeoGebra-Grafiken}
+\section{Einfügen von GeoGebra-Grafiken}
-Folgende Schritte m�ssen befolgt werden, um Geogebra-Grafiken in \LaTeX-Dokumente einf�gen zu k�nnen.
+Folgende Schritte müssen befolgt werden, um Geogebra-Grafiken in \LaTeX-Dokumente einfügen zu können.
\leer
\begin{enumerate}
\item Grafik in Geogebra zeichnen
\item Datei $\rightarrow$ Export $\rightarrow$ Grafik-Ansicht als PSTricks\ldots
\item Parameter einstellen
- \item \fbox{Erzeuge PSTricks} dr�cken
+ \item \fbox{Erzeuge PSTricks} drücken
\item Gesamten Text, der zwischen \verb|\begin{document}| und \verb|\end{document}| steht, kopieren.
- \item Im \LaTeX-Dokument dort einf�gen, wo die Grafik integriert werden soll. (Dies ist auch innerhalb von den unterschiedlichen Formaten (wie \verb|\zuordnen| oder \verb|\multiplechoice| m�glich)
+ \item Im \LaTeX-Dokument dort einfügen, wo die Grafik integriert werden soll. (Dies ist auch innerhalb von den unterschiedlichen Formaten (wie \verb|\zuordnen| oder \verb|\multiplechoice| möglich)
- \item Die Gr��e der Grafik kann mithilfe des folgenden Befehls angepasst werden:
+ \item Die Größe der Grafik kann mithilfe des folgenden Befehls angepasst werden:
\begin{verbatim}
- \resizebox{0.5\linewidth}{!}{Hier wird der Text von Geogebra eingef�gt}
+ \resizebox{0.5\linewidth}{!}{Hier wird der Text von Geogebra eingefügt}
\end{verbatim}
- Der Faktor 0.5 gibt die Gr��e der Grafik an. Mit dem Wert 0.5 wird die Gr��e der Grafik somit halbiert.
+ Der Faktor 0.5 gibt die Größe der Grafik an. Mit dem Wert 0.5 wird die Größe der Grafik somit halbiert.
\end{enumerate}
@@ -1030,7 +1143,7 @@
\centering Kopie des PSTricks-Exports von Geogebra \\
- (Originalgr��e und mit \verb|\resizebox{0.5\linewidth}{!}{|\ldots\})
+ (Originalgröße und mit \verb|\resizebox{0.5\linewidth}{!}{|\ldots\})
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj new/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj
--- old/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/srdp-mathematik.doc.tlpobj 2020-04-12 01:55:42.000000000 +0200
@@ -1,9 +1,9 @@
name srdp-mathematik.doc
category Package
-revision 49706
+revision 54685
shortdesc doc files of srdp-mathematik
relocated 1
-docfiles size=47
+docfiles size=53
RELOC/doc/latex/srdp-mathematik/README.txt
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.pdf
RELOC/doc/latex/srdp-mathematik/srdp-mathematik.tex
++++++ srdp-mathematik.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/srdp-mathematik/srdp-mathematik.sty new/tex/latex/srdp-mathematik/srdp-mathematik.sty
--- old/tex/latex/srdp-mathematik/srdp-mathematik.sty 2019-01-14 23:08:11.000000000 +0100
+++ new/tex/latex/srdp-mathematik/srdp-mathematik.sty 2020-04-12 00:53:26.000000000 +0200
@@ -1,5 +1,16 @@
+% srdp-mathemathik.sty
+%
+% This package provides basic commands for the defined formats of the Austrian sRDP
+% (Standardisierte Reife- und Diplomprüfung) in mathematics.
+%
+% Author: Christoph Weberndorfer
+%
+% Released under the LaTeX Project Public License 1.3c
+%
+%
+
\NeedsTeXFormat{LaTeX2e}[1996/12/26]
-\ProvidesPackage{srdp-mathematik}[2019/01/14 v1.2 Standard-Schularbeitsformate]
+\ProvidesPackage{srdp-mathematik}[2020/04/03 v1.6 Standard-Schularbeitsformate]
\usepackage{color}
@@ -42,7 +53,8 @@
\renewcommand{\vec}[1]{\vv{#1}}
\usepackage{graphicx}
\usepackage{setspace}
-\usepackage{enumerate}
+%\usepackage{enumerate}
+\usepackage[inline, shortlabels]{enumitem}
\usepackage{xparse}
\usepackage{eurosym, xspace}
\renewcommand*\euro{\officialeuro\xspace}
@@ -73,9 +85,23 @@
%
%
\newcounter{Antworten}
+\newcounter{Zufall}
+\newcounter{info}
\newcounter{marker}
\DeclareOption{solution_on}{\setcounter{Antworten}{1}}
\DeclareOption{solution_off}{\setcounter{Antworten}{0}}
+\DeclareOption{info_on}{\setcounter{info}{1}}
+\DeclareOption{info_off}{\setcounter{info}{0}}
+\DeclareOption{random=0}{\setcounter{Zufall}{0}}
+\DeclareOption{random=1}{\setcounter{Zufall}{1}}
+\DeclareOption{random=2}{\setcounter{Zufall}{2}}
+\DeclareOption{random=3}{\setcounter{Zufall}{3}}
+\DeclareOption{random=4}{\setcounter{Zufall}{4}}
+\DeclareOption{random=5}{\setcounter{Zufall}{5}}
+\DeclareOption{random=6}{\setcounter{Zufall}{6}}
+\DeclareOption{random=7}{\setcounter{Zufall}{7}}
+\DeclareOption{random=8}{\setcounter{Zufall}{8}}
+\DeclareOption{random=9}{\setcounter{Zufall}{9}}
\AtBeginDocument{\@ifpackagewith{srdp-mathematik}{solution_on}{
\AddToShipoutPictureBG{%
@@ -93,6 +119,16 @@
\newcommand{\antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#2\color[rgb]{0,0,0}}{#1}}
+\newcommand{\info}[2][]{\ifthenelse{\theinfo=1}{
+\color[rgb]{0,0,1}{#2}\color[rgb]{0,0,0}
+}{#1}}
+
+
+%\NewEnviron{antwort}[1][hallo]{\textcolor{red}{\BODY}}
+%\NewEnviron{antwort}[2][]{\ifthenelse{\theAntworten=1}{\color[rgb]{1,0,0}#1\color[rgb]{0,0,0}}{#2}}
+%\newenvironment{antwort}[2][]{\color[rgb]{1,0,0}{#1}}{\color[rgb]{0,0,0}}
+
+
\newcounter{A1}
\newcounter{A2}
@@ -196,7 +232,7 @@
\renewcommand{\labelenumii}{(\roman{enumii})}
\list
{}
- {%
+ {%
\rightmargin.12\textwidth
\def\makelabel##1{\stepcounter{number}%
\hss\llap{\thenumber.}%
@@ -205,13 +241,38 @@
\llap{\small\_\_\_/##1}}}}%
}
{\endlist}
+
\makeatother
+
+\newcommand{\typzwei}{}
+\newcounter{subitemcounter}
+\newcommand{\Subitem}[1]{\stepcounter{subitemcounter}\begin{enumerate}[\thesubitemcounter),leftmargin=*]\itemalt{#1}\end{enumerate}}
+\newcommand{\Aitem}{\item \fbox{A} }
+\newcommand{\ASubitem}[1]{\Subitem{\fbox{A} #1}}
+\NewEnviron{aufgabenstellung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\subsubsection{Aufgabenstellung:}%
+\begin{enumerate}[a),leftmargin=0pt]
+\item \BODY
+\end{enumerate}%
+\let\item\itemalt}
+
+\NewEnviron{loesung}[1]{\let\itemalt\item
+\renewcommand*{\item}{\setcounter{subitemcounter}{0}\itemalt}
+\antwort{%%
+\begin{enumerate}[a),leftmargin=0pt]
+\item \BODY
+\end{enumerate}}%
+\let\item\itemalt}
+
%
%
%
%
%
%
+
+
%%%%%%%%%%%%%%%%%%%%%%%%% Vektorendefinition
\newcommand{\vek}[1]{\overrightarrow{#1}}%
@@ -235,6 +296,12 @@
%
%
+%%%%%%%%%%%%%%%%%%%% INTEGRAL BEFEHL
+%\newcommand{\dx}{\,\text{d}x}
+\newcommand{\dx}[1][x]{\,\text{d}#1}
+\newcommand{\dint}{\displaystyle\int}
+
+
%%%%%%%%%% HOMEWORK BEFEHL
\newcommand{\hw}[1]{
@@ -262,13 +329,13 @@
&b3+1 &c3+1 &d3+1 & e3+1\\
&b3-1 &c3-1 &d3-1 & e3-1\\
\end{spreadtab}
-\footnotesize
-\begin{center}\renewcommand{\arraystretch}{1}
+\footnotesize\renewcommand{\arraystretch}{1}
+\begin{center}
\begin{tabular}{|C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}|} \hline
Erreichte Punkte & Prozent & Gesamt & \multicolumn{2}{c|}{Note} \\
&& \multirow{2}{*}{\thepunkte} && \\
&&&& \\ \hline \hline
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} & \scriptsize{unter \ifdim\nichtgenuegend pt=\nichtgenuegendgenau pt \nichtgenuegend\else\nichtgenuegendpluseins\fi} \\ \hline
\end{tabular}
\end{center}\STautoround{}\normalsize}
@@ -285,13 +352,13 @@
&b3+1 &c3+1 &d3+1 &\\
&b3-1 &c3-1 &d3-1 &\\
\end{spreadtab}
-\footnotesize
-\begin{center}\renewcommand{\arraystretch}{1}
+\footnotesize\renewcommand{\arraystretch}{1}
+\begin{center}
\begin{tabular}{|C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}|} \hline
Erreichte Punkte &Gesamt&\multicolumn{2}{c}{Note}& \\
&\multirow{2}{*}{\thepunkte} &&& \\
&&&& \\ \hline \hline
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
\scriptsize{\thepunkte ~ - \ifdim\gut pt=\gutgenau pt \gut\else\gutpluseins\fi}& \scriptsize{\ifdim\gut pt=\gutgenau pt \gutminuseins\else\gut\fi ~ - \ifdim\befriedigend pt=\befriedigendgenau pt \befriedigend\else\befriedigendpluseins\fi} & \scriptsize{\ifdim\befriedigend pt=\befriedigendgenau pt \befriedigendminuseins\else\befriedigend\fi ~ - \ifdim\genuegend pt=\genuegendgenau pt \genuegend\else\genuegendpluseins\fi} & \scriptsize{\ifdim\genuegend pt=\genuegendgenau pt \genuegendminuseins\else\genuegend\fi ~ - \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\ \hline
\end{tabular}
\end{center}\STautoround{}\normalsize}
@@ -386,10 +453,48 @@
\SThiderow &\theteileins/3*2 & \theteileins+\theausgleichspkte+\theteilzwei \\
\end{spreadtab}
-Die Schularbeit besteht aus Teil 1 (Grundkompetenzen) und Teil 2 (vernetzte und erweiterte Grundkompetenzen). In Teil 1 und Teil 2 sind jeweils \jeroen@get{T1} Punkte zu erreichen. \jeroen@get{AP} Punkte aus Teil 2 k\"onnen zum Ausgleich fehlender Grundkompetenzpunkte aus Teil 1 herangezogen werden. Diese sind in der Angabe mit \fbox{\large A} gekennzeichnet.
-F\"ur eine positive Beurteilung gilt: mindestens \positiv~Punkte aus Teil 1, allenfalls unter Einbeziehung der \jeroen@get{AP} Ausgleichspunkte aus Teil 2 (d.h. Zwischensumme $\geq \positiv$)!
-\leer
+\small
+Die Schularbeit besteht aus Teil 1 (Grundkompetenzen) und Teil 2 (vernetzte und erweiterte Grundkompetenzen). In Teil 1 und Teil 2 sind jeweils \jeroen@get{T1} Punkte zu erreichen. \jeroen@get{AP} Punkte aus Teil 2 k\"onnen zum Ausgleich fehlender Grundkompetenzpunkte aus Teil 1 herangezogen werden. Diese sind in der Angabe mit \fbox{A} gekennzeichnet.
+
+\tiny
+\STautoround{0}
+\begin{spreadtab}[\STsavecell\brzweigrenze{f1} \STsavecell\gut{b2} \STsavecell\befriedigend{c2} \STsavecell{\genuegend}{d2} \STsavecell{\nichtgenuegend}{e2} \STsavecell\brzweibefriedigend{f2} \STsavecell{\gutminuseins}{b3} \STsavecell{\befriedigendminuseins}{c3} \STsavecell{\genuegendminuseins}{d3} \STsavecell\brzweigrenzeminuseins{e3} \STsavecell\brzweibefriedigendminuseins{f3}]{{tabular}{cccccc}}
+\SThidecol \gesamtpunkte & \SThidecol 1 &\SThidecol 2 & \SThidecol 3 &\SThidecol 4 & \SThidecol \gesamtpunkte*0.75\\ % \SThidecol
+&a1*#1 &a1*#2 &a1*#3 &a1*#4 & \gesamtpunkte*0.6\\
+& b2-1 &c2-1 &d2-1 & f1-1 & f2-1\\ %\SThiderow
+\end{spreadtab}
+\small
+
+\textbf{Zwei Beurteilungswege}
+
+\begin{enumerate}[1)]
+ \item Wenn mindestens \positiv~Punkte aus Teil 1, allenfalls unter Einbeziehung der Ausgleichspunkte aus \mbox{Teil 2} erreicht werden, gilt folgender Beurteilungsschlüssel:\vspace{0.3cm}
+
+\footnotesize
+\begin{tabular}{C{2.8cm}C{2.8cm}C{2.8cm}C{2.8cm}C{2.8cm}}
+\scriptsize{Sehr gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht gen\"ugend} \\
+\scriptsize{\gesamtpunkte ~-~ \gut} & \scriptsize{\gutminuseins,5 ~-~ \befriedigend} & \scriptsize{\befriedigendminuseins,5 ~-~ \genuegend} & \scriptsize{\genuegendminuseins,5 ~-~ \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\
+\end{tabular}
+\STautoround{}\vspace{0.3cm}
+
+\small
+\item Wenn weniger als \positiv\ Punkte aus Teil 1, allenfalls unter Einbeziehung der Ausgleichspunkte aus \mbox{Teil 2} erreicht werden, dann kann auf diesem Weg ein \glqq Gen\"ugend\grqq\ oder \glqq Befriedigend\grqq\ erreicht werden: \vspace{0.3cm}
+
+\footnotesize
+\begin{tabular}{C{2.8cm}C{2.8cm}}
+\scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} \\
+\scriptsize{\brzweigrenzeminuseins,5 ~-~ \brzweibefriedigend} & \scriptsize{\brzweibefriedigendminuseins,5 ~-~\genuegend}\\
+\end{tabular}
+\STautoround{} \vspace{0.3cm}
+
+\small
+Ab \brzweigrenze\ erreichten Punkten gilt der unter 1) angeführte Beurteilungsschlüssel.
+
+Die Arbeit wird mit \glqq Nicht genügend\grqq\ beurteilt, wenn im Teil 1 unter Berücksichtigung der \jeroen@get{AP} Ausgleichspunkte aus Teil 2 weniger als \nichtgenuegend\ Punkte und insgesamt weniger als \genuegend\ Punkte erreicht wurden.
+
+\end{enumerate} \leer
+\vfil
\renewcommand{\arraystretch}{1.5}
\begin{center}
@@ -400,37 +505,19 @@
&Zwischensumme &\\ \hline
Teil 2: sonstige Punkte &\jeroen@get{T2} &\\ \hline
& $\Sigma=\gesamtpunkte$ & \\ \hline
+Beurteilungsweg & \fbox{1} oder \fbox{2} \\ \hline
\end{tabular}
\vspace{1cm}
Beurteilung: \rule{8cm}{0.4pt}
\end{center}
\renewcommand{\arraystretch}{1}
-
-\vfill
-
-\small
-\STautoround{0}
-\begin{spreadtab}[\STsavecell\gut{b2} \STsavecell\befriedigend{c2} \STsavecell{\genuegend}{d2} \STsavecell{\nichtgenuegend}{e2} \STsavecell{\gutminuseins}{b3} \STsavecell{\befriedigendminuseins}{c3} \STsavecell{\genuegendminuseins}{d3}]{{tabular}{ccccc}}
- \SThidecol \gesamtpunkte &\SThidecol 1 &\SThidecol 2 &\SThidecol 3 &\SThidecol 4 \\
- \SThiderow &a1*#1 &a1*#2 &a1*#3 &a1*#4 \\
- \SThiderow &b2-1 &c2-1 &d2-1 & \\
-\end{spreadtab}
-\footnotesize
-\begin{center}
-\begin{tabular}{C{3cm}C{3cm}C{3cm}C{3cm}C{3cm}}
-\scriptsize{Sehr Gut} & \scriptsize{Gut} & \scriptsize{Befriedigend} & \scriptsize{Gen\"ugend} & \scriptsize{Nicht Gen\"ugend} \\
-\scriptsize{\gesamtpunkte ~ - \gut} & \scriptsize{\gutminuseins ~ - \befriedigend} & \scriptsize{\befriedigendminuseins ~ - \genuegend} & \scriptsize{\genuegendminuseins ~ - \nichtgenuegend} & \scriptsize{unter \nichtgenuegend} \\
-\end{tabular}
-\end{center}
-\STautoround{}
\egroup
-
}
%%%%%%%%%%%%%%%%
-\newcounter{Zufall}
+
\makeatletter
\def\prunelist#1{%
\expandafter\edef\csname pgfmath@randomlist@#1\endcsname
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/srdp-mathematik.tlpobj new/tlpkg/tlpobj/srdp-mathematik.tlpobj
--- old/tlpkg/tlpobj/srdp-mathematik.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/srdp-mathematik.tlpobj 2020-04-12 01:55:42.000000000 +0200
@@ -1,6 +1,6 @@
name srdp-mathematik
category Package
-revision 49706
+revision 54685
shortdesc Typeset Austrian SRDP in mathematics
relocated 1
longdesc This package provides basic commands for the defined formats of
@@ -9,10 +9,9 @@
longdesc in the tex file which can optionally be displayed in the pdf
longdesc file, and it offers a way to vary the answers in order to
longdesc create different groups (e. g. for tests) easily.
-runfiles size=17
+runfiles size=18
RELOC/tex/latex/srdp-mathematik/srdp-mathematik.sty
catalogue-ctan /macros/latex/contrib/srdp-mathematik
-catalogue-date 2019-01-14 18:24:52 +0100
catalogue-license lppl1.3c
catalogue-topics exam maths
-catalogue-version 1.2
+catalogue-version 1.6
++++++ stackengine.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stackengine.doc.tlpobj new/tlpkg/tlpobj/stackengine.doc.tlpobj
--- old/tlpkg/tlpobj/stackengine.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stackengine.doc.tlpobj 2020-02-20 01:54:49.000000000 +0100
@@ -1,6 +1,6 @@
name stackengine.doc
category Package
-revision 43221
+revision 53843
shortdesc doc files of stackengine
relocated 1
docfiles size=102
++++++ stackengine.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stackengine.tlpobj new/tlpkg/tlpobj/stackengine.tlpobj
--- old/tlpkg/tlpobj/stackengine.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stackengine.tlpobj 2020-02-20 01:54:49.000000000 +0100
@@ -1,16 +1,16 @@
name stackengine
category Package
-revision 43221
+revision 53843
shortdesc Highly customised stacking of objects, insets, baseline changes, etc
relocated 1
longdesc The package provides a versatile way to stack objects
longdesc vertically in a variety of customizable ways. A number of
longdesc useful macros are provided, all of which make use of the
longdesc stackengine core.
+depend listofitems
runfiles size=4
RELOC/tex/latex/stackengine/stackengine.sty
catalogue-ctan /macros/latex/contrib/stackengine
-catalogue-date 2017-02-13 14:03:10 +0100
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version 4.01
++++++ stage.doc.tar.xz ++++++
Binary files old/doc/latex/stage/stage-documentation.pdf and new/doc/latex/stage/stage-documentation.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/stage/stage-documentation.tex new/doc/latex/stage/stage-documentation.tex
--- old/doc/latex/stage/stage-documentation.tex 2017-04-28 23:17:39.000000000 +0200
+++ new/doc/latex/stage/stage-documentation.tex 2020-02-25 23:06:40.000000000 +0100
@@ -157,8 +157,6 @@
%%% The following items are optional. Uncomment to use.
% \address{}
-% \copyrightnotice{}
-% \draft{}
\begin{document}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stage.doc.tlpobj new/tlpkg/tlpobj/stage.doc.tlpobj
--- old/tlpkg/tlpobj/stage.doc.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stage.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name stage.doc
category Package
-revision 44100
+revision 53915
shortdesc doc files of stage
relocated 1
docfiles size=41
++++++ stage.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/stage/stage.cls new/tex/latex/stage/stage.cls
--- old/tex/latex/stage/stage.cls 2017-04-28 23:17:39.000000000 +0200
+++ new/tex/latex/stage/stage.cls 2020-02-25 23:06:40.000000000 +0100
@@ -1,6 +1,6 @@
%% stage.cls
%% Copyright 2005 Robert Jahrling
-%% Copyright 2017 Reuben Thomas
+%% Copyright 2017–2018 Reuben Thomas
%
% This is a LaTeX2e class called stage, providing a class
% for stage play Manuscript Format.
@@ -23,7 +23,7 @@
%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{stage}[2017/04/25 v1.00 Manuscript Format for stage plays]
+\ProvidesClass{stage}[2018/05/14 v1.01 Manuscript Format for stage plays]
% The class is based on the default book class
\LoadClass[12pt,oneside]{book}
\PassOptionsToClass{\CurrentOption}{book}
@@ -32,6 +32,7 @@
\RequirePackage{fancyhdr}
\RequirePackage{extramarks}
\RequirePackage{needspace}
+\RequirePackage{changepage}
% These three commands are required.
% The default font size is 12/14. It looks better than 12 solid.
% The textwidth and textheight represent one-inch margins all
@@ -71,13 +72,8 @@
\renewcommand{\headheight}{14pt}
%%%
-% No indentation. Double space between paragraphs.
-\parindent 0pt
-\parskip 0pt
-\newlength{\doublespacelength}
-\setlength{\doublespacelength}{1.6ex}
-% \doublespace leaves a line's worth of space between elements.
-\newcommand{\doublespace}{\vspace{\doublespacelength}}
+% No indentation; space between paragraphs.
+\usepackage{parskip}
% \introduce is used the first time we meet a character.
\newcommand{\introduce}[1]{\textsc{#1}}
% \address is used for the writer's address
@@ -89,28 +85,15 @@
% Counts scenes per act
\newcounter{scenecounter}[actcounter]
-% An environment for specifying margin changes
-\newenvironment{changemargin}[2]{%
- \begin{list}{}{%
- % Without the following critical setting, we could use
- % changepage’s adjustwidth environment
- \setlength{\partopsep}{0pt}%
- \setlength{\topsep}{0pt}%
- \setlength{\leftmargin}{#1}%
- \setlength{\rightmargin}{#2}%
- \setlength{\listparindent}{\parindent}%
- \setlength{\itemindent}{\parindent}%
- \setlength{\parsep}{\parskip}%
- }%
- \item[]}{\end{list}}
% \dialog sets the character's name above their speech
+\let\stageoldep=\everypar
+\newlength{\saveparskip}
\newcommand{\dialog}[2]{%
- \doublespace%
\needspace{2\baselineskip}%
- \begin{changemargin}{2.5in}{0in}\textsc{#1}\end{changemargin}%
+ {\begin{adjustwidth}{2.5in}{0in}\textsc{#1}\end{adjustwidth}\saveparskip=\parskip\parskip=0pt%
\extramarks{}{}%
- #2%
- \extramarks{\textsc{#1} (\continuedname)}{}
+ {\begin{adjustwidth}{0in}{0in}\def\everypar{\parskip=\saveparskip\stageoldep}#2\end{adjustwidth}}%
+ \extramarks{\textsc{#1} (\continuedname)}{}}
}
% \dialogue, for people who like that spelling better
@@ -121,40 +104,33 @@
% Start a new page for each Act except the first
\newcommand{\act}{%
\renewcommand{\thepage}{\Roman{actcounter}-\arabic{page}}%
- \begin{changemargin}{2.5in}{0in}
- \ifthenelse{\value{actcounter} > 1}{\newpage}{}
- \ifthenelse{\value{actcounter} = 1}{\doublespace}{}
- \stepcounter{actcounter}
- \textsc{\actname} \Roman{actcounter}
- \end{changemargin}
- \setcounter{page}{1}
+ \ifthenelse{\value{actcounter} > 1}{\newpage}{\vspace{\parskip}}
+ \stepcounter{actcounter}
+ \hspace*{2.5in}\textsc{\actname} \Roman{actcounter}%
+ \setcounter{page}{1}
}
% \scene creates a scene header, with arabic numerals
%
% Start a new page for each scene except the first
\newcommand{\scene}{%
- \begin{changemargin}{2.5in}{0in}
- \stepcounter{scenecounter}
- \ifthenelse{\value{scenecounter} > 1}{\newpage}{}
- \textsc{\scenename} \arabic{scenecounter}
- \ifthenelse{\value{scenecounter} = 1}{\doublespace}{}
- \end{changemargin}
+ \extramarks{}{}%
+ \stepcounter{scenecounter}
+ \ifthenelse{\value{scenecounter} > 1}{\newpage}{\vspace{\parskip}}
+ \hspace*{2.5in}\textsc{\scenename} \arabic{scenecounter}%
}
% \stage sets the stage directions farther in than the box
% containing the dialog, and parenthesizes them.
\newcommand{\stage}[1]{%
- \doublespace
- \begin{changemargin}{2in}{0in}
+ \begin{adjustwidth}{2in}{0in}
(#1)%
- \end{changemargin}
+ \end{adjustwidth}
}
% \charsd is like \paren in ScriptTeX, used for brief character
% stage directions. It's intended to set properly into a passage
% of dialog.
\newcommand{\charsd}[1]{%
- \begin{changemargin}{2in}{0in}%
- (#1)%
- \end{changemargin}}
+ {\def\everypar{\parskip=0pt\stageoldep}%
+ \stage{#1}\par\leavevmode}}
% Undocumented, for backwards compatibility
\newcommand{\initsd}[1]{\charsd{#1}}
@@ -167,9 +143,9 @@
% \opensd is opening stage directions, set differently from
% other stage directions; \opensd sets time and place.
\newcommand{\opensd}[1]{%
- \begin{changemargin}{2.5in}{0in}
+ \begin{adjustwidth}{2.5in}{0in}
(#1)%
- \end{changemargin}
+ \end{adjustwidth}
}
% \open is the same as \opensd
\newcommand{\open}[1]{\opensd{#1}}
@@ -181,9 +157,9 @@
\par
\center{\@author}
\vspace{5in}
- \begin{changemargin}{0in}{0in}
+ \begin{adjustwidth}{0in}{0in}
\ifthenelse{\not\isundefined{\@address}}{\@address}{}
- \end{changemargin}
+ \end{adjustwidth}
\end{titlepage}
\setcounter{page}{1}
}
@@ -193,21 +169,20 @@
\thispagestyle{empty}%
\center{\textsc{\castname}}%
\vspace{3ex}%
- \begin{changemargin}{0in}{0.5in}%
+ \begin{adjustwidth}{0in}{0.5in}%
}{%
- \end{changemargin}%
+ \end{adjustwidth}%
\setcounter{page}{0}%
\newpage%
}
% \addcharacter adds characters to the cast page.
\newcommand{\addcharacter}[2]{%
\begin{tabular}[2]{p{2in} p{4in}}
- \textsc{#1} & #2\\[\doublespacelength]
+ \textsc{#1} & #2\\[\parskip]
\end{tabular}
}
% Mark the end of the document.
\AtEndDocument{%
- \doublespace %
\hskip 2.5in %
\textsc{\theendname}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stage.tlpobj new/tlpkg/tlpobj/stage.tlpobj
--- old/tlpkg/tlpobj/stage.tlpobj 2019-02-28 04:06:00.000000000 +0100
+++ new/tlpkg/tlpobj/stage.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,6 +1,6 @@
name stage
category Package
-revision 44100
+revision 53915
shortdesc A LaTeX class for stage plays
relocated 1
longdesc Stage.cls is a LaTeX class for creating plays of any length in
@@ -12,7 +12,6 @@
catalogue-contact-home https://github.com/rrthomas/stage
catalogue-contact-repository https://github.com/rrthomas/stage
catalogue-ctan /macros/latex/contrib/stage
-catalogue-date 2017-04-27 23:31:51 +0200
catalogue-license lppl1.3
catalogue-topics drama-script
-catalogue-version 1.00
+catalogue-version 1.01
++++++ stanli.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stanli.doc.tlpobj new/tlpkg/tlpobj/stanli.doc.tlpobj
--- old/tlpkg/tlpobj/stanli.doc.tlpobj 2019-02-28 04:06:01.000000000 +0100
+++ new/tlpkg/tlpobj/stanli.doc.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,6 +1,6 @@
name stanli.doc
category Package
-revision 42765
+revision 54512
shortdesc doc files of stanli
relocated 1
docfiles size=153
++++++ stanli.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stanli.tlpobj new/tlpkg/tlpobj/stanli.tlpobj
--- old/tlpkg/tlpobj/stanli.tlpobj 2019-02-28 04:06:01.000000000 +0100
+++ new/tlpkg/tlpobj/stanli.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,6 +1,6 @@
name stanli
category Package
-revision 42765
+revision 54512
shortdesc TikZ Library for Structural Analysis
relocated 1
longdesc stanli is a STructural ANalysis LIbrary based on PGF/TikZ.
@@ -12,7 +12,6 @@
runfiles size=20
RELOC/tex/latex/stanli/stanli.sty
catalogue-ctan /graphics/pgf/contrib/stanli
-catalogue-date 2016-12-29 05:38:19 +0100
-catalogue-license gpllppl1.3
+catalogue-license gpl lppl1.3
catalogue-topics pgf-tikz engineering
catalogue-version 3.0
++++++ statistics.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/statistics/LICENSE new/doc/latex/statistics/LICENSE
--- old/doc/latex/statistics/LICENSE 2018-07-22 23:18:56.000000000 +0200
+++ new/doc/latex/statistics/LICENSE 2019-09-29 23:14:48.000000000 +0200
@@ -632,7 +632,7 @@
the "copyright" line and a pointer to where the full notice is found.
statistics
- Copyright (C) 2014-2018 Julien RIVAUD
+ Copyright (C) 2014-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:
- statistics Copyright (C) 2014-2018 Julien RIVAUD
+ statistics Copyright (C) 2014-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.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/statistics/README.md new/doc/latex/statistics/README.md
--- old/doc/latex/statistics/README.md 2018-07-22 23:18:56.000000000 +0200
+++ new/doc/latex/statistics/README.md 2019-09-29 23:14:48.000000000 +0200
@@ -14,7 +14,7 @@
Every part of the generated tables or graphics is customizable.
-(C) Copyright 2014-2018 RIVAUD Julien
+(C) Copyright 2014-2019 RIVAUD Julien
This package may be distributed and/or modified under the conditions of the
General Public License (GPL), either version 3 of this license or (at your
Binary files old/doc/latex/statistics/statistics.pdf and new/doc/latex/statistics/statistics.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/statistics.doc.tlpobj new/tlpkg/tlpobj/statistics.doc.tlpobj
--- old/tlpkg/tlpobj/statistics.doc.tlpobj 2019-02-28 04:06:02.000000000 +0100
+++ new/tlpkg/tlpobj/statistics.doc.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,9 +1,9 @@
name statistics.doc
category Package
-revision 48252
+revision 52212
shortdesc doc files of statistics
relocated 1
-docfiles size=115
+docfiles size=117
RELOC/doc/latex/statistics/LICENSE
RELOC/doc/latex/statistics/README.md
RELOC/doc/latex/statistics/statistics.pdf
++++++ statistics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/statistics/statistics.sty new/tex/latex/statistics/statistics.sty
--- old/tex/latex/statistics/statistics.sty 2018-07-22 23:18:56.000000000 +0200
+++ new/tex/latex/statistics/statistics.sty 2019-09-29 23:14:48.000000000 +0200
@@ -6,17 +6,17 @@
%%
%% statistics.dtx (with options: `package')
%%
-%% File: statistics.dtx (C) Copyright 2014-2018 RIVAUD Julien
+%% File: statistics.dtx (C) Copyright 2014-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{statistics}
\def\ExplFileDescription{Compute and typeset statistics table and graphics}
-\def\ExplFileDate{2018/07/21}
-\def\ExplFileVersion{2.0}
+\def\ExplFileDate{2019/09/29}
+\def\ExplFileVersion{2.2}
\ProvidesExplPackage
{\ExplFileName}{\ExplFileDate}{\ExplFileVersion}{\ExplFileDescription}
\RequirePackage{xparse}
@@ -155,6 +155,9 @@
}
}
+\int_new:N \l__statistics_table_maxcols_int
+\int_set:Nn \l__statistics_table_maxcols_int {0}
+
\__statistics_keys_define:nn { table } {
showonly .value_required:n = true,
showonly .code:n = \__statistics_setshow:n{#1},
@@ -175,9 +178,9 @@
},
showonly/shown .initial:n = #1,
- maxcols .int_set:N = \l__statistics_table_maxcols_int,
+ maxcols .clist_set:N = \l__statistics_table_maxcols_clist,
maxcols .value_required:n = true,
- maxcols .initial:n = 0,
+ maxcols .initial:n = ,
tablesep .tl_set:N = \l__statistics_table_sep_tl,
tablesep .value_required:n = true,
@@ -319,6 +322,9 @@
\bool_new:N \l__statistics_table_firstrow_bool
+\seq_new:N \l__statistics_store_values_seq
+\seq_new:N \l__statistics_store_counts_seq
+
\cs_generate_variant:Nn \keyval_parse:NNn { NNV }
\NewDocumentCommand \StatsTable { +O{} +m +O{} } {
\group_begin:
@@ -338,6 +344,12 @@
}{
\tl_set:Nn \l__statistics_data_tl { #2 }
}
+ \cs_set_nopar:Npn \getvalue {
+ \seq_item:Nn \l__statistics_store_values_seq
+ }
+ \cs_set_nopar:Npn \getcount {
+ \seq_item:Nn \l__statistics_store_count_seq
+ }
\fp_zero:N \l__statistics_total_fp
\keyval_parse:NNV
\__statistics_table_count:n
@@ -354,6 +366,9 @@
}
\cs_new_protected_nopar:Nn \__statistics_table_start: {
\int_zero:N \l__statistics_nbvals_int
+ \clist_pop:NNT \l__statistics_table_maxcols_clist \l_tmpa_tl {
+ \int_set:Nn \l__statistics_table_maxcols_int { \l_tmpa_tl }
+ }
\clist_map_inline:nn { values, counts, frequencies, icc, icf, dcc, dcf } {
\tl_set:cx { l__statistics_table_##1_tl } {
\exp_not:N \ensuremath { \exp_not:N \hbox {
@@ -420,6 +435,7 @@
\tl_put_right:Nn \l_tmpa_tl
{\__statistics_table_hidden_format:n}
}
+ \seq_put_right:Nn \l__statistics_store_values_seq { #1 }
\bool_if:NT \l__statistics_table_values_bool {
\tl_put_right:Nx \l__statistics_table_values_tl {
\exp_not:V \l_tmpa_tl {
@@ -429,6 +445,7 @@
}
}
}
+ \seq_put_right:Nx \l__statistics_store_counts_seq { \fp_eval:n {#2} }
\bool_if:NT \l__statistics_table_counts_bool {
\tl_put_right:Nx \l__statistics_table_counts_tl {
\exp_not:V \l_tmpa_tl {
@@ -757,7 +774,7 @@
counts/format = { \num{#1} },
counts/axis = { ticks~and~grid={
- many, int~about~strategy, integer~minor~steps,
+ many, int~about~strategy, integer~minor~steps*,
} },
comb/counts/label = \countname,
cumulative/counts/label = \ccountname,
@@ -771,7 +788,10 @@
histogram/y/axis = {ticks = none},
histogram/y/autostep = 1,
histogram/legend = { x=, y=0, w=\xstep },
- histogram/style = { semithick, black, fill=black, fill~opacity=0.1 },
+ histogram/style = {
+ every~path/.prefix~style=fill,
+ semithick, black, fill=black, fill~opacity=0.1
+ },
histogram/areas,
histogram/areas/style = { auto, font=\small },
@@ -886,6 +906,18 @@
}
},
integer~minor~steps/.default=50,
+integer~minor~steps*/.style={
+ compute~step/.append = {
+ \tl_set_eq:NN \l_tmpa_tl \tikz@lib@dv@step
+ \tl_if_eq:NNF \l_tmpa_tl \relax {
+ \fp_compare:nT { \l_tmpa_tl < 1 } {
+ \tl_set:Nx \tikz@lib@dv@step {1}
+ }
+ }
+ },
+ integer~minor~steps=#1,
+},
+integer~minor~steps*/.default=50,
}
\bool_new:N \l__statistics_graph_allranges_bool
@@ -920,7 +952,7 @@
\fp_gset:Nn \g__statistics_graph_xstep_fp
{ \tl_use:c {\l_tmpa_tl} }
}{
- \fp_gset:Nn \g__statistics_graph_xstep_fp { \c_one }
+ \fp_gset:Nn \g__statistics_graph_xstep_fp { \c_one_int }
}
\__statistics_setup:nn { graph } { #1, #3 }
\tl_if_single:nTF { #2 } {
@@ -1148,9 +1180,8 @@
\exp_not:n { , visualize~as~line = histogram,
histogram = } {
\exp_not:n { polygon, style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_histogram_tl
- } } }
+ } }
\exp_not:n { ] data [set = histogram, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
@@ -1258,9 +1289,8 @@
\exp_not:n { , visualize~as~line = bar~graph,
bar~graph = } {
\exp_not:n { style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_comb_tl
- } } }
+ } }
\exp_not:n { ] data [set = bar~graph, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
@@ -1368,9 +1398,8 @@
\exp_not:n { , visualize~as~line = cumulative,
cumulative = } {
\exp_not:n { style = } {
- \exp_not:n { every~path/.append~style = } {
\exp_not:V \l__statistics_graph_options_cumulative_tl
- } } }
+ } }
\exp_not:n { ] data [set = cumulative, format = TeX~code] } {
\exp_not:V \l__statistics_graph_tikzdata_tl
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/statistics.tlpobj new/tlpkg/tlpobj/statistics.tlpobj
--- old/tlpkg/tlpobj/statistics.tlpobj 2019-02-28 04:06:02.000000000 +0100
+++ new/tlpkg/tlpobj/statistics.tlpobj 2019-09-30 01:54:45.000000000 +0200
@@ -1,6 +1,6 @@
name statistics
category Package
-revision 48252
+revision 52212
shortdesc Compute and typeset statistics tables and graphics
relocated 1
longdesc The 'statistics' package can compute and typeset statistics
@@ -15,7 +15,7 @@
longdesc them. Similarly 'statistics' can draw only some parts of the
longdesc graphs. Every part of the generated tables or graphics is
longdesc customizable.
-runfiles size=14
+runfiles size=15
RELOC/tex/latex/statistics/statistics.sty
catalogue-contact-bugs https://gitlab.com/frnchfrgg-latex/statistics/issues
catalogue-contact-development https://gitlab.com/frnchfrgg-latex/statistics
@@ -23,7 +23,7 @@
catalogue-contact-repository https://gitlab.com/frnchfrgg-latex/statistics
catalogue-contact-support https://gitlab.com/frnchfrgg-latex/statistics/issues
catalogue-ctan /macros/latex/contrib/statistics
-catalogue-date 2018-07-23 05:27:45 +0200
+catalogue-date 2019-09-29 19:55:40 +0200
catalogue-license gpl3+
catalogue-topics maths statistics
-catalogue-version 2.0
+catalogue-version 2.2
++++++ stickstoo.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stickstoo/README new/doc/fonts/stickstoo/README
--- old/doc/fonts/stickstoo/README 2018-05-29 00:25:34.000000000 +0200
+++ new/doc/fonts/stickstoo/README 2019-10-11 23:31:43.000000000 +0200
@@ -19,7 +19,13 @@
Files provided "as is", with no warranties.
-Current version: 1.031 2018-05-27
+Current version: 1.033 2019-10-10
+
+Changes in version 1.033
+Version 1.032 lacked some of the latest versions of fonts and tfm files. Corrected in 1.033.
+
+Changes in version 1.032
+Changed the math italic and math upright tfm and vf that allow these fonts to produce pdf files that conform to PDF/A-1b when used in conjunction with newtxmath. See the newtx documentation for details.
Changes in version 1.031
Corrected the ot1G fonts, the originals having found to be the cause of some subtle issues with the microcode package. I owe Ulrike Fischer my sincere gratitude for tracking down the true source of the problem.
Binary files old/doc/fonts/stickstoo/stickstoo-doc.pdf and new/doc/fonts/stickstoo/stickstoo-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stickstoo/stickstoo-doc.tex new/doc/fonts/stickstoo/stickstoo-doc.tex
--- old/doc/fonts/stickstoo/stickstoo-doc.tex 2018-05-13 23:45:23.000000000 +0200
+++ new/doc/fonts/stickstoo/stickstoo-doc.tex 2019-10-10 22:43:56.000000000 +0200
@@ -5,10 +5,10 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
%\pdfmapfile{+SticksTooText.map}
\pdfmapfile{=newtx.map}
-\usepackage{graphicx}
+\usepackage[a-1b]{pdfx}
%\usepackage{amssymb}% don't use with newtxmath
%SetFonts
-% libertine+newtxmath
+% stickstoo+newtxmath
\usepackage{stickstootext} % use sb in place of bold
\usepackage[T1]{fontenc}
\usepackage{textcomp}
@@ -100,6 +100,22 @@
Option {\tt varbb} causes \verb|\mathbb| to be let equal to \verb|\varmathbb|, effectively {\tt DSSerif}, and option {\tt vvarbb} causes \verb|\mathbb| to be let equal to \verb|\vvmathbb|, effectively STIX blackboard bold.
+\section{PDF/A Compliance}
+This pdf document was generated with
+
+was tested for compliance with {\tt PDFA-1b} a preamble containing the line
+\begin{verbatim}
+\usepackage[a-1b]{pdfx}
+\end{verbatim}
+It was tested for compliance with that standard using three different methods, with varying results, as is common.
+\begin{itemize}
+\item
+\textsf{Adobe Acrobat Pro DC} says it does comply with PDF/A-1b.
+\item The test site \url{https://www.pdf-online.com/osa/validate.aspx} affirms that also.
+\item The free test package \textsf{veraPDF} says that it does not, and shows a number of issues about widths of glyphs and non-existence of some used glyphs. I found this report unconvincing, as when I merely removed the hints from the type 1 fonts, it gave me the same errors, but relating to a different set of glyphs. A message from its developers said that the type 1 fonts would fail the conformance test if their disassembled code contained a subroutine call before the width specification {\tt hsbw}, and that is common for type 1 fonts constructed using {\tt cfftot1} from the well known \textsf{LCDF Type Tools}. When I changed to using \textsf{FontForge} to construct the type 1 fonts, \textsf{veraPDF} gave a different set of problem glyphs, not overlapping the previous set. Finally, I removed all hints and received yet another set of problem glyphs.
+\end{itemize}•
+
+
\section{Some math samples}
The following snippets mostly originated with the \TeX Book\ and were adapted for \LaTeX\ from Karl Berry's torture test for plain tex math fonts.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stickstoo.doc.tlpobj new/tlpkg/tlpobj/stickstoo.doc.tlpobj
--- old/tlpkg/tlpobj/stickstoo.doc.tlpobj 2019-02-28 04:06:09.000000000 +0100
+++ new/tlpkg/tlpobj/stickstoo.doc.tlpobj 2020-03-24 02:03:50.000000000 +0100
@@ -1,9 +1,9 @@
name stickstoo.doc
category Package
-revision 47858
+revision 54512
shortdesc doc files of stickstoo
relocated 1
-docfiles size=138
+docfiles size=156
RELOC/doc/fonts/stickstoo/OFL-FAQ.txt
RELOC/doc/fonts/stickstoo/OFL.txt
RELOC/doc/fonts/stickstoo/README
++++++ stickstoo.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Bold.afm new/fonts/afm/public/stickstoo/stickstooMath-Bold.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Bold.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Bold.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Thu May 3 18:45:17 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Thu Oct 3 18:44:57 2019
FontName stickstooMath-Bold
FullName stickstoo Math Bold
FamilyName stickstooMath
@@ -14,8 +14,8 @@
UnderlineThickness 50
Version 001.000
EncodingScheme FontSpecific
-FontBBox -112 -269 1107 775
-StartCharMetrics 237
+FontBBox -112 -269 1107 826
+StartCharMetrics 241
C 0 ; WX 625 ; N u1D6AA ; B 35 0 604 657 ;
C 1 ; WX 702 ; N u1D6AB ; B 15 0 687 662 ;
C 2 ; WX 766 ; N u1D6AF ; B 44 -14 722 669 ;
@@ -140,7 +140,6 @@
C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
C 132 ; WX 504 ; N uni03F0 ; B 4 -12 521 479 ;
C 133 ; WX 591 ; N u1D4F5.up ; B 42 -15 511 716 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 359 427 655 ;
C 136 ; WX 222 ; N uni0300 ; B 22 521 204 674 ;
C 137 ; WX 222 ; N uni0301 ; B 18 521 200 674 ;
C 138 ; WX 342 ; N uni0302 ; B 18 521 324 674 ;
@@ -253,5 +252,10 @@
C 245 ; WX 540 ; N u1D7DF ; B 24 0 511 662 ;
C 246 ; WX 540 ; N u1D7E0 ; B 28 -14 512 676 ;
C 247 ; WX 540 ; N u1D7E1 ; B 28 -12 512 676 ;
+C 248 ; WX 612 ; N uni2107 ; B 28 -15 574 692 ;
+C 249 ; WX 722 ; N uni212B ; B 6 0 717 826 ;
+C 250 ; WX 762 ; N uni2126 ; B 29 0 732 692 ;
+C 251 ; WX 762 ; N uni2127 ; B 29 -15 732 678 ;
+C 252 ; WX 594 ; N uni01B5 ; B 29 0 568 657 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm new/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm 2018-05-22 23:02:53.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-BoldItalic.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Mon May 21 13:26:44 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 15:30:13 2019
FontName stickstooMath-BoldItalic
FullName stickstoo Math Bold Italic
FamilyName stickstooMath
@@ -15,7 +15,7 @@
Version 001.000
EncodingScheme FontSpecific
FontBBox -146 -240 1101 775
-StartCharMetrics 119
+StartCharMetrics 117
C 0 ; WX 672 ; N u1D71E ; B -13 0 681 657 ;
C 1 ; WX 641 ; N u1D71F ; B -31 0 582 662 ;
C 2 ; WX 745 ; N u1D723 ; B 38 -14 707 669 ;
@@ -60,17 +60,16 @@
C 45 ; WX 555 ; N u1D753 ; B 30 -222 545 685 ;
C 46 ; WX 525 ; N u1D754 ; B 68 -240 500 481 ;
C 47 ; WX 910 ; N u1D755 ; B 15 -11 940 473 ;
-C 48 ; WX 531 ; N zero.OP ; B 28 -11 503 484 ;
-C 49 ; WX 424 ; N one.OP ; B 29 0 408 478 ;
-C 50 ; WX 465 ; N two.OP ; B 29 0 453 485 ;
-C 51 ; WX 470 ; N three.OP ; B 19 -171 449 485 ;
-C 52 ; WX 516 ; N four.OP ; B 22 -143 501 482 ;
-C 53 ; WX 465 ; N five.OP ; B 19 -171 437 473 ;
-C 54 ; WX 525 ; N six.OP ; B 37 -14 494 646 ;
-C 55 ; WX 487 ; N seven.OP ; B 32 -167 455 473 ;
-C 56 ; WX 513 ; N eight.OP ; B 32 -14 481 649 ;
-C 57 ; WX 525 ; N nine.OP ; B 31 -175 488 485 ;
-C 58 ; WX 607 ; N NameMe.58 ; B -12 -15 630 462 ;
+C 48 ; WX 495 ; N zero.oldstyle ; B 29 -11 466 484 ;
+C 49 ; WX 495 ; N one.oldstyle ; B 53 0 454 478 ;
+C 50 ; WX 495 ; N two.oldstyle ; B 36 0 459 485 ;
+C 51 ; WX 495 ; N three.oldstyle ; B 28 -171 459 485 ;
+C 52 ; WX 495 ; N four.oldstyle ; B 21 -143 471 482 ;
+C 53 ; WX 495 ; N five.oldstyle ; B 39 -171 453 473 ;
+C 54 ; WX 495 ; N six.oldstyle ; B 30 -14 467 646 ;
+C 55 ; WX 495 ; N seven.oldstyle ; B 37 -167 466 473 ;
+C 56 ; WX 495 ; N eight.oldstyle ; B 29 -14 464 649 ;
+C 57 ; WX 495 ; N nine.oldstyle ; B 29 -175 466 485 ;
C 65 ; WX 710 ; N u1D468 ; B -12 0 683 662 ;
C 66 ; WX 669 ; N u1D469 ; B -13 0 641 657 ;
C 67 ; WX 663 ; N u1D46A ; B 38 -12 669 669 ;
@@ -125,15 +124,14 @@
C 122 ; WX 350 ; N u1D48A.dotless ; B 52 -12 319 476 ;
C 123 ; WX 516 ; N u1D48B.dotless ; B 31 -222 500 476 ;
C 124 ; WX 637 ; N u1D489 ; B 52 -12 618 706 ;
-C 125 ; WX 637 ; N u1D489.var ; B 52 -12 618 706 ;
+C 125 ; WX 637 ; N uni210F ; B 52 -12 618 706 ;
C 126 ; WX 601 ; N u1D4F5 ; B 25 -15 524 716 ;
-C 127 ; WX 637 ; N u1D489.var2 ; B 52 -12 618 706 ;
+C 127 ; WX 637 ; N uni210F.alt ; B 52 -12 618 706 ;
C 128 ; WX 506 ; N uni019B ; B 15 -11 521 706 ;
C 129 ; WX 506 ; N uni019B.var ; B 15 -11 521 706 ;
-C 130 ; WX 573 ; N uni019B.ital ; B -8 -11 565 706 ;
-C 131 ; WX 573 ; N uni019B.varital ; B -8 -11 565 706 ;
+C 130 ; WX 573 ; N uni019B.bit ; B -8 -11 565 706 ;
+C 131 ; WX 573 ; N uni019B.alt ; B -8 -11 565 706 ;
C 132 ; WX 574 ; N uni03F0 ; B 30 -12 582 479 ;
C 133 ; WX 591 ; N u1D4F5.up ; B 42 -15 511 716 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 359 427 655 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Italic.afm new/fonts/afm/public/stickstoo/stickstooMath-Italic.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Italic.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Italic.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,13 +1,13 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Sat May 5 14:03:32 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 14:38:55 2019
FontName stickstooMath-Italic
FullName stickstoo Math Italic
FamilyName stickstooMath
Weight Regular
Notice (Copyright (c) 2001-2016 by the STI Pub Companies, consisting of the American Chemical Society, the American Institute of Physics, the American Mathematical Society, the American Physical Society, Else)
Comment vier, Inc., and The Institute of Electrical and Electronic Engineers, Inc. Portions copyright (c) 1998-2003 by MicroPress, Inc. Portions copyright (c) 1990 by Elsevier, Inc. All rights reserved.
-Comment Copyright (c) 2018, Michael Sharpe
+Comment Copyright (c) 2018-2019, Michael Sharpe
ItalicAngle -11.5
IsFixedPitch false
UnderlinePosition -1005
@@ -15,7 +15,7 @@
Version 001.000
EncodingScheme FontSpecific
FontBBox -55 -235 987 764
-StartCharMetrics 117
+StartCharMetrics 116
C 0 ; WX 483 ; N u1D6E4 ; B -13 0 622 657 ;
C 1 ; WX 658 ; N u1D6E5 ; B 17 0 613 662 ;
C 2 ; WX 711 ; N u1D6E9 ; B 38 -12 673 669 ;
@@ -60,16 +60,16 @@
C 45 ; WX 587 ; N u1D719 ; B 34 -216 554 695 ;
C 46 ; WX 475 ; N u1D71A ; B 37 -235 434 481 ;
C 47 ; WX 865 ; N u1D71B ; B 31 -11 858 473 ;
-C 48 ; WX 496 ; N zero.OP ; B 40 -11 455 484 ;
-C 49 ; WX 370 ; N one.OP ; B 25 0 346 478 ;
-C 50 ; WX 446 ; N two.OP ; B 29 0 419 485 ;
-C 51 ; WX 429 ; N three.OP ; B 29 -171 400 485 ;
-C 52 ; WX 491 ; N four.OP ; B 20 -143 461 482 ;
-C 53 ; WX 435 ; N five.OP ; B 28 -171 399 473 ;
-C 54 ; WX 472 ; N six.OP ; B 40 -14 438 646 ;
-C 55 ; WX 452 ; N seven.OP ; B 30 -167 432 473 ;
-C 56 ; WX 463 ; N eight.OP ; B 33 -12 431 647 ;
-C 57 ; WX 473 ; N nine.OP ; B 35 -174 433 485 ;
+C 48 ; WX 495 ; N zero.oldstyle ; B 40 -11 455 484 ;
+C 49 ; WX 495 ; N one.oldstyle ; B 77 0 417 478 ;
+C 50 ; WX 495 ; N two.oldstyle ; B 49 0 449 485 ;
+C 51 ; WX 495 ; N three.oldstyle ; B 49 -171 432 485 ;
+C 52 ; WX 495 ; N four.oldstyle ; B 33 -143 462 482 ;
+C 53 ; WX 495 ; N five.oldstyle ; B 53 -171 434 473 ;
+C 54 ; WX 495 ; N six.oldstyle ; B 50 -14 456 646 ;
+C 55 ; WX 495 ; N seven.oldstyle ; B 49 -167 457 473 ;
+C 56 ; WX 495 ; N eight.oldstyle ; B 47 -12 452 647 ;
+C 57 ; WX 495 ; N nine.oldstyle ; B 45 -174 449 485 ;
C 65 ; WX 725 ; N u1D434 ; B -12 0 698 661 ;
C 66 ; WX 604 ; N u1D435 ; B -3 0 598 657 ;
C 67 ; WX 646 ; N u1D436 ; B 38 -11 652 670 ;
@@ -132,6 +132,5 @@
C 130 ; WX 525 ; N uni019B.ital ; B -9 -12 512 705 ;
C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
C 132 ; WX 596 ; N uni03F0 ; B 34 -12 551 479 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 391 427 655 ;
EndCharMetrics
EndFontMetrics
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/afm/public/stickstoo/stickstooMath-Regular.afm new/fonts/afm/public/stickstoo/stickstooMath-Regular.afm
--- old/fonts/afm/public/stickstoo/stickstooMath-Regular.afm 2018-05-10 00:17:55.000000000 +0200
+++ new/fonts/afm/public/stickstoo/stickstooMath-Regular.afm 2019-10-11 23:31:43.000000000 +0200
@@ -1,6 +1,6 @@
StartFontMetrics 2.0
-Comment Generated by FontForge 20170730
-Comment Creation Date: Thu May 3 18:43:56 2018
+Comment Generated by FontForge 20190801
+Comment Creation Date: Fri Oct 4 17:12:57 2019
FontName stickstooMath-Regular
FullName stickstoo Math Regular
FamilyName stxickstooMath
@@ -14,12 +14,12 @@
UnderlineThickness 50
Version 001.000
EncodingScheme FontSpecific
-FontBBox -95 -236 1055 756
+FontBBox -95 -236 1055 826
CapHeight 655
XHeight 473
Ascender 704
Descender -214
-StartCharMetrics 195
+StartCharMetrics 200
C 0 ; WX 569 ; N Gamma ; B 32 0 539 657 ;
C 1 ; WX 667 ; N Delta ; B 28 0 629 662 ;
C 2 ; WX 738 ; N Theta ; B 50 -13 688 668 ;
@@ -32,6 +32,7 @@
C 9 ; WX 720 ; N Psi ; B 5 0 715 657 ;
C 10 ; WX 777 ; N Omega ; B 47 0 731 669 ;
C 11 ; WX 748 ; N uni2207 ; B 64 -13 683 678 ;
+C 15 ; WX 382 ; N uni03F6 ; B 28 -14 345 481 ;
C 16 ; WX 591 ; N alpha ; B 34 -14 558 478 ;
C 17 ; WX 530 ; N beta ; B 45 -217 490 716 ;
C 18 ; WX 406 ; N gamma ; B -9 -214 448 476 ;
@@ -84,18 +85,22 @@
C 65 ; WX 553 ; N u1D7DF ; B 24 0 523 678 ;
C 66 ; WX 553 ; N u1D7E0 ; B 28 -15 524 692 ;
C 67 ; WX 553 ; N u1D7E1 ; B 28 -13 524 692 ;
-C 122 ; WX 285 ; N dotlessi ; B 32 0 257 482 ;
-C 123 ; WX 263 ; N uni0237 ; B -95 -235 183 482 ;
+C 68 ; WX 612 ; N uni2107 ; B 28 -15 574 692 ;
+C 69 ; WX 722 ; N uni212B ; B 6 0 717 826 ;
+C 70 ; WX 594 ; N uni01B5 ; B 29 0 568 657 ;
+C 71 ; WX 762 ; N uni2126 ; B 29 0 732 692 ;
+C 72 ; WX 762 ; N uni2127 ; B 29 -15 732 678 ;
+C 122 ; WX 285 ; N u1D6A4.up ; B 32 0 257 482 ;
+C 123 ; WX 263 ; N u1D6A5.up ; B -95 -235 183 482 ;
C 124 ; WX 577 ; N h ; B 22 0 556 706 ;
-C 125 ; WX 577 ; N uni210F ; B 22 0 556 706 ;
+C 125 ; WX 599 ; N uni210F ; B 45 -10 549 706 ;
C 126 ; WX 493 ; N uni2113 ; B 32 -10 431 670 ;
-C 127 ; WX 577 ; N uni210F.var ; B 22 0 556 706 ;
+C 127 ; WX 599 ; N uni210F.alt ; B 47 -10 549 706 ;
C 128 ; WX 506 ; N uni019B ; B 15 -11 521 706 ;
C 129 ; WX 506 ; N uni019B.var ; B 15 -11 521 706 ;
C 130 ; WX 525 ; N uni019B.ital ; B -9 -12 512 705 ;
-C 131 ; WX 525 ; N uni019B.varital ; B -9 -12 517 705 ;
+C 131 ; WX 525 ; N uni019B.ital.alt ; B -9 -12 517 705 ;
C 132 ; WX 504 ; N uni03F0 ; B 4 -12 521 479 ;
-C 134 ; WX 495 ; N NameMe.134 ; B 66 391 427 655 ;
C 136 ; WX 226 ; N uni0300 ; B 32 521 194 674 ;
C 137 ; WX 227 ; N uni0301 ; B 32 521 195 674 ;
C 138 ; WX 346 ; N uni0302 ; B 32 521 314 674 ;
Binary files old/fonts/tfm/public/stickstoo/ntxstx2bmi.tfm and new/fonts/tfm/public/stickstoo/ntxstx2bmi.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2bmia.tfm and new/fonts/tfm/public/stickstoo/ntxstx2bmia.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2mi.tfm and new/fonts/tfm/public/stickstoo/ntxstx2mi.tfm differ
Binary files old/fonts/tfm/public/stickstoo/ntxstx2mia.tfm and new/fonts/tfm/public/stickstoo/ntxstx2mia.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Bold.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Bold.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-BoldItalic.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-BoldItalic.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Italic.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Italic.tfm differ
Binary files old/fonts/tfm/public/stickstoo/stickstooMath-Regular.tfm and new/fonts/tfm/public/stickstoo/stickstooMath-Regular.tfm differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Bold.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Bold.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-BoldItalic.pfb and new/fonts/type1/public/stickstoo/stickstooMath-BoldItalic.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Italic.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Italic.pfb differ
Binary files old/fonts/type1/public/stickstoo/stickstooMath-Regular.pfb and new/fonts/type1/public/stickstoo/stickstooMath-Regular.pfb differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2bmi.vf and new/fonts/vf/public/stickstoo/ntxstx2bmi.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2bmia.vf and new/fonts/vf/public/stickstoo/ntxstx2bmia.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2mi.vf and new/fonts/vf/public/stickstoo/ntxstx2mi.vf differ
Binary files old/fonts/vf/public/stickstoo/ntxstx2mia.vf and new/fonts/vf/public/stickstoo/ntxstx2mia.vf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stickstoo.tlpobj new/tlpkg/tlpobj/stickstoo.tlpobj
--- old/tlpkg/tlpobj/stickstoo.tlpobj 2019-02-28 04:06:09.000000000 +0100
+++ new/tlpkg/tlpobj/stickstoo.tlpobj 2020-03-24 02:03:51.000000000 +0100
@@ -1,16 +1,16 @@
name stickstoo
category Package
-revision 47858
+revision 54512
shortdesc A reworking of STIX2
relocated 1
-longdesc SticksToo is a reworking of the STIX2 with support files
+longdesc SticksToo is a reworking of the STIX2 fonts with support files
longdesc focussing on enhancements of support for LaTeX users wishing to
longdesc be able to access more of its features. A companion addition to
longdesc the newtxmath package (version 1.55) provides a matching math
longdesc package using STIX2 letters (Roman and Greek) with newtxmath
longdesc symbols.
execute addMap SticksTooText.map
-runfiles size=6097
+runfiles size=6094
RELOC/fonts/afm/public/stickstoo/SticksTooText-Bold.afm
RELOC/fonts/afm/public/stickstoo/SticksTooText-BoldItalic.afm
RELOC/fonts/afm/public/stickstoo/SticksTooText-Italic.afm
@@ -577,7 +577,6 @@
RELOC/tex/latex/stickstoo/TS1SticksTooText-TOsF.fd
RELOC/tex/latex/stickstoo/stickstootext.sty
catalogue-ctan /fonts/stickstoo
-catalogue-date 2018-05-28 08:09:08 +0200
-catalogue-license ofllppl
-catalogue-topics font font-proportional font-maths font-type1 font-otf font-t1enc
-catalogue-version 1.031
+catalogue-license ofl lppl1.3
+catalogue-topics font font-body font-serif font-proportional font-maths font-type1 font-supp font-t1enc
+catalogue-version 1.033
++++++ stix.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix.doc.tlpobj new/tlpkg/tlpobj/stix.doc.tlpobj
--- old/tlpkg/tlpobj/stix.doc.tlpobj 2019-02-28 04:06:19.000000000 +0100
+++ new/tlpkg/tlpobj/stix.doc.tlpobj 2020-03-24 02:04:00.000000000 +0100
@@ -1,6 +1,6 @@
name stix.doc
category Package
-revision 47652
+revision 54512
shortdesc doc files of stix
relocated 1
docfiles size=591
++++++ stix.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix.tlpobj new/tlpkg/tlpobj/stix.tlpobj
--- old/tlpkg/tlpobj/stix.tlpobj 2019-02-28 04:06:19.000000000 +0100
+++ new/tlpkg/tlpobj/stix.tlpobj 2020-03-24 02:04:00.000000000 +0100
@@ -1,6 +1,6 @@
name stix
category Package
-revision 47652
+revision 54512
shortdesc OpenType Unicode maths fonts
relocated 1
longdesc The STIX fonts are a suite of unicode OpenType fonts containing
@@ -118,7 +118,6 @@
catalogue-also xits stix2-otf stix2-type1
catalogue-contact-home http://www.stixfonts.org/
catalogue-ctan /fonts/stix
-catalogue-date 2018-04-18 21:20:16 +0200
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-serif font-otf font-type1 font-maths font-symbol-maths font-bbd
catalogue-version 1.1.3
++++++ stix2-otf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/README.md new/doc/fonts/stix2-otf/README.md
--- old/doc/fonts/stix2-otf/README.md 2018-05-01 20:01:24.000000000 +0200
+++ new/doc/fonts/stix2-otf/README.md 2019-05-03 00:48:54.000000000 +0200
@@ -1,24 +1,184 @@
# stixfonts
OpenType Unicode fonts for Scientific, Technical, and Mathematical texts
-## Description
+## About the STIX fonts.
+
+See https://www.stixfonts.org/ for background on the the STIX Fonts project.
The Scientific and Technical Information eXchange (STIX) fonts are
-intended to satisfy the demanding needs of authors, publishers,
-printers, and others working in the scientific, medical, and technical
-fields. They combine a comprehensive Unicode-based collection of
-mathematical symbols and alphabets with a set of text faces suitable
-for professional publishing. The fonts are available royalty-free
-under the SIL Open Font License.
-
-See the [release notes](STIX_2.0.0_release_notes.txt) for a more
-detailed introduction to this version of the fonts.
-
-## Type 1 support
-
-The STIX Two fonts are a set of OpenType fonts and are meant to be
-used in that format. For the benefit of LaTeX users who are currently
-unable to use XeTeX or LuaTeX, we have also provided a set of TFM, VF,
-and Type 1 files in the CTAN package stix2-type1. Please note that
-while development of the OpenType fonts is ongoing, no further updates
-to the Type 1 versions are planned.
+intended to meet the demanding needs of authors, publishers, printers,
+and others in the scientific, medical, and technical fields. They
+combine a comprehensive Unicode-based collection of mathematical
+symbols and alphabets with a set of text faces suitable for
+professional publishing. They are available royalty-free under the
+SIL Open Font License, Version 1.1.
+
+Version 2 of the STIX fonts, now known as “STIX Two”, is a thorough
+revision of version 1 undertaken by the renowned type house [Tiro
+Typeworks](https://tiro.com). The STIX Two fonts consist of four text
+fonts (Regular, Italic, Bold, and Bold Italic) and one Math font.
+Together, they provide a uniform set of fonts that can be used
+throughout the production process, whether that be a traditional
+print-only process, an entirely electronic one, or a combination of
+the two.
+
+The [STIX project](https://www.stixfonts.org/) began through the joint
+efforts of
+the [American Mathematical Society](https://www.ams.org/) (AMS),
+the [American Institute of Physics](https://www.aip.org/) (AIP),
+the [American Physical Society](https://www.aps.org/) (APS),
+the [American Chemical Society](https://www.acs.org/) (ACS),
+the [Institute of Electrical and Electronic](https://www.ieee.org/) Engineers (IEEE),
+and [Elsevier](https://www.elsevier.com/).
+These companies are collectively known as the STI Pub companies.
+
+### A Fresh Take on Times Roman
+
+The original version of STIX was based on Times Roman, which has now
+been updated for the digital age.
+
+As is well known, Times Roman was originally intended for printing the
+*London Times*. What is not generally appreciated is that the
+production quality of the *Times* was atypically high: It was printed
+on unusually high-quality paper on presses that operated more slowly
+than most newspaper presses. This allowed for the design of a
+typeface that could exploit this level of care: serifs could be much
+finer and counters (enclosed areas such as that in the lowercase *e*)
+could be much smaller than in other newspaper typefaces. These
+features of the font have not always fared well in less exacting
+environments. At the same time, a notable quirk of the Times Roman
+family is that the bold font is, in many respects, strikingly
+dissimilar to the roman font.
+
+Tiro Typeworks explain their approach to updating the Times Roman
+basis of STIX as follows:
+
+> “Our principal goal in approaching STIX Two was to address several
+> inherent deficiencies in the Times New Roman model as well as expand
+> the typographic features. This process necessarily involved
+> diverging somewhat from Times as familiar to people who have only
+> known the common digital versions, while simultaneously restoring to
+> that typeface aspects of the size-appropriate design characteristics
+> that made it so successful in newspaper, book, and journal
+> publishing in it’s metal type incarnation. The essential
+> ‘Times-ness’ remains, but are with greater harmonisation of style
+> across the family.
+>
+> “Most digital versions of Times have been based on an optical size
+> model that appears too light and fine when scaled down to typical
+> text sizes. In the design of STIX Two, we went back to specimens of
+> size-specific designs from the metal era, and adapted proportions,
+> weights, and spacing of the 10pt and 12pt designs. The oft-noted
+> mismatch between the style of different weights of Times has been
+> resolved with a new bold design that matches the construction of the
+> regular weight.”
+
+### Font implementation decisions
+
+* The STIX fonts do not contain fixed-width or sans serif text faces.
+
+* The sans serif, fraktur, script, etc., alphabets in Plane 1
+ (U+1D400-U+1D4FF) are intended to be used only as technical symbols.
+
+* These fonts are designed to support left-to-right typesetting in
+ Latin-based scripts, with additional support for Greek and Cyrillic
+ text. Extensions to support other writing directions have been
+ considered, but are currently deemed to be outside the scope of the
+ STIX project.
+
+### Note to TeX users
+
+These fonts have been tested with both
+[XeTeX](http://xetex.sourceforge.net/)
+and
+[luaTeX](http://www.luatex.org/)
+with good results. For best results, XeTeX users will want to use
+version 0.99999 or later of XeTeX, which ships with
+[TeXLive 2018](https://www.tug.org/texlive/).
+This version fixes a number of bugs that were present in earlier
+versions. Our thanks go out to Jonathan Kew and Khaled Hosny for
+their generous help in identifying and fixing these bugs. LaTeX users
+should also make sure they have the latest version of the
+[amsmath package](https://ctan.org/pkg/amsmath).
+
+## Summary of OpenType Features and Scripts
+
+Further details these features can be found in the code charts.
+
+The four text fonts implement the following OpenType script tags:
+
+ Regular Bold Italic BoldItalic
+
+ DFLT DFLT DFLT DFLT Default
+
+ cyrl cyrl cyrl cyrl Cyrillic
+ cyrl.MKD cyrl.MKD Cyrillic/Macedonian
+ cyrl.SRB cyrl.SRB Cyrillic/Serbian
+
+ grek grek grek grek Greek
+
+ latn latn latn latn Latin
+ latn.ROM latn.ROM latn.ROM latn.ROM Latin/Romanian
+ latn.TRK latn.TRK latn.TRK latn.TRK Latin/Turkish
+
+and the following features
+
+ c2sc Small Capitals from Capitals
+ case Case-Sensitive Forms
+ ccmp Glyph Composition/Decomposition
+ dnom Denominators
+ frac Fractions
+ kern Kerning
+ liga Standard Ligatures -- latn only
+ locl Localized Forms -- latn.ROM and Italic/BoldItalic cyrl.MKD only
+ numr Numerators
+ onum Oldstyle Figures
+ pnum Proportional Figures
+ smcp Small Capitals
+ subs Subscript
+ sups Superscript
+
+All four text fonts also support the following Character Variants:
+
+ cv01 U+019B Lambda with horizontal, not slanted stroke -- latn only
+ cv02 U+0264 Rams horn with serifs -- latn only
+ cv03 U+2423 OPEN BOX curved instead of straight
+
+In addition, the Italic and BoldItalic faces support the following
+Stylistic Variants:
+
+ ss01 Replace two-story g by hooked g -- Italic/BoldItalic only
+ ss02 Upright parens, brackets, and braces -- Italic/BoldItalic only
+
+STIX Two Math implements the following font features:
+
+ ccmp Glyph Composition/Decomposition
+ dtls Dotless forms of i and j
+ flac Flattened accents
+ ssty Math Script style alternates
+
+and the following Character Variant (note the different meaning
+compared to the text fonts):
+
+ cv03 Replace U2205 EMPTY SET by an oblate form
+
+and the following Stylistic Sets (again, note that ss01 and ss02 have
+different meanings compared to the text fonts):
+
+ ss01 Stylistic Set 1 -- Math chancery to roundhand (\mathcal -> \mathscr)
+ ss02 Stylistic Set 2 -- Alternate italic forms: g, u, v, w, z
+ ss03 Stylistic Set 3 -- Horizontal crossbar variants
+ ss04 Stylistic Set 4 -- Minute, second and primes to long variants
+ ss05 Stylistic Set 5 -- Short arrow variants
+ ss06 Stylistic Set 6 -- Short/narrow variants
+ ss07 Stylistic Set 7 -- Alternate math symbols (product, summation, etc)
+ ss08 Stylistic Set 8 -- Upright integral variants; XITS compatible
+ ss09 Stylistic Set 9 -- Vertical slash variants; XITS compatible
+ ss10 Stylistic Set 10 -- Diagonal greater/lesser combination variants
+ ss11 Stylistic Set 11 -- Long slash not-equal combination variants
+ ss12 Stylistic Set 12 -- Low contrast (sans-like) variants
+ ss13 Stylistic Set 13 -- Horizontally flipped sine wave glyph
+ ss14 Stylistic Set 14 -- Tall variants
+ ss15 Stylistic Set 15 -- Slab serif symbol variants
+ ss16 Stylistic Set 16 -- Circled operator variants
+ ss20 Stylistic Set 20 -- Miscellaneous variants
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx and new/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx differ
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf and new/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt new/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt
--- old/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt 2018-05-01 20:01:24.000000000 +0200
+++ new/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt 1970-01-01 01:00:00.000000000 +0100
@@ -1,303 +0,0 @@
- STIX Font Release Documentation
- OpenType/WOFF/WOFF2
-
- Version 2.0.0
-
- 1 December 2016
- Updated 13 April 2018
-
-INTRODUCTION
-
-The Scientific and Technical Information eXchange (STIX) fonts are
-intended to satisfy the demanding needs of authors, publishers,
-printers, and others working in the scientific, medical, and technical
-fields. They combine a comprehensive Unicode-based collection of
-mathematical symbols and alphabets with a set of text faces suitable
-for professional publishing. The fonts are available royalty-free
-under the SIL Open Font License.
-
-Version 2.0.0 of the STIX fonts, now known as "STIX Two", is a
-thorough revision undertaken by the renowned type house Tiro
-Typeworks. The STIX Two fonts consist of four text fonts (Regular,
-Italic, Bold, and Bold Italic) and one Math font. Together, they
-provide a uniform set of fonts that can be used throughout the
-production process, whether that be a traditional print-only process,
-an entirely electronic one, or a combination of the two.
-
-The STIX project began through the joint efforts of American
-Mathematical Society (AMS), American Institute of Physics (AIP),
-American Physical Society (APS), American Chemical Society (ACS),
-Institute of Electrical and Electronic Engineers (IEEE), and Elsevier.
-These companies are collectively known as the STI Pub companies.
-
-A FRESH TAKE ON TIMES ROMAN
-
-The original version of STIX was based on Times Roman, which has now
-been updated for the digital age.
-
-As is well known, Times Roman was originally intended for printing the
-London Times. What is not generally appreciated is the fact that the
-Times was a very atypically produced newspaper: It was printed on very
-high quality paper run through presses that operated more slowly than
-most newspaper presses. This allowed for the design of a typeface
-that could benefit from this level of printing: serifs could be very
-fine (much finer than other newspaper typefaces) and small counters
-(enclosed areas) such as in the lowercase e could be much smaller than
-in other newspaper typefaces. Another anomaly is that the bold font
-for Times Roman is, in many respects, strikingly dissimilar to the
-roman font.
-
-Tiro Typeworks explain their approach to updating the Times Roman
-basis of STIX as follows:
-
- "Our principal goal in approaching STIX Two was to address several
- inherent deficiencies in the Times New Roman model as well as
- expand the typographic features. This process necessarily
- involved diverging somewhat from Times, given that many features
- of that typeface are either incompatible with current printing
- methods and electronic reading environments, and some others too
- esoteric to repeat. That said, the essential 'Times-ness'
- remains, we believe, and such changes won't distract readers and
- users in any negative way.
-
- "At the core of Times' problems was inappropriate digitization,
- using an optical size model too large to be scaled down to text
- sizes, with compensations appropriate to its original purpose and
- printing technique, but not for 21st century conditions. We have
- also re-thought somewhat overall proportions and spacing, with
- changes made in varying degrees to both the Roman and the Italic
- (and we have begun to harmonize the Bold, which has always been a
- major shortcoming with Times New Roman)."
-
-WHAT IS NEW IN THIS RELEASE?
-
-In addition to the overall visual redesign, STIX Two incorporates a
-number of significant improvements and additions. Special attention
-has been given to implementing accepted best practices for OpenType
-fonts, such as the use of font features to access variant glyph shapes
-that were previously only available via the Unicode Private Use Areas.
-
-The letterspacing and kerning of the text fonts have been
-significantly improved.
-
-True small capital variants (Latin, Cyrillic, and Greek), accessible
-via the OpenType font feature smcp, have been added for all text
-fonts.
-
-Text (lowercase or oldstyle) numerals, available via the font features
-pnum and onum, have been added, in addition to natural-spacing
-figures.
-
-Alphabetic superscripts and numeric sub- and superscripts, accessible
-via the subs and sups font features, have been added.
-
-Fractions are available via the frac feature, as well as numerators
-(numr) and denominators (dnom).
-
-The OpenType MATH table has been completely rewritten and extended.
-
-Additions have been made to these Unicode blocks:
- Latin-1 Supplement U+0080 - U+00FF
- Latin Extended-A U+0100 - U+017F
- Latin Extended Additional U+0180 - U+024F
- Cyrillic U+0400 - U+04FF
- Greek and Coptic U+0370 - U+03FF
- IPA blocks U+0250 - U+02AF
-
-Full details of included glyphs and supported font features are
-available in the included spreadsheet.
-
-BACKWARDS COMPATIBILITY
-
-Because of the scope of the changes, especially to the text fonts,
-STIX Two is not a drop-in replacement for earlier versions. While we
-understand and sympathize with the difficulties caused by the
-incompatibilities we have introduced, we nevertheless felt they were
-necessary to address some of the shortcomings of earlier versions of
-the fonts and to position us to respond to the needs of modern
-publishing.
-
-Earlier versions of the STIX fonts are deprecated and no longer
-supported. We urge all users of the STIX fonts to upgrade to the new
-versions as soon as possible.
-
-To enable the new and old versions of the fonts to coexist during the
-transition phase, the fonts have been renamed as follows:
-
- STIX 1.1.0 STIX 2.0.0
-
- STIX-Regular STIX Two Text
- STIX-Italic STIX Two Text Italic
- STIX-Bold STIX Two Text Bold
- STIX-BoldItalic STIX Two Text Bold Italic
-
- STIX Math Regular STIX Two Math
-
-The four text fonts contain glyphs from Unicode text blocks only. For
-example, all characters from the range U+2190 to U+3063 and U+E000 to
-U+E368 and all plane 1 characters have been removed from the text
-fonts and are now found only in STIX Two Math. Whenever possible,
-characters have been removed from the Private Use Area (U+E000-U+F8FF)
-and made available via font features instead.
-
-The STIX-General packaging of the fonts is no longer supported.
-
-WHAT IS PROVIDED IN THIS RELEASE?
-
-The contents of this distribution are as follows
-
- Fonts/
- OTF/
- STIX2Math.otf
- STIX2Text-BoldItalic.otf
- STIX2Text-Bold.otf
- STIX2Text-Italic.otf
- STIX2Text-Regular.otf
- WOFF/
- STIX2Math.woff
- STIX2Text-BoldItalic.woff
- STIX2Text-Bold.woff
- STIX2Text-Italic.woff
- STIX2Text-Regular.woff
- WOFF2/
- STIX2Math.woff2
- STIX2Text-BoldItalic.woff2
- STIX2Text-Bold.woff2
- STIX2Text-Italic.woff2
- STIX2Text-Regular.woff2
- docs/
- STIX_2.0.0_glyph_sets.xlsx
- STIX_2.0.0_license.pdf
- STIX_2.0.0_release_notes.txt
- STIX_2.0.0_stylistic_sets.pdf
-
-The font is distributed under the "SIL Open Font License, Version
-1.1", a copy of which is included in the License folder.
-
-Support for 8-bit, DVI-based TeX in the form of TFM files and Type 1
-fonts is available separately (see below).
-
-We also hope to provide a version of the WOFF fonts broken down into
-smaller, more web-download-friendly chunks.
-
-FONT IMPLEMENTATION DECISIONS
-
-The STIX fonts do not contain fixed-width or sans serif text faces.
-
-The sans serif, fraktur, script, etc., alphabets in Plane 1
-(U+1D400-U+1D4FF) are intended to be used only as technical symbols.
-
-These fonts are designed to support left-to-right typesetting in
-Latin-based scripts, with additional support for Greek and Cyrillic
-text. Extensions to support other writing directions have been
-considered, but are currently deemed to be outside the scope of the
-STIX project.
-
-The font contains:
-
-1. Kerning pairs for characters suitable for use with sizes 8pt
- through 12pt.
-
-2. Standard ligature support for those ligatures included in the font.
-
-NOTE TO TEX USERS
-
-If you use XeTeX or LuaTeX, the OTF files are all you need. The fonts
-have been tested with both XeTeX and luaTeX with good results. For
-best results, XeTeX users will want to upgrade to the latest
-development version from
-
- http://xetex.sourceforge.net/
-
-This version fixes a number of bugs that are present in the version
-shipped with TeX Live 2016. Our thanks go out to Jonathan Kew and
-Khaled Hosny for their generous help in identifying and fixing these
-bugs. LaTeX users should also make sure they have the latest version
-of the amsmath package available on CTAN.
-
-There are some known issues with kerning of second-order subscripts
-that we hope to address in a future release.
-
-For the convenience of users who are restricted to pdfTeX or DVI-based
-TeX, a separate implementation set of Type 1 PostScript fonts, TFM
-files, and virtual fonts is available from
-
- https://github.com/stipub/stixfonts/tree/master/STIXv2.0.0/Fonts/Type1
-
-Please note that although development work on the OpenType fonts is
-ongoing, no further updates are planned to the Type 1 fonts.
-
-FEEDBACK
-
-Please direct any questions or general comments to the STIX Fonts
-project. Bug reports and technical support issues should be reported
-through https://github.com/stipub/stixfonts.
-
-===========================================================================
-
- APPENDIX
-
- Summary of OpenType Features and Scripts
-
-Full details on all features can be found in the docs folder in
-STIX_2.0.0_stylistic_sets.pdf and STIX_2.0.0_glyph_sets.xlsx.
-
-The four text fonts support the following OpenType script tags:
-
- DFLT Default
- cyrl Cyrillic
- cyrl.MKD Cyrillic/Macedonian
- cyrl.SRB Cyrillic/Serbian
- grek Greek
- latn Latin
- latn.ROM Latin/Romanian
- latn.TRK Latin/Turkish
-
-and the following OpenType font features:
-
- c2sc Small Capitals From Capitals
- case Case-Sensitive Forms
- ccmp Glyph Composition/Decomposition
- cv01 Character Variants 1 -- lambda with horizontal crossbar (U+019B)
- cv02 Character Variants 2 -- serifed ramshorn (U+0264)
- dnom Denominators
- frac Fractions
- kern Kerning
- liga Standard Ligatures
- numr Numerators
- onum Oldstyle Figures
- pnum Proportional Figures
- smcp Small Capitals
- subs Subscript
- sups Superscript
-
-The Italic and BoldItalic fonts also support the following feature:
-
- ss01 Stylistic Set 1 -- alternate lowercase g
-
-The following font features are supported by STIX Two Math:
-
-Supported features:
-
- aalt Access All Alternates
- ccmp Glyph Composition/Decomposition
- cv01 Character Variants 1 -- lambda with horizontal crossbar (U+019B)
- cv02 Character Variants 2 -- serifed ramshorn (U+0264)
- kern Kerning
- ss01 Stylistic Set 1 -- Math chancery to roundhand (\mathcal -> \mathscr)
- ss02 Stylistic Set 2 -- Alternate italic forms: g, u, v, w, z
- ss03 Stylistic Set 3 -- Horizontal crossbar variants
- ss04 Stylistic Set 4 -- Minute, second and primes to long variants
- ss05 Stylistic Set 5 -- Short arrow variants
- ss06 Stylistic Set 6 -- Short/narrow variants
- ss07 Stylistic Set 7 -- Alternate math symbols (product, summation, etc)
- ss08 Stylistic Set 8 -- Upright integral variants; XITS compatible
- ss09 Stylistic Set 9 -- Vertical slash variants; XITS compatible
- ss10 Stylistic Set 10 -- Diagonal greater/lesser combination variants
- ss11 Stylistic Set 11 -- Long slash not-equal combination variants
- ss12 Stylistic Set 12 -- Low contrast (sans-like) variants
- ss13 Stylistic Set 13 -- Horizontally flipped sine wave glyph
- ss14 Stylistic Set 14 -- Tall variants
- ss15 Stylistic Set 15 -- Slab serif symbol variants
- ss16 Stylistic Set 16 -- Circled operator variants
- ss20 Stylistic Set 20 -- Miscellaneous variants
Binary files old/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf and new/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf differ
Binary files old/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf and new/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt new/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt
--- old/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt 2019-05-03 00:48:54.000000000 +0200
@@ -0,0 +1,302 @@
+ STIX Font Release Documentation
+ OpenType/WOFF/WOFF2
+
+ https://www.stixfonts.org/
+
+ Version 2.0.1
+
+ 15 April 2019
+
+ WHAT IS PROVIDED IN THIS RELEASE?
+
+The contents of this distribution are
+
+ Fonts/
+ OTF/
+ STIX2Math.otf
+ STIX2Text-BoldItalic.otf
+ STIX2Text-Bold.otf
+ STIX2Text-Italic.otf
+ STIX2Text-Regular.otf
+ WOFF/
+ STIX2Math.woff
+ STIX2Text-BoldItalic.woff
+ STIX2Text-Bold.woff
+ STIX2Text-Italic.woff
+ STIX2Text-Regular.woff
+ WOFF2/
+ STIX2Math.woff2
+ STIX2Text-BoldItalic.woff2
+ STIX2Text-Bold.woff2
+ STIX2Text-Italic.woff2
+ STIX2Text-Regular.woff2
+ docs/
+ STIX_2.0.1_license.pdf
+ STIX_2.0.1_release_notes.txt
+ charts/
+ StixTwoBold.pdf
+ StixTwoBoldItalic.pdf
+ StixTwoItalic.pdf
+ StixTwoMath.pdf
+ StixTwoRegular.pdf
+
+The STIX font is distributed under the SIL Open Font License, Version
+1.1, a copy of which is included in the docs folder.
+
+FEEDBACK
+
+Please direct any questions or general comments to the STIX Fonts
+project. Bug reports and technical support issues should be submitted
+through
+
+ https://github.com/stipub/stixfonts
+
+where you can also find a list of known issues.
+
+
+ WHAT'S NEW IN 2.0.1?
+
+COMPATIBILITY BETWEEN 2.0.1 AND 2.0.0
+
+There have been numerous improvements to the design of individual
+glyphs and to the placement of various accents. Since these don't
+affect character metrics, they should not affect the layout of
+documents that used v2.0.0 of the fonts.
+
+Users upgrading existing documents from 2.0.0 to 2.0.1 should be aware
+of the following potential incompatibilities:
+
+* Character metrics for some glyphs, especially Mathematical
+ Alphanumeric Symbols and APL functional symbols, have changed.
+
+* Kerning between z and following punctuation has been improved.
+
+* In STIX2Math, Stylistic Set 7 (ss07) no longer includes U+2205
+
+* U+2202 PARTIAL DIFFERENTIAL and U+1D6DB MATHEMATICAL BOLD PARTIAL
+ DIFFERENTIAL are now upright by default.
+
+See below for further details.
+
+TEXT FONTS
+
+* Added U+2423 OPEN BOX to all faces.
+
+* Added Stylistic Set ss02 to select upright parentheses, brackets,
+ and braces in Italic and BoldItalic faces.
+
+* Harmonized design of smallcap U+02A9 LATIN SMALL LETTER FENG DIGRAPH
+ between Regular and Bold faces.
+
+* Improved design of extended Latin and IPA character glyphs.
+
+* Improved kerning of selected character pairs.
+
+* Improved design and placement of U+0307 COMBINING DOT ABOVE and
+ U+0308 COMBINING DIAERESIS.
+
+MATH FONTS
+
+* The following Mathematical Alphanumeric Symbols have been improved.
+ Note that in some case this has necessitated changes to the
+ character metrics.
+
+ U+1D504..1D537 Fraktur symbols
+ U+1D538..1D56B Double-struck symbols
+ U+1D56C..1D59F Bold Fraktur symbols
+ U+1D5A0..1D5D3 Sans-serif symbols [SSP]
+ U+1D5D4..1D607 Sans-serif bold symbols [SSP]
+ U+1D608..1D63B Sans-serif italic symbols [SSP]
+ U+1D63C..1D66F Sans-serif bold italic symbols [SSP]
+ U+1D670..1D6A3 Monospace symbols
+ U+1D756..1D78F Sans-serif bold Greek
+ U+1D790..1D7C9 Sans-serif bold italic Greek
+ U+1D7D8..1D7E1 Double-struck digits
+ U+1D7E2..1D7EB Sans-serif digits [SSP]
+ U+1D7EC..1D7F5 Sans-serif bold digits [SSP]
+ U+1D7F6..1D7FF Monospace digits
+
+ Note: The ranges marked "[SSP]" are derived from the Source Sans Pro
+ fonts, with proportions and weight modified to harmonize with the
+ STIX design.
+
+* Added support for Unicode Standard Mathematical Standardized Variants.
+
+* Removed variant form of U+2205 EMPTY SET from Stylistic Set 7 to
+ Character Variant 3. NOTE: For most users, the "variant" form will
+ be the preferred shape, but the default shape has been left as-is
+ for backwards compatibility.
+
+* Improved proportions of existing APL symbols and added an additional
+ 16 symbols (see below).
+
+* Corrected glyph for U+1D752 MATHEMATICAL BOLD ITALIC KAPPA SYMBOL.
+
+* Improved positioning of tilde math accent.
+
+* Added dotless variants of U+2148 DOUBLE-STRUCK ITALIC SMALL I and
+ U_2149 DOUBLE-STRUCK ITALIC SMALL J.
+
+* Made U+2202 PARTIAL DIFFERENTIAL and U+1D6DB MATHEMATICAL BOLD
+ PARTIAL DIFFERENTIAL upright rather than italic.
+
+* Revised and extended coverage of Enclosed Alphanumeric block
+ (U+2460-24FF).
+
+* U+20E1 COMBINING LEFT RIGHT ARROW ABOVE is now extensible.
+
+* Corrected vertical placement of U+00B1 PLUS-MINUS SIGN
+
+* The following delimiters now have a full set of 12 growing form
+ variants.
+
+ U+2308 LEFT CEILING
+ U+2309 RIGHT CEILING
+
+ U+230A LEFT FLOOR
+ U+230B RIGHT FLOOR
+
+ U+2772 LIGHT LEFT TORTOISE SHELL BRACKET ORNAMENT
+ U+2773 LIGHT RIGHT TORTOISE SHELL BRACKET ORNAMENT
+
+ U+27E6 LEFT WHITE SQUARE BRACKET
+ U+27E7 MATHEMATICAL RIGHT WHITE SQUARE BRACKET
+
+ U+27E8 MATHEMATICAL LEFT ANGLE BRACKET
+ U+27E9 MATHEMATICAL RIGHT ANGLE BRACKET
+
+ U+27EA MATHEMATICAL LEFT DOUBLE ANGLE BRACKET
+ U+27EB MATHEMATICAL RIGHT DOUBLE ANGLE BRACKET
+
+ U+2983 WHITE CURLY BRACKET
+ U+2984 RIGHT WHITE CURLY BRACKET
+
+ U+2985 LEFT WHITE PARENTHESIS
+ U+2986 RIGHT WHITE PARENTHESIS
+
+* New characters
+
+ General Punctuation
+ U+2061 FUNCTION APPLICATION
+ U+2062 INVISIBLE TIMES
+ U+2063 INVISIBLE SEPARATOR
+ U+2064 INVISIBLE PLUS
+
+ Miscellaneous Technical
+ U+2338 APL FUNCTIONAL SYMBOL QUAD EQUAL
+ U+233A APL FUNCTIONAL SYMBOL QUAD DIAMOND
+ U+233E APL FUNCTIONAL SYMBOL CIRCLE JOT
+ U+2341 APL FUNCTIONAL SYMBOL QUAD SLASH
+ U+2342 APL FUNCTIONAL SYMBOL QUAD BACKSLASH
+ U+2347 APL FUNCTIONAL SYMBOL QUAD LEFTWARDS ARROW
+ U+2348 APL FUNCTIONAL SYMBOL QUAD RIGHTWARDS ARROW
+ U+2350 APL FUNCTIONAL SYMBOL QUAD UPWARDS ARROW
+ U+2357 APL FUNCTIONAL SYMBOL QUAD DOWNWARDS ARROW
+ U+2360 APL FUNCTIONAL SYMBOL QUAD COLON
+ U+2364 APL FUNCTIONAL SYMBOL JOT DIAERESIS
+ U+2365 APL FUNCTIONAL SYMBOL CIRCLE DIAERESIS
+ U+2366 APL FUNCTIONAL SYMBOL DOWN SHOE STILE
+ U+236D APL FUNCTIONAL SYMBOL STILE TILDE
+ U+2378 APL FUNCTIONAL SYMBOL IOTA UNDERBAR
+ U+2395 APL FUNCTIONAL SYMBOL QUAD
+ U+23B7 RADICAL SYMBOL BOTTOM
+ U+23B8 LEFT VERTICAL BOX LINE
+ U+23B9 RIGHT VERTICAL BOX LINE
+
+ Control Pictures
+ U+2422 BLANK SYMBOL
+
+ Enclosed Alphanumerics
+ U+2469..24B5
+ U+24EB..24FF
+
+ Dingbats
+ U+2776 DINGBAT NEGATIVE CIRCLED DIGIT ONE
+ U+2777 DINGBAT NEGATIVE CIRCLED DIGIT TWO
+ U+2778 DINGBAT NEGATIVE CIRCLED DIGIT THREE
+ U+2779 DINGBAT NEGATIVE CIRCLED DIGIT FOUR
+ U+277A DINGBAT NEGATIVE CIRCLED DIGIT FIVE
+ U+277B DINGBAT NEGATIVE CIRCLED DIGIT SIX
+ U+277C DINGBAT NEGATIVE CIRCLED DIGIT SEVEN
+ U+277D DINGBAT NEGATIVE CIRCLED DIGIT EIGHT
+ U+277E DINGBAT NEGATIVE CIRCLED DIGIT NINE
+ U+277F DINGBAT NEGATIVE CIRCLED NUMBER TEN
+
+ Arabic Mathematical Alphabetic Symbols
+ U+1EEF0 ARABIC MATHEMATICAL OPERATOR MEEM WITH HAH WITH TATWEEL
+ U+1EEF1 ARABIC MATHEMATICAL OPERATOR HAH WITH DAL
+
+ Note: These two characters were added for compatibility with
+ the LaTeX unicode-math package. There are no plans to include
+ further support for Arabic typesetting.
+
+
+ WHAT'S NEW IN 2.0.0?
+
+In addition to the overall visual redesign, STIX Two incorporates a
+number of significant improvements and additions. Special attention
+has been given to implementing accepted best practices for OpenType
+fonts, such as the use of font features to access variant glyph shapes
+that were previously only available via the Unicode Private Use Areas.
+
+The letterspacing and kerning of the text fonts have been
+significantly improved.
+
+True small capital variants (Latin, Cyrillic, and Greek), accessible
+via the OpenType font feature smcp, have been added for all text
+fonts.
+
+Text (lowercase or oldstyle) numerals, available via the font features
+pnum and onum, have been added, in addition to natural-spacing
+figures.
+
+Alphabetic superscripts and numeric sub- and superscripts, accessible
+via the subs and sups font features, have been added.
+
+Fractions are available via the frac feature, as well as numerators
+(numr) and denominators (dnom).
+
+The OpenType MATH table has been completely rewritten and extended.
+
+Additions have been made to these Unicode blocks:
+ Latin-1 Supplement U+0080 - U+00FF
+ Latin Extended-A U+0100 - U+017F
+ Latin Extended Additional U+0180 - U+024F
+ Cyrillic U+0400 - U+04FF
+ Greek and Coptic U+0370 - U+03FF
+ IPA blocks U+0250 - U+02AF
+
+BACKWARDS COMPATIBILITY
+
+Because of the scope of the changes, especially to the text fonts,
+STIX Two is not a drop-in replacement for earlier versions. While we
+understand and sympathize with the difficulties caused by the
+incompatibilities we have introduced, we nevertheless felt they were
+necessary to address some of the shortcomings of earlier versions of
+the fonts and to position us to respond to the needs of modern
+publishing.
+
+Earlier versions of the STIX fonts are deprecated and no longer
+supported. We urge all users of the STIX fonts to upgrade to the new
+versions as soon as possible.
+
+To enable the new and old versions of the fonts to coexist during the
+transition phase, the fonts have been renamed as follows:
+
+ STIX 1.1.0 STIX 2.0.0
+
+ STIX-Regular STIX Two Text
+ STIX-Italic STIX Two Text Italic
+ STIX-Bold STIX Two Text Bold
+ STIX-BoldItalic STIX Two Text Bold Italic
+
+ STIX Math Regular STIX Two Math
+
+The four text fonts contain glyphs from Unicode text blocks only. For
+example, all characters from the range U+2190 to U+3063 and U+E000 to
+U+E368 and all plane 1 characters have been removed from the text
+fonts and are now found only in STIX Two Math. Whenever possible,
+characters have been removed from the Private Use Area (U+E000-U+F8FF)
+and made available via font features instead.
+
+The STIX-General packaging of the fonts is no longer supported.
Binary files old/doc/fonts/stix2-otf/StixTwoBold.pdf and new/doc/fonts/stix2-otf/StixTwoBold.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf and new/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoItalic.pdf and new/doc/fonts/stix2-otf/StixTwoItalic.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoMath.pdf and new/doc/fonts/stix2-otf/StixTwoMath.pdf differ
Binary files old/doc/fonts/stix2-otf/StixTwoRegular.pdf and new/doc/fonts/stix2-otf/StixTwoRegular.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-otf.doc.tlpobj new/tlpkg/tlpobj/stix2-otf.doc.tlpobj
--- old/tlpkg/tlpobj/stix2-otf.doc.tlpobj 2019-02-28 04:06:20.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-otf.doc.tlpobj 2020-03-04 23:53:48.000000000 +0100
@@ -1,11 +1,14 @@
name stix2-otf.doc
category Package
-revision 47549
+revision 54080
shortdesc doc files of stix2-otf
relocated 1
-docfiles size=177
+docfiles size=513
RELOC/doc/fonts/stix2-otf/README.md
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_glyph_sets.xlsx
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_license.pdf
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_release_notes.txt
- RELOC/doc/fonts/stix2-otf/STIX_2.0.0_stylistic_sets.pdf
+ RELOC/doc/fonts/stix2-otf/STIX_2.0.1_license.pdf
+ RELOC/doc/fonts/stix2-otf/STIX_2.0.1_release_notes.txt
+ RELOC/doc/fonts/stix2-otf/StixTwoBold.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoBoldItalic.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoItalic.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoMath.pdf
+ RELOC/doc/fonts/stix2-otf/StixTwoRegular.pdf
++++++ stix2-otf.tar.xz ++++++
Binary files old/fonts/opentype/public/stix2-otf/STIX2Math.otf and new/fonts/opentype/public/stix2-otf/STIX2Math.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf differ
Binary files old/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf and new/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-otf.tlpobj new/tlpkg/tlpobj/stix2-otf.tlpobj
--- old/tlpkg/tlpobj/stix2-otf.tlpobj 2019-02-28 04:06:21.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-otf.tlpobj 2020-03-04 23:53:49.000000000 +0100
@@ -1,6 +1,6 @@
name stix2-otf
category Package
-revision 47549
+revision 54080
shortdesc OpenType Unicode text and maths fonts
relocated 1
longdesc The Scientific and Technical Information eXchange (STIX) fonts
@@ -11,17 +11,17 @@
longdesc with a set of text faces suitable for professional publishing.
longdesc The fonts are available royalty-free under the SIL Open Font
longdesc License.
-runfiles size=586
+runfiles size=569
RELOC/fonts/opentype/public/stix2-otf/STIX2Math.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Bold.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-BoldItalic.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Italic.otf
RELOC/fonts/opentype/public/stix2-otf/STIX2Text-Regular.otf
+catalogue-also stickstoo
catalogue-contact-bugs https://github.com/stipub/stixfonts/issues
catalogue-contact-home http://www.stixfonts.org/
catalogue-contact-repository https://github.com/stipub/stixfonts
catalogue-ctan /fonts/stix2-otf
-catalogue-date 2018-05-02 06:34:24 +0200
catalogue-license ofl
catalogue-topics font font-otf font-maths font-symbol font-symbol-maths font-body font-collection font-nonroman font-serif
-catalogue-version 2.0.0
+catalogue-version 2.0.1
++++++ stix2-type1.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/stix2/README.md new/doc/latex/stix2/README.md
--- old/doc/latex/stix2/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/stix2/README.md 2019-05-03 00:38:58.000000000 +0200
@@ -0,0 +1,34 @@
+# stix2-type1, v2.0.0a
+Type 1 versions of STIX 2.0.0 for legacy TeX engines
+
+If you are using XeTeX or luaTeX, you do not need the files in this
+directory. See the stix2-otf package instead.
+
+The stix2 package provides support for versions of TeX that are
+limited to TFM files, Type 1 PostScript fonts, and 8-bit font
+encodings. Version 2.0.0 of the STIX fonts are being released in this
+format in hopes of easing the transition from legacy TeX engines to
+modern fully Unicode-compatible systems. The Type 1 versions are
+merely a repackaging of the original OpenType versions and should not
+be viewed as independent entities. Some glyphs that are traditionally
+available in TeX math fonts are not available in version 2.0.0 of STIX
+Two. In such cases, we have chosen to omit them from the stix2
+package rather than create incompatibilities between the OpenType and
+Type 1 versions.
+
+Note that while the OpenType versions of these fonts are under active
+development, **no further updates** are planned to the Type 1
+distribution; future efforts by the STI Pub companies will focus on
+improving the OpenType fonts. However, patches to the existing Type 1
+distribution are welcome and, pending review, will be incorporated
+into the distribution. Any such patches should be submitted through
+the github repo at
+
+ https://github.com/stipub/stixfonts
+
+# Changelog
+
+v2.0.0a fixes a problem in the TeX font metrics file for stix2-mathcal
+(https://github.com/stipub/stixfonts/issues/108). The only changes
+outside of this README file were to the files stix2-mathcal.tfm and
+stix2-mathcal.pl.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-type1.doc.tlpobj new/tlpkg/tlpobj/stix2-type1.doc.tlpobj
--- old/tlpkg/tlpobj/stix2-type1.doc.tlpobj 2019-02-28 04:06:21.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-type1.doc.tlpobj 2020-03-24 02:04:02.000000000 +0100
@@ -1,7 +1,8 @@
name stix2-type1.doc
category Package
-revision 47554
+revision 54512
shortdesc doc files of stix2-type1
relocated 1
-docfiles size=327
+docfiles size=328
+ RELOC/doc/latex/stix2/README.md
RELOC/doc/latex/stix2/stix2.pdf
++++++ stix2-type1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/fonts/source/public/stix2/stix2-mathcal.pl new/fonts/source/public/stix2/stix2-mathcal.pl
--- old/fonts/source/public/stix2/stix2-mathcal.pl 2018-05-01 20:22:55.000000000 +0200
+++ new/fonts/source/public/stix2/stix2-mathcal.pl 2019-05-03 00:38:58.000000000 +0200
@@ -94,55 +94,55 @@
(STOP)
)
(CHARACTER O 0 (comment uni222B.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 1 (comment uni222C.sm)
- (CHARWD R 0.889)
+ (CHARWD R 0.789)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 2 (comment uni222D.sm)
- (CHARWD R 1.222)
+ (CHARWD R 1.122)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 3 (comment uni222E.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 4 (comment uni222F.sm)
- (CHARWD R 0.889)
+ (CHARWD R 0.789)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 5 (comment uni2230.sm)
- (CHARWD R 1.222)
+ (CHARWD R 1.122)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 6 (comment uni2231.sm)
- (CHARWD R 0.562)
+ (CHARWD R 0.462)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 7 (comment uni2232.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 10 (comment uni2233.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
@@ -151,160 +151,159 @@
(CHARWD R 0.611)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.102)
)
(CHARACTER O 12 (comment uni2A0C.sm)
- (CHARWD R 1.555)
+ (CHARWD R 1.455)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 13 (comment uni2A0D.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 14 (comment uni2A0E.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 15 (comment uni2A0F.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 16 (comment uni2A10.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 17 (comment uni2A11.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 20 (comment uni2A12.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 21 (comment uni2A13.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 22 (comment uni2A14.sm)
- (CHARWD R 0.578)
+ (CHARWD R 0.478)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 23 (comment uni2A15.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.716)
(CHARDP R 0.022)
(CHARIC R 0.1)
)
(CHARACTER O 24 (comment uni2A16.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 25 (comment uni2A17.sm)
- (CHARWD R 0.627)
+ (CHARWD R 0.527)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 26 (comment uni2A18.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 27 (comment uni2A19.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 30 (comment uni2A1A.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 31 (comment uni2A1B.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.829)
(CHARDP R 0.011)
(CHARIC R 0.1)
)
(CHARACTER O 32 (comment uni2A1C.sm)
- (CHARWD R 0.556)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.107)
(CHARIC R 0.1)
)
(CHARACTER O 33 (comment uni222B.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 34 (comment uni222C.upsm)
- (CHARWD R 0.808)
+ (CHARWD R 0.728)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 35 (comment uni222D.upsm)
- (CHARWD R 1.13)
+ (CHARWD R 1.05)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 36 (comment uni222E.upsm)
- (CHARWD R 0.496)
+ (CHARWD R 0.416)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 37 (comment uni222F.upsm)
- (CHARWD R 0.818)
+ (CHARWD R 0.738)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 40 (comment uni2230.upsm)
- (CHARWD R 1.141)
+ (CHARWD R 1.061)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 41 (comment uni2231.upsm)
- (CHARWD R 0.556)
+ (CHARWD R 0.476)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 42 (comment uni2232.upsm)
- (CHARWD R 0.516)
+ (CHARWD R 0.436)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 43 (comment uni2233.upsm)
- (CHARWD R 0.536)
+ (CHARWD R 0.456)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
@@ -315,103 +314,103 @@
(CHARDP R 0.226)
)
(CHARACTER O 45 (comment uni2A0C.upsm)
- (CHARWD R 1.472)
+ (CHARWD R 1.392)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 46 (comment uni2A0D.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 47 (comment uni2A0E.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 50 (comment uni2A0F.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 51 (comment uni2A10.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 52 (comment uni2A11.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 53 (comment uni2A12.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 54 (comment uni2A13.upsm)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
)
(CHARACTER O 55 (comment uni2A14.upsm)
- (CHARWD R 0.563)
+ (CHARWD R 0.483)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 56 (comment uni2A15.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 57 (comment uni2A16.upsm)
- (CHARWD R 0.461)
+ (CHARWD R 0.381)
(CHARHT R 0.727)
(CHARDP R 0.018)
- (CHARIC R 0.115)
+ (CHARIC R 0.08)
)
(CHARACTER O 60 (comment uni2A17.upsm)
- (CHARWD R 0.647)
+ (CHARWD R 0.567)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 61 (comment uni2A18.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 62 (comment uni2A19.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 63 (comment uni2A1A.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 64 (comment uni2A1B.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.829)
(CHARDP R 0.018)
(CHARIC R 0.08)
)
(CHARACTER O 65 (comment uni2A1C.upsm)
- (CHARWD R 0.506)
+ (CHARWD R 0.426)
(CHARHT R 0.727)
(CHARDP R 0.115)
(CHARIC R 0.08)
@@ -807,63 +806,63 @@
(CHARDP R 0.16)
)
(CHARACTER O 224 (comment uni222B)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 312)
)
(CHARACTER O 225 (comment uni222C)
- (CHARWD R 1.016)
+ (CHARWD R 0.786)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 313)
)
(CHARACTER O 226 (comment uni222D)
- (CHARWD R 1.348)
+ (CHARWD R 1.118)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 314)
)
(CHARACTER O 227 (comment uni222E)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 315)
)
(CHARACTER O 230 (comment uni222F)
- (CHARWD R 1.016)
+ (CHARWD R 0.786)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 316)
)
(CHARACTER O 231 (comment uni2230)
- (CHARWD R 1.348)
+ (CHARWD R 1.118)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 317)
)
(CHARACTER O 232 (comment uni2231)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.728)
(CHARDP R 0.225)
(CHARIC R 0.23)
(NEXTLARGER O 320)
)
(CHARACTER O 233 (comment uni2232)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.728)
(CHARDP R 0.225)
(CHARIC R 0.23)
(NEXTLARGER O 321)
)
(CHARACTER O 234 (comment uni2233)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
@@ -876,182 +875,182 @@
(NEXTLARGER O 323)
)
(CHARACTER O 236 (comment uni2A0C)
- (CHARWD R 1.68)
+ (CHARWD R 1.45)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 324)
)
(CHARACTER O 237 (comment uni2A0D)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 325)
)
(CHARACTER O 240 (comment uni2A0E)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 326)
)
(CHARACTER O 241 (comment uni2A0F)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 327)
)
(CHARACTER O 242 (comment uni2A10)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 330)
)
(CHARACTER O 243 (comment uni2A11)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 331)
)
(CHARACTER O 244 (comment uni2A12)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 332)
)
(CHARACTER O 245 (comment uni2A13)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 333)
)
(CHARACTER O 246 (comment uni2A14)
- (CHARWD R 0.711)
+ (CHARWD R 0.481)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 334)
)
(CHARACTER O 247 (comment uni2A15)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 335)
)
(CHARACTER O 250 (comment uni2A16)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 336)
)
(CHARACTER O 251 (comment uni2A17)
- (CHARWD R 0.864)
+ (CHARWD R 0.634)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 337)
)
(CHARACTER O 252 (comment uni2A18)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 340)
)
(CHARACTER O 253 (comment uni2A19)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 341)
)
(CHARACTER O 254 (comment uni2A1A)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 342)
)
(CHARACTER O 255 (comment uni2A1B)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.849)
(CHARDP R 0.226)
(CHARIC R 0.23)
(NEXTLARGER O 343)
)
(CHARACTER O 256 (comment uni2A1C)
- (CHARWD R 0.684)
+ (CHARWD R 0.454)
(CHARHT R 0.727)
(CHARDP R 0.347)
(CHARIC R 0.23)
(NEXTLARGER O 344)
)
(CHARACTER O 257 (comment uni222B.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 345)
)
(CHARACTER O 260 (comment uni222C.up)
- (CHARWD R 0.83)
+ (CHARWD R 0.75)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 346)
)
(CHARACTER O 261 (comment uni222D.up)
- (CHARWD R 1.149)
+ (CHARWD R 1.069)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 347)
)
(CHARACTER O 262 (comment uni222E.up)
- (CHARWD R 0.513)
+ (CHARWD R 0.433)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 350)
)
(CHARACTER O 263 (comment uni222F.up)
- (CHARWD R 0.837)
+ (CHARWD R 0.757)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 351)
)
(CHARACTER O 264 (comment uni2230.up)
- (CHARWD R 1.206)
+ (CHARWD R 1.126)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 352)
)
(CHARACTER O 265 (comment uni2231.up)
- (CHARWD R 0.545)
+ (CHARWD R 0.465)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 353)
)
(CHARACTER O 266 (comment uni2232.up)
- (CHARWD R 0.602)
+ (CHARWD R -0.198)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.8)
(NEXTLARGER O 354)
)
(CHARACTER O 267 (comment uni2233.up)
- (CHARWD R 0.596)
+ (CHARWD R 0.516)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
@@ -1064,174 +1063,174 @@
(NEXTLARGER O 356)
)
(CHARACTER O 271 (comment uni2A0C.up)
- (CHARWD R 1.491)
+ (CHARWD R 1.411)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 357)
)
(CHARACTER O 272 (comment uni2A0D.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 360)
)
(CHARACTER O 273 (comment uni2A0E.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 361)
)
(CHARACTER O 274 (comment uni2A0F.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 362)
)
(CHARACTER O 275 (comment uni2A10.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 363)
)
(CHARACTER O 276 (comment uni2A11.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.11)
+ (CHARIC R 0.08)
(NEXTLARGER O 364)
)
(CHARACTER O 277 (comment uni2A12.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 365)
)
(CHARACTER O 300 (comment uni2A13.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 366)
)
(CHARACTER O 301 (comment uni2A14.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
- (CHARIC R 0.167)
+ (CHARIC R 0.08)
(NEXTLARGER O 367)
)
(CHARACTER O 302 (comment uni2A15.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 370)
)
(CHARACTER O 303 (comment uni2A16.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 371)
)
(CHARACTER O 304 (comment uni2A17.up)
- (CHARWD R 0.865)
+ (CHARWD R 0.785)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 372)
)
(CHARACTER O 305 (comment uni2A18.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 373)
)
(CHARACTER O 306 (comment uni2A19.up)
- (CHARWD R 0.545)
+ (CHARWD R 0.465)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 374)
)
(CHARACTER O 307 (comment uni2A1A.up)
- (CHARWD R 0.576)
+ (CHARWD R 0.496)
(CHARHT R 0.727)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 375)
)
(CHARACTER O 310 (comment uni2A1B.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.848)
(CHARDP R 0.226)
(CHARIC R 0.08)
(NEXTLARGER O 376)
)
(CHARACTER O 311 (comment uni2A1C.up)
- (CHARWD R 0.525)
+ (CHARWD R 0.445)
(CHARHT R 0.727)
(CHARDP R 0.346)
(CHARIC R 0.08)
(NEXTLARGER O 377)
)
(CHARACTER O 312 (comment uni222B.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 313 (comment uni222C.dsp)
- (CHARWD R 1.489)
+ (CHARWD R 0.949)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 314 (comment uni222D.dsp)
- (CHARWD R 1.946)
+ (CHARWD R 1.406)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 315 (comment uni222E.dsp)
- (CHARWD R 1.007)
+ (CHARWD R 0.467)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 316 (comment uni222F.dsp)
- (CHARWD R 1.45)
+ (CHARWD R 0.91)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 317 (comment uni2230.dsp)
- (CHARWD R 1.907)
+ (CHARWD R 1.367)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 320 (comment uni2231.dsp)
- (CHARWD R 0.989)
+ (CHARWD R 0.449)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.54)
)
(CHARACTER O 321 (comment uni2232.dsp)
- (CHARWD R 1.102)
+ (CHARWD R 0.562)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 322 (comment uni2233.dsp)
- (CHARWD R 1.159)
+ (CHARWD R 0.619)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
@@ -1242,157 +1241,157 @@
(CHARDP R 0.802)
)
(CHARACTER O 324 (comment uni2A0C.dsp)
- (CHARWD R 2.363)
+ (CHARWD R 1.823)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 325 (comment uni2A0D.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 326 (comment uni2A0E.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 327 (comment uni2A0F.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 330 (comment uni2A10.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 331 (comment uni2A11.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 332 (comment uni2A12.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 333 (comment uni2A13.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 334 (comment uni2A14.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
- (CHARIC R 0.104)
+ (CHARIC R 0.54)
)
(CHARACTER O 335 (comment uni2A15.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 336 (comment uni2A16.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 337 (comment uni2A17.dsp)
- (CHARWD R 1.1)
+ (CHARWD R 0.56)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 340 (comment uni2A18.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 341 (comment uni2A19.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 342 (comment uni2A1A.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 343 (comment uni2A1B.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.582)
(CHARDP R 0.917)
(CHARIC R 0.54)
)
(CHARACTER O 344 (comment uni2A1C.dsp)
- (CHARWD R 1.032)
+ (CHARWD R 0.492)
(CHARHT R 1.429)
(CHARDP R 1.068)
(CHARIC R 0.54)
)
(CHARACTER O 345 (comment uni222B.updsp)
- (CHARWD R 0.632)
+ (CHARWD R 0.552)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 346 (comment uni222C.updsp)
- (CHARWD R 0.999)
+ (CHARWD R 0.919)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 347 (comment uni222D.updsp)
- (CHARWD R 1.366)
+ (CHARWD R 1.286)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 350 (comment uni222E.updsp)
- (CHARWD R 1.009)
+ (CHARWD R 0.929)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 351 (comment uni222F.updsp)
- (CHARWD R 1.374)
+ (CHARWD R 1.294)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 352 (comment uni2230.updsp)
- (CHARWD R 1.793)
+ (CHARWD R 1.713)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 353 (comment uni2231.updsp)
- (CHARWD R 0.834)
+ (CHARWD R 0.754)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 354 (comment uni2232.updsp)
- (CHARWD R 1.102)
+ (CHARWD R 1.022)
(CHARHT R 1.42)
(CHARDP R 0.926)
(CHARIC R 0.08)
)
(CHARACTER O 355 (comment uni2233.updsp)
- (CHARWD R 1.159)
+ (CHARWD R 1.079)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
@@ -1403,103 +1402,103 @@
(CHARDP R 0.803)
)
(CHARACTER O 357 (comment uni2A0C.updsp)
- (CHARWD R 1.713)
+ (CHARWD R 1.633)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 360 (comment uni2A0D.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 361 (comment uni2A0E.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 362 (comment uni2A0F.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 363 (comment uni2A10.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 364 (comment uni2A11.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
- (CHARIC R 0.16)
+ (CHARIC R 0.08)
)
(CHARACTER O 365 (comment uni2A12.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 366 (comment uni2A13.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 367 (comment uni2A14.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
- (CHARIC R 0.237)
+ (CHARIC R 0.08)
)
(CHARACTER O 370 (comment uni2A15.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 371 (comment uni2A16.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 372 (comment uni2A17.updsp)
- (CHARWD R 1.1)
+ (CHARWD R 1.02)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 373 (comment uni2A18.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 374 (comment uni2A19.updsp)
- (CHARWD R 0.844)
+ (CHARWD R 0.764)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 375 (comment uni2A1A.updsp)
- (CHARWD R 0.844)
+ (CHARWD R 0.764)
(CHARHT R 1.428)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 376 (comment uni2A1B.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.588)
(CHARDP R 0.918)
(CHARIC R 0.08)
)
(CHARACTER O 377 (comment uni2A1C.updsp)
- (CHARWD R 0.697)
+ (CHARWD R 0.617)
(CHARHT R 1.428)
(CHARDP R 1.068)
(CHARIC R 0.08)
Binary files old/fonts/tfm/public/stix2/stix2-mathcal.tfm and new/fonts/tfm/public/stix2/stix2-mathcal.tfm differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/stix2-type1.tlpobj new/tlpkg/tlpobj/stix2-type1.tlpobj
--- old/tlpkg/tlpobj/stix2-type1.tlpobj 2019-02-28 04:06:22.000000000 +0100
+++ new/tlpkg/tlpobj/stix2-type1.tlpobj 2020-03-24 02:04:02.000000000 +0100
@@ -1,6 +1,6 @@
name stix2-type1
category Package
-revision 47554
+revision 54512
shortdesc Type1 versions of the STIX Two OpenType fonts
relocated 1
longdesc The stix2 package provides minimal support for using the STIX
@@ -142,11 +142,11 @@
RELOC/tex/latex/stix2/stix2.sty
RELOC/tex/latex/stix2/t1stix2.fd
RELOC/tex/latex/stix2/ts1stix2.fd
+catalogue-also stickstoo
catalogue-contact-bugs https://github.com/stipub/stixfonts/issues
catalogue-contact-development https://github.com/stipub/stixfonts
catalogue-contact-home http://www.stixfonts.org/
catalogue-ctan /fonts/stix2-type1
-catalogue-date 2018-05-02 06:34:24 +0200
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font font-type1 font-maths font-symbol-maths font-bbd font-body font-collection font-nonroman font-otf font-serif font-symbol font-supp font-supp-maths font-supp-symbol
-catalogue-version 2.0.0
+catalogue-version 2.0.0a
++++++ subfiles.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/subfiles/README new/doc/latex/subfiles/README
--- old/doc/latex/subfiles/README 2018-07-31 22:54:49.000000000 +0200
+++ new/doc/latex/subfiles/README 2020-02-14 23:34:36.000000000 +0100
@@ -1,7 +1,15 @@
subfiles - class and package for multi-file projects in LaTeX
-Author: Federico Garcia
+Author: Federico Garcia, Gernot Salzer
This material is subject to the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html
-for the details of that license.
+https://ctan.org/license/lppl for the details of that license.
+
+Installation:
+Run 'latex subfiles.ins' to generate the files
+subfiles.cls
+subfiles.sty
+and put them somewhere on the search path of TeX.
+
+Documentation:
+Run 'pdflatex subfiles.dtx' twice to generate subfiles.pdf.
Binary files old/doc/latex/subfiles/subfiles.pdf and new/doc/latex/subfiles/subfiles.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfiles.doc.tlpobj new/tlpkg/tlpobj/subfiles.doc.tlpobj
--- old/tlpkg/tlpobj/subfiles.doc.tlpobj 2019-02-28 04:06:28.000000000 +0100
+++ new/tlpkg/tlpobj/subfiles.doc.tlpobj 2020-02-15 01:54:15.000000000 +0100
@@ -1,8 +1,8 @@
name subfiles.doc
category Package
-revision 48323
+revision 53782
shortdesc doc files of subfiles
relocated 1
-docfiles size=58
+docfiles size=60
RELOC/doc/latex/subfiles/README
RELOC/doc/latex/subfiles/subfiles.pdf
++++++ subfiles.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/subfiles/subfiles.cls new/tex/latex/subfiles/subfiles.cls
--- old/tex/latex/subfiles/subfiles.cls 2018-07-31 22:54:49.000000000 +0200
+++ new/tex/latex/subfiles/subfiles.cls 2020-02-14 23:34:36.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
+%% Copyright 2002, 2012 Federico Garcia; 2018, 2019 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,20 +26,33 @@
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
+\ProvidesClass{subfiles}[2020/02/14 v1.6 Multi-file projects (class)]
\DeclareOption*{\typeout{Preamble taken from file `\CurrentOption'}%
\let\preamble@file\CurrentOption}
\ProcessOptions
-\let\old@documentclass@subfiles\documentclass
+\let\@classoptionslist\relax
+\let\subfiles@documentclass\documentclass
\let\documentclass\LoadClass\relax
-\input{\preamble@file}
+\RequirePackage{verbatim}
+\let\subfiles@comment\comment
+\let\subfiles@endcomment\endcomment
+\RequirePackage{import}
+\def\subfiles@split#1{%
+ \let\subfiles@filename@simple\filename@simple
+ \def\filename@simple##1.\\{\edef\filename@base{##1}}%
+ \filename@parse{#1}%
+ \let\filename@simple\subfiles@filename@simple
+}
+\subfiles@split{\preamble@file}
+\subimport{\filename@area}{\filename@base}
{\catcode`\@=11
-\global\let\document\old@document@subfiles
-\global\let\enddocument\old@enddocument@subfiles
-\global\let\documentclass\old@documentclass@subfiles
-\global\let\old@document@subfiles\undefined
-\global\let\old@enddocument@subfiles\undefined
-\global\let\old@documentclass@subfiles\undefined}
+\global\let\document\subfiles@document
+\global\let\enddocument\subfiles@enddocument
+\global\let\documentclass\subfiles@documentclass
+\global\let\subfiles@document\undefined
+\global\let\subfiles@enddocument\undefined
+\global\let\subfiles@documentclass\undefined
+}
\endinput
%%
%% End of file `subfiles.cls'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/subfiles/subfiles.sty new/tex/latex/subfiles/subfiles.sty
--- old/tex/latex/subfiles/subfiles.sty 2018-07-31 22:54:49.000000000 +0200
+++ new/tex/latex/subfiles/subfiles.sty 2020-02-14 23:34:36.000000000 +0100
@@ -8,7 +8,7 @@
%%
%% This is a generated file.
%%
-%% Copyright 2002, 2012 Federico Garcia; 2018 Gernot Salzer
+%% Copyright 2002, 2012 Federico Garcia; 2018, 2019 Gernot Salzer
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -26,21 +26,70 @@
%% and the derived files subfiles.sty and subfiles.pdf
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{subfiles}[2018/07/31 Federico Garcia, Gernot Salzer]
+\ProvidesPackage{subfiles}[2020/02/14 v1.6 Multi-file projects (package)]
\DeclareOption*{\PackageWarning{\CurrentOption ignored}}
\ProcessOptions
-\RequirePackage{verbatim}
-\newcommand{\skip@preamble}{%
- \let\document\relax\let\enddocument\relax%
- \newenvironment{document}{}{}%
- \renewcommand{\documentclass}[2][subfiles]{}}
-\newcommand\subfile[1]{\begingroup\skip@preamble\input{#1}\endgroup}
\@ifclassloaded{subfiles}{%
- \let\old@document@subfiles\document
- \let\old@enddocument@subfiles\enddocument
- \let\document\comment
- \let\enddocument\endcomment
-}{}
+ \let\subfiles@document\document
+ \let\subfiles@enddocument\enddocument
+ \let\document\subfiles@comment
+ \let\enddocument\subfiles@endcomment
+}{% subfiles class not loaded, we typeset the main document
+ \RequirePackage{import}
+ \def\subfiles@split#1{%
+ \let\subfiles@filename@simple\filename@simple
+ \def\filename@simple##1.\\{\edef\filename@base{##1}}%
+ \filename@parse{#1}%
+ \let\filename@simple\subfiles@filename@simple
+ }
+}
+\newcommand\subfile{%
+ \let\subfiles@loadfile\subimport
+ \subfiles@subfile
+}
+\newcommand\subfileinclude{%
+ \let\subfiles@loadfile\subincludefrom
+ \subfiles@subfile
+}
+\newcommand\subfiles@subfile[1]{%
+ \begingroup
+ \let\subfiles@documentclass\documentclass
+ \let\subfiles@document\document
+ \let\subfiles@enddocument\enddocument
+ \renewcommand\documentclass[2][subfiles]{%
+ \let\documentclass\subfiles@documentclass
+ \ignorespaces
+ }%
+ \renewenvironment{document}{%
+ \let\document\subfiles@document
+ \ignorespaces
+ }{%
+ \let\enddocument\subfiles@enddocument
+ \@ignoretrue
+ }%
+ \subfiles@split{#1}%
+ \subfiles@loadfile{\filename@area}{\filename@base}%
+ \endgroup
+}
+\def\subfiles@addimportpath#1{%
+ \def\subfiles@filelist{}%
+ \def\subfiles@sep{}%
+ \@for\subfiles@filename:=#1\do{%
+ \edef\subfiles@filelist{%
+ \subfiles@filelist
+ \subfiles@sep
+ \import@path
+ \subfiles@filename
+ }%
+ \def\subfiles@sep{,}%
+ }
+}
+\let\subfiles@bibliography\bibliography
+\renewcommand\bibliography[1]{%
+ \subfiles@addimportpath{#1}%
+ \expandafter\subfiles@bibliography\expandafter{\subfiles@filelist}%
+}
+\def\subfix#1{\import@path#1}
\endinput
%%
%% End of file `subfiles.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/subfiles.tlpobj new/tlpkg/tlpobj/subfiles.tlpobj
--- old/tlpkg/tlpobj/subfiles.tlpobj 2019-02-28 04:06:28.000000000 +0100
+++ new/tlpkg/tlpobj/subfiles.tlpobj 2020-02-15 01:54:15.000000000 +0100
@@ -1,6 +1,6 @@
name subfiles
category Package
-revision 48323
+revision 53782
shortdesc Individual typesetting of subfiles of a "main" document
relocated 1
longdesc Using subfiles the user can handle multi-file projects more
@@ -11,8 +11,10 @@
RELOC/tex/latex/subfiles/subfiles.cls
RELOC/tex/latex/subfiles/subfiles.sty
catalogue-also combine standalone
+catalogue-contact-bugs https://github.com/gsalzer/subfiles/issues
+catalogue-contact-repository https://github.com/gsalzer/subfiles
+catalogue-contact-support https://tex.stackexchange.com/
catalogue-ctan /macros/latex/contrib/subfiles
-catalogue-date 2018-07-31 17:12:00 +0200
catalogue-license lppl1.3
-catalogue-topics subdocs
-catalogue-version 1.2
+catalogue-topics subdocs class
+catalogue-version 1.6
++++++ suftesi.doc.tar.xz ++++++
Binary files old/doc/latex/suftesi/suftesi.pdf and new/doc/latex/suftesi/suftesi.pdf differ
Binary files old/doc/latex/suftesi/templates.zip and new/doc/latex/suftesi/templates.zip differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suftesi.doc.tlpobj new/tlpkg/tlpobj/suftesi.doc.tlpobj
--- old/tlpkg/tlpobj/suftesi.doc.tlpobj 2019-02-28 04:06:29.000000000 +0100
+++ new/tlpkg/tlpobj/suftesi.doc.tlpobj 2020-02-26 01:55:05.000000000 +0100
@@ -1,8 +1,9 @@
name suftesi.doc
category Package
-revision 49138
+revision 53903
shortdesc doc files of suftesi
relocated 1
-docfiles size=270
+docfiles size=354
RELOC/doc/latex/suftesi/README
RELOC/doc/latex/suftesi/suftesi.pdf
+ RELOC/doc/latex/suftesi/templates.zip
++++++ suftesi.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/suftesi/suftesi.cls new/tex/latex/suftesi/suftesi.cls
--- old/tex/latex/suftesi/suftesi.cls 2018-11-12 23:10:37.000000000 +0100
+++ new/tex/latex/suftesi/suftesi.cls 2020-02-25 02:22:11.000000000 +0100
@@ -6,7 +6,7 @@
%%
%% suftesi.dtx (with options: `class')
%%
-%% Copyright 2009-2018 by Ivan Valbusa
+%% Copyright 2009-2020 by Ivan Valbusa
%%
%% This program is provided under the terms of the
%% LaTeX Project Public License distributed from CTAN
@@ -19,17 +19,10 @@
%%
\NeedsTeXFormat{LaTeX2e}[2005/12/01]
\ProvidesClass{suftesi}
- [2018/11/09 v2.9.1 A class for typesetting theses, books and articles]
+ [2020/02/24 v2.9.8 A class for typesetting theses, books and articles]
+
+
-\ClassWarningNoLine{suftesi}{%
- ******************************************\MessageBreak
- * DO NOT MODIFY THE STYLES OF THIS CLASS\MessageBreak
- * WITH PACKAGES AND/OR COMMANDS WHICH\MessageBreak
- * MAY CHANGE THE LAYOUT OF THE DOCUMENT.\MessageBreak
- * SEE DOCUMENTATION FOR DETAILS.\MessageBreak
- * ANYWAY, DON'T WORRY!\MessageBreak
- * THIS IS A HARMLESS MESSAGE :-)\MessageBreak
- ******************************************}
\RequirePackage{xkeyval}
\newif\ifsuftesi@compatibility
\newif\ifsuftesi@nofont
@@ -76,6 +69,9 @@
\newif\ifsuftesi@twocolumnlot
\newif\ifsuftesi@reverseauthortitle
\newif\ifsuftesi@collection
+\newif\ifsuftesi@toccompactsec
+\newif\ifsuftesi@toccompactsubsec
+\newif\ifsuftesi@toccompactsubsubsec
\DeclareOption{a4paper}{%
\ClassWarningNoLine{suftesi}{Option 'a4paper' not available}{}}
\DeclareOption{a5paper}{%
@@ -92,16 +88,22 @@
\ProcessOptions
\relax
\LoadClass{book}
+\RequirePackage{fontsize}
+\DeclareOptionX{parindent}{\setlength{\parindent}{#1}}
+\ExecuteOptionsX{parindent=\baselineskip}
+\ProcessOptionsX*\relax
\define@choicekey{}{structure}[\val\nr]
{book,article,collection}[book]{%
\ifcase\nr\relax
-\disable@keys{}{secnumstyle}
+\def\SUF(a)chapswitch{\thechapter.}
\or
\suftesi@articletrue
\@titlepagefalse
+\def\SUF@chapswitch{}
\or
\suftesi@collectiontrue
\setkeys{}{headerstyle=authortitleinner}
+\def\SUF@chapswitch{}
\fi}
\define@choicekey{}{documentstructure}[\val\nr]
{book,article,collection}[book]{%
@@ -120,11 +122,12 @@
{standard,standardaureo,periodical,compact,compactaureo,supercompact,
supercompactaureo,periodicalaureo}[standard]{%
\ifcase\nr\relax
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
a4paper,
includeheadfoot=true,
@@ -134,11 +137,12 @@
marginparwidth= 30mm,
marginparsep= 12pt}
\or
+ \DeclareRobustCommand{\SUF@partsize}{\Large}
\DeclareRobustCommand{\SUF@chaptersize}{\Large}
\DeclareRobustCommand{\SUF@sectionsize}{\large}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
a4paper,
includeheadfoot=true,
@@ -149,6 +153,7 @@
marginparsep= 12pt}
\or
\suftesi@periodicaltrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -165,6 +170,7 @@
marginparsep= 10pt}
\or
\suftesi@compacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -181,6 +187,7 @@
marginparsep= 9pt}
\or
\suftesi@compactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -197,6 +204,7 @@
marginparsep= 9pt}
\or
\suftesi@supercompacttrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -213,6 +221,7 @@
marginparsep= 8pt}
\or
\suftesi@supercompactaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
@@ -229,11 +238,12 @@
marginparsep= 7pt}
\or
\suftesi@periodicalaureotrue
+ \DeclareRobustCommand{\SUF@partsize}{\large}
\DeclareRobustCommand{\SUF@chaptersize}{\large}
\DeclareRobustCommand{\SUF@sectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsectionsize}{\normalsize}
\DeclareRobustCommand{\SUF@subsubsectionsize}{\normalsize}
- \geometry{%
+ \geometry{
heightrounded,
includeheadfoot=true,
textwidth= 120mm,
@@ -432,81 +442,141 @@
\ifcase\nr\relax
\def\SUF@thepart{\arabic{part}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF@dotpart{}
- \def\SUF@toclabelnum{\@Roman}
\or
\def\SUF@thepart{\arabic{part}}
\def\SUF(a)dotpart{.}
- \def\SUF@toclabelnum{}
\or
\def\SUF@thepart{\textsc{\roman{part}}}
\def\SUF(a)dotpart{.}
- \def\SUF@toclabelnum{\scshape\@roman}
\or
\def\SUF@thepart{\Roman{part}}
\def\SUF(a)dotpart{.}
- \def\SUF@toclabelnum{\@Roman}
\fi}
\define@choicekey{}{chapnumstyle}[\val\nr]{arabic,roman,Roman,
dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
\def\SUF@thechapter{\arabic{chapter}}
+ \def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{}
+ \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
+ \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
+ \def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF@dotchap{}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\or
\def\SUF@thechapter{\arabic{chapter}}
+ \def\SUF@HEAD@thechapter{\arabic{chapter}}
\def\SUF(a)dotchap{.}
- \def\SUF@toclabelnum{}
+ \def\SUF@CHAP@thecontentslabel{\thecontentslabel}
\or
\def\SUF@thechapter{\textsc{\roman{chapter}}}
+ \def\SUF@HEAD@thechapter{\textsc{\roman{chapter}}}
\def\SUF(a)dotchap{.}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@CHAP@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
\def\SUF@thechapter{\Roman{chapter}}
+ \def\SUF@HEAD@thechapter{\Roman{chapter}}
\def\SUF(a)dotchap{.}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@CHAP@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define@choicekey{}{secnumstyle}[\val\nr]
{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
\ifcase\nr\relax
- \def\SUF@thesection{\arabic{section}}
+ \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
+ \def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{}
+ \def\SUF@SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF@thesection{\textsc{\roman{section}}}
+ \def\SUF@thesection{\textsc{\SUF@chapswitch\roman{section}}}
+ \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF@thesection{\Roman{section}}
+ \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
+ \def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF@dotsec{}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
\or
- \def\SUF@thesection{\arabic{section}}
+ \def\SUF@thesection{\SUF@chapswitch\arabic{section}}
+ \def\SUF@HEAD@thesection{\arabic{section}}
\def\SUF(a)dotsec{.}
- \def\SUF@toclabelnum{}
+ \def\SUF@SEC@thecontentslabel{\thecontentslabel}
\or
- \def\SUF@thesection{\textsc{\roman{section}}}
+ \def\SUF@thesection{\SUF@chapswitch\textsc{\roman{section}}}
+ \def\SUF@HEAD@thesection{\textsc{\roman{section}}}
\def\SUF(a)dotsec{.}
- \def\SUF@toclabelnum{\scshape\@roman}
+ \def\SUF@SEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
\or
- \def\SUF@thesection{\Roman{section}}
+ \def\SUF@thesection{\SUF@chapswitch\Roman{section}}
+ \def\SUF@HEAD@thesection{\Roman{section}}
\def\SUF(a)dotsec{.}
- \def\SUF@toclabelnum{\@Roman}
+ \def\SUF@SEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\fi}
+\define@choicekey{}{subsecnumstyle}[\val\nr]
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+\def\SUF@dotsubsec{}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\arabic{subsection}}
+\def\SUF(a)dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\textsc{\roman{subsection}}}
+\def\SUF(a)dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsection{\SUF@thesection.\Roman{subsection}}
+\def\SUF(a)dotsubsec{.}
+\def\SUF@SUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\fi}
+\define@choicekey{}{subsubsecnumstyle}[\val\nr]
+{arabic,roman,Roman,dotarabic,dotroman,dotRoman}[arabic]{%
+\ifcase\nr\relax
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+\def\SUF@dotsubsubsec{}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\arabic{subsubsection}}
+\def\SUF(a)dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\thecontentslabel}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\textsc{\roman{subsubsection}}}
+\def\SUF(a)dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\textsc{\@roman{\thecontentslabel}}}
+\or
+\def\SUF@thesubsubsection{\SUF@thesubsection.\Roman{subsubsection}}
+\def\SUF(a)dotsubsubsec{.}
+\def\SUF@SUBSUBSEC@thecontentslabel{\@Roman{\thecontentslabel}}
\fi}
\define@choicekey{}{smallcapsstyle}[\val\nr]
{low,upper}[low]{%
@@ -517,6 +587,26 @@
\def\suftesi@MakeTextLowercase{\relax}
\def\suftesi@MakeTextTOCLowercase{\relax}
\fi}
+\newcommand{\partfont}[1]{\def\SUF@PART@StyleSwitch{#1}}
+\newcommand{\chapfont}[1]{\def\SUF@CHAP@StyleSwitch{#1}}
+\newcommand{\secfont}[1]{\def\SUF@SEC@StyleSwitch{#1}}
+\newcommand{\subsecfont}[1]{\def\SUF@SUBSEC@StyleSwitch{#1}}
+\newcommand{\subsubsecfont}[1]{\def\SUF@SUBSUBSEC@StyleSwitch{#1}}
+\newcommand{\chapnumfont}[1]{\def\SUF@thechapter{#1}}
+\newcommand{\secnumfont}[1]{\def\SUF@thesection{#1}}
+\newcommand{\subsecnumfont}[1]{\def\SUF@thesubsection{#1}}
+\newcommand{\subsubsecnumfont}[1]{\def\SUF@thesubsubsection{#1}}
+\newcommand{\titlefont}[1]{\def\SUF@titlefont@Switch{#1}}
+\newcommand{\authorfont}[1]{\def\SUF@authorfont@Switch{#1}}
+\newcommand{\tocchapfont}[1]{\def\SUF@tocCHAP@font{#1}}
+\newcommand{\tocsecfont}[1]{\def\SUF@tocSEC@font{#1}}
+\newcommand{\tocsubsecfont}[1]{\def\SUF@tocSUBSEC@font{#1}}
+\newcommand{\tocsubsubsecfont}[1]{\def\SUF@tocSUBSUBSEC@font{#1}}
+\newcommand{\tocpartnumfont}[1]{\def\SUF@PART@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocchapnumfont}[1]{\def\SUF@CHAP@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsecnumfont}[1]{\def\SUF@SEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsecnumfont}[1]{\def\SUF@SUBSEC@thecontentslabel{#1\thecontentslabel}}
+\newcommand{\tocsubsubsecnumfont}[1]{\def\SUF@SUBSUBSEC@thecontentslabel{#1\thecontentslabel}}
\define@choicekey{}{headerstyle}[\val\nr]
{inner,center,plain,authortitleinner,
authortitlecenter}[inner]{%
@@ -620,18 +710,16 @@
\relax
\fi}
\RequirePackage{caption}
+\captionsetup{labelsep=period,font=small,textformat=period}
\define@choicekey{}{captionstyle}[\val\nr]
{standard,sanserif,italic,smallcaps}[standard]{%
\ifcase\nr\relax
- \captionsetup{labelsep=period,font=small}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=sf}
\or
- \captionsetup{labelsep=period,font=small}
\captionsetup{font+=it}
\or
- \captionsetup{labelsep=period,font=small,labelfont=sc}
+ \captionsetup{labelfont=sc}
\fi
}
\define@choicekey{}{marginpar}[\val\nr]
@@ -656,6 +744,30 @@
\or
\suftesi@pagelefttoctrue
\fi}
+\define@choicekey{}{compacttoc}[\val\nr]{%
+sec,subsec,subsubsec}[sec]{%
+\ifcase\nr\relax
+\suftesi@toccompactsectrue
+\suftesi@toccompactsubsectrue
+\suftesi@toccompactsubsubsectrue
+\def\suf(a)sscorrect{\hskip.5em}
+\def\suf(a)ssscorrect{\hskip.5em}
+ \def\suf(a)ctocdotsec{.}
+ \def\suf@ctocdotssec{}
+ \def\suf@ctocdotsssec{}
+\or
+\suftesi@toccompactsubsectrue
+\suftesi@toccompactsubsubsectrue
+\def\suf@sscorrect{\relax}
+\def\suf(a)ssscorrect{\hskip.5em}
+ \def\suf(a)ctocdotssec{.}
+ \def\suf@ctocdotsssec{}
+\or
+\suftesi@toccompactsubsubsectrue
+\def\suf@sscorrect{\relax}
+\def\suf@ssscorrect{\relax}
+ \def\suf(a)ctocdotsssec{.}
+\fi}
\define@choicekey{}{twocolcontents}[\val\nr]{%
toc,lof,lot,toclof,toclot,loflot,all}[all]{%
\ifcase\nr\relax
@@ -724,13 +836,6 @@
\or
\suftesi@greekfonttrue\suftesi@cbgreektrue
\fi}
-\define@choicekey{}{parindent}[\val\nr]
- {compact,wide}[compact]{%
-\ifcase\nr\relax
-\setlength\parindent{1em}
-\or
-\setlength\parindent{1.5em}
-\fi}
\define@choicekey{}{partpage}[\val\nr]{true,false}[true]{%
\ifcase\nr\relax
\suftesi@partpagetrue
@@ -963,7 +1068,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi@periodicalaureotrue
\suftesi@FSPLtrue
@@ -981,7 +1086,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\or
\suftesi@periodicalaureotrue
\suftesi@FSPLtrue
@@ -1000,7 +1105,7 @@
subsecfont,subsubsecfont,partstyle,chapstyle,secstyle,%
subsecstyle,subsubsecstyle,partnumstyle,chapnumstyle,%
secnumstyle,tocstyle,headerstyle,headerfont,quotestyle,%
-quotesize,footnotestyle,liststyle,captionstyle,parindent}
+quotesize,footnotestyle,liststyle,captionstyle}
\fi}
\define@choicekey{}{papertitlestyle}[\val\nr]{%
left,center,right}[left]{%
@@ -1025,7 +1130,6 @@
\or
\def\SUF@titlefont@Switch{\expandafter\SUF@titlesmallcaps}
\fi}
-
\define@choicekey{}{authorfont}[\val\nr]{roman,italic,smallcaps}[roman]{%
\ifcase\nr\relax
\def\SUF@authorfont@Switch{\relax}
@@ -1035,9 +1139,9 @@
\def\SUF@authorfont@Switch{\expandafter\SUF@titlesmallcaps}
\fi}
\ExecuteOptionsX<>{
+ structure=book,
captionstyle=standard,
marginpar=true,
- parindent=compact,
tocstyle=standard,
defaultfont=cochineal,
mathfont=minimal,
@@ -1059,9 +1163,11 @@
subsecfont=roman,
subsubsecfont=roman,
headerfont=roman,
- secnumstyle=arabic,
partnumstyle=Roman,
chapnumstyle=arabic,
+ secnumstyle=arabic,
+ subsecnumstyle=arabic,
+ subsubsecnumstyle=arabic,
smallcapsstyle=low,
titlefont=italic,
authorfont=roman,
@@ -1069,8 +1175,6 @@
tocauthorfont=roman,
revauthortitle=false,
papertitlestyle=left,
- authorfont=roman,
- titlefont=italic,
tocchapfont=roman,
tocsecfont=roman,
tocsubsecfont=roman,
@@ -1087,12 +1191,12 @@
\XKV@useoption{legalpaper}\XKV@useoption{executivepaper}
\XKV@useoption{landscape}
\def\XKV@classoptionslist{}
-\RequirePackage{color}
- \definecolor{sufred}{rgb}{0.5,0,0}
- \definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{multicol}
\RequirePackage{emptypage}
\RequirePackage{microtype}
+\RequirePackage{color}
+\definecolor{sufred}{rgb}{0.5,0,0}
+\definecolor{sufgray}{rgb}{0.5,0.5,0.5}
\RequirePackage{iftex}
\ifLuaTeX
\RequirePackage{luatex85}
@@ -1390,63 +1494,61 @@
{\SUF@CHAP@StyleSwitch}
\fi
\ifsuftesi@numparchap
- \setlength{\SUF(a)ADJnumparchap}{-2.5\baselineskip}
+ \setlength{\SUF@ADJnumparchap}{-6ex}
\else
\setlength{\SUF@ADJnumparchap}{0pt}
\fi}
\def\SUF@default@SECTIONS{
\ifsuftesi@numparsec
\titleformat{\section}[display]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
- {\ifsuftesi@article\SUF@thesection
- \else\thesection\fi\SUF@dotsec}
- {0ex}
- {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
+{\SUF@sectionsize\SUF@lr@SECSwitch}
+{\SUF@thesection\SUF@dotsec}
+{0ex}
+{\SUF@SEC@StyleSwitch}
+\titlespacing*{\section}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\section}[hang]
- {\SUF@sectionsize\SUF@lr@SECSwitch}
- {\ifsuftesi@article\SUF@thesection
- \else\thesection\fi\SUF@dotsec}
- {1em}
- {\SUF@SEC@StyleSwitch}
-\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
+{\SUF@sectionsize\SUF@lr@SECSwitch}
+{\SUF@thesection\SUF@dotsec}
+{1em}
+{\SUF@SEC@StyleSwitch}
+\titlespacing*{\section}{0ex}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsec
\titleformat{\subsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
- {\textnormal\thesubsection}
- {0ex}
- {\SUF@SUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+{\textnormal\SUF@thesubsection\SUF@dotsubsec}
+{0ex}
+{\SUF@SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
- {\textnormal\thesubsection}
- {1em}
- {\SUF@SUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSECSwitch}
+{\textnormal\SUF@thesubsection\SUF@dotsubsec}
+{1em}
+{\SUF@SUBSEC@StyleSwitch}
\titlespacing*{\subsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
\ifsuftesi@numparsubsubsec
\titleformat{\subsubsection}[display]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
- {\textnormal\thesubsubsection}
- {0ex}
- {\SUF@SUBSUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+{0ex}
+{\SUF@SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{0em}{\sectionsep}{\sectionsep}[0em]
\else
\titleformat{\subsubsection}[hang]
- {\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
- {\textnormal\thesubsubsection}
- {1em}
- {\SUF@SUBSUBSEC@StyleSwitch}
+{\SUF@subsectionsize\SUF@lr@SUBSUBSECSwitch}
+{\textnormal\SUF@thesubsubsection\SUF@dotsubsubsec}
+{1em}
+{\SUF@SUBSUBSEC@StyleSwitch}
\titlespacing*{\subsubsection}{\parindent}{\sectionsep}{\sectionsep}[0ex]
\fi
}
\SUF@default@CHAPTER
\SUF@default@SECTIONS
\ifsuftesi@periodical
- \titlespacing*{\chapter}{0em}{0\SUF@ADJnumparchap}{18ex}
+ \titlespacing*{\chapter}{0em}{\SUF@ADJnumparchap}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else
\ifsuftesi@periodicalaureo
@@ -1470,7 +1572,7 @@
\titlespacing*{name=\chapter,numberless}{0em}{0pt}{18ex}
\else%standard/standardaureo
\titlespacing*{\chapter}{0em}{%
- \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
+ \dimexpr(6ex+\SUF@ADJnumparchap)}{18ex}
\titlespacing*{name=\chapter,numberless}{0em}{6ex}{18ex}
\fi
\fi
@@ -1504,13 +1606,13 @@
\fi
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -1518,13 +1620,13 @@
\else
\ifsuftesi@numparpart
\titleformat{\part}[display]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{2ex}
{\SUF@PART@StyleSwitch}
\else
\titleformat{\part}[hang]
- {\SUF@chaptersize\SUF@lr@PARTSwitch}
+ {\SUF@partsize\SUF@lr@PARTSwitch}
{\SUF@PART@StyleSwitch\partname\hskip.5em\SUF@thepart\SUF@dotpart}
{1em}
{\SUF@PART@StyleSwitch}
@@ -1545,7 +1647,7 @@
{}
[{.}\hspace*{1em}]
\titlespacing*{\subparagraph}{\parindent}{.5\sectionsep}{.5\sectionsep}
-\ifsuftesi@article
+\ifsuftesi@article
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\refname]{%
@@ -1577,7 +1679,7 @@
\subsection{#1}}}%
{\relax}%
}%
-\else
+\else
\AtBeginDocument{%
\@ifpackageloaded{biblatex}{%
\defbibheading{bibliography}[\bibname]{%
@@ -1691,7 +1793,6 @@
\def\isbn#1{\gdef\@issn{#1}}
\def\@issn{\@latex@warning@no@line{%
No \noexpand\isbn given}}
-
\renewcommand*{\title}[2][]{\gdef\@headtitle{#1}\gdef\@title{#2}}
\edef\title{\noexpand\@dblarg
\expandafter\noexpand\csname\string\title\endcsname}
@@ -1936,7 +2037,6 @@
\protect\ClassWarningNoLine{suftesi}{%
No \string\author\space given\MessageBreak%
See the class documentation for explanation}}
-
\newcommand*\l@title[2]{%
\ifnum \c@tocdepth >\m@ne
\addpenalty{-\@highpenalty}%
@@ -2123,49 +2223,79 @@
\columnsep 35\p@
\let\item\@idxitem}
{\if@restonecol\onecolumn\else\clearpage\fi}
-\newcommand{\appendicesname}[1]{\def\SUF@appendices{#1}}
- \appendicesname{Appendici}
- \newcommand{\appendixpage}{\SUF@appendixpage}
-\def\SUF@appendixpage{%
- \@mainmattertrue
- \titlecontents{part}
- [0em]
- {\addvspace{3ex}}
- {}
- {}
- {}
- [\addvspace{1ex}]
-\let\contentspage\relax
- \cleardoublepage
- \thispagestyle{empty}
- \addcontentsline{toc}{part}{\SUF@appendices}
- \begingroup
- \centering
- \null\vfil
- {\LARGE\SUF@appendices\par}
- \vfil
- \endgroup
- \cleardoublepage
-\titlecontents{part}
- [0em]
- {\addvspace{3ex}\partname~}
- {\makebox[\SUF@label@part][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
- {}
- {}
- [\addvspace{1ex}]
+\RequirePackage{appendix}
+\renewcommand{\appendixpagename}{Appendici}
+\renewcommand{\appendixtocname}{Appendici}
+\renewcommand{\appendixname}{Appendice}
+\noappendicestocpagenum
+\def\appendicesname{%
+ \ClassError{suftesi}%
+ {Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead.
+ See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}
+{Command \noexpand\appendicesname undefined\MessageBreak
+ Redefine the \noexpand\appendixpagename command instead.
+ See the 'appendix' package documentation.\MessageBreak
+ \noexpand\renewcommand{\noexpand\appendixpagename{newname}}}}
+\renewcommand{\@chap@pppage}{%
+\clear@ppage
+\thispagestyle{plain}%
+\if@twocolumn\onecolumn\@tempswatrue\else\@tempswafalse\fi
+\null\vfil
+\markboth{}{}%
+{\centering
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\vfil\newpage
+\if@twoside
+\if@openright
+\null
+\thispagestyle{empty}%
+\newpage
+\fi
+\fi
+\if@tempswa
+\twocolumn
+\fi
+}
+\renewcommand{\@sec@pppage}{%
+\par
+\addvspace{4ex}%
+\@afterindentfalse
+{\parindent \z@ \raggedright
+\interlinepenalty \@M
+\normalfont
+\SUF@chaptersize
+ \SUF@CHAP@StyleSwitch\expandafter\appendixpagename%
+\markboth{}{}\par}%
+\if@dotoc@pp
+\addappheadtotoc
+\fi
+\nobreak
+\vskip 3ex
+\@afterheading
}
\ifsuftesi@article
\renewcommand\appendix{\par
\setcounter{section}{0}%
\setcounter{subsection}{0}%
- \gdef\SUF@thesection{\@Alph\c@section}}
+ \gdef\SUF@thesection{\@Alph\c@section}%
+ \gdef\SUF@HEAD@thesection{\@Alph\c@section}%
+ \renewcommand{\thesection}{\@Alph\c@section}}
\else
\renewcommand\appendix{\par
\setcounter{chapter}{0}%
\setcounter{section}{0}%
\gdef\@chapapp{\appendixname}%
- \gdef\SUF@thechapter{\@Alph\c@chapter}}
+ \gdef\SUF@thechapter{\@Alph\c@chapter}%
+ \gdef\SUF@HEAD@thechapter{\@Alph\c@chapter}%
+ \renewcommand{\thechapter}{\@Alph\c@chapter}}
\fi
\RequirePackage{fancyhdr}
\newcommand{\versionstring}[1]{\def\version@string{#1}}
@@ -2176,9 +2306,9 @@
\renewcommand{\footnoterule}{}
\def\SUF@versionstring{\texttt{\version@string{} \today}}
\renewcommand{\chaptermark}[1]{%
- \markboth{\chaptertitlename\ \SUF@thechapter}{#1}}
+ \markboth{\chaptertitlename\ \protect\SUF@HEAD@thechapter}{#1}}
\ifsuftesi@article
- \renewcommand{\sectionmark}[1]{\markright{\SUF(a)thesection.\ #1}}
+ \renewcommand{\sectionmark}[1]{\markright{\protect\SUF@HEAD@thesection.\ #1}}
\else
\renewcommand{\sectionmark}[1]{}
\fi
@@ -2234,7 +2364,7 @@
{\list{}{\leftmargin \parindent
\SUF@quote@style}%
\item\relax%
- \SUF@quotation@size}%\ignorespaces?
+ \SUF@quotation@size}% \ignorespaces?
{\endlist}
\renewenvironment{verse}
{\let\\\@centercr
@@ -2409,6 +2539,8 @@
\addtolength{\csname SUF@tocindent@#1\endcsname}{#2}%
}
}
+\newcommand{\adjtoclabelsep}{\hskip.2em plus 1pt minus 1pt}
+\newcommand{\adjtocpagesep}{\hskip.5em plus 2pt minus 1pt}
\newcommand{\toclabelspace}{%
\ClassError{suftesi}
{\MessageBreak
@@ -2451,7 +2583,7 @@
[0em]
{\addvspace{3ex}\partname\hspace*{.5em}}
{\makebox[\SUF@label@part][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}}
+ \thecontentslabel}\hspace*{1em}}
{}
{}
[\addvspace{1ex}]
@@ -2514,48 +2646,64 @@
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap%
\makebox[\SUF@label@chap][l]{%
- \SUF@toclabelnum\thecontentslabel}\hspace*{1em}%
+ \SUF@CHAP@thecontentslabel}\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tochang@chap%
\makebox[1em][l]{\thecontentspage}%
\hskip\SUF@addto@tochang@chap\SUF@tocCHAP@font}
{}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tochang@chap]{}{%
+\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tochang@sec]
{}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
- \makebox[\SUF@label@sec][l]{%
- \ifsuftesi@article\SUF@toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\SUF@tochang@sec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@sec%
\SUF@tocSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tochang@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tochang@subsec]
{}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
- \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\SUF@tochang@subsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsec%
\SUF@tocSUBSEC@font}
{}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tochang@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tochang@subsubsec]
{}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
- \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\SUF@tochang@subsubsec%
\makebox[1em][l]{\thecontentspage}\hskip\SUF@addto@tochang@subsubsec%
\SUF@tocSUBSUBSEC@font}
{}
+\fi
\titlecontents{paragraph}
[\SUF@tochang@par]
{}
@@ -2638,43 +2786,59 @@
[\SUF@tocindent@chap]
{\addvspace{2ex}}
{\hskip-\SUF@tocindent@chap%
- \makebox[\SUF@label@chap][l]{\SUF@toclabelnum\thecontentslabel}%
+ \makebox[\SUF@label@chap][l]{\SUF@CHAP@thecontentslabel}%
\hspace*{1em}%
\SUF@tocCHAP@font}
{\hskip-\SUF@tocindent@chap%
\SUF@tocCHAP@font}
{\SUF@chaptitlerule\contentspage}
[\addvspace{1ex}]
+\ifsuftesi@toccompactsec
+\titlecontents*{section}[\SUF@tocindent@chap]{}{%
+\SUF@SEC@thecontentslabel\adjtoclabelsep\SUF@tocSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsec]
+\else
\titlecontents{section}
[\SUF@tocindent@sec]
{}
{\hskip-\dimexpr(\SUF@label@sec+1em)%
- \makebox[\SUF@label@sec][l]{%
- \ifsuftesi@article\SUF@toclabelnum%
- \else\fi\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@sec][l]{\SUF@SEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSEC@font}
{\hskip-\dimexpr(\SUF@label@sec+1em)%
\SUF@tocSEC@font}
{\ifsuftesi@article\SUF@chaptitlerule%
\else\SUF@titlerule\fi\contentspage}
+\fi
+\ifsuftesi@toccompactsubsec
+\titlecontents*{subsection}[\SUF@tocindent@sec]{\suf@sscorrect}{%
+\SUF@SUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotssec]
+\else
\titlecontents{subsection}
[\SUF@tocindent@subsec]
{}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
- \makebox[\SUF@label@subsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsec][l]{\SUF@SUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsec+1em)%
\SUF@tocSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
+\ifsuftesi@toccompactsubsubsec
+\titlecontents*{subsubsection}[\SUF@tocindent@subsec]{\suf@ssscorrect}{%
+\SUF@SUBSUBSEC@thecontentslabel\adjtoclabelsep\SUF@tocSUBSUBSEC@font}{}{,
+\thecontentspage}[][.\adjtocpagesep][\suf@ctocdotsssec]
+\else
\titlecontents{subsubsection}
[\SUF@tocindent@subsubsec]
{}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
- \makebox[\SUF@label@subsubsec][l]{\thecontentslabel}\hspace*{1em}%
+ \makebox[\SUF@label@subsubsec][l]{\SUF@SUBSUBSEC@thecontentslabel}\hspace*{1em}%
\SUF@tocSUBSUBSEC@font}
{\hskip-\dimexpr(\SUF@label@subsubsec+1em)%
\SUF@tocSUBSUBSEC@font}
{\SUF@titlerule\contentspage}
+\fi
\titlecontents{paragraph}
[\SUF@tocindent@par]
{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/suftesi.tlpobj new/tlpkg/tlpobj/suftesi.tlpobj
--- old/tlpkg/tlpobj/suftesi.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/suftesi.tlpobj 2020-02-26 01:55:06.000000000 +0100
@@ -1,14 +1,13 @@
name suftesi
category Package
-revision 49138
+revision 53903
shortdesc A document class for typesetting theses, books and articles
relocated 1
longdesc The class can be used to typeset any kind of book (originally
longdesc designed for use in the humanities).
-runfiles size=21
+runfiles size=23
RELOC/tex/latex/suftesi/suftesi.cls
catalogue-ctan /macros/latex/contrib/suftesi
-catalogue-date 2018-11-12 12:44:06 +0100
catalogue-license lppl1.3
catalogue-topics book-pub class dissertation
-catalogue-version 2.9.1
+catalogue-version 2.9.8
++++++ superiors.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/superiors/README new/doc/fonts/superiors/README
--- old/doc/fonts/superiors/README 2015-03-02 23:00:03.000000000 +0100
+++ new/doc/fonts/superiors/README 2019-08-19 22:57:34.000000000 +0200
@@ -1,11 +1,14 @@
This small package provides a means of adding to or modifying the superior figures used for footnote and endnote markers in any font collection.
-Current version: 1.05
+Current version: 1.06
This material is subject to the LaTeX Project Public License. See
http://www.ctan.org/license/lppl1.3
for the details of that license.
+Changes in 1.06
+Added more abbreviations and added a check for KOMA, with which it is incompatibe.
+
Changes in 1.05
1. Added option to allow the tfm containing the superior figures to be specified by an abbreviation.
2. Modified code so that options supspaced and raised actually do what they are claimed to do.
Binary files old/doc/fonts/superiors/superiors-doc.pdf and new/doc/fonts/superiors/superiors-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/superiors/superiors-doc.tex new/doc/fonts/superiors/superiors-doc.tex
--- old/doc/fonts/superiors/superiors-doc.tex 2015-03-02 23:00:03.000000000 +0100
+++ new/doc/fonts/superiors/superiors-doc.tex 2019-08-19 22:57:34.000000000 +0200
@@ -9,7 +9,7 @@
\usepackage[TS1,T1]{fontenc}
\usepackage{textcomp}
\usepackage[scaled=.85]{beramono}
-\usepackage[libertine,cmbraces]{newtxmath}
+\usepackage[libertine]{newtxmath}
\makeatletter
\def\libertine@figurestyle{OsF}
\makeatother
@@ -27,10 +27,19 @@
\section{Briefly}
The default behavior of footnote and endnote markers in \LaTeX\ is to print the number as if it were a mathematical superscript. In most cases, this means the size is about 70\% of the normal lining figure and the top is somewhat above the tops of capital letters. In many cases, the superscript figure is simply reduced in all dimensions by about 70\%, making them appear rather slight, though overly tall. (The \textsf{libertine} package used for preparing this document has a custom footnote illustrated below.)
-As an alternative, one may use superior figures---small figures, usually 50\% to 60\% of the height of lining figures, like \textsu{1234567890}. Commonly, they are designed so that the tops of the numbers are aligned with the tops of the capital letters in the font, though sometimes a little higher, corresponding to the ascender height. PostScript fonts have for a long time mostly contained just a small subset $\{1,2,3\}$ of the possible superior digits, and most OpenType fonts in the Adobe portfolio, other than the most popular and the most recent, contain the same small subset. Moreover, the \textsf{TS1} encoding includes slots for only those three superior figures. Even the recent STIX collection contains just the basic three.
+As an alternative, one may use superior figures---small figures, usually 50\% to 60\% of the height of lining figures, like \textsu{1234567890}. Commonly, they are designed so that the tops of the numbers are aligned with the tops of the capital letters in the font, though sometimes a little higher, corresponding to the ascender height. PostScript fonts have for a long time mostly contained just a small subset $\{1,2,3\}$ of the possible superior digits, and most OpenType fonts in the Adobe portfolio, other than the most popular and the most recent, contain the same small subset. Moreover, the \textsf{TS1} encoding includes slots for only those three superior figures. Even the recent STIX collection contains just the basic three, at least in its original distribution.
-This package allows you to add a full set of superior figures to a font family that lacks one. It uses two predefined collections---the default is {\tt ntxsups-Regular-t1}, drawn from TeX Gyre Termes, while the second, {\tt libertinesups}, is taken from Libertine-Legacy. (The standard \textsf{libertine} package provides no access to these glyphs other than through footnote markers.) In addition, you may specify any \TeX\ tfm whose figure slots contain superior figures. The package also allows you to scale the size of the imported figures, to take into account your general font scaling, and to specify an amount by which to raise the imported, rescaled figures. You may also specify a spacing to apply before the footnote marker, using the option {\tt supspaced}. The package should be loaded after your Roman text font package\footnote{The {\tt newtxtext} package uses the {\tt ntxsups-*} superiors contained in the newtx package by default for footnote markers.}.
+This package allows you to add a full set of superior figures to a font family that lacks one. It uses two predefined collections---the default is {\tt ntxsups-Regular-t1}, drawn from TeX Gyre Termes, while the second, {\tt libertinesups}, is taken from Libertine-Legacy. (The standard \textsf{libertine} package provides no access to these glyphs other than through footnote markers.) In addition, you may specify any \TeX\ tfm whose figure slots contain superior figures. The package also allows you to scale the size of the imported figures, to take into account your general font scaling, and to specify an amount by which to raise the imported, rescaled figures. You may also specify a spacing to apply before the footnote marker, using the option {\tt supspaced}. The package should be loaded \textbf{after} your Roman text font package\footnote{The {\tt newtxtext} package uses the {\tt ntxsups-*} superiors contained in the newtx package by default for footnote markers.} so that it overwrites any existing definitions of \verb|\sustyle| (a switch to turn on superior letters and figures, usually employed within braces to limit its effect, \verb|\textsu| (a macro that applies the \verb|\sustyle| switch to its argument) and the footnote style macros.
+
+\textsc{Important Notes:} \\
+\begin{itemize}
+\item
+\verb|\sustyle| is a simple text switch---the value of the parameter {\tt raised} is ignored;
+\item \verb|\textsu| is a macro that reads the value of {\tt raised} and, if it is non-zero, created an \verb|\hbox| from its argument and raises it by the specified amount. In the latter case, the argument must be short as line breaks will not happen. If on the other hand {\tt raised} has a zero value, \verb|\textsu| acts like \verb|\sustyle|, permitting line breaks to occur.
+\item This package is not compatible with KOMA classes or packages and will stop loading if one is detected, leaving only a line in the log file.
+
+\end{itemize}
\textsc{Sample Invocations:}
@@ -104,6 +113,10 @@
Baskervaldx
garamondx
XCharter
+baskervillef
+cochineal
+stickstoo
+fbb
Adobe Bembo Std
Adobe Caslon Pro
Adobe Warnock Pro
@@ -121,16 +134,20 @@
You may, as of version 1.05, refer to a font to use for superior figures by using an abbreviated form. The following abbreviations are known to {\tt superiors} and may be activated by setting the option {\tt supsfam} to one of:
\begin{verbatim}
-newtx ---ntxsups-Regular-ot1,%
-newtxtext ---ntxsups-Regular-ot1,%
-newpx ---zplsups-Regular-ot1,%
-newpxtext ---zplsups-Regular-ot1,%
+newtx ---ntxsups-Regular-t1,%
+newtxtext ---ntxsups-Regular-t1,%
+newpx ---zplsups-Regular-t1,%
+newpxtext ---zplsups-Regular-t1,%
libertine ---libertinesups,%
garamondx ---NewG8-sups,%
zgm ---NewG8-sups,%
erewhon ---Erewhon-Regular-sup-t1,%
xcharter ---XCharter-Roman-sup-t1,%
baskervaldx ---Baskervaldx-Reg-sup-t1
+baskervillef ---BaskervilleF-Regular-sup-t1
+cochineal ---Cochineal-Roman-sup-t1
+stickstoo ---SticksToo-Regular-sup-t1
+fbb ---fbb-Regular-sup-t1
\end{verbatim}
For example, loading {\tt superiors} with the line
\begin{verbatim}
@@ -138,7 +155,7 @@
\end{verbatim}
has the same effect as
\begin{verbatim}
-\usepackage[supstfm=zplsups-Regular-ot1]{superiors}
+\usepackage[supstfm=zplsups-Regular-t1]{superiors}
\end{verbatim}
but may be easier to remember.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/superiors.doc.tlpobj new/tlpkg/tlpobj/superiors.doc.tlpobj
--- old/tlpkg/tlpobj/superiors.doc.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/superiors.doc.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,9 +1,9 @@
name superiors.doc
category Package
-revision 36422
+revision 51909
shortdesc doc files of superiors
relocated 1
-docfiles size=89
+docfiles size=93
RELOC/doc/fonts/superiors/README
RELOC/doc/fonts/superiors/libfoot0-crop.pdf
RELOC/doc/fonts/superiors/libfoot1-crop.pdf
++++++ superiors.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/superiors/superiors.sty new/tex/latex/superiors/superiors.sty
--- old/tex/latex/superiors/superiors.sty 2015-03-02 23:00:03.000000000 +0100
+++ new/tex/latex/superiors/superiors.sty 2019-08-19 22:57:34.000000000 +0200
@@ -1,14 +1,26 @@
\NeedsTeXFormat{LaTeX2e}
-\def\superiorsVersion{1.05}
-\def\superiorsDate{2015/03/01}
+\def\superiorsVersion{1.06}
+\def\superiorsDate{2019/08/18}
\ProvidesPackage{superiors}[\superiorsDate\space-\space\superiorsVersion
superiors (License LPPL) Michael Sharpe]
+\newif\ifsuperiors@KOMA
+\@ifundefined{KOMAClassName}{}{\superiors@KOMAtrue}
+\@ifundefined{ver@scrextend.sty}{}{\superiors@KOMAtrue}
+\ifsuperiors@KOMA
+ \message{Cannot load superiors with any KOMA class or package.^^J}
+ \endinput
+\fi
\RequirePackage{xkeyval}
\RequirePackage{pgffor}
-
+% Ensure that T1 is loaded, but don't change existing default encoding
+\def\t@one{T1}
+\ifx\encodingdefault\t@one\else%
+ \usepackage[T1,\encodingdefault]{fontenc}
+\fi
\def\sups@tfm{ntxsups-Regular-t1}
\let\sups@fam\@empty
\newdimen\superiors@scale
+\newdimen\superiors@raise
\def\superiors@raised{\z@}
\def\superiors(a)spaced{.04em}
\def\superiors(a)scaledval{1.0}
@@ -27,22 +39,32 @@
\ProcessOptions*
+\setlength{\superiors@raise}{\superiors@raised}
\setlength{\superiors@scale}{\superiors@scaledval\p@}
\superiors@scale=\superiors@supscale\superiors@scale %
\def\superiors@scaled{s*[\strip@pt\superiors@scale]}
\let\superiors@makefnmark\@makefnmark
\ifx\sups@fam\@empty\else%
-\foreach\x/\y in {newtx/ntxsups-Regular-ot1,%
-newtxtext/ntxsups-Regular-ot1,%
-newpx/zplsups-Regular-ot1,%
-newpxtext/zplsups-Regular-ot1,%
+\foreach\x/\y in {newtx/ntxsups-Regular-t1,%
+newtxtext/ntxsups-Regular-t1,%
+newpx/zplsups-Regular-t1,%
+newpxtext/zplsups-Regular-t1,%
libertine/libertinesups,%
garamondx/NewG8-sups,%
zgm/NewG8-sups,%
erewhon/Erewhon-Regular-sup-t1,%
xcharter/XCharter-Roman-sup-t1,%
-baskervaldx/Baskervaldx-Reg-sup-t1}
+baskervaldx/Baskervaldx-Reg-sup-t1,%
+baskervillef/BaskervilleF-Regular-sup-t1,%
+Baskervillef/BaskervilleF-Regular-sup-t1,%
+cochineal/Cochineal-Roman-sup-t1,%
+Cochineal/Cochineal-Reoman-sup-t1,%
+cochineal/Cochineal-Regular-sup-t1,%
+stickstoo/SticksToo-Regular-sup-t1,%
+stickstootext/SticksToo-Regular-sup-t1,%
+SticksToo/SticksToo-Regular-sup-t1,%
+fbb/fbb-Regular-sup-t1}
{\ifx\x\sups@fam\xdef\sups@tfm{\y}\breakforeach\fi}
\fi
@@ -54,8 +76,12 @@
\not@math@alphabet\sustyle\relax
\usefont{U}{zsups}{m}{n}}
-\def\textsu#1{\raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}}
-
+\ifdim\superiors@raise=\z@
+ \DeclareRobustCommand{\textsu}[1]{{\sustyle#1}}
+\else
+ \DeclareRobustCommand{\textsu}[1]{%
+ \raisebox{\superiors@raised}{\hbox{{\sustyle#1}}}}
+\fi
%\def\@makefnmark{\hbox{\textsu{\hspace*{\superiors@spaced}\@thefnmark}}}
\def\f@@tn@te{footnote}
\def\@makefnmark{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/superiors.tlpobj new/tlpkg/tlpobj/superiors.tlpobj
--- old/tlpkg/tlpobj/superiors.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/superiors.tlpobj 2019-08-20 01:53:48.000000000 +0200
@@ -1,6 +1,6 @@
name superiors
category Package
-revision 36422
+revision 51909
shortdesc Attach superior figures to a font family
relocated 1
longdesc The package allows the attachment of an arbitrary superior
@@ -16,7 +16,7 @@
RELOC/fonts/type1/public/superiors/libertinesups.pfb
RELOC/tex/latex/superiors/superiors.sty
catalogue-ctan /fonts/superiors
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-08-19 15:57:06 +0200
catalogue-license lppl
catalogue-topics font font-symbol font-type1 font-supp
-catalogue-version 1.05
+catalogue-version 1.06
++++++ supertabular.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/CATALOG new/doc/latex/supertabular/CATALOG
--- old/doc/latex/supertabular/CATALOG 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/CATALOG 2020-02-03 23:32:05.000000000 +0100
@@ -1,7 +1,7 @@
Name: supertabular (also called supertab)
-Problems-To: texniek(a)braams.cistron.nl
+Problems-To: texniek(a)braams.xs4all.nl
Author: J.L. Braams and T. Jurriens
-Version: 4.1d
+Version: 4.1g
Description:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/ChangeLog new/doc/latex/supertabular/ChangeLog
--- old/doc/latex/supertabular/ChangeLog 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/ChangeLog 2020-02-03 23:32:05.000000000 +0100
@@ -1,59 +1,105 @@
-2001-08-21 Johannes Braams (texniek at braams.cistron.nl)
+2020-02-02 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: Replaced the way the height of normal tabular
+ lines is calculated by basing it on the height and depth of
+ \strutbox. This also ment being able to take the \extrarowheight
+ from the array package into account.
+ Also the height of the first and subsequent heads was not taken
+ into account in the calculation of the available pageheigt. This
+ meant that especially the first part of the table could become too
+ high and hence be forced onto the next page (which is, by
+ consequence) not entirely filled).
+ Finally, if a caption preceeds the table, the entire height of the
+ caption and the white space around it may not yet be accounted in
+ \pagesofar. Therefore we substract a little extra from
+ \ST@pageleft.
+
+2020-01-26 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx: Updated the copyright year and rearranged the
+ text around the examples in order to get the first table to split
+ accross a page boundary again.
+
+2019-01-18 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The linenumber in the tracing information, that
+ is reported from within \\, is off by one when the optional
+ argument is missing. Therefore the input linenumber is now saved
+ before TeX starts scanning. Problem reported by Frank Mittelbach.
+
+2019-01-16 Johannes Braams <texniek at braams.xs4all.nl>
+
+ * supertabular.dtx: The option "pageshow" didn't work as it set a
+ too low value in \c@tracingst. Problem reported by Frank
+ Mittelbach.
+
+2019-01-12 Johannes Braams <texniek at braams.xs4all.nl>
+ * supertabular.dtx : The definition for the first table head was
+ different from the definition of the regular table heads.
+ This problem was reported by FMi as it produced an extra table in
+ an example.
+ The same was true for the table tail and the last table tail,
+ applied the same fix.
+ FMi also reported that a first table head, once set would appear on
+ all subsequent supertabulars. The internal macro's now `undefine'
+ themselves although this couteracts the change that was introduced
+ on 08-08-1999.
+
+2001-08-21 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : The macro \ST@next needs to be defined when
\ST@skippage was called. Therefore I moved the default definition
to earlier in the code; just before the \if clause after which it
is called; possibly defined by \ST@newpage. This problem was
- reported by Andrew Dorrell (dorrell(a)research.canon.com.au).
+ reported by Andrew Dorrell <dorrell(a)research.canon.com.au>.
-1999-08-08 Johannes Braams (texniek at braams.cistron.nl)
+1999-08-08 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : No longer re-initialize the internal variable
\@table@first@head and \@table@last@tail. This made it impossible
to have more than one supertabular in the same document with the
exact same appearance of the heads and tail without repeatedly
redeclaring the firsthead and/or lasttail. Reported by Christian
- Matuszewski (matuszew at informatik.uni-halle.de).
+ Matuszewski <matuszew(a)informatik.uni-halle.de>.
-Fri Nov 7 20:27:27 1997 Johannes Braams (texniek at braams.cistron.nl)
+Fri Nov 7 20:27:27 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : For standard LaTeX we need to change
\@@startpbox not \@startpbox. Found by Peter R Wilson
- (Peter.Wilson(a)PSS.Boeing.com)
+ <Peter.Wilson(a)PSS.Boeing.com>
-Wed Oct 8 22:35:40 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Oct 8 22:35:40 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Running the documentation revealed a loop;
inside the table tail and head \\ was reset to \@tabularcr instead
of to \@@tabularcr (now: \org@tabularcr). First found by Thomas
- Esser (te at informatik.uni-hannover.de)
+ Esser <te(a)informatik.uni-hannover.de>
-Sat Sep 27 21:35:29 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Sep 27 21:35:29 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Added the mpsupertabular and mpsupertabular*
- environments provided by Axel Kielhorn (A.Kielhorn at tu-bs.de);
+ environments provided by Axel Kielhorn <A.Kielhorn(a)tu-bs.de>;
added \noindent in front of all the starts of tabulars and
minipages as it seems senseles to have a paragraph indent in front
of a large tabularl; fixed a few documentation bugs.
The calculation of the available height still missed the case
where TeX has already begun the second column.
-Thu Sep 18 00:31:55 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Sep 18 00:31:55 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : The \tablehead and \tabletail commands reset
the command \\; they used \cr for it. That should have been
\@tabularcr to properly deal with it's optional argument.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn <A.Kielhorn(a)tu-bs.de>
-Wed Sep 17 23:59:13 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Sep 17 23:59:13 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : In two column mode the parameters that
determine how much space is left on the page were not correctly
initialised when TeX hasn't yet filled up the first column
completely.
- Found by Jeffrey Spielberg (jspielberg at infinet-software.com)
+ Found by Jeffrey Spielberg <jspielberg(a)infinet-software.com>
-Tue May 20 23:46:08 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue May 20 23:46:08 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : \shrinkheight didn't shrink the available
height for a part of the tabular (as documented); it just *set* it
@@ -61,43 +107,43 @@
\setSTheight for the former functionality
At the end of a supertabular \@table@first@head and
\@table@last@tail are undefined; this shoud be done globally.
- Found by Axel Kielhorn (A.Kielhorn at tu-bs.de)
+ Found by Axel Kielhorn <A.Kielhorn(a)tu-bs.de>
-Sat Apr 12 23:37:33 1997 Johannes Braams (texniek at braams.cistron.nl)
+Sat Apr 12 23:37:33 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Added \ST@stretchht and \ST@prevht to improve
decision process. \estimate@lineht now also computes the
difference between a normal line height and when \arraystretch is
in effect.
-Thu Apr 10 23:33:07 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Apr 10 23:33:07 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Had to repaire some documentation errors.
- (found by Thomas Esser (te at informatik.uni-hannover.de))
+ (found by Thomas Esser <te(a)informatik.uni-hannover.de>)
-Wed Apr 9 00:29:36 1997 Johannes Braams (texniek at braams.cistron.nl)
+Wed Apr 9 00:29:36 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Only the first part of a supertabular can be
moved to the next page. Therefore we need to change the definition
of \ST@skippage in the middle of processing the supertabular data.
-Thu Mar 6 21:56:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Mar 6 21:56:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx : Using a tabular environment in the cells of a
supertabular gives `interesting' results when the algorithm
decides to split the supertabular down the middle of an inner
tabular. A number of changes were necessary to make this work.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn <i0080108(a)ws.rz.tu-bs.de>
-Thu Feb 20 23:29:18 1997 Johannes Braams (texniek at braams.cistron.nl)
+Thu Feb 20 23:29:18 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Renamed \tableformat into \ST@tableformat
because the KOPMA-packages also use \tableformat and therefore
clashed with babel.
- Found by Axel Kielhorn (i0080108 at ws.rz.tu-bs.de)
+ Found by Axel Kielhorn <i0080108(a)ws.rz.tu-bs.de>
-Tue Feb 4 23:50:50 1997 Johannes Braams (texniek at braams.cistron.nl)
+Tue Feb 4 23:50:50 1997 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx (section{The Implementation}): Removed the use
of the page height correction for p-columns; the current algorithm
@@ -109,7 +155,7 @@
page on a calculated minimum height of the table. The minimum is
the head, the tail and 1 line of tabular data.
-Thu Nov 28 20:38:53 1996 Johannes Braams (texniek at braams.cistron.nl)
+Thu Nov 28 20:38:53 1996 Johannes Braams <texniek at braams.xs4all.nl>
* supertabular.dtx: Started a cleanup of the code, made source
file a full fledged .dtx file
@@ -122,12 +168,12 @@
% jurriens at fwn.rug.nl P.O Box 800, 9700 AV Groningen
%
% revised by: Johannes Braams
-% texniek at braams.cistron.nl TeXniek (NL)
+% texniek at braams.xs4all.nl TeXniek (NL)
% \def\fileversion{3.7c}
% \def\filename{supertabular sty}
% \def\filedate{1995/10/16}
%
-% \changes{v3.7c}{1995/10/16}{No space after the argument of
+% \changes{v3.7c}{1995/10/16}{No space after the argument of
% supertabular led to a `mysterious' error because of the space
% delemiting the argument}
% \changes{v3.7b}{1994/05/16}{Rewrote the page break deciding
@@ -195,7 +241,7 @@
% Reintroduced the version numbering
%
% revised by: Gabriele Kruljac
-% kruljac at ds0mpi11 Max-Planck-Institute Stuttgart
+% kruljac@ds0mpi11 Max-Planck-Institute Stuttgart
%
%
% 06.06.89 Correction: now care is taken of probably existing onecolumn
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/MANIFEST new/doc/latex/supertabular/MANIFEST
--- old/doc/latex/supertabular/MANIFEST 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/MANIFEST 2020-02-03 23:32:05.000000000 +0100
@@ -1,8 +1,9 @@
-README - A short introduction
-MANIFEST - A list of files
-CATALOG - An entry for the macro catalog
+README - A short introduction
+MANIFEST - A list of files
+CATALOG - An entry for the macro catalog
+Changelog - An overview of the changes to the package
supertabular.dtx - The documented version of the code, including a couple
of examples of how to use it. Needs supertabular.sty
to be available (run latex supertabular.ins first).
-supertabular.dtx - The `printed version� of supertabular.dtx
+supertabular.pdf - The `printed version' of supertabular.dtx
supertabular.ins - A docstrip file to produce the stripped code
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/supertabular/README new/doc/latex/supertabular/README
--- old/doc/latex/supertabular/README 2006-01-09 01:49:07.000000000 +0100
+++ new/doc/latex/supertabular/README 2020-02-03 23:32:05.000000000 +0100
@@ -13,7 +13,7 @@
Supertabular can be used with LaTeX2e as a package.
-Copyright (C) 2004 Johannes L. Braams texniek at braams.cistron.nl
+Copyright (C) 1989 - 2020 Johannes L. Braams texniek at braams.xs4all.nl
This program can be redistributed and/or modified under the terms
of the LaTeX Project Public License Distributed from CTAN
Binary files old/doc/latex/supertabular/supertabular.pdf and new/doc/latex/supertabular/supertabular.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/supertabular.doc.tlpobj new/tlpkg/tlpobj/supertabular.doc.tlpobj
--- old/tlpkg/tlpobj/supertabular.doc.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/supertabular.doc.tlpobj 2020-02-04 01:55:20.000000000 +0100
@@ -1,9 +1,9 @@
name supertabular.doc
category Package
-revision 15878
+revision 53658
shortdesc doc files of supertabular
relocated 1
-docfiles size=45
+docfiles size=70
RELOC/doc/latex/supertabular/CATALOG
RELOC/doc/latex/supertabular/ChangeLog
RELOC/doc/latex/supertabular/MANIFEST
++++++ supertabular.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/supertabular/supertabular.sty new/tex/latex/supertabular/supertabular.sty
--- old/tex/latex/supertabular/supertabular.sty 2006-01-13 01:08:12.000000000 +0100
+++ new/tex/latex/supertabular/supertabular.sty 2020-02-03 23:32:05.000000000 +0100
@@ -5,18 +5,18 @@
%% The original source files were:
%%
%% supertabular.dtx (with options: `package')
-%% Copyright (C) 1989-2004 Johannes Braams. All rights reserved.
+%% Copyright (C) 1989-2020 Johannes Braams. All rights reserved.
%%
%% This file was generated from file(s) of the supertabular package.
%% -----------------------------------------------------------------
%%
%% It may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
+%% 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
%% 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.
+%% 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".
%%
@@ -35,7 +35,7 @@
%% Sourcefile `supertabular.dtx'.
%%
%% Copyright (C) 1988 by Theo Jurriens
-%% Copyright (C) 1990-2004 by Johannes Braams texniek at braams.cistron.nl
+%% Copyright (C) 1990-2020 by Johannes Braams texniek at braams.xs4all.nl
%% Kersengaarde 33
%% 2723 BP Zoetermeer NL
%% all rights reserved.
@@ -43,10 +43,10 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{supertabular}
- [2004/02/20 v4.1e the supertabular environment]
+ [2020/02/02 v4.1g the supertabular environment]
\newcount\c@tracingst
\DeclareOption{errorshow}{\c@tracingst\z@}
-\DeclareOption{pageshow}{\c@tracingst\tw@}
+\DeclareOption{pageshow}{\c@tracingst\thr@@}
\DeclareOption{debugshow}{\c@tracingst5\relax}
\ProcessOptions
\newif\if@topcaption \@topcaptiontrue
@@ -63,6 +63,7 @@
\newskip\ST@rightskip
\newskip\ST@leftskip
\newskip\ST@parfillskip
+\def\ST@captionroom{\z@}
\long\def\ST@caption#1[#2]#3{\par%
\addcontentsline{\csname ext@#1\endcsname}{#1}%
{\protect\numberline{%
@@ -72,7 +73,7 @@
\normalsize
\if@topcaption \vskip -10\p@ \fi
\@makecaption{\csname fnum@#1\endcsname}{\ignorespaces #3}\par
- \if@topcaption \vskip 10\p@ \fi
+ \if@topcaption \vskip 10\p@ \gdef\ST@captionroom{20\p@}\fi
\endgroup}
\newcommand\tablehead[1]{%
\gdef\@tablehead{%
@@ -82,7 +83,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tablehead{}
-\newcommand\tablefirsthead[1]{\gdef\@table@first@head{#1}}
+\newcommand\tablefirsthead[1]{%
+ \gdef\@table@first@head{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@first@head\undefined
+ }}}
\newcommand\tabletail[1]{%
\gdef\@tabletail{%
\noalign{%
@@ -91,7 +101,16 @@
#1%
\noalign{\global\let\\=\@savcr}}}
\tabletail{}
-\newcommand\tablelasttail[1]{\gdef\@table@last@tail{#1}}
+\newcommand\tablelasttail[1]{%
+ \gdef\@table@last@tail{%
+ \noalign{%
+ \global\let\@savcr=\\
+ \global\let\\=\org@tabularcr}%
+ #1%
+ \noalign{%
+ \global\let\\=\@savcr
+ \global\let\@table@last@tail\undefined
+ }}}
\newcommand\sttraceon{\c@tracingst5\relax}
\newcommand\sttraceoff{\c@tracingst\z@}
\newcommand\ST@trace[2]{%
@@ -101,6 +120,19 @@
{Package supertabular: #2}%
\fi
}
+\newcommand\ST@save@lineno{%
+ \expandafter\gdef\expandafter\ST@LineNo\expandafter{%
+ \the\inputlineno}}
+\newcommand\ST@trace@cr[2]{%
+ \ifnum\c@tracingst>#1\relax
+ \begingroup
+ \edef\on@line{ on input line \ST@LineNo}%
+ \GenericWarning
+ {(supertabular)\@spaces\@spaces}
+ {Package supertabular: #2}%
+ \endgroup
+ \fi
+ }
\newdimen\ST@pageleft
\newcommand*\shrinkheight[1]{%
\noalign{\global\advance\ST@pageleft-#1\relax}}
@@ -111,13 +143,13 @@
\newdimen\ST@pagesofar
\newdimen\ST@pboxht
\newdimen\ST@lineht
-\newdimen\ST@stretchht
\newdimen\ST@prevht
\newdimen\ST@toadd
\newdimen\ST@dimen
\newbox\ST@pbox
\def\ST@tabularcr{%
{\ifnum0=`}\fi
+ \ST@save@lineno
\@ifstar{\ST@xtabularcr}{\ST@xtabularcr}}
\def\ST@xtabularcr{%
\@ifnextchar[%]
@@ -159,6 +191,15 @@
\fi
\ST@dimen=\z@
\unvbox\ST@pbox\egroup\hfil}
+\def\ST@compute@lineht{%
+ \ST@lineht=\ht\strutbox
+ \ifx\extrarowheight\undefined\else
+ \advance \ST@lineht by \extrarowheight
+ \fi
+ \ST@lineht = \arraystretch\ST@lineht
+ \advance\ST@lineht \arraystretch\dp\strutbox
+ \ST@trace\tw@{Normal Line height: \the\ST@lineht}%
+ }
\def\estimate@lineht{%
\ST@lineht=\arraystretch \baslineskp
\global\advance\ST@lineht by 1\p@
@@ -166,7 +207,7 @@
\ifdim\ST@stretchht<\z@\ST@stretchht\z@\fi
\ST@trace\tw@{Average line height: \the\ST@lineht}%
\ST@trace\tw@{Stretched line height: \the\ST@stretchht}%
- }
+}
\def\@calfirstpageht{%
\ST@trace\tw@{Calculating height of tabular on first page}%
\global\ST@pagesofar\pagetotal
@@ -211,6 +252,7 @@
\global\ST@pagesofar\z@
\fi
\fi
+ \if@topcaption\advance\ST@pageleft-\ST@captionroom\fi
\ST@trace\tw@{Available height: \the\ST@pageleft}%
\ifx\@@tablehead\@empty
\ST@headht=\z@
@@ -242,12 +284,14 @@
\ST@trace\tw@{starting new page}%
\newpage\@calnextpageht
\fi
+ \advance\ST@pageleft-\ST@headht
}
\def\@calnextpageht{%
\ST@trace\tw@{Calculating height of tabular on next page}%
\global\ST@pageleft\@colroom
\global\ST@pagesofar=\z@
\ST@trace\tw@{Maximum height of tabular: \the\ST@pageleft}%
+ \advance\ST@pageleft-\ST@headht
}
\def\x@supertabular{%
\let\org@tabular\tabular
@@ -281,7 +325,7 @@
\let\@@tablehead=\@table@first@head
\fi
\let\ST@skippage\ST@skipfirstpart
- \estimate@lineht
+ \ST@compute@lineht
\@calfirstpageht
\noindent
}
@@ -413,16 +457,15 @@
\global\advance\ST@pageleft -\ST@lineht
\global\ST@prevht\ST@lineht
\else
- \ST@trace\thr@@{Added par box with height \the\ST@pboxht}%
+ \ST@trace@cr\thr@@{Added par box with height \the\ST@pboxht}%
\global\advance\ST@pageleft -\ST@pboxht
\global\advance\ST@pageleft -0.1\ST@pboxht
- \global\advance\ST@pageleft -\ST@stretchht
\global\ST@prevht\ST@pboxht
\global\ST@pboxht\z@
\fi
\global\advance\ST@pageleft -\ST@toadd
\global\ST@toadd=\z@
- \ST@trace\thr@@{Space left for tabular: \the\ST@pageleft}%
+ \ST@trace@cr\thr@@{Space left for tabular: \the\ST@pageleft}%
}
\noalign{\global\let\ST@next\@empty}%
\ifnum\ST@pageleft<\z@
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/supertabular.tlpobj new/tlpkg/tlpobj/supertabular.tlpobj
--- old/tlpkg/tlpobj/supertabular.tlpobj 2019-02-28 04:06:30.000000000 +0100
+++ new/tlpkg/tlpobj/supertabular.tlpobj 2020-02-04 01:55:20.000000000 +0100
@@ -1,6 +1,6 @@
name supertabular
category Package
-revision 15878
+revision 53658
shortdesc A multi-page tables package
relocated 1
longdesc The package was a predecessor of longtable; the newer package
@@ -11,7 +11,6 @@
RELOC/tex/latex/supertabular/supertabular.sty
catalogue-also xtab
catalogue-ctan /macros/latex/contrib/supertabular
-catalogue-date 2017-08-05 18:49:19 +0200
-catalogue-license lppl1.3
+catalogue-license lppl1.3c
catalogue-topics table table-long
-catalogue-version 4.1e
+catalogue-version 4.1g
++++++ svg.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/LICENSE.md new/doc/latex/svg/LICENSE.md
--- old/doc/latex/svg/LICENSE.md 2017-03-28 22:37:19.000000000 +0200
+++ new/doc/latex/svg/LICENSE.md 2020-01-13 22:24:53.000000000 +0100
@@ -1,8 +1,8 @@
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+ svg and svg-extract – Handling SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- Copyright (C) Philip Ilten <philten(a)cern.ch>, 2012-2016
+ Copyright (C) Philip Ilten <philten(a)cern.ch>, 2012-2016<br>
Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2017-
----------------------------------------------------------------------------
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/README.md new/doc/latex/svg/README.md
--- old/doc/latex/svg/README.md 2018-11-13 23:48:18.000000000 +0100
+++ new/doc/latex/svg/README.md 2020-01-13 22:24:53.000000000 +0100
@@ -1,15 +1,15 @@
- svg and svg-extract -- Include and extract SVG pictures in LaTeX documents
+ svg and svg-extract – Handling SVG pictures in LaTeX documents
----------------------------------------------------------------------------
- Copyright (C) Philip Ilten <philten(a)cern.ch>, 2012-2016
+ Copyright (C) Philip Ilten <philten(a)cern.ch>, 2012-2016<br>
Copyright (C) Falk Hanisch <hanisch.latex(a)outlook.com>, 2017-
- svg 2018/11/12 v2.02b
+ **svg 2020/01/13 v2.02e**
----------------------------------------------------------------------------
- This material is subject to the LaTeX Project Public License version 1.3c
+ This material is subject to the LaTeX Project Public License version 1.3c
or later. See http://www.latex-project.org/lppl.txt for details.
----------------------------------------------------------------------------
@@ -18,31 +18,48 @@
Summary
-------
-The **svg** package is intended for the automated integration of SVG graphics
-into LaTeX documents. Therefor the capabilities provided by ***Inkscape***---or
-more precisely its command line tool---are used to export the text within a SVG
-graphic to a separate file, which is then rendered by LaTeX. For this purpose
-the two commands `\includesvg` and `\includeinkscape` are provided which are
-very similar to the `\includegraphics` command of the **graphicx** package.
-
-In addition, the package **svg-extract** allows the extraction of these
-graphics into independent files in different graphic formats, exactly as
-it is rendered within the LaTeX document using either ***ImageMagick*** or
-***Ghostscript***
+The **svg** package provides an user‑interface for automated integration
+of SVG graphics created with ***Inkscape*** into LaTeX documents.
+Therefor the capabilities provided by ***Inkscape***—and its command line
+tool—are used to export the text within a SVG graphic to a separate
+file, which is then rendered by LaTeX. The two commands `\includesvg` and
+`\includeinkscape` are provided as central user‑interface, which are very
+similar to the `\includegraphics` command of the **graphicx** package.
+
+In addition, the package **svg-extract** extends the user‑interface of
+package **svg** in order to support the extraction of these graphics into
+independent files in different graphic formats, exactly as they are rendered
+within the LaTeX document. For the creation of these graphics in the
+well‑known formats PDF, EPS and PS, LaTeX and possibly conversion
+tools shipped with the most LaTeX distributions are used. If the graphics are
+required in other file formats, either ***ImageMagick*** or ***Ghostscript***
+can be invoked.
Versions
--------
+**v2.02e** (2020/01/13)
++ fixes for new version of package **scrbase**
+
+**v2.02d** (2019/10/22)
++ fix bugs with current kernel (2019/10/01) regarding file name parsing, see
+ https://github.com/mrpiggi/svg/issues/16
++ use `\filemoddate` with XeLaTeX, see https://github.com/mrpiggi/svg/issues/12
+
+**v2.02c** (2019/10/10)
++ fix bugs with current kernel (2019/10/01) regarding file name parsing
+
**v2.02b** (2018/11/12)
-+ fix bug for package **tikzscale** which changes `includgraphics` globally
++ fix bug for package **tikzscale** which changes the definition of
+ `\includegraphics`
**v2.02a** (2018/10/17)
+ fix bug for package **polyglossia** which fakes **babel** poorly
**v2.02** (2018/09/08)
-+ distortion of included and extracted graphics supported with options `distort`
- (or `keepaspectratio`) and `extractdistort` as well as rotation for
++ distortion of included and extracted graphics supported with options `distort`
+ (or `keepaspectratio`) and `extractdistort` as well as rotation for
extractions (`extractangle`)
+ fixed errors with active double qoutes from **babel** in path arguments
+ multiple dots within file names possible
@@ -69,8 +86,8 @@
+ **svg-extract**: enhanced support for ***ImageMagick***
+ **svg-extract**: support for ***Ghostscript*** added
+ package **subfig** not required anymore
-+ support of subfigures stopped due to the huge number of packages which deal
- with this topic and the large variety of implementing this functionality;
++ support of subfigures stopped due to the huge number of packages which deal
+ with this topic and the large variety of implementing this functionality;
naming exported graphics after their consecutive numbering can't be ensured
for all variants of subfigures, so it's neglected
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/svg/root.C new/doc/latex/svg/root.C
--- old/doc/latex/svg/root.C 2017-03-27 23:47:01.000000000 +0200
+++ new/doc/latex/svg/root.C 2020-01-13 22:24:53.000000000 +0100
@@ -17,9 +17,9 @@
// Draw additional text.
TText *t = new TText(); t->SetTextAlign(31);
t->DrawText(0.7, 0.9, "\\larger[2]$z(x,y) = \\frac{1}{\\sigma_x\\sigma_y"
- "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
- "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
- "\\right)$");
+ "\\sqrt{4\\pi^2}}\\exp\\left(- \\left(\\frac{(x-\\mu_x)^2}"
+ "{2\\sigma_x^2} + \\frac{(y-\\mu_y)^2}{2\\sigma_y^2} \\right)"
+ "\\right)$");
// Print the plot.
gPad->Print("root.svg");
Binary files old/doc/latex/svg/svg.pdf and new/doc/latex/svg/svg.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svg.doc.tlpobj new/tlpkg/tlpobj/svg.doc.tlpobj
--- old/tlpkg/tlpobj/svg.doc.tlpobj 2019-02-28 04:06:31.000000000 +0100
+++ new/tlpkg/tlpobj/svg.doc.tlpobj 2020-01-14 01:55:08.000000000 +0100
@@ -1,9 +1,9 @@
name svg.doc
category Package
-revision 49148
+revision 53389
shortdesc doc files of svg
relocated 1
-docfiles size=434
+docfiles size=435
RELOC/doc/latex/svg/LICENSE.md
RELOC/doc/latex/svg/README.md
RELOC/doc/latex/svg/root.C
++++++ svg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/svg/svg-extract.sty new/tex/latex/svg/svg-extract.sty
--- old/tex/latex/svg/svg-extract.sty 2018-11-13 23:48:18.000000000 +0100
+++ new/tex/latex/svg/svg-extract.sty 2020-01-13 22:24:53.000000000 +0100
@@ -31,9 +31,9 @@
%% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg).
%%
%%
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg-extract}[%
- 2018/11/12 v2.02b\space%
+ 2020/01/13 v2.02e\space%
(extract independent graphics from SVG pictures)%
]
\RequirePackage{svg}[2017/03/27]
@@ -407,7 +407,7 @@
\renewcommand*\svgx@param@width{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@width{\svg@param@width}%
\FamilyKeyStateProcessed%
}{%
@@ -427,7 +427,7 @@
\renewcommand*\svgx@param@height{\z@}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@height{\svg@param@height}%
\FamilyKeyStateProcessed%
}{%
@@ -447,7 +447,7 @@
\@svgx@param@distortfalse%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\if@svgx@param@distort{\if@svg@param@distort}%
\FamilyKeyStateProcessed%
}{%
@@ -474,11 +474,11 @@
\renewcommand*\svgx@param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@scale{\svg@param@scale}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svgx@param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -492,7 +492,7 @@
\svg@ifvalueisrelax{#1}{%
\let\svgx@param@pretex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@pretex{\svg@param@pretex}%
}{%
\renewcommand*\svgx@param@pretex{#1}%
@@ -505,7 +505,7 @@
\svg@ifvalueisrelax{#1}{%
\let\svgx@param@apptex\relax%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@apptex{\svg@param@apptex}%
}{%
\renewcommand*\svgx@param@apptex{#1}%
@@ -563,7 +563,7 @@
\newcommand*\svgx@onlywindows[1]{}
\AfterPackage*{ifplatform}{\renewcommand*\svgx@onlywindows[1]{\ifwindows#1\fi}}
\newcommand*\svgx@ifkeyandval[3]{%
- \def\svg@tempa##1=##2=##3\@nil{\ifstr{##3}{=}{#2}{#3}}%
+ \def\svg@tempa##1=##2=##3\@nil{\Ifstr{##3}{=}{#2}{#3}}%
\svg@tempa#1==\@nil%
}
\newcommand*\svgx@cnv@get@dpi[1]{%
@@ -571,9 +571,9 @@
\def\svg@tempa##1dpi##2x##3dpi##4\@nil{%
\edef\svg@tempa{##1}%
\@svg@tempswafalse%
- \ifnumber{##1}{%
+ \Ifnumber{##1}{%
\IfArgIsEmpty{##3}{\@svg@tempswatrue}{%
- \ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}%
+ \Ifnumber{##3}{\edef\svg@tempa{##1x##3}}{}%
}%
}{}%
\if@svg@tempswa\else%
@@ -581,13 +581,13 @@
\fi%
}%
\def\svg@tempb##1x##2x##3\@nil{%
- \ifstr{##3}{x}{%
+ \Ifstr{##3}{x}{%
\@svg@tempswatrue%
\IfArgIsEmpty{##1}{\@svg@tempswafalse}{%
- \ifnumber{##1}{}{\@svg@tempswafalse}%
+ \Ifnumber{##1}{}{\@svg@tempswafalse}%
}%
\IfArgIsEmpty{##2}{\@svg@tempswafalse}{%
- \ifnumber{##2}{}{\@svg@tempswafalse}%
+ \Ifnumber{##2}{}{\@svg@tempswafalse}%
}%
\if@svg@tempswa%
\edef\svg@tempa{##1x##2}%
@@ -727,11 +727,11 @@
\renewcommand*\svgx@param@angle{0}%
\FamilyKeyStateProcessed%
}{%
- \ifstr{#1}{inherit}{%
+ \Ifstr{#1}{inherit}{%
\renewcommand*\svgx@param@angle{\svg@param@angle}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svgx@param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -913,7 +913,7 @@
\fi%
\let\svg@tempa\@empty%
\if@svg@ink@latex%
- \ifstr{\svg@ink@format}{pdf}{%
+ \Ifstr{\svg@ink@format}{pdf}{%
\ifnum\value{svg@param@lastpage}>\z@\relax%
\edef\svg@tempa{lastpage=\the\value{svg@param@lastpage}}%
\else%
@@ -952,7 +952,7 @@
}%
\immediate\closeout\svgx@stream@out%
\endgroup%
- \ifstr{\svgx@format\svgx@cnv@format}{}{%
+ \Ifstr{\svgx@format\svgx@cnv@format}{}{%
\PackageWarning{svg-extract}{%
Both keys `extractformat' and `convertformat' are\MessageBreak%
empty, so nothing to do so far%
@@ -1102,13 +1102,13 @@
\def\svg@tempa##1{%
\def\svg@tempa####1##1####2##1####3\@nil{%
\IfArgIsEmpty{####3}{}{%
- \ifstr{#2}{till}{%
+ \Ifstr{#2}{till}{%
\IfArgIsEmpty{####1}{}{%
\immediate\write\svgx@stream@out{####1}%
}%
\@svgx@preamble@writefalse%
}{%
- \ifstr{#2}{from}{%
+ \Ifstr{#2}{from}{%
\IfArgIsEmpty{####2}{%
\def\svgx@read@line{}%
}{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/svg/svg.sty new/tex/latex/svg/svg.sty
--- old/tex/latex/svg/svg.sty 2018-11-13 23:48:18.000000000 +0100
+++ new/tex/latex/svg/svg.sty 2020-01-13 22:24:53.000000000 +0100
@@ -31,15 +31,13 @@
%% svg-example.svg, svg-preamble.tex and root.C (with derived file root.svg).
%%
%%
-\NeedsTeXFormat{LaTeX2e}
+\NeedsTeXFormat{LaTeX2e}[2019-10-01]
\ProvidesPackage{svg}[%
- 2018/11/12 v2.02b\space%
+ 2020/01/13 v2.02e\space%
(include SVG pictures)%
]
-\RequirePackage{scrbase}[2016/06/14]
-\RequirePackage{ifpdf}[2016/05/14]
-\RequirePackage{ifluatex}[2016/05/16]
-\RequirePackage{ifxetex}[2010/09/12]
+\RequirePackage{iftex}[2019/11/07]
+\RequirePackage{scrbase}[2019/12/23]
\RequirePackage{pdftexcmds}[2016/05/21]
\RequirePackage{shellesc}[2016/06/07]
\RequirePackage{trimspaces}[2009/09/17]
@@ -124,7 +122,7 @@
\fi%
\else% dpi
\def\svg@tempa##1dpi##2\@nil{%
- \ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
+ \Ifstr{##2}{dpi}{\FamilyOptions{SVG}{inkscapedpi=##1}}{}%
}%
\lowercase{\expandafter\svg@tempa\svg@tempb dpi\@nil}%
\ifx\FamilyKeyState\FamilyKeyStateProcessed\else%
@@ -217,7 +215,7 @@
}{%
\def\svg@tempa##1dpi##2\@nil{\def\svg@tempa{##1}}%
\lowercase{\svg@tempa#1dpi\@nil}%
- \ifnumber{\svg@tempa}{%
+ \Ifnumber{\svg@tempa}{%
\edef\svg@ink@dpi{\svg@tempa}%
\FamilyKeyStateProcessed%
}{}%
@@ -333,7 +331,7 @@
\renewcommand*\svg@param@scale{1}%
\FamilyKeyStateProcessed%
}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\ifdim\dimexpr#1\p@\relax>\z@\relax%
\renewcommand*\svg@param@scale{#1}%
\FamilyKeyStateProcessed%
@@ -611,6 +609,10 @@
\svg@set@input@path[{#3}]%
\@svg@tempswafalse%
\expandafter\IfFileExists\expandafter{\svg@tempa}{%
+ \expandafter\svg@quotes@check\expandafter{\svg@tempa}%
+ \if@svg@quotes@found\else%
+ \svg@quotes@remove{\@filef@und}%
+ \fi%
\@svg@tempswatrue%
\edef\@filef@und{\expandafter\trim@spaces\expandafter{\@filef@und}}%
\svg@filename@parse[{#1}]{\@filef@und}%
@@ -665,7 +667,8 @@
}
\newcommand*\svg@extension@parse[1]{%
\IfArgIsEmpty{#1}{}{%
- \ifstr{#1}{\filename@ext}{}{%
+ \@expandtwoargs\Ifstr%
+ {\detokenize\expandafter{\filename@ext}}{\detokenize\expandafter{#1}}{}{%
\begingroup%
\edef\svg@tempa{%
\def\noexpand\svg@tempa{}%
@@ -691,7 +694,7 @@
\def\svg@extension@@parse#1.#2\@nil#3\@nil{%
\edef\svg@tempa{\svg@tempa.#1}%
\IfArgIsEmpty{#2}{}{%
- \ifstr{#2}{#3.}{%
+ \Ifstr{\detokenize{#2}}{\detokenize{#3.}}{%
\edef\svg@tempb{#3}%
}{%
\svg@extension@@parse#2\@nil#3\@nil%
@@ -711,9 +714,9 @@
}%
}{%
\edef\filename@ext{#1}%
- \ifstr{\filename@area}{./}{\let\filename@area\@empty}{}%
+ \Ifstr{\filename@area}{./}{\let\filename@area\@empty}{}%
\edef\svg@tempb{#3}%
- \ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}%
+ \Ifstr{\svg@tempb}{./}{\let\svg@tempb\@empty}{}%
\ifx\svg@tempb\@empty%
\svg@set@input@path%
\else%
@@ -744,25 +747,42 @@
}{\svg@tempa}%
\endgroup%
}
+\newcommand*\svg@iffilenewer[2]{\@gobbletwo}
\ifx\pdf@filemoddate\@undefined
- \newcommand*\svg@iffilenewer[2]{\@gobbletwo}
+ \ifx\filemoddate\@undefined\else
+ \ifx\strcmp\@undefined\else
+ \renewcommand*\svg@iffilenewer[2]{%
+ \begingroup%
+ \edef\svg@tempa{\filemoddate{#1}}%
+ \edef\svg@tempb{\filemoddate{#2}}%
+ \ifnum\strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
+ \aftergroup\@firstoftwo%
+ \else%
+ \aftergroup\@secondoftwo%
+ \fi%
+ \endgroup%
+ }%
+ \fi
+ \fi
\else
- \newcommand*\svg@iffilenewer[2]{%
- \begingroup%
- \edef\svg@tempa{\pdf@filemoddate{#1}}%
- \edef\svg@tempb{\pdf@filemoddate{#2}}%
- \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
- \aftergroup\@firstoftwo%
- \else%
- \aftergroup\@secondoftwo%
- \fi%
- \endgroup%
- }
+ \ifx\pdf@strcmp\@undefined\else
+ \renewcommand*\svg@iffilenewer[2]{%
+ \begingroup%
+ \edef\svg@tempa{\pdf@filemoddate{#1}}%
+ \edef\svg@tempb{\pdf@filemoddate{#2}}%
+ \ifnum\pdf@strcmp{\svg@tempa}{\svg@tempb}>\z@\relax%
+ \aftergroup\@firstoftwo%
+ \else%
+ \aftergroup\@secondoftwo%
+ \fi%
+ \endgroup%
+ }%
+ \fi
\fi
\newcommand*\svg@local@param@set[1]{%
\svg@local@param@use%
\FamilyOptions{SVG}{#1}%
- \ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
+ \Ifstr{\svg@ink@format}{png}{\FamilyOptions{SVG}{inkscapelatex=false}}{}%
\@svg@tempswafalse%
\ifdim\svg@param@width>\z@\relax\ifdim\svg@param@height>\z@\relax%
\@svg@tempswatrue%
@@ -830,7 +850,7 @@
\newcommand*\svg@param@angle{0}
\svg@local@param@def{%
\DefineFamilyKey[.param]{SVG}{angle}{%
- \ifisdimension{#1\p@}{%
+ \Ifisdimension{#1\p@}{%
\renewcommand*\svg@param@angle{#1}%
\FamilyKeyStateProcessed%
}{}%
@@ -854,7 +874,7 @@
}%
\def\svg@tempb##1_tex##2\@nil{%
\IfArgIsEmpty{##1}{}{\def\filename@ext{##1}}%
- \ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}%
+ \Ifstr{##2}{_tex}{\@svg@tempswatrue}{\@svg@tempswafalse}%
}%
\@svg@tempswafalse%
\@tfor\svg@tempa:={pdf}{eps}{ps}{png}\do{%
@@ -959,7 +979,7 @@
\if@svg@ink@run%
\ifnum\pdf@shellescape=\@ne\relax%
\ifx\svg@ink@dpi\relax%
- \ifstr{\svg@ink@format}{png}{%
+ \Ifstr{\svg@ink@format}{png}{%
\FamilyOptions{SVG}{inkscapedpi=300}%
}{}%
\fi%
@@ -1010,7 +1030,7 @@
--export-\svg@ink@format="#2.\svg@ink@format"\space%
}
\newcommand*\svg@get@lastpage[1]{%
- \ifstr{\svg@ink@format}{pdf}{%
+ \Ifstr{\svg@ink@format}{pdf}{%
\begingroup%
\@tempcnta=\m@ne\relax%
\ifx\XeTeXpdfpagecount\@undefined%
@@ -1081,7 +1101,17 @@
}%
\svg@tempa%
\svg@remove@leadingchar.\svg@tempa%
- \edef\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \begingroup%
+ \expandafter\filename@parse\expandafter{\svg@tempa}%
+ \edef\svg@tempa{%
+ \endgroup%
+ \ifx\filename@ext\relax%
+ \edef\noexpand\svg@tempa{\svg@tempa.\svg@tempb}%
+ \else%
+ \edef\noexpand\svg@tempa{{\svg@tempa}.\svg@tempb}%
+ \fi%
+ }%
+ \svg@tempa%
\edef\svg@tempb{#2}%
\if@svg@ink@latex%
\svg@patches{\svg@tempa}%
@@ -1214,8 +1244,8 @@
\begingroup%
\svg@quotes@remove[{#1}]{\svg@tempa}%
\@svg@tempswatrue%
- \ifstr{\svg@tempa}{}{\@svg@tempswafalse}{%
- \ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{%
+ \Ifstr{\svg@tempa}{}{\@svg@tempswafalse}{%
+ \Ifstr{\svg@tempa}{./}{\@svg@tempswafalse}{%
}}%
\if@svg@tempswa%
\ShellEscape{\svg@shell@@mkdir{\svg@tempa}}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/svg.tlpobj new/tlpkg/tlpobj/svg.tlpobj
--- old/tlpkg/tlpobj/svg.tlpobj 2019-02-28 04:06:31.000000000 +0100
+++ new/tlpkg/tlpobj/svg.tlpobj 2020-01-14 01:55:09.000000000 +0100
@@ -1,6 +1,6 @@
name svg
category Package
-revision 49148
+revision 53389
shortdesc Include and extract SVG pictures in LaTeX documents
relocated 1
longdesc This bundle contains the two packages svg and svg-extract. The
@@ -20,10 +20,8 @@
RELOC/tex/latex/svg/svg.sty
catalogue-also svg-inkscape
catalogue-contact-bugs https://github.com/mrpiggi/svg/issues
-catalogue-contact-home https://github.com/mrpiggi/svg
catalogue-contact-repository https://github.com/mrpiggi/svg
catalogue-ctan /graphics/svg
-catalogue-date 2018-11-13 10:20:49 +0100
catalogue-license lppl1.3c
-catalogue-topics graphics-incl graphics-import
-catalogue-version 2.02b
+catalogue-topics graphics graphics-incl graphics-import
+catalogue-version 2.02e
++++++ synctex.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/synctex.man1.pdf and new/texmf-dist/doc/man/man1/synctex.man1.pdf differ
Binary files old/texmf-dist/doc/man/man5/synctex.man5.pdf and new/texmf-dist/doc/man/man5/synctex.man5.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/synctex.doc.tlpobj new/tlpkg/tlpobj/synctex.doc.tlpobj
--- old/tlpkg/tlpobj/synctex.doc.tlpobj 2019-03-27 02:26:39.000000000 +0100
+++ new/tlpkg/tlpobj/synctex.doc.tlpobj 2020-03-04 23:53:51.000000000 +0100
@@ -1,6 +1,6 @@
name synctex.doc
category TLCore
-revision 50602
+revision 54074
shortdesc doc files of synctex
docfiles size=17
texmf-dist/doc/man/man1/synctex.1
++++++ systeme.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/systeme/README new/doc/generic/systeme/README
--- old/doc/generic/systeme/README 2019-01-14 00:30:37.000000000 +0100
+++ new/doc/generic/systeme/README 2020-04-13 23:39:04.000000000 +0200
@@ -1,9 +1,9 @@
L'extension
systeme
- v0.32
+ v0.33
- 13 janvier 2019
+ 13 avril 2020
Author : Christian Tellechea
Email : unbonpetit(a)netc.fr (CT)
Binary files old/doc/generic/systeme/systeme_fr.pdf and new/doc/generic/systeme/systeme_fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/systeme/systeme_fr.tex new/doc/generic/systeme/systeme_fr.tex
--- old/doc/generic/systeme/systeme_fr.tex 2019-01-14 00:30:37.000000000 +0100
+++ new/doc/generic/systeme/systeme_fr.tex 2020-04-13 23:39:04.000000000 +0200
@@ -1,14 +1,10 @@
-% Documentation de systeme
+% !TeX TS-program = xelatex
\documentclass[10pt,french]{article}
-\usepackage[utf8]{inputenc}
-\usepackage[T1]{fontenc}
\usepackage[a4paper,margin=3cm,head=12pt,headsep=7mm,footskip=7mm]{geometry}
\usepackage[bottom]{footmisc}
-\usepackage{libertine,amsmath,fancybox,enumitem,systeme,xcolor,amssymb,array,longtable,fancyhdr}
-\renewcommand*\oldstylenums[1]{{\fontfamily{fxlj}\selectfont #1}}
-\usepackage[scaled=0.8]{luximono}
-\usepackage[libertine]{newtxmath}%
-\usepackage[protrusion=true,expansion,final,babel=true]{microtype}
+
+\usepackage{amsmath,fancybox,enumitem,systeme,xcolor,amssymb,array,longtable,fancyhdr,libertinus-otf}
+\setsansfont[Scale=0.8]{Luxi Mono}
\fancypagestyle{plain}{%
\fancyhead[L]{\small L'extension \bfseries systeme}
\fancyhead[C]{}
@@ -290,6 +286,18 @@
\exemple{Coefficients décimaux}/\systeme[][:]{1,5x-0,45y=0,7:x-0,8y=1,4}/
Pour qui veut utiliser la virgule régulièrement dans les coefficients, on peut changer définitivement le séparateur par défaut pour n'importe quel autre caractère que l'on placera dans l'argument de la commande \verb-\syseqsep- et écrire par exemple \og\verb/\syseqsep{:}/\fg{} pour choisir \og\verb-:-\fg.
+\subsection{Alignement des termes}
+Par défaut, les termes dans le membre de gauche sont alignes à droite, tandis que le terme du membre de droite est aligné à gauche. On peut changer ces consignes d'alignement avec la macro \verb|\sysalign{x,y}| où \verb|x| représente la consigne d'alignement des termes du membre de gauche et \verb|y| celle du terme du membre de droite. Ces consignes doivent être «\verb|c|» pour «centré», «\verb|r|» pour alignement à droite (right) ou «\verb|l|» pour gauche (left).
+\exemple{Alignement des termes}|\systeme{3x-y=-12,x+4y=3}
+ \quad(par défaut, droite/gauche)\par
+\sysalign{l,l}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement gauche/gauche)\par
+\sysalign{r,r}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement droite/droite)\par
+\sysalign{l,r}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement gauche/droite)\par
+\sysalign{c,c}\systeme{3x-y=-12,x+4y=3}
+ \quad(alignement centré/centré)|
\subsection{Espacement des lignes}\label{espacement.vertical}
On peut faire varier l'espacement entre les lignes avec la commande \verb-\syslineskipcoeff- dont l'argument est un nombre qui viendra multiplier la valeur de \verb-\baselinskip-. Par défaut, l'argument vaut \verb-1.25-.
@@ -297,6 +305,12 @@
\syslineskipcoeff{1.75}\quad
\systeme{x+2y-z=0,2x-y+z=1,x-3y+2z=1}/
+\subsection{Espaces autour des signes}
+Il est possible d'ajouter une espace avant et après tous les signes \verb|+| et \verb|-| séparant les termes du membre de gauche à l'aide de la macro \verb|\syssignspace{dim}| où \verb|dim| est la dimension du \emph{ressort} que l'on souhaite insérer. La macro \verb|\syseqspace{dim}| exécute la même action, mais pour le signe \verb|=|.
+\exemple{Espaces autour des signes}/\systeme{3x-y=-12,x+4y=3} puis
+\syssignspace{3pt}\syseqspace{10pt}
+\systeme{3x-y=-12,x+4y=3}/
+
\subsection{Colonne supplémentaire}
Lorsqu'une équation comporte le signe \og\verb-@-\fg{}, tout ce qui se trouve à droite de ce caractère sera mis dans une colonne supplémentaire au fer à gauche qui se trouvera à droite du système, en dernière position.
\exemple{Colonne supplémentaire}/\systeme{x+y=125@L_1,
@@ -387,6 +401,9 @@
\verb-\systeme{<code système>}-&compose un système d'équations ou d'inéquations\\
\verb-\sysdelim<delim gauche><delim droit>-&modifie les délimiteurs extensibles placées à gauche et à droite du système\\
\verb-\syseqsep{<caractère>}-&définit le séparateur par défaut des équations\\
+\verb-\sysalign{x,y}-&définit l'alignement des termes dans les 2 membres\\
+\verb-\syssignspace{dim}-&définit l'espace ajoutée autour des signes dans le membre de gauche\\
+\verb-\syseqspace{dim}-&définit l'espace ajoutée autour du signe \verb-=-\\
\verb-\syslineskipcoeff{<coeff>}-&définit le coefficient multiplicateur de \verb-\baselinskip- pour modifier l'espacement vertical des équations\\
\verb-\+- et \verb|\-|&remplace "+" et "-" lorsqu'on veut éviter d'indiquer un nouveau terme\\
\verb-\sysequivsign{<signe>}{<substitution>}-&définit ce par quoi un \verb-<signe>- d'égalité doit être remplacé à l'affichage\\
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/systeme.doc.tlpobj new/tlpkg/tlpobj/systeme.doc.tlpobj
--- old/tlpkg/tlpobj/systeme.doc.tlpobj 2019-02-28 04:06:36.000000000 +0100
+++ new/tlpkg/tlpobj/systeme.doc.tlpobj 2020-04-15 01:54:54.000000000 +0200
@@ -1,9 +1,9 @@
name systeme.doc
category Package
-revision 49690
+revision 54724
shortdesc doc files of systeme
relocated 1
-docfiles size=118
+docfiles size=27
RELOC/doc/generic/systeme/README
RELOC/doc/generic/systeme/systeme_fr.pdf
RELOC/doc/generic/systeme/systeme_fr.tex
++++++ systeme.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/systeme/systeme.tex new/tex/generic/systeme/systeme.tex
--- old/tex/generic/systeme/systeme.tex 2019-01-14 00:30:37.000000000 +0100
+++ new/tex/generic/systeme/systeme.tex 2020-04-13 23:39:04.000000000 +0200
@@ -4,9 +4,9 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\SYSname {systeme} %
-\def\SYSver {0.32} %
+\def\SYSver {0.33} %
% %
-\def\SYSdate {2019/01/13} %
+\def\SYSdate {2020/04/13} %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -58,6 +58,7 @@
\long\def\SYS_execarg#1{#1}
\long\def\SYS_gobtwoargs#1#2{}
\def\SYS_addtotok#1#2{#1\expandafter{\the#1#2}}
+\def\SYS_xaddtotok#1#2{\SYS_expaddtotok#1{\expanded{#2}}}
\def\SYS_expaddtotok#1#2{\xs_exparg{\SYS_addtotok#1}{#2}}
\def\SYS_addtotab{\SYS_addtotok\SYS_systemecode}
\def\SYS_cslet#1{\expandafter\let\csname#1\endcsname}
@@ -155,6 +156,28 @@
\sysequivsign{<=}\leq
\sysequivsign{>=}\geq
+\def\syssignspace#1{\edef\SYS_signspace{\ifdim#1=0pt \else\hskip\dimexpr#1\relax\fi}}
+\def\syseqspace#1{\edef\SYS_eqspace{\ifdim#1=0pt \else\hskip\dimexpr#1\relax\fi}}
+\syssignspace{0pt}
+\syseqspace{0pt}
+
+\def\SYS_firsttonil#1#2\_nil{#1}
+\def\SYS_firstletter#1#2{\string#1\expandafter\SYS_firsttonil\detokenize{#2.}\_nil}
+\def\sysalign#1{%
+ \xs_ifempty{#1}{\sysalign_i r}{\sysalign_i#1},l,\_nil
+}
+\def\sysalign_i#1,#2,#3\_nil{%
+ \let\SYS_leftright\hfil
+ \if\SYS_firstletter c{#1}\let\SYS_leftleft\hfil \else
+ \if\SYS_firstletter l{#1}\let\SYS_leftleft\empty\else
+ \let\SYS_leftleft\hfil \let\SYS_leftright\empty\fi\fi
+ \let\SYS_rightleft\hfil
+ \if\SYS_firstletter c{#2}\let\SYS_rightright\hfil \else
+ \if\SYS_firstletter r{#2}\let\SYS_rightright\empty \else
+ \let\SYS_rightleft\empty \let\SYS_rightright\hfil\fi\fi
+}
+\sysalign{r,l}
+
% #1 est l'�quation courante. La macro la s�pare en 2 membres -> \SYS_leftmember et \SYS_rightmember
% le signe de s�paration entre les 2 membres se trouve dans \SYS_currenteqsign
\def\SYS_splitinmembers#1{%
@@ -238,7 +261,7 @@
\fi
}
{\ifcsname SYS_term_\detokenize\expandafter{\SYS_letterfound}_\SYS_eqnumber\endcsname
- \errmessage{Package systeme Error: l'inconnue "\detokenize\expandafter{\SYS_letterfound}" a deja ete trouvee dans l'�quation !}%
+ \errmessage{Package systeme Error: l'inconnue "\detokenize\expandafter{\SYS_letterfound}" a deja ete trouvee dans l'equation !}%
\fi
\ifSYS_sortvariable
\SYS_insletter\SYS_letterfound% l'ins�rer si besoin dans la liste ordonn�e des variables
@@ -606,15 +629,16 @@
\SYS_makesyspreamble_i1%
}
+
\def\SYS_makesyspreamble_i#1{%
\xs_ifnum{#1<\SYS_preamblenum\relax}% tant qu'il reste des variables
- {\SYS_addtotok\SYS_systempreamble{\hfil$##$&\hfil$##$&}% une colonne pour le terme et une pour le signe
+ {\SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_signspace$##$\SYS_signspace\hfil&}% une colonne pour le terme et une pour le signe
\xs_exparg\SYS_makesyspreamble_i{\number\numexpr#1+1}%
}
{\ifSYS_constterm
- \SYS_addtotok\SYS_systempreamble{\hfil$##$&\hfil$##$&}% une colonne pour le terme constant et son signe
+ \SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_signspace$##$\SYS_signspace\hfil&}% une colonne pour le terme constant et son signe
\fi
- \SYS_addtotok\SYS_systempreamble{\hfil$##$&$##$&$##$\hfil\null}% ajouter 1 colonne pour le signe = et une pour le terme de droite
+ \SYS_xaddtotok\SYS_systempreamble{\SYS_leftleft$##$\SYS_leftright&\hfil\SYS_eqspace$##$\SYS_eqspace\hfil&\SYS_rightleft$##$\SYS_rightright\null}% ajouter 1 colonne pour le signe = et une pour le terme de droite
\ifSYS_extracol
\SYS_addtotok\SYS_systempreamble{&\SYS_extracolstart##\SYS_extracolend\hfil\null}% la colonne suppl�mentaire (pas de mode math)
\fi
@@ -686,4 +710,12 @@
les noms des termes.
- Correction d'un bug : si version �toil�e et terme constant dans
membre de gauche, d�faut d'alignement.
- - Nettoyage du code.
\ No newline at end of file
+ - Nettoyage du code.
+----------------------------------------------------------------------
+v0.33 13/04/2020
+ - possibilit� de choisir un espacement avant et apr�s les signes
+ + et - avec \syssignspace{<skip>}. De m�me pour = avec
+ \syseqspace{<skip>}
+ - possibilit� de choisir l'alignement des colonnes des termes �
+ gauche du signe = et celle � droite avec \sysalign{x,y} o�
+ x et y sont "c", "r", ou "l"
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/systeme.tlpobj new/tlpkg/tlpobj/systeme.tlpobj
--- old/tlpkg/tlpobj/systeme.tlpobj 2019-02-28 04:06:36.000000000 +0100
+++ new/tlpkg/tlpobj/systeme.tlpobj 2020-04-15 01:54:54.000000000 +0200
@@ -1,6 +1,6 @@
name systeme
category Package
-revision 49690
+revision 54724
shortdesc Format systems of equations
relocated 1
longdesc The package allows you to enter systems of equations or
@@ -16,7 +16,6 @@
catalogue-contact-bugs https://framagit.org/unbonpetit/systeme/issues
catalogue-contact-repository https://framagit.org/unbonpetit/systeme/tree/master
catalogue-ctan /macros/generic/systeme
-catalogue-date 2019-01-13 21:13:02 +0100
catalogue-license lppl1.3c
catalogue-topics maths maths-syseqn simplified
-catalogue-version 0.32
+catalogue-version 0.33
1
0
Hello community,
here is the log from the commit of package texlive-specs-u for openSUSE:Factory checked in at 2020-05-29 21:19:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-u (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-u.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-u"
Fri May 29 21:19:17 2020 rev:40 rq:806931 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-u/texlive-specs-u.changes 2019-11-07 23:12:09.688247914 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-u.new.3606/texlive-specs-u.changes 2020-05-29 21:32:48.441833720 +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
+
+-------------------------------------------------------------------
New:
----
ruler.tar.xz
rulerbox.doc.tar.xz
rulerbox.tar.xz
schedule.doc.tar.xz
schedule.tar.xz
scholax.doc.tar.xz
scholax.tar.xz
schulmathematik.doc.tar.xz
schulmathematik.tar.xz
scontents.doc.tar.xz
scontents.tar.xz
sdaps.doc.tar.xz
sdaps.tar.xz
secnum.doc.tar.xz
secnum.tar.xz
selinput.doc.tar.xz
selinput.tar.xz
shortmathj.doc.tar.xz
shortmathj.tar.xz
simplebnf.doc.tar.xz
simplebnf.tar.xz
simpleoptics.doc.tar.xz
simpleoptics.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-u.spec ++++++
++++ 13417 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-u/texlive-specs-u.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-u.new.3606/texlive-specs-u.spec
++++++ rosario.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/rosario/OFL.txt new/doc/fonts/rosario/OFL.txt
--- old/doc/fonts/rosario/OFL.txt 2016-05-03 01:43:02.000000000 +0200
+++ new/doc/fonts/rosario/OFL.txt 2019-07-13 23:38:54.000000000 +0200
@@ -1,5 +1,4 @@
-Copyright (c) 2012-2015, Omnibus-Type (www.omnibus-type.com|omnibus.type@gmail.com)
-
+Copyright 2016 The Sansita Project Authors (omnibus.type(a)gmail.com)
This Font Software is licensed under the SIL Open Font License, Version 1.1.
This license is copied below, and is also available with a FAQ at:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/rosario/README.md new/doc/fonts/rosario/README.md
--- old/doc/fonts/rosario/README.md 2016-05-03 01:43:02.000000000 +0200
+++ new/doc/fonts/rosario/README.md 2019-07-21 00:24:30.000000000 +0200
@@ -1,15 +1,26 @@
# Rosario fonts for LaTeX #
This work provides the necessary files to use the Rosario fonts with
-LaTeX. Rosario is a set of four fonts provided by Héctor Gatti, Adobe
-Typekit &
-[Omnibus-Type](http://www.omnibus-type.com/fonts/rosario.php) Team
+LaTeX. Rosario is a set of eight fonts provided by Héctor Gatti,
+Adobe Typekit &
+[Omnibus-Type](https://www.omnibus-type.com/fonts/rosario/) Team
under the Open Font License [(OFL)](http://scripts.sil.org/OFL),
-version 1.1. The fonts are copyright (c) 2012-2015, Omnibus-Type.
+version 1.1. The fonts are copyright (c) 2012-2019, Omnibus-Type.
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) 2016 Arash Esbati.
+copyright (c) 2016-2019 Arash Esbati.
+
+ v2.1, 2019/07/19
+ * Fix a bug in handling of alias keys
+
+ v2.0, 2019/07/07
+ * Remove `Rosario.fontspec' from the bundle since the
+ functionality is now provided by the package itself
+ * Add the `scaled' key
+ * Use NFSS scheme for fonts mapping
+ * Rewrite major part of the code supporting 8 fonts. Harmonize
+ the usage of package options over different TeX engines
v1.0, 2016/05/01
* Initial release
Binary files old/doc/fonts/rosario/Rosario.pdf and new/doc/fonts/rosario/Rosario.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rosario.doc.tlpobj new/tlpkg/tlpobj/rosario.doc.tlpobj
--- old/tlpkg/tlpobj/rosario.doc.tlpobj 2019-02-28 04:04:41.000000000 +0100
+++ new/tlpkg/tlpobj/rosario.doc.tlpobj 2019-07-22 01:53:39.000000000 +0200
@@ -1,9 +1,9 @@
name rosario.doc
category Package
-revision 40843
+revision 51688
shortdesc doc files of rosario
relocated 1
-docfiles size=61
+docfiles size=125
RELOC/doc/fonts/rosario/OFL.txt
RELOC/doc/fonts/rosario/README.md
RELOC/doc/fonts/rosario/Rosario.pdf
++++++ rosario.tar.xz ++++++
++++ 8108 lines of diff (skipped)
++++++ rutitlepage.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/rutitlepage/README.md new/doc/latex/rutitlepage/README.md
--- old/doc/latex/rutitlepage/README.md 2018-11-10 23:22:44.000000000 +0100
+++ new/doc/latex/rutitlepage/README.md 2019-05-10 23:15:48.000000000 +0200
@@ -34,4 +34,4 @@
## Version
-Version 2.0
+Version 2.3
Binary files old/doc/latex/rutitlepage/rutitlepage.pdf and new/doc/latex/rutitlepage/rutitlepage.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rutitlepage.doc.tlpobj new/tlpkg/tlpobj/rutitlepage.doc.tlpobj
--- old/tlpkg/tlpobj/rutitlepage.doc.tlpobj 2019-02-28 04:04:46.000000000 +0100
+++ new/tlpkg/tlpobj/rutitlepage.doc.tlpobj 2019-05-11 01:38:22.000000000 +0200
@@ -1,6 +1,6 @@
name rutitlepage.doc
category Package
-revision 49125
+revision 51073
shortdesc doc files of rutitlepage
relocated 1
docfiles size=48
++++++ rutitlepage.tar.xz ++++++
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-bw.eps and new/tex/latex/rutitlepage/rutitlepage-logo-bw.eps differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-bw.pdf and new/tex/latex/rutitlepage/rutitlepage-logo-bw.pdf differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-cmyk.eps and new/tex/latex/rutitlepage/rutitlepage-logo-cmyk.eps differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-cmyk.pdf and new/tex/latex/rutitlepage/rutitlepage-logo-cmyk.pdf differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.eps and new/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.eps differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.pdf and new/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.pdf differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.eps and new/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.eps differ
Binary files old/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.pdf and new/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/rutitlepage/rutitlepage-logo.eps new/tex/latex/rutitlepage/rutitlepage-logo.eps
--- old/tex/latex/rutitlepage/rutitlepage-logo.eps 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/rutitlepage/rutitlepage-logo.eps 2019-05-10 23:15:48.000000000 +0200
@@ -0,0 +1,286 @@
+%!PS-Adobe-3.0 EPSF-3.0
+%%Creator: cairo 1.14.0 (http://cairographics.org)
+%%CreationDate: Tue Jun 28 20:12:30 2016
+%%Pages: 1
+%%DocumentData: Clean7Bit
+%%LanguageLevel: 2
+%%BoundingBox: 0 -1 38 49
+%%EndComments
+%%BeginProlog
+save
+50 dict begin
+/q { gsave } bind def
+/Q { grestore } bind def
+/cm { 6 array astore concat } bind def
+/w { setlinewidth } bind def
+/J { setlinecap } bind def
+/j { setlinejoin } bind def
+/M { setmiterlimit } bind def
+/d { setdash } bind def
+/m { moveto } bind def
+/l { lineto } bind def
+/c { curveto } bind def
+/h { closepath } bind def
+/re { exch dup neg 3 1 roll 5 3 roll moveto 0 rlineto
+ 0 exch rlineto 0 rlineto closepath } bind def
+/S { stroke } bind def
+/f { fill } bind def
+/f* { eofill } bind def
+/n { newpath } bind def
+/W { clip } bind def
+/W* { eoclip } bind def
+/BT { } bind def
+/ET { } bind def
+/pdfmark where { pop globaldict /?pdfmark /exec load put }
+ { globaldict begin /?pdfmark /pop load def /pdfmark
+ /cleartomark load def end } ifelse
+/BDC { mark 3 1 roll /BDC pdfmark } bind def
+/EMC { mark /EMC pdfmark } bind def
+/cairo_store_point { /cairo_point_y exch def /cairo_point_x exch def } def
+/Tj { show currentpoint cairo_store_point } bind def
+/TJ {
+ {
+ dup
+ type /stringtype eq
+ { show } { -0.001 mul 0 cairo_font_matrix dtransform rmoveto } ifelse
+ } forall
+ currentpoint cairo_store_point
+} bind def
+/cairo_selectfont { cairo_font_matrix aload pop pop pop 0 0 6 array astore
+ cairo_font exch selectfont cairo_point_x cairo_point_y moveto } bind def
+/Tf { pop /cairo_font exch def /cairo_font_matrix where
+ { pop cairo_selectfont } if } bind def
+/Td { matrix translate cairo_font_matrix matrix concatmatrix dup
+ /cairo_font_matrix exch def dup 4 get exch 5 get cairo_store_point
+ /cairo_font where { pop cairo_selectfont } if } bind def
+/Tm { 2 copy 8 2 roll 6 array astore /cairo_font_matrix exch def
+ cairo_store_point /cairo_font where { pop cairo_selectfont } if } bind def
+/g { setgray } bind def
+/rg { setrgbcolor } bind def
+/d1 { setcachedevice } bind def
+%%EndProlog
+%%BeginSetup
+%%EndSetup
+%%Page: 1 1
+%%BeginPageSetup
+%%PageBoundingBox: 0 -1 38 49
+%%EndPageSetup
+q 0 -1 38 50 rectclip q
+Q q
+0 48.189 37.527 -48.191 re W n
+q
+0 48.189 38 -49 re W n
+[ 1 0 0 1 0 -0.810501 ] concat
+ q
+0.137255 0.121569 0.12549 rg
+3.074 19.461 m 2.996 19.07 2.512 18.539 1.938 18.48 c 1.133 18.461 0.461
+ 19.121 0.422 19.676 c 0.391 20.199 0.43 20.336 0.43 20.336 c 3.133 20.246
+ l 3.125 19.949 3.152 19.797 3.074 19.461 c h
+3.438 21.258 m 3.336 21.023 l 0.391 21.102 l 0.195 21.348 l 0 21.344 l
+0 19.539 l -0.043 18.715 0.797 17.715 1.922 17.719 c 2.977 17.777 3.488
+18.773 3.559 19.699 c 3.672 21.262 l 3.438 21.258 l f
+1.238 12.719 m 1.812 11.57 l 1.938 11.645 l 1.871 11.945 l 4.57 13.141
+l 4.707 12.969 l 4.941 13.082 l 4.438 14.113 l 4.277 14.043 l 4.281 13.723
+ l 1.633 12.566 l 1.402 12.742 l 1.238 12.719 l f
+2.113 13.926 m 2.113 13.801 l 1.344 13.641 l 0.906 13.938 0.699 14.254
+0.57 14.77 c 0.32 15.773 0.57 16.703 1.883 17.07 c 3.262 17.5 3.832 16.605
+ 4.129 15.562 c 4.215 15.254 4.219 15.031 4.273 14.695 c 3.543 14.492 l
+3.441 14.641 l 3.73 14.898 3.82 15.285 3.723 15.656 c 3.582 16.223 2.93
+16.547 2.398 16.332 c 2.781 14.66 l 3.078 14.535 l 3.133 14.375 l 2.352
+14.176 l 2.301 14.336 l 2.414 14.512 l 1.992 16.191 l 1.34 16.156 0.859
+15.484 1 14.852 c 1.09 14.445 1.578 13.984 2.113 13.926 c f
+1.539 22.031 m 1.445 22.234 1.539 22.48 1.75 22.574 c 1.953 22.656 2.195
+ 22.602 2.277 22.426 c 2.387 22.215 2.277 21.977 2.086 21.828 c 1.883 21.734
+ 1.637 21.828 1.539 22.031 c f
+3.848 11.328 m 3.754 11.539 3.84 11.777 3.988 11.871 c 4.172 11.969 4.441
+ 11.871 4.598 11.656 c 4.688 11.453 4.594 11.203 4.391 11.121 c 4.184 11.023
+ 3.945 11.121 3.848 11.328 c f
+24.27 3.441 m 24.176 3.652 24.277 3.891 24.492 3.984 c 24.707 4.078 24.949
+ 3.984 25.035 3.781 c 25.113 3.574 25.035 3.332 24.824 3.23 c 24.621 3.137
+ 24.379 3.234 24.27 3.441 c f
+2.375 28.719 m 1.789 27.57 l 1.926 27.523 l 2.172 27.734 l 4.777 26.391
+ l 4.723 26.176 l 4.957 26.082 l 5.43 27.09 l 5.262 27.168 l 5.023 26.996
+ l 2.531 28.332 l 2.504 28.605 l 2.375 28.719 l f
+3.996 23.676 m 3.832 23.723 l 3.68 23.605 l 1.73 24.023 l 4.52 25.086 l
+ 4.773 25.73 l 4.566 25.777 l 4.379 25.695 l 1.758 26.738 l 1.738 26.988
+ l 1.547 27.047 l 1.219 26.145 l 1.461 26.055 l 1.684 26.172 l 3.547 25.445
+ l 0.57 24.301 l 0.438 23.855 l 3.547 23.168 l 3.68 23.02 l 3.797 22.969
+ l 3.996 23.676 l f
+8.82 5.602 m 8.707 5.484 8.27 5.07 7.816 5.059 c 7.625 5.059 7.453 5.117
+ 7.293 5.273 c 7.25 5.324 l 7.098 5.434 7.031 5.566 7.02 5.762 c 7.02 6.137
+ 7.34 6.641 7.582 6.898 c 7.785 7.102 8.52 7.875 9.098 7.352 c 9.184 7.273
+ l 9.746 6.727 8.988 5.773 8.82 5.602 c h
+9.957 6.27 m 9.984 6.758 9.887 7.18 9.566 7.508 c 9.52 7.562 l 9.5 7.582
+ l 9.477 7.598 l 9.461 7.613 l 9.414 7.648 l 9.066 7.953 8.645 8.051 8.152
+ 7.996 c 7.629 7.945 7.137 7.668 6.816 7.203 c 6.254 6.496 6.262 5.582 6.926
+ 4.922 c 6.945 4.906 l 6.941 4.906 l 6.934 4.914 l 6.945 4.906 l 7.656 4.312
+ 8.578 4.344 9.27 4.918 c 9.676 5.258 9.926 5.754 9.957 6.27 c f
+14.203 1.359 m 15.414 1.094 l 15.426 1.234 l 15.16 1.434 l 15.73 4.285
+l 16 4.297 l 16.016 4.547 l 14.906 4.746 l 14.859 4.555 l 15.137 4.352 l
+ 14.574 1.598 l 14.281 1.516 l 14.203 1.359 l f
+23.434 2.672 m 23.559 2.664 l 23.805 1.91 l 23.48 1.492 23.18 1.293 22.652
+ 1.18 c 21.637 0.961 20.715 1.188 20.414 2.465 c 19.973 3.855 20.867 4.41
+ 21.91 4.715 c 22.23 4.805 22.445 4.805 22.789 4.852 c 22.98 4.098 l 22.828
+ 4.004 l 22.578 4.305 22.195 4.402 21.812 4.32 c 21.254 4.172 20.902 3.508
+ 21.098 2.961 c 22.777 3.344 l 22.914 3.648 l 23.078 3.691 l 23.262 2.91
+ l 23.09 2.871 l 22.922 2.98 l 21.262 2.586 l 21.293 1.957 21.934 1.48 22.582
+ 1.613 c 23 1.684 23.473 2.141 23.434 2.672 c f
+7.273 9.59 m 7.137 9.48 l 7.16 9.281 l 5.727 7.824 l 6.363 10.73 l 5.961
+ 11.285 l 5.82 11.148 l 5.781 10.941 l 3.441 9.316 l 3.219 9.434 l 3.074
+ 9.309 l 3.68 8.527 l 3.883 8.691 l 3.906 8.941 l 5.52 10.098 l 4.859 7.008
+ l 5.172 6.652 l 7.453 8.922 l 7.648 8.961 l 7.754 9.027 l 7.273 9.59 l f
+18.84 4.266 m 18.828 4.094 l 19 3.977 l 19.199 1.973 l 17.316 4.383 l 16.664
+ 4.449 l 16.684 4.25 l 16.809 4.082 l 16.582 1.227 l 16.344 1.117 l 16.34
+ 0.926 l 17.285 0.914 l 17.301 1.18 l 17.137 1.355 l 17.266 3.324 l 19.242
+ 0.809 l 19.707 0.812 l 19.453 3.965 l 19.559 4.141 l 19.57 4.27 l 18.84
+ 4.266 l f
+8.938 3.566 m 9.027 3.762 l 9.301 3.738 l 11.18 5.891 l 11.086 6.117 l
+11.238 6.293 l 11.82 6.043 l 11.727 3.91 l 12.93 5.309 l 12.871 5.422 l
+12.973 5.496 l 13.82 5.152 l 13.809 4.938 l 13.66 4.867 l 13.281 1.961 l
+ 13.488 1.723 l 13.43 1.551 l 12.438 1.992 l 12.496 2.199 l 12.676 2.242
+ l 12.949 4.535 l 11.188 2.43 l 10.832 2.547 l 11.074 5.188 l 9.645 3.473
+ l 9.773 3.23 l 9.719 3.105 l 8.938 3.566 l f
+31.297 7.328 m 31.414 7.383 l 31.926 6.781 l 31.867 6.246 31.691 5.926
+31.289 5.562 c 30.504 4.824 29.57 4.605 28.641 5.59 c 27.66 6.641 28.168
+ 7.566 28.961 8.316 c 29.191 8.543 29.383 8.656 29.664 8.859 c 30.195 8.297
+ l 30.117 8.141 l 29.738 8.281 29.359 8.176 29.07 7.914 c 28.629 7.531 28.641
+ 6.793 29.09 6.422 c 30.402 7.547 l 30.367 7.875 l 30.48 7.992 l 31.027
+7.449 l 30.902 7.332 l 30.695 7.336 l 29.375 6.109 l 29.703 5.551 30.52
+5.43 31.016 5.906 c 31.336 6.18 31.496 6.824 31.297 7.328 c f
+35.426 25.012 m 35.426 25.141 l 36.203 25.309 l 36.641 24.984 36.832 24.688
+ 36.949 24.168 c 37.203 23.156 36.926 22.223 35.645 21.875 c 34.297 21.457
+ 33.684 22.348 33.406 23.395 c 33.316 23.703 33.309 23.926 33.258 24.27
+c 33.996 24.469 l 34.094 24.316 l 33.801 24.066 33.703 23.676 33.801 23.297
+ c 33.934 22.727 34.578 22.398 35.129 22.609 c 34.754 24.289 l 34.441 24.418
+ l 34.398 24.582 l 35.195 24.797 l 35.23 24.656 l 35.117 24.438 l 35.539
+ 22.75 l 36.191 22.77 36.68 23.445 36.543 24.09 c 36.461 24.5 35.965 24.949
+ 35.426 25.012 c f
+32.906 25.68 m 32.574 26.371 32.387 27.391 33.293 27.621 c 34.043 27.824
+ 34.492 27.105 34.594 26.531 c h
+35.852 27.176 m 34.98 26.738 l 34.977 27.41 35.152 28.16 35.082 28.539
+c 34.953 29.086 34.785 29.23 34.348 29.594 c 34.219 29.492 l 34.348 29.273
+ 34.398 29.273 34.484 28.945 c 34.598 28.48 34.586 28.184 34.473 27.719
+c 34.219 28.191 33.664 28.383 33.07 28.211 c 32.34 28.016 31.918 27.254
+32.246 26.559 c 32.977 24.863 l 33.223 24.973 l 33.285 25.133 l 35.902 26.477
+ l 36.086 26.355 l 36.23 26.402 l 35.852 27.176 l f
+33.953 18.195 m 33.965 20.906 l 33.742 21.645 l 34.672 21.055 l 34.578
+21.031 34.5 21 34.441 20.953 c 34.344 20.855 34.344 20.449 34.328 19.84
+c 37.312 19.883 l 37.367 20.012 l 37.523 20.004 l 37.527 18.938 l 37.441
+ 18.938 l 37.309 19.191 l 34.352 19.141 l 34.355 18.816 34.309 18.34 34.398
+ 18.266 c 34.43 18.234 34.492 18.199 34.57 18.172 c 33.789 17.656 l 33.953
+ 18.195 l f
+37.078 15.617 m 37.309 16.84 l 37.172 16.852 l 36.961 16.602 l 34.082 17.113
+ l 34.055 17.324 l 33.812 17.344 l 33.66 16.223 l 33.84 16.203 l 34.02 16.426
+ l 36.824 15.941 l 36.922 15.684 l 37.078 15.617 l f
+35.809 14.984 m 35.934 15.117 l 36.609 14.805 l 36.75 14.254 36.727 13.859
+ 36.488 13.352 c 36 12.406 35.293 11.773 33.953 12.324 c 32.648 12.914 32.793
+ 13.988 33.23 14.996 c 33.367 15.305 33.496 15.477 33.664 15.766 c 34.41
+ 15.48 l 34.355 15.281 l 33.961 15.262 33.68 15.082 33.512 14.734 c 33.23
+ 14.176 33.664 13.676 34.18 13.27 c 34.695 12.883 35.816 13.051 36.109 13.629
+ c 36.289 14.02 36.184 14.598 35.809 14.984 c f
+34.82 9.828 m 35.441 10.922 l 35.301 10.926 l 35.043 10.773 l 32.383 12.23
+ l 32.438 12.441 l 32.211 12.535 l 31.793 11.535 l 31.961 11.449 l 32.211
+ 11.602 l 34.688 10.211 l 34.707 9.945 l 34.82 9.828 l f
+32.762 7.07 m 34.492 9.051 l 34.121 10 l 33.875 9.754 l 33.875 9.754 33.961
+ 9.355 33.926 9.117 c 33.852 8.637 33.195 8.062 33.195 8.062 c 30.953 9.922
+ l 31.051 10.16 l 30.848 10.297 l 30.074 9.32 l 30.281 9.176 l 30.531 9.289
+ l 32.711 7.465 l 32.668 7.211 l 32.762 7.07 l f
+26.762 2.512 m 27.695 3.02 l 27.598 3.133 l 27.355 3.168 l 26.688 4.523
+ l 26.688 4.523 27.242 4.922 27.598 4.996 c 27.773 5.039 28.055 5.035 28.055
+ 5.035 c 27.715 5.719 l 27.715 5.719 27.555 5.512 27.434 5.398 c 27.168
+5.141 26.492 4.91 26.492 4.91 c 26.02 5.898 l 26.02 5.898 26.68 6.367 27.105
+ 6.496 c 27.242 6.535 27.512 6.586 27.512 6.586 c 27.512 6.586 27.523 6.773
+ 27.562 6.879 c 27.621 7.062 27.793 7.324 27.793 7.324 c 25.055 5.723 l
+25.113 5.52 l 25.383 5.523 l 26.703 2.898 l 26.641 2.672 l 26.762 2.512
+l f
+28.867 29.129 m 20.754 30.406 l 20.855 30.156 20.918 29.875 20.918 29.594
+ c 20.918 28.43 19.984 27.492 18.812 27.492 c 18.797 27.492 18.766 27.496
+ 18.742 27.496 c 18.738 27.496 l 18.715 27.496 18.699 27.492 18.676 27.492
+ c 17.52 27.492 16.625 28.43 16.625 29.594 c 16.625 29.875 16.684 30.156
+ 16.781 30.406 c 8.711 29.129 l 8.477 30.504 8.359 31.781 8.359 32.922 c
+ 8.359 33.332 8.379 33.715 8.41 34.102 c 13.234 34.102 l 14.562 34.102 14.672
+ 33.965 14.734 33.902 c 14.824 33.82 14.844 33.598 14.723 33.512 c 14.434
+ 33.332 13.992 33.117 13.992 32.465 c 13.992 32.43 l 13.992 31.91 14.453
+ 31.715 15.551 31.277 c 15.867 31.156 16.977 30.719 16.977 30.719 c 17.207
+ 30.848 l 17.594 31.047 18.418 31.602 18.418 32.547 c 18.418 32.668 18.402
+ 32.766 18.387 32.852 c 18.355 32.977 18.305 33.09 18.25 33.184 c 18.25
+33.191 l 18.074 33.52 17.863 33.617 17.863 33.617 c 17.863 33.617 17.969
+ 34.066 18.617 34.121 c 18.617 34.117 l 18.648 34.125 18.664 34.129 18.691
+ 34.129 c 18.742 34.129 l 19.066 34.129 19.285 33.859 19.285 33.543 c 19.285
+ 33.148 19.031 33.066 19.031 32.547 c 19.027 31.602 19.852 31.047 20.234
+ 30.848 c 20.484 30.719 l 20.484 30.719 21.613 31.156 21.922 31.277 c 23.039
+ 31.715 23.484 31.91 23.484 32.43 c 23.484 32.465 l 23.484 33.117 23.051
+ 33.332 22.77 33.512 c 22.625 33.598 22.652 33.82 22.75 33.902 c 22.812
+33.965 22.93 34.102 24.234 34.102 c 29.176 34.102 l 29.207 33.715 29.23
+33.332 29.23 32.922 c 29.23 31.781 29.105 30.504 28.867 29.129 c h
+28.141 25.898 m 21.289 29.031 l 23.699 28.656 27.195 28.105 28.621 27.883
+ c 28.484 27.23 28.324 26.586 28.141 25.898 c h
+20.637 27.941 m 24.973 25.898 l 21.992 25.898 l h
+26.793 21.672 m 21.594 21.672 l 21.594 24.625 l 27.781 24.625 l 27.492
+23.676 27.164 22.684 26.793 21.672 c h
+19.391 25.898 m 19.391 27.504 l 20.461 25.898 l h
+17.043 25.898 m 18.109 27.504 l 18.109 25.898 l h
+26.121 19.914 m 25.781 19.074 25.43 18.266 25.059 17.445 c 20.32 17.445
+ l 20.32 8.629 l 19.852 7.949 19.438 7.406 19.094 7.031 c 19 6.93 18.844
+ 6.773 18.742 6.699 c 18.652 6.773 18.512 6.93 18.406 7.031 c 18.062 7.406
+ 17.645 7.949 17.176 8.629 c 17.176 17.445 l 12.496 17.445 l 12.129 18.266
+ 11.773 19.074 11.449 19.914 c 11.383 20.078 11.316 20.238 11.254 20.398
+ c 17.176 20.398 l 17.176 24.625 l 20.32 24.625 l 20.32 20.398 l 26.312
+20.398 l 26.254 20.238 26.188 20.078 26.121 19.914 c h
+21.594 10.629 m 21.594 16.168 l 24.496 16.168 l 23.52 14.102 22.52 12.191
+ 21.594 10.629 c h
+15.949 10.629 m 15.02 12.191 14.012 14.102 13.043 16.168 c 15.949 16.168
+ l h
+9.805 24.625 m 15.949 24.625 l 15.949 21.672 l 10.777 21.672 l 10.402 22.684
+ 10.094 23.676 9.805 24.625 c h
+16.887 27.941 m 15.535 25.898 l 12.59 25.898 l h
+9.441 25.898 m 9.254 26.586 9.094 27.23 8.957 27.883 c 10.367 28.105 13.832
+ 28.656 16.25 29.031 c h
+18.738 35.938 m 28.867 35.938 l 28.918 35.75 28.965 35.543 29 35.34 c 24.234
+ 35.34 l 22.215 35.34 21.352 34.848 21.352 33.668 c 21.352 33.305 21.551
+ 32.914 21.879 32.637 c 21.648 32.543 20.68 32.195 20.539 32.133 c 20.426
+ 32.266 20.207 32.469 20.176 32.793 c 20.273 32.949 20.484 33.27 20.484
+33.734 c 20.484 34.461 19.984 35.195 18.715 35.23 c 18.129 35.207 17.758
+ 35.035 17.461 34.801 c 17.441 34.777 17.43 34.762 17.41 34.742 c 16.883
+ 34.598 16.551 34.23 16.551 33.762 c 16.551 33.258 l 16.551 33.258 16.781
+ 33.234 16.914 33.184 c 17.086 33.109 17.152 33.02 17.203 32.949 c 17.348
+ 32.742 17.227 32.281 16.934 32.133 c 16.797 32.195 15.828 32.543 15.59
+32.637 c 15.922 32.914 16.137 33.305 16.137 33.668 c 16.137 34.848 15.266
+ 35.34 13.234 35.34 c 8.574 35.34 l 8.617 35.543 8.656 35.75 8.711 35.938
+ c h
+12.262 40.18 m 12.262 40.57 12.387 41.078 13.516 41.078 c 14.43 41.078
+14.801 40.941 14.957 40.824 c 15.035 40.777 15.137 40.699 15.137 40.312
+c 15.137 40.312 15.137 38.293 15.137 37.215 c 12.262 37.215 l h
+17.375 43.703 m 17.375 43.277 l 16.625 43.051 15.996 42.594 15.566 41.945
+ c 15.219 42.156 14.785 42.254 14.344 42.301 c 15.207 43.008 16.277 43.484
+ 17.375 43.703 c h
+16.555 46.188 m 18.371 46.188 l 18.371 48.004 l 19.133 48.004 l 19.133
+46.188 l 20.98 46.188 l 20.98 45.379 l 19.133 45.379 l 19.133 43.535 l 18.371
+ 43.535 l 18.371 45.379 l 16.555 45.379 l h
+21.129 40.312 m 21.129 37.215 l 16.406 37.215 l 16.406 40.312 l 16.406
+41.203 16.992 42.23 18.738 42.23 c 18.742 42.23 l 20.52 42.23 21.129 41.203
+ 21.129 40.312 c h
+23.191 42.301 m 22.746 42.254 22.324 42.156 21.965 41.945 c 21.547 42.594
+ 20.918 43.051 20.117 43.277 c 20.117 43.703 l 21.262 43.484 22.332 43.008
+ 23.191 42.301 c h
+25.301 40.18 m 25.301 37.215 l 22.398 37.215 l 22.398 40.312 l 22.398 40.699
+ 22.504 40.777 22.57 40.824 c 22.73 40.941 23.109 41.078 24.027 41.078 c
+ 25.168 41.078 25.301 40.57 25.301 40.18 c h
+29.957 36.777 m 29.801 37.215 l 26.578 37.215 l 26.578 40.18 l 26.578 41
+ 26.168 41.863 25.07 42.199 c 24.277 43.16 23.191 43.957 21.969 44.469 c
+ 21.969 47.176 l 20.117 47.176 l 20.117 49 l 17.375 49 l 17.375 47.176 l
+ 15.566 47.176 l 15.566 44.469 l 14.344 43.957 13.242 43.16 12.473 42.199
+ c 11.398 41.863 10.98 41 10.98 40.18 c 10.98 37.215 l 7.77 37.215 l 7.629
+ 36.777 l 7.242 35.598 7.07 34.301 7.07 32.891 c 7.07 28.523 8.684 23.418
+ 10.262 19.438 c 12.66 13.418 15.828 7.969 17.477 6.156 c 17.867 5.762 18.184
+ 5.418 18.707 5.395 c 18.715 5.391 18.73 5.395 18.738 5.395 c 18.742 5.395
+ l 18.758 5.395 18.766 5.391 18.781 5.395 c 19.316 5.418 19.637 5.762 20.023
+ 6.156 c 21.711 7.969 24.906 13.418 27.301 19.438 c 28.895 23.418 30.504
+ 28.523 30.504 32.891 c 30.504 34.301 30.355 35.598 29.957 36.777 c f
+ Q
+Q
+Q Q
+showpage
+%%Trailer
+end restore
+%%EOF
Binary files old/tex/latex/rutitlepage/rutitlepage-logo.pdf and new/tex/latex/rutitlepage/rutitlepage-logo.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/rutitlepage/rutitlepage.sty new/tex/latex/rutitlepage/rutitlepage.sty
--- old/tex/latex/rutitlepage/rutitlepage.sty 2018-11-10 23:22:44.000000000 +0100
+++ new/tex/latex/rutitlepage/rutitlepage.sty 2019-05-10 23:15:48.000000000 +0200
@@ -7,7 +7,7 @@
%% rutitlepage.dtx (with options: `package')
%% This is a generated file.
%%
-%% Copyright (C) 2017 Mart Lubbers
+%% Copyright (C) 2019 Mart Lubbers
%%
%% This file may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either
@@ -53,7 +53,7 @@
\null\vfill%
\parindent0pt
{\Huge\bfseries\@rutitletitle}%
-\ifdefined\@rutitlesubtitle{\\[2\baselineskip]\large\it\@rutitlesubtitle}\fi\\[4\baselineskip]
+\ifdefined\@rutitlesubtitle{\\[2\baselineskip]\large\it\@rutitlesubtitle\/}\fi\\[4\baselineskip]
{\Large\sc\@rutitleauthors}\\[\baselineskip]
{\large\@rutitledate}
\vfill
@@ -113,7 +113,8 @@
}
\newcommand{\maketitleru}[1][]{
\setkeys{maketitleru}{#1}
-\ifcsname rutitle@layout@\@rutitlelayout\endcsname
+\ifcsname%
+rutitle@layout@\@rutitlelayout\endcsname
\expandafter\csname rutitle@layout@\@rutitlelayout\endcsname
\else
\PackageError{rutitlepage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/rutitlepage.tlpobj new/tlpkg/tlpobj/rutitlepage.tlpobj
--- old/tlpkg/tlpobj/rutitlepage.tlpobj 2019-02-28 04:04:46.000000000 +0100
+++ new/tlpkg/tlpobj/rutitlepage.tlpobj 2019-05-11 01:38:22.000000000 +0200
@@ -1,6 +1,6 @@
name rutitlepage
category Package
-revision 49125
+revision 51073
shortdesc Radboud University Titlepage Package
relocated 1
longdesc This is an unofficial LaTeX package to generate titlepages for
@@ -8,12 +8,22 @@
longdesc from the university. This package requires the following other
longdesc LaTeX packages: geometry, graphicx, ifpdf, keyval, iflang, and,
longdesc optionnaly, babel-dutch.
-runfiles size=2
+runfiles size=1070
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-bw.eps
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-bw.pdf
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-cmyk.eps
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-cmyk.pdf
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.eps
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-nl-bw.pdf
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.eps
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo-nl-cmyk.pdf
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo.eps
+ RELOC/tex/latex/rutitlepage/rutitlepage-logo.pdf
RELOC/tex/latex/rutitlepage/rutitlepage.sty
catalogue-contact-bugs https://github.com/dopefishh/rutitlepage/issues
catalogue-contact-repository https://github.com/dopefishh/rutitlepage
catalogue-ctan /macros/latex/contrib/rutitlepage
-catalogue-date 2018-11-10 20:32:18 +0100
+catalogue-date 2019-05-10 18:23:12 +0200
catalogue-license lppl1.3
catalogue-topics titlepage logo
-catalogue-version 2.1
+catalogue-version 2.3
++++++ sanitize-umlaut.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sanitize-umlaut/CHANGES new/doc/latex/sanitize-umlaut/CHANGES
--- old/doc/latex/sanitize-umlaut/CHANGES 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/sanitize-umlaut/CHANGES 2020-01-01 22:51:17.000000000 +0100
@@ -0,0 +1,27 @@
+%% The LaTeX package sanitize-umlaut - version 1.10 (2020/01/01)
+%%
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2016-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
+%%
+%% This work may be distributed and/or modified under the
+%% conditions of the LaTeX Project Public License, either version 1.3
+%% of this license or (at your option) any later version.
+%% The latest version of this license is in
+%% http://www.latex-project.org/lppl.txt
+%% and version 1.3 or later is part of all distributions of LaTeX
+%% version 2005/12/01 or later.
+%%
+%% This work has the LPPL maintenance status `author-maintained'.
+%%
+%% This work consists of all files listed in README
+%%
+
+version 1.00 (2016/05/27): initial public release
+
+version 1.10 (2020/01/01):
+- implementation changed to adapt for LaTeX/inputenc UTF-8 changes
+ (see documentation):
+ version 1.00 is only compatible to older LaTeX/inputenc UTF-8
+ version 1.10 is only compatible to recent LaTeX/inputenc UTF-8
+- utf8-2018 is a new supported encoding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sanitize-umlaut/README new/doc/latex/sanitize-umlaut/README
--- old/doc/latex/sanitize-umlaut/README 2016-06-12 00:12:06.000000000 +0200
+++ new/doc/latex/sanitize-umlaut/README 2020-01-01 22:51:17.000000000 +0100
@@ -1,8 +1,8 @@
-%% The LaTeX package sanitize-umlaut - version 1.00 (2016/05/28)
+%% The LaTeX package sanitize-umlaut - version 1.10 (2020/01/01)
%%
-%% --------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% --------------------------------------------------------------------------------------
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2016-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -17,7 +17,7 @@
%% This work consists of all files listed in README
%%
-The packages sanitizes umlauts to be used directly in index entries for
+The package sanitizes umlauts to be used directly in index entries for
MakeIndex and friends with pdflatex. This means, that inside '\index' an umlaut
can be used as "U or directly. In both cases, the letter is written as "U into
the raw index file for correct processing with MakeIndex and pdflatex.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sanitize-umlaut/sanitize-umlaut.doc.sty new/doc/latex/sanitize-umlaut/sanitize-umlaut.doc.sty
--- old/doc/latex/sanitize-umlaut/sanitize-umlaut.doc.sty 2016-06-12 00:12:06.000000000 +0200
+++ new/doc/latex/sanitize-umlaut/sanitize-umlaut.doc.sty 2020-01-01 22:51:17.000000000 +0100
@@ -69,7 +69,7 @@
\urlstyle{sf}
\newtcblisting{fullexample}[1]{docexample,minted style=colorful,
- listing and comment,pdf comment,compilable listing,#1}
+ listing and comment,pdf comment,freeze pdf,compilable listing,#1}
\DeclareTotalTCBox{\myverb}{ O{} v }{tile,fontupper=\ttfamily,nobeforeafter,
tcbox raise base,boxsep=0.5mm,top=0pt,bottom=0pt,left=0pt,right=0pt,boxrule=0.3mm,
Binary files old/doc/latex/sanitize-umlaut/sanitize-umlaut.pdf and new/doc/latex/sanitize-umlaut/sanitize-umlaut.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/sanitize-umlaut/sanitize-umlaut.tex new/doc/latex/sanitize-umlaut/sanitize-umlaut.tex
--- old/doc/latex/sanitize-umlaut/sanitize-umlaut.tex 2016-06-12 00:12:06.000000000 +0200
+++ new/doc/latex/sanitize-umlaut/sanitize-umlaut.tex 2020-01-01 22:51:17.000000000 +0100
@@ -2,12 +2,12 @@
% !TeX encoding=UTF-8
% !TeX spellcheck=en_US
%%
-%% The LaTeX package sanitize-umlaut - version 1.00 (2016/05/28)
+%% The LaTeX package sanitize-umlaut - version 1.10 (2020/01/01)
%% sanitize-umlaut.tex: Manual
%%
-%% --------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% --------------------------------------------------------------------------------------
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2016-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -27,8 +27,8 @@
\usepackage{%
sanitize-umlaut}
-\def\version{1.00}%
-\def\datum{2016/05/28}%
+\def\version{1.10}%
+\def\datum{2020/01/01}%
\hypersetup{
pdftitle={Manual for the sanitize-umlaut package},
@@ -87,7 +87,7 @@
\clearpage
\section{Purpose of the Package}%
-The packages sanitizes umlauts to be used directly in index entries for
+The package sanitizes umlauts to be used directly in index entries for
|makeindex| and friends with |pdflatex|. This means, that inside |\index| an umlaut can
be used as \myverb{"U} or \myverb{Ã}. In both cases, the letter is written
as \myverb{"U} into the raw index file for correct processing with |makeindex|
@@ -95,7 +95,7 @@
The package is intended
\begin{itemize}
-\item for documents in german language using the babel package with a setting
+\item for documents in German language using the babel package with a setting
identical or similar to \myverb{\usepackage[ngerman]{babel}}.
\item for documents which are processed by |latex| or |pdflatex| (not |lualatex| or |xelatex|).
\item for documents with an index which is processed using the
@@ -113,22 +113,59 @@
processor.
+\section{Important Compatibility Informations}%
+
+\subsection{Past}
+Until 2018, the default encoding for \LaTeX\ files was 7-bit ASCII.
+For other encodings, packages like |inputenc| had to be loaded.
+Also, |inputenc| used to expand characters like umlauts during |\index| output.
+The package |sanitize-umlaut| version 1.00 replaced this expansion code
+for |\index| output to get \myverb{"U} instead of \myverb{Ã}, etc.
+
+\subsection{Present}
+Since April 2018, the default encoding for \LaTeX\ files has been changed to UTF-8.
+This is done by preloading the UTF-8 settings of the package |inputenc|
+by default \LaTeX, i.e. if you want to use UTF-8 (recommended!), you do not
+longer need to load |inputenc| inside your preamble.
+But, also the implementation of |inputenc| changed for UTF-8 (October 2019?).
+Nowadays, characters like umlauts are not longer expanded during |\index| output,
+but are preserved as is.
+Therefore, |sanitize-umlaut| version 1.00 \textbf{is not compatible} to
+|inputenc| with UTF-8 dating from 2019 or newer.
+
+|sanitize-umlaut| version 1.10 (or newer) patches some UTF-8 code of
+\LaTeX/|inputenc| to return and replace character expansion during |\index| output.
+This patch \textbf{is not compatible} to older versions of \LaTeX/|inputenc| (before October 2019).
+Therefore, if your \LaTeX\ distribution is not reasonable up to date, you
+should stay at version 1.00 of |sanitize-umlaut|.
+
+\subsection{Future}
+As always, the future is dark and difficult to see. Further changes of
+|inputenc| implementation may force further changes of |sanitize-umlaut|.
+Hopefully, this will not happen too soon or too often.
+Also, if some miracle happens, MakeIndex may be updated one day to
+recognize UTF-8 properly to make |sanitize-umlaut| superfluous.
+
+
\section{Package Usage}%
\subsection{Prerequisites}
-The source document needs some encoding by |inputenc| since |pdflatex|
+The source document may need some encoding by |inputenc| since |pdflatex|
is assumed as engine. For example:
\begin{dispListing}
-\usepackage[utf8]{inputenc}
+\usepackage[latin1]{inputenc}
\end{dispListing}
+For |utf8| (UTF-8), modern \LaTeX\ does not need this package inclusion any more!
+
Just some few encodings are supported by |sanitize-umlaut|.
These are the most important for German language texts:
\tcbox[center,size=minimal,enhanced,frame hidden,colback=red!10]{\begin{tabular}{>{\ttfamily}l>{\ttfamily}l}\toprule
\textnormal{\bfseries encoding} & \textnormal{\bfseries recognized as}\\\midrule
utf8 & utf8\\
+utf8-2018 & utf8-2018\\
latin1, ansinew, cp1252 & latin1\\
applemac & applemac\\\bottomrule
\end{tabular}}
@@ -169,7 +206,7 @@
\subsection{Technical Information}
-The package uses \myverb{\inputencodingname} (set by the |inputencoding| package)
+The package uses \myverb{\inputencodingname} (set by \LaTeX\ and the |inputencoding| package)
to determine the current encoding.
The package redefines the \myverb{\@sanitize} macro at the begin of the
@@ -193,7 +230,7 @@
% arara: pdflatex
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc} % utf8 is default now
\usepackage[ngerman]{babel}
\usepackage{makeidx}
\usepackage{sanitize-umlaut}
@@ -218,7 +255,7 @@
% arara: pdflatex
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc} % utf8 is default now
\usepackage[ngerman]{babel}
\usepackage{makeidx}
\usepackage{sanitize-umlaut}
@@ -242,7 +279,7 @@
% arara: pdflatex
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc} % utf8 is default now
\usepackage[ngerman]{babel}
\usepackage[makeindex]{imakeidx}
\makeindex[options=-s german.ist -g]
@@ -265,7 +302,7 @@
% arara: pdflatex
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc} % utf8 is default now
\usepackage[ngerman]{babel}
\usepackage[makeindex]{imakeidx}
\makeindex[options=-s german.ist -g]
@@ -289,7 +326,7 @@
% arara: pdflatex
\documentclass[a4paper,12pt]{article}
\usepackage[T1]{fontenc}
-\usepackage[utf8]{inputenc}
+%\usepackage[utf8]{inputenc} % utf8 is default now
\usepackage[ngerman]{babel}
\usepackage[makeindex]{imakeidx}
\indexsetup{level=\section*,noclearpage}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sanitize-umlaut.doc.tlpobj new/tlpkg/tlpobj/sanitize-umlaut.doc.tlpobj
--- old/tlpkg/tlpobj/sanitize-umlaut.doc.tlpobj 2019-02-28 04:04:48.000000000 +0100
+++ new/tlpkg/tlpobj/sanitize-umlaut.doc.tlpobj 2020-01-02 01:59:50.000000000 +0100
@@ -1,9 +1,10 @@
name sanitize-umlaut.doc
category Package
-revision 41365
+revision 53292
shortdesc doc files of sanitize-umlaut
relocated 1
-docfiles size=108
+docfiles size=111
+ RELOC/doc/latex/sanitize-umlaut/CHANGES
RELOC/doc/latex/sanitize-umlaut/README
RELOC/doc/latex/sanitize-umlaut/german.ist
RELOC/doc/latex/sanitize-umlaut/sanitize-umlaut.doc.sty
++++++ sanitize-umlaut.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sanitize-umlaut/sanitize-umlaut.sty new/tex/latex/sanitize-umlaut/sanitize-umlaut.sty
--- old/tex/latex/sanitize-umlaut/sanitize-umlaut.sty 2016-06-12 00:12:06.000000000 +0200
+++ new/tex/latex/sanitize-umlaut/sanitize-umlaut.sty 2020-01-01 22:51:17.000000000 +0100
@@ -1,9 +1,9 @@
-%% The LaTeX package sanitize-umlaut - version 1.00 (2016/05/28)
+%% The LaTeX package sanitize-umlaut - version 1.10 (2020/01/01)
%% sanitize-umlaut.sty: Sanitize umlauts for makeindex
%%
-%% --------------------------------------------------------------------------------------
-%% Copyright (c) 2016 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
-%% --------------------------------------------------------------------------------------
+%% -------------------------------------------------------------------------------------------
+%% Copyright (c) 2016-2020 by Prof. Dr. Dr. Thomas F. Sturm <thomas dot sturm at unibw dot de>
+%% -------------------------------------------------------------------------------------------
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License, either version 1.3
@@ -18,23 +18,42 @@
%% This work consists of all files listed in README
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{sanitize-umlaut}[2016/05/28 version 1.00 sanitize umlauts]
+\ProvidesPackage{sanitize-umlaut}[2020/01/01 version 1.10 sanitize umlauts]
-\def\define@unicode@char#1#2{%
+\def\sanitize@unicode@char#1#2{%
\@namedef{u8:\detokenize{#1}}{#2}%
}
+\long\def\sanitize@umlaut@UTFviii@two@octets{% patch for 'utf8.def'
+ \ifincsname
+ \expandafter \UTF@two@octets@string
+ \else
+ \fi
+ \UTFviii@two@octets@combine
+}
+
\begingroup
\catcode`\"=12
\gdef\sanitize@umlaut@utfviii{%
- \define@unicode@char{^^c3^^a4}{"a}%
- \define@unicode@char{^^c3^^b6}{"o}%
- \define@unicode@char{^^c3^^bc}{"u}%
- \define@unicode@char{^^c3^^84}{"A}%
- \define@unicode@char{^^c3^^96}{"O}%
- \define@unicode@char{^^c3^^9c}{"U}%
- \define@unicode@char{^^c3^^9f}{"s}%
+ \let\UTFviii@two@octets\sanitize@umlaut@UTFviii@two@octets%
+ \sanitize@unicode@char{^^c3^^a4}{"a}%
+ \sanitize@unicode@char{^^c3^^b6}{"o}%
+ \sanitize@unicode@char{^^c3^^bc}{"u}%
+ \sanitize@unicode@char{^^c3^^84}{"A}%
+ \sanitize@unicode@char{^^c3^^96}{"O}%
+ \sanitize@unicode@char{^^c3^^9c}{"U}%
+ \sanitize@unicode@char{^^c3^^9f}{"s}%
+}
+
+\gdef\sanitize@umlaut@utfviii@old{%
+ \sanitize@unicode@char{^^c3^^a4}{"a}%
+ \sanitize@unicode@char{^^c3^^b6}{"o}%
+ \sanitize@unicode@char{^^c3^^bc}{"u}%
+ \sanitize@unicode@char{^^c3^^84}{"A}%
+ \sanitize@unicode@char{^^c3^^96}{"O}%
+ \sanitize@unicode@char{^^c3^^9c}{"U}%
+ \sanitize@unicode@char{^^c3^^9f}{"s}%
}
\gdef\sanitize@umlaut@latini{%
@@ -64,6 +83,9 @@
\def\@tempa{utf8}\ifx\inputencodingname\@tempa
\let\sanitize@umlaut\sanitize@umlaut@utfviii
\PackageInfo{sanitize-umlaut}{encoding utf8 selected}
+ \else\def\@tempa{utf8-2018}\ifx\inputencodingname\@tempa
+ \let\sanitize@umlaut\sanitize@umlaut@utfviii@old
+ \PackageInfo{sanitize-umlaut}{encoding utf8-2018 selected}
\else\def\@tempa{latin1}\ifx\inputencodingname\@tempa
\let\sanitize@umlaut\sanitize@umlaut@latini
\PackageInfo{sanitize-umlaut}{encoding latin1 selected}
@@ -79,7 +101,7 @@
\else
\def\sanitize@umlaut{}%
\PackageWarning{sanitize-umlaut}{encoding \inputencodingname\space is not supported}
- \fi\fi\fi\fi\fi
+ \fi\fi\fi\fi\fi\fi
\else
\let\sanitize@umlaut\sanitize@umlaut@utfviii
\PackageWarning{sanitize-umlaut}{encoding unknown. utf8 is selected as fallback (possibly nonsense)}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sanitize-umlaut.tlpobj new/tlpkg/tlpobj/sanitize-umlaut.tlpobj
--- old/tlpkg/tlpobj/sanitize-umlaut.tlpobj 2019-02-28 04:04:48.000000000 +0100
+++ new/tlpkg/tlpobj/sanitize-umlaut.tlpobj 2020-01-02 01:59:50.000000000 +0100
@@ -1,9 +1,9 @@
name sanitize-umlaut
category Package
-revision 41365
+revision 53292
shortdesc Sanitize umlauts for MakeIndex and pdfLaTeX
relocated 1
-longdesc This packages sanitizes umlauts to be used directly in index
+longdesc This package sanitizes umlauts to be used directly in index
longdesc entries for MakeIndex and friends with pdfLaTeX. This means
longdesc that inside \index an umlaut can be used as "U or as U. In both
longdesc cases, the letter is written as "U into the raw index file for
@@ -12,7 +12,6 @@
RELOC/tex/latex/sanitize-umlaut/sanitize-umlaut.sty
catalogue-contact-repository https://github.com/T-F-S/sanitize-umlaut
catalogue-ctan /macros/latex/contrib/sanitize-umlaut
-catalogue-date 2018-01-07 12:06:50 +0100
catalogue-license lppl1.3
catalogue-topics utf8-adapt enc-juggle index-proc
-catalogue-version 1.00
+catalogue-version 1.10
++++++ sansmathaccent.doc.tar.xz ++++++
Binary files old/doc/fonts/sansmathaccent/sansmathaccent.pdf and new/doc/fonts/sansmathaccent/sansmathaccent.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/sansmathaccent/sansmathaccent.tex new/doc/fonts/sansmathaccent/sansmathaccent.tex
--- old/doc/fonts/sansmathaccent/sansmathaccent.tex 2013-03-29 00:07:19.000000000 +0100
+++ new/doc/fonts/sansmathaccent/sansmathaccent.tex 2020-02-01 23:13:39.000000000 +0100
@@ -6,7 +6,7 @@
%
% author: Ariel Barton
%
-% Copyright Ariel Barton, 2012, 2013
+% Copyright Ariel Barton, 2012, 2013, 2020
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -22,7 +22,7 @@
% The complete list of files considered part of this work is
% later in this file.
%
-% Date: 2013/03/28
+% Date: 2020/01/31
\documentclass{amsart}
@@ -60,9 +60,11 @@
$$ \bm{\tilde M} \quad \bm{\dot u} \quad \bm{\hat{T}} \quad \bm{\bar v}
\quad \bm{\mathring{A}}$$
+Version 3 uses the \textsf{scrlfile} package instead of the \textsf{filehooks} package at the request of the \textsf{beamer} support community.
+
\section{Usage}
-This package was uploaded to CTAN in March 2013. If you have installed
+This package was uploaded to CTAN in January 2020. If you have installed
or updated your \TeX\ distribution since then, this package might have
been installed on your system.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sansmathaccent.doc.tlpobj new/tlpkg/tlpobj/sansmathaccent.doc.tlpobj
--- old/tlpkg/tlpobj/sansmathaccent.doc.tlpobj 2019-02-28 04:04:49.000000000 +0100
+++ new/tlpkg/tlpobj/sansmathaccent.doc.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,6 +1,6 @@
name sansmathaccent.doc
category Package
-revision 30187
+revision 53628
shortdesc doc files of sansmathaccent
relocated 1
docfiles size=44
++++++ sansmathaccent.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sansmathaccent/ot1mathkerncmss.fd new/tex/latex/sansmathaccent/ot1mathkerncmss.fd
--- old/tex/latex/sansmathaccent/ot1mathkerncmss.fd 2013-03-29 00:07:19.000000000 +0100
+++ new/tex/latex/sansmathaccent/ot1mathkerncmss.fd 2020-02-01 23:13:39.000000000 +0100
@@ -5,7 +5,7 @@
%THIS FILE SHOULD BE PUT IN A TEX INPUTS DIRECTORY
\ProvidesFile{ot1mathkerncmss.fd}
- [2013/03/27 Fontinst v1.933 font definitions for OT1/mathkerncmss.]
+ [2020/01/31 Fontinst v1.933 font definitions for OT1/mathkerncmss.]
\DeclareFontFamily{OT1}{mathkerncmss}{\skewchar \font 127 }
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sansmathaccent/sansmathaccent.sty new/tex/latex/sansmathaccent/sansmathaccent.sty
--- old/tex/latex/sansmathaccent/sansmathaccent.sty 2013-03-29 00:07:19.000000000 +0100
+++ new/tex/latex/sansmathaccent/sansmathaccent.sty 2020-02-01 23:13:39.000000000 +0100
@@ -4,7 +4,7 @@
%
% author: Ariel Barton
%
-% Copyright Ariel Barton, 2012, 2013
+% Copyright Ariel Barton, 2012, 2013, 2020
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -20,7 +20,7 @@
% The complete list of files considered part of this work is in
% the file `sansmathaccent.pdf' and its source code `sansmathaccent.tex'.
%
-\ProvidesPackage{sansmathaccent}[2013/03/28]
+\ProvidesPackage{sansmathaccent}[2020/01/31]
\def\sansmathaccent@warning{sansmathaccent is not a standalone package; it should be used with beamer or sfmath}
@@ -53,9 +53,9 @@
% Ensure proper placement of accents with bm
% but don't waste a mathgroup unless we will in fact use
% bm and pureletters
- \IfFileExists{filehook.sty}{
- \RequirePackage{filehook}
- \AtBeginOfFile{bm.sty}{
+ \IfFileExists{scrlfile.sty}{
+ \RequirePackage{scrlfile}
+ \BeforeFile{bm.sty}{
\beamer@font@check \ifbeamer@suppressreplacements\else
\DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl}
\SetSymbolFont{pureletters}{bold}{OT1}{mathkerncmss}{bx}{sl}
@@ -64,7 +64,7 @@
}{
\DeclareSymbolFont{pureletters}{OT1}{mathkerncmss}{m}{sl}
\SetSymbolFont{pureletters}{bold}{OT1}{mathkerncmss}{bx}{sl}
- \PackageWarning{sansmathaccent}{Could not find 'filehooks' package: one mathgroup may be wasted}
+ \PackageWarning{sansmathaccent}{Could not find 'scrlfile' package: one mathgroup may be wasted}
}
\AtBeginDocument{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sansmathaccent.tlpobj new/tlpkg/tlpobj/sansmathaccent.tlpobj
--- old/tlpkg/tlpobj/sansmathaccent.tlpobj 2019-02-28 04:04:49.000000000 +0100
+++ new/tlpkg/tlpobj/sansmathaccent.tlpobj 2020-02-02 01:58:19.000000000 +0100
@@ -1,12 +1,14 @@
name sansmathaccent
category Package
-revision 30187
+revision 53628
shortdesc Correct placement of accents in sans-serif maths
relocated 1
longdesc Sans serif maths (produced by the beamer class or the sfmath
-longdesc package) often has accents positioned incorrectly. The package
+longdesc package) often has accents positioned incorrectly. This package
longdesc fixes the positioning of such accents when the default font
-longdesc (cmssi) is used for sans serif maths.
+longdesc (cmssi) is used for sans serif maths. It will have no effect if
+longdesc used in a document that does not use the beamer class or the
+longdesc sfmath package.
execute addMap sansmathaccent.map
runfiles size=19
RELOC/fonts/map/dvips/sansmathaccent/sansmathaccent.map
@@ -28,6 +30,5 @@
RELOC/tex/latex/sansmathaccent/ot1mathkerncmss.fd
RELOC/tex/latex/sansmathaccent/sansmathaccent.sty
catalogue-ctan /fonts/sansmathaccent
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
-catalogue-topics font font-virtual font-supp-maths
+catalogue-topics font font-virtual font-supp-maths font-cm font-sans
++++++ sansmathfonts.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/sansmathfonts/README new/doc/fonts/sansmathfonts/README
--- old/doc/fonts/sansmathfonts/README 2019-04-04 22:54:15.000000000 +0200
+++ new/doc/fonts/sansmathfonts/README 2019-06-10 23:17:21.000000000 +0200
@@ -1,8 +1,10 @@
The sansmathfonts package provides math fonts designed to work with the Computer Modern sans serif typeface, as well as some missing Computer Modern sans serif text fonts.
This package is released under the LaTeX Project Public License. See
-http://www.ctan.org/tex-archive/help/Catalogue/licenses.lppl.html for
-the details of that license.
+ https://www.latex-project.org//lppl/
+or
+ https://ctan.org/license/lppl1.3c
+for the details of that license.
This package has the LPPL maintenance status ``maintained''. The package author is Ariel Barton; she may be contacted at origamist(a)gmail.com.
Binary files old/doc/fonts/sansmathfonts/sansmathfonts.pdf and new/doc/fonts/sansmathfonts/sansmathfonts.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/sansmathfonts/sansmathfonts.tex new/doc/fonts/sansmathfonts/sansmathfonts.tex
--- old/doc/fonts/sansmathfonts/sansmathfonts.tex 2019-04-04 22:54:15.000000000 +0200
+++ new/doc/fonts/sansmathfonts/sansmathfonts.tex 2019-06-10 23:17:21.000000000 +0200
@@ -498,6 +498,8 @@
\item
February 2017: Corrected the font names in \texttt{sansmathfonts.map}; this allowed the package to be used correctly with \textsf{dvips}.
\item
-April 2019: Fixed a bug in the file \texttt{ucmsmf.fd} that prevented the \texttt{[I]} package option from working correctly; rewrote all \texttt{.fd} files to allow fonts to be loaded at arbitrary sizes; changed maintenance status from ``author-maintained'' to ``maintained''.
+April 2019: Fixed a bug in the file \texttt{ucmsmf.fd} that prevented the \texttt{[I]} package option from working correctly; rewrote most of the \texttt{.fd} files to allow fonts to be loaded at arbitrary sizes; changed maintenance status from ``author-maintained'' to ``maintained''.
+\item
+June 2019: Rewrote the file \texttt{omxcmssex.fd} to allow the math extended characters to be loaded at arbitrary sizes.
\end{itemize}
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sansmathfonts.doc.tlpobj new/tlpkg/tlpobj/sansmathfonts.doc.tlpobj
--- old/tlpkg/tlpobj/sansmathfonts.doc.tlpobj 2019-04-06 23:34:44.000000000 +0200
+++ new/tlpkg/tlpobj/sansmathfonts.doc.tlpobj 2019-06-11 01:38:50.000000000 +0200
@@ -1,6 +1,6 @@
name sansmathfonts.doc
category Package
-revision 50756
+revision 51356
shortdesc doc files of sansmathfonts
relocated 1
docfiles size=70
++++++ sansmathfonts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sansmathfonts/omxcmssex.fd new/tex/latex/sansmathfonts/omxcmssex.fd
--- old/tex/latex/sansmathfonts/omxcmssex.fd 2019-04-04 22:54:15.000000000 +0200
+++ new/tex/latex/sansmathfonts/omxcmssex.fd 2019-06-10 23:17:21.000000000 +0200
@@ -14,11 +14,14 @@
%%
%%
\ProvidesFile{omxcmssex.fd}
- [2019/04/04]
+ [2019/06/10]
\DeclareFontFamily{OMX}{cmssex}{}
-\DeclareFontShape{OMX}{cmssex}{m}{n}{%
- <->sfixed*cmssex10%
- }{}
+\DeclareFontShape{OMX}{cmssex}{m}{n}{
+ <-7.5> cmssex7
+ <7.5-8.5> cmssex8
+ <8.5-9.5> cmssex9
+ <9.5-> cmssex10
+}{}
\endinput
%%
%% End of file `omxcmssex.fd'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sansmathfonts.tlpobj new/tlpkg/tlpobj/sansmathfonts.tlpobj
--- old/tlpkg/tlpobj/sansmathfonts.tlpobj 2019-04-06 23:34:44.000000000 +0200
+++ new/tlpkg/tlpobj/sansmathfonts.tlpobj 2019-06-11 01:38:50.000000000 +0200
@@ -1,6 +1,6 @@
name sansmathfonts
category Package
-revision 50756
+revision 51356
shortdesc Correct placement of accents in sans-serif maths
relocated 1
longdesc Sans serif small caps and math fonts for use with Computer
@@ -526,6 +526,6 @@
RELOC/tex/latex/sansmathfonts/ussmsb.fd
RELOC/tex/latex/sansmathfonts/uxcmss.fd
catalogue-ctan /fonts/sansmathfonts
-catalogue-date 2019-04-04 19:50:42 +0200
-catalogue-license lppl1.3
-catalogue-topics font font-cm font-maths font-mf font-type1
+catalogue-date 2019-06-10 19:27:15 +0200
+catalogue-license lppl1.3c
+catalogue-topics font font-cm font-sans font-proportional font-maths font-mf font-type1 font-supp
++++++ schemata.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/schemata/Makefile new/doc/generic/schemata/Makefile
--- old/doc/generic/schemata/Makefile 2016-01-30 23:59:40.000000000 +0100
+++ new/doc/generic/schemata/Makefile 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-NAME = schemata
-SHELL = bash
-PWD = $(shell pwd)
-VERS = $(shell ltxfileinfo -v $(NAME).dtx|sed -e 's/^v//')
-LOCAL = $(shell kpsewhich --var-value TEXMFLOCAL)
-UTREE = $(shell kpsewhich --var-value TEXMFHOME)
-all: $(NAME).pdf
- test -e README.txt && mv README.txt README || exit 0
-$(NAME).pdf: $(NAME).dtx
- pdflatex -shell-escape -recorder -interaction=batchmode $(NAME).dtx >/dev/null
- pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
- if [ -f $(NAME).glo ]; then makeindex -q -s gglo.ist -o $(NAME).gls $(NAME).glo; fi
- if [ -f $(NAME).idx ]; then makeindex -q -s gind.ist -o $(NAME).ind $(NAME).idx; fi
- pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
- pdflatex --recorder --interaction=nonstopmode $(NAME).dtx > /dev/null
-clean:
- rm -f $(NAME).{aux,fls,glo,gls,hd,idx,ilg,ind,ins,log,out,toc} README.txt
-distclean: clean
- rm -f $(NAME).{pdf,sty} README
-inst: all
- mkdir -p $(UTREE)/{tex,source,doc}/generic/$(NAME)
- cp $(NAME).dtx $(UTREE)/source/generic/$(NAME)
- cp Makefile $(UTREE)/source/generic/$(NAME)
- cp $(NAME).sty $(UTREE)/tex/generic/$(NAME)
- cp $(NAME).pdf $(UTREE)/doc/generic/$(NAME)
-install: all
- sudo mkdir -p $(LOCAL)/{tex,source,doc}/generic/$(NAME)
- sudo cp $(NAME).dtx $(LOCAL)/source/generic/$(NAME)
- sudo cp Makefile $(LOCAL)/source/generic/$(NAME)
- sudo cp $(NAME).sty $(LOCAL)/tex/generic/$(NAME)
- sudo cp $(NAME).pdf $(LOCAL)/doc/generic/$(NAME)
-zip: all
- ln -sf . $(NAME)
- zip -Drq $(PWD)/$(NAME)-$(VERS).zip $(NAME)/{README,Makefile,$(NAME).{pdf,dtx}}
- rm $(NAME)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/schemata/README new/doc/generic/schemata/README
--- old/doc/generic/schemata/README 2016-01-30 23:59:40.000000000 +0100
+++ new/doc/generic/schemata/README 2020-03-15 22:31:09.000000000 +0100
@@ -1,31 +1,34 @@
-|
+
--------:| ----------------------------------------------------------------
schemata:| Generic package to aid construction of topical categories
Author:| Charles P. Schaum
- E-mail:| charles dot schaum at comcast dot net
+ E-mail:| charles dot schaum(a)comcast.net
License:| Released under the LaTeX Project Public License v1.3c or later
See:| http://www.latex-project.org/lppl.txt
Short description:
The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
-Files Distribution
+Files Distribution
-README This file
-schemata.pdf Documentation
+README This file
+schemata.pdf Documentation
+schematest.tex Test file for Plain TeX or Eplain
+schemata.png Image file used for the manual
-Makefile Automates building with GNU make 3.81
-schemata.dtx Documented LaTeX file containing both code and documentation
+Makefile Automates building with GNU make 3.81
+schemata.dtx Documented LaTeX file containing both code and documentation
Installation
-Unpack schemata-XX.zip in an appropriate directory.
+Download the package from
+
+https://www.ctan.org/tex-archive/macros/generic/schemata
-Note that the instructions below assume that you are using a *nix-
-compatible computer. If that is otherwise, you will need to modify
-these instructions to your needs.
+Unpack schemata.zip in an appropriate directory.
-If you have a make utility compatible with GNU make you can type
+If you have a make utility compatible with GNU make, either in
+GNU/Linux, a BSD variant, OSX, or Cygwin in Windows you can type
make inst
@@ -34,42 +37,77 @@
make install
to install the package into your $TEXMFLOCAL tree for all users.
+The latter requires sudo privileges.
+
+Other useful targets include:
+
+(release process)
+
+make release The default target, same as just ``make''.
+
+make clean Removes all intermediate files. Left are
+the files listed above plus schemata.sty.
+
+make distclean Leave only schemata.dtx, schematest.tex,
+schemata.png, and Makefile.
+
+make zip Generate a zip file ready for distribution.
-Manually, you can generate the package files. First you generate the
-installer driver, README, and style files, with a preliminary PDF:
+(testing process)
+
+make testing Release files, plus compiles schematest.tex.
+
+It is not necessary, however, to use GNU make. One can generate
+the package files manually. Since the files schemata.ins and README.txt
+are contained in the .dtx file itself, the first step is to generate
+the installer driver schemata.ins, plus the file README.txt, which will
+also trigger the extraction of schemata.sty and produce the first pass of
+the package documentation schemata.pdf:
pdflatex -shell-escape -recorder -interaction=batchmode schemata.dtx
-Next you generate the PDF with a table of contents and all cross-references
-validated, so that the index entries will not move:
+Next one adds a table of contents and all cross-references, this also
+should finalize page numbers for glossary and index input files:
pdflatex --recorder --interaction=nonstopmode schemata.dtx
-The next commands generate the glossary/index and final pdf file
+The next commands generate the glossary/index output files:
makeindex -q -s gglo.ist -o schemata.gls schemata.glo
makeindex -q -s gind.ist -o schemata.ind schemata.idx
+
+The final two commands integrate the glossary (changes) and index:
+
pdflatex --recorder --interaction=nonstopmode schemata.dtx
pdflatex --recorder --interaction=nonstopmode schemata.dtx
-Normally you create the following manual installation directories for user:
+Now one can either keep README.txt or rename it to README, e.g.:
-$TEXMFHOME/source/generic/schemata dtx file
-$TEXMFHOME/tex/generic/schemata sty file
-$TEXMFHOME/doc/generic/schemata pdf file
+mv README.txt README
-and you create the following manual installation directories for local site:
+Normally one creates the following directories for a user:
-$TEXMFLOCAL/source/generic/schemata dtx file
-$TEXMFLOCAL/tex/generic/schemata sty file
-$TEXMFLOCAL/doc/generic/schemata pdf file
+$TEXMFHOME/source/generic/schemata dtx file, schemata.png
+$TEXMFHOME/doc/generic/schemata pdf file, README, schematest.tex,
+
+and creates the following directories for the local site:
+
+$TEXMFLOCAL/source/generic/schemata dtx file, schemata.png
+$TEXMFLOCAL/doc/generic/schemata pdf file, README, schematest.tex,
The above environment variables often are /usr/local/texlive/texmf-local for
$TEXMFLOCAL and ~/texmf for $TEXMFHOME.
-Run mktexlsr with the appropriate level of permissions to complete the install.
+The make process normally renames the README.txt file created from the
+dtx file to just README by using mv (move / rename utility in the *nix
+userland). Windows distributions of TeX and LaTeX often keep the txt file
+because of using file extensions instead of ``magic numbers'' to identify
+files.
+
+Run mktexlsr with the appropriate level of permissions to complete the
+install.
-This packages works with LaTeX and plain TeX.
+This packages works with LaTeX and Plain TeX.
License
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/schemata/README.txt new/doc/generic/schemata/README.txt
--- old/doc/generic/schemata/README.txt 2016-01-30 23:59:40.000000000 +0100
+++ new/doc/generic/schemata/README.txt 2020-03-15 22:31:09.000000000 +0100
@@ -1,31 +1,34 @@
-|
+
--------:| ----------------------------------------------------------------
schemata:| Generic package to aid construction of topical categories
Author:| Charles P. Schaum
- E-mail:| charles dot schaum at comcast dot net
+ E-mail:| charles dot schaum(a)comcast.net
License:| Released under the LaTeX Project Public License v1.3c or later
See:| http://www.latex-project.org/lppl.txt
Short description:
The schemata package helps the creation of topical outlines that illustrate the breakdown of concepts and categories in academic texts from the late medieval to early modern periods.
-Files Distribution
+Files Distribution
-README This file
-schemata.pdf Documentation
+README This file
+schemata.pdf Documentation
+schematest.tex Test file for Plain TeX or Eplain
+schemata.png Image file used for the manual
-Makefile Automates building with GNU make 3.81
-schemata.dtx Documented LaTeX file containing both code and documentation
+Makefile Automates building with GNU make 3.81
+schemata.dtx Documented LaTeX file containing both code and documentation
Installation
-Unpack schemata-XX.zip in an appropriate directory.
+Download the package from
+
+https://www.ctan.org/tex-archive/macros/generic/schemata
-Note that the instructions below assume that you are using a *nix-
-compatible computer. If that is otherwise, you will need to modify
-these instructions to your needs.
+Unpack schemata.zip in an appropriate directory.
-If you have a make utility compatible with GNU make you can type
+If you have a make utility compatible with GNU make, either in
+GNU/Linux, a BSD variant, OSX, or Cygwin in Windows you can type
make inst
@@ -34,42 +37,77 @@
make install
to install the package into your $TEXMFLOCAL tree for all users.
+The latter requires sudo privileges.
+
+Other useful targets include:
+
+(release process)
+
+make release The default target, same as just ``make''.
+
+make clean Removes all intermediate files. Left are
+the files listed above plus schemata.sty.
+
+make distclean Leave only schemata.dtx, schematest.tex,
+schemata.png, and Makefile.
+
+make zip Generate a zip file ready for distribution.
-Manually, you can generate the package files. First you generate the
-installer driver, README, and style files, with a preliminary PDF:
+(testing process)
+
+make testing Release files, plus compiles schematest.tex.
+
+It is not necessary, however, to use GNU make. One can generate
+the package files manually. Since the files schemata.ins and README.txt
+are contained in the .dtx file itself, the first step is to generate
+the installer driver schemata.ins, plus the file README.txt, which will
+also trigger the extraction of schemata.sty and produce the first pass of
+the package documentation schemata.pdf:
pdflatex -shell-escape -recorder -interaction=batchmode schemata.dtx
-Next you generate the PDF with a table of contents and all cross-references
-validated, so that the index entries will not move:
+Next one adds a table of contents and all cross-references, this also
+should finalize page numbers for glossary and index input files:
pdflatex --recorder --interaction=nonstopmode schemata.dtx
-The next commands generate the glossary/index and final pdf file
+The next commands generate the glossary/index output files:
makeindex -q -s gglo.ist -o schemata.gls schemata.glo
makeindex -q -s gind.ist -o schemata.ind schemata.idx
+
+The final two commands integrate the glossary (changes) and index:
+
pdflatex --recorder --interaction=nonstopmode schemata.dtx
pdflatex --recorder --interaction=nonstopmode schemata.dtx
-Normally you create the following manual installation directories for user:
+Now one can either keep README.txt or rename it to README, e.g.:
-$TEXMFHOME/source/generic/schemata dtx file
-$TEXMFHOME/tex/generic/schemata sty file
-$TEXMFHOME/doc/generic/schemata pdf file
+mv README.txt README
-and you create the following manual installation directories for local site:
+Normally one creates the following directories for a user:
-$TEXMFLOCAL/source/generic/schemata dtx file
-$TEXMFLOCAL/tex/generic/schemata sty file
-$TEXMFLOCAL/doc/generic/schemata pdf file
+$TEXMFHOME/source/generic/schemata dtx file, schemata.png
+$TEXMFHOME/doc/generic/schemata pdf file, README, schematest.tex,
+
+and creates the following directories for the local site:
+
+$TEXMFLOCAL/source/generic/schemata dtx file, schemata.png
+$TEXMFLOCAL/doc/generic/schemata pdf file, README, schematest.tex,
The above environment variables often are /usr/local/texlive/texmf-local for
$TEXMFLOCAL and ~/texmf for $TEXMFHOME.
-Run mktexlsr with the appropriate level of permissions to complete the install.
+The make process normally renames the README.txt file created from the
+dtx file to just README by using mv (move / rename utility in the *nix
+userland). Windows distributions of TeX and LaTeX often keep the txt file
+because of using file extensions instead of ``magic numbers'' to identify
+files.
+
+Run mktexlsr with the appropriate level of permissions to complete the
+install.
-This packages works with LaTeX and plain TeX.
+This packages works with LaTeX and Plain TeX.
License
Binary files old/doc/generic/schemata/schemata.pdf and new/doc/generic/schemata/schemata.pdf differ
Binary files old/doc/generic/schemata/schemata.png and new/doc/generic/schemata/schemata.png differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/generic/schemata/schematest.tex new/doc/generic/schemata/schematest.tex
--- old/doc/generic/schemata/schematest.tex 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/generic/schemata/schematest.tex 2020-03-14 21:44:40.000000000 +0100
@@ -0,0 +1,530 @@
+%--------:| ----------------------------------------------------------------
+%schemata:| Generic package to aid construction of topical categories
+% Author:| Charles P. Schaum
+% E-mail:| charles dot schaum(a)comcast.net
+% License:| Released under the LaTeX Project Public License 1.3c or later
+% See:| http://www.latex-project.org/lppl.txt
+%
+% This is an example file used with the schemata package.
+% See README and schemata.pdf for copyright info.
+%---------------------------------------------------------------------------
+\def\nameofplain{plain}
+\def\nameofeplain{eplain}
+\def\nameoflatex{LaTeX2e}
+\def\nameoflollipop{Lollipop}
+%
+% To use Plain TeX, do something like the following, substituting
+% tex, xetex, luatex, etc.:
+%
+% pdftex schematest
+%
+% To use Eplain, do something like the following:
+%
+% touch test.tex
+% pdftex test <<< "\\input eplain \\input schematest"
+%
+% To use lollipop, do something like the following:
+%
+% lollipop schematest
+%
+% To use LaTeX, do something like the following, substituting
+% latex, xelatex, lualatex, etc.:
+%
+% pdflatex schematest
+%
+\ifx\fmtname\nameoflatex
+ \documentclass[10pt]{article}
+ %\usepackage[utf8]{inputenc} %Not needed for newer versions
+ \usepackage[T1]{fontenc}
+ \usepackage[polutonikogreek,american]{babel}
+ \newcommand{\gk}[1]{\foreignlanguage{polutonikogreek}{#1}}
+ \usepackage{schemata}
+ \begin{document}
+\else
+ \ifx\fmtname\nameoflollipop
+ \input schemata.sty
+ \font\scshape=cmcsc10
+ \def\textsc#1{\bgroup\scshape #1\egroup}
+ \def\gk#1{\bgroup\it #1\egroup}
+ \Start
+ \else
+ \input schemata.sty
+ \font\scshape=cmcsc10
+ \def\textsc#1{\bgroup\scshape #1\egroup}
+ \def\gk#1{\bgroup\it #1\egroup}
+ \fi
+\fi
+$$
+\Schema{-1ex}{8.7ex}
+{
+ \schemabox{Subjectum theo-\\
+ logi\ae{} est Notitia\\
+ Dei. Considerat\\
+ ergo, Dei, vel}
+}
+{
+\schema
+ {
+ \schemabox{\textsc{Essentiam},}
+ }
+ {
+ \schemabox{Unitate natur\ae{}.\\
+ Trinitate personarum.\\
+ Operibus ad intra.}
+ }\smallskip
+ \schema
+ {
+ \schemabox{\textsc{Voluntatem},\\
+ manifestatam in\\
+ operibus ad extra;\\
+ ut in}
+ }
+ {
+ \schemabox{Creatione.\\
+ Sustentatione natur\ae{} %
+ laps\ae{}.\\
+ Reparatione.\\
+ Conversione.\\
+ Justificatione.\\
+ Sanctificatione \&\\
+ Glorificatione ejusdem.}
+ }
+}
+$$
+
+$$
+\Schema{-25ex}{20.6ex}
+{
+ \schemabox{Subjectum \&\\
+ summa univer-\\
+ s\ae{} Scriptur\ae{},\\
+ est \textsc{Cognitio}\\
+ vel}
+}
+{
+ \Schema{-6.4ex}{8.5ex}
+ {
+ \schemabox{\textsc{Dei}, qua-\\lis sit, aut}
+ }
+ {
+ \schema
+ {\schemabox{\textsc{Per se}:\\ scilicet.}}
+ {
+ \schemabox{Unus in essentia.}\smallskip
+ \schemabox{Trinus in personis.}
+ }\smallskip
+ \schema
+ {\schemabox{Ad hominem\\ quem vel}}
+ {
+ \schemabox{Accusat \& terret, \textsc{Per Legem},\\
+ Consolatur \& erigit, \textsc{Per Evangelium}.\\
+ Salvat, \textsc{Per Christum}.\\
+ Renovat, \textsc{Per Spiritum Sanctum}.\\
+ Sanctificat, \textsc{Per Verbum} \& \textsc{Sacramenta}.\\
+ Castigat, tentat \& exercet, \textsc{Per Crucem}.\\
+ Glorificat \textsc{Per Resurrectionem Carnis}\\
+ \textsc{\quad Ad Vitam \AE{}ternam}.}
+ }\medskip
+ }
+ \Schema{-13.4ex}{17.4ex}
+ {
+ \schemabox{\textsc{Hominis},\\ qualis sit}
+ }
+ {
+ \Schema{-4.4ex}{5ex}
+ {\schemabox{\textsc{Per se}:}}
+ {
+ \schemabox{Ante lapsum.}\smallskip
+ \schema
+ {\schemabox{Post lapsum:}}
+ {
+ \schemabox{Ante Regenerationem \&\\
+ Renovationem S. Sancti.}\medskip
+ \schemabox{Post Regenerationem \&\\
+ Renovationem S. Sancti.}\smallskip
+ }\smallskip
+ }
+ \Schema{4.2ex}{14.4ex}
+ {\schemabox{Ad}}
+ {
+ \schema
+ {\schemabox{\textsc{Deum},}}
+ {
+ \schemabox{P\oe{}nitentia agens, agnitis peccatis \&\\
+ ira Dei cognita \textsc{Ex Lege}.\\
+ Erigens se \textsc{Voce Evangelii}.\\
+ Credens \textsc{In Christum Salvatorem}.\\
+ Non repugnans \textsc{Spiritui Sancto} impellenti.\\
+ Audiens \textsc{Verbum}: \& utens \textsc{Sacramentis}.\\
+ Patienter \& constanter sufferens \textsc{Crucem}.\\
+ Sperans \& expectans glorificationem\\
+ \textsc{\quad In Resurrectione Carnis}\\
+ \textsc{\quad Ad Vitam \AE{}ternam}.}
+ }\smallskip
+ \schema
+ {\schemabox{seipsum ratione}}
+ {\schemabox{Anim\ae{}\\ vel\\ Corporis}}\smallskip
+ \Schema{2ex}{5.1ex}
+ {\schemabox{Proximum,}}
+ {
+ \schema
+ {\schemabox{Amicum ra-\\ tione vel}}
+ {
+ \schemabox{Religionis.\\
+ Politic\ae{} \& \OE{}conomic\ae{}.\\
+ Cognationis.\\
+ Agnationis.}
+ }\smallskip
+ \schemabox{Inimicum.}
+ }
+ }
+ }
+}
+$$
+
+\eject
+
+\bgroup
+
+\ifx\fmtname\nameofeplain
+\verbatim \DoParens |endverbatim
+\fi
+\DoParens%
+\vfil
+$$
+\Schema{-26ex}{21.5ex}
+{
+ \schemabox{Sacr\ae{}\\ litter\ae{}\\ loquuntur,\\ de}
+}
+{
+ \schema
+ {
+ \schemabox{\textsc{Deo}}
+ }
+ {
+ \schemabox{Uno, in Trinitate.}\smallskip\schemabox{Trino, in unitate.}
+ }
+ \Schema{-16.5ex}{23.4ex}
+ {
+ \vskip30ex
+ \schemabox{\textsc{Dei}\\ \textsc{Operibus}}
+ }
+ {
+ \schema
+ {
+ \schemabox{\textsc{Intra},\\ qu\ae{} sunt\\ divisa, ut}
+ }
+ {
+ \schemabox{\textsc{Patris}, ab \ae{}terno gignere.\\ \textsc{Filii}, ab \ae{}terno genitum esse.\\ \textsc{Spiritus Sancti}, ab utroque\\ ab \ae{}terno procedete.}
+ }
+ \medskip
+ \Schema{-2ex}{21ex}
+ {
+ \schemabox{\textsc{Extra},\\ qu\ae{} sunt\\ indivisa;\\ tervata\\ tamen\\ cujusque\\ person\ae{}\\ divinitatis\\ sua pro-\\prietate}
+ }
+ {
+ \Schema{-0.8ex}{6.4ex}
+ {
+ \schemabox{Creatione\\ natur\ae{}}
+ }
+ {
+ \schema
+ {
+ \schemabox{Brute ut}
+ }
+ {
+ \schemabox{C\oe{}li} \smallskip \schemabox{Elementorum} \smallskip \schemabox{Mundi}
+ }
+ \smallskip
+ \schema
+ {
+ \schemabox{\ifx\fmtname\nameoflatex\gk{logik~hs}\else\gk{logik\=es}\fi, ut}
+ }
+ {
+ \schemabox{Angelorum.} \smallskip \schemabox{Hominum: Ad\ae{},\\ Ev\ae{} \& procreatorum\\ exipsis.}
+ }
+ }
+ \schema
+ {
+ \schemabox{Sustenatione\\ natur\ae{} laps\ae{},}
+ }
+ {
+ \schemabox{Angelorum malorum,} \smallskip \schemabox{Hominum: Ad\ae{}, Ev\ae{}\\ \& procreatorum exipsis.}
+ }
+ \Schema{2.6ex}{8.8ex}
+ {
+ \schemabox{Beneficiis\\ erga Ecc-\\ lesiam: ea\\ versantur\\ aut circa}
+ }
+ {
+ \Schema{2.2ex}{7ex}
+ {
+ \schemabox{Res, ut}
+ }
+ {
+ \schema
+ {
+ \schemabox{Verbum}
+ }
+ {
+ \schemabox{Legis} \smallskip \schemabox{Evangelii} \smallskip \schemabox{Sacramentorum}
+ }
+ \smallskip
+ \schema
+ {
+ \schemabox{Signa vel Veteris\\ vel Novi Testa-\\ mentum ut sunt:}
+ }
+ {
+ \schemabox{Ceremoni\ae{}} \smallskip \schemabox{Miracula}
+ }
+ }
+ \smallskip
+ \Schema{1ex}{5ex}
+ {
+ \schemabox{Personas}
+ }
+ {
+ \schema
+ {
+ \schemabox{Ecclesi\ae{}}
+ }
+ {
+ \schemabox{Universalis} \smallskip \schemabox{Particularis}
+ }
+ \smallskip
+ \schemabox{Politi\ae{} ut Magistratuum}
+ \smallskip
+ \schemabox{\OE{}conomi\ae{} ut privatorum}
+ }
+ }\vskip2ex
+ }
+ }
+}
+$$
+\vfil
+
+\eject
+
+\ifx\fmtname\nameofeplain
+\verbatim \DoGroups |endverbatim
+\fi
+\DoGroups
+
+\vfil
+$$
+\Schema{-26.5ex}{21ex}
+{
+ \schemabox{Sacr\ae{}\\ litter\ae{}\\ loquuntur,\\ de}
+}
+{
+ \schema
+ {
+ \schemabox{\textsc{Deo}}
+ }
+ {
+ \schemabox{Uno, in Trinitate.}\smallskip\schemabox{Trino, in unitate.}
+ }
+ \Schema{-17ex}{23.4ex}
+ {
+ \vskip30ex
+ \schemabox{\textsc{Dei}\\ \textsc{Operibus}}
+ }
+ {
+ \schema
+ {
+ \schemabox{\textsc{Intra},\\ qu\ae{} sunt\\ divisa, ut}
+ }
+ {
+ \schemabox{\textsc{Patris}, ab \ae{}terno gignere.\\ \textsc{Filii}, ab \ae{}terno genitum esse.\\ \textsc{Spiritus Sancti}, ab utroque\\ ab \ae{}terno procedete.\strut}
+ }
+ \medskip
+ \Schema{-2ex}{21ex}
+ {
+ \schemabox{\textsc{Extra},\\ qu\ae{} sunt\\ indivisa;\\ tervata\\ tamen\\ cujusque\\ person\ae{}\\ divinitatis\\ sua pro-\\prietate}
+ }
+ {
+ \Schema{-0.8ex}{6.4ex}
+ {
+ \schemabox{Creatione\\ natur\ae{}}
+ }
+ {
+ \schema
+ {
+ \schemabox{Brute ut}
+ }
+ {
+ \schemabox{C\oe{}li} \smallskip \schemabox{Elementorum} \smallskip \schemabox{Mundi}
+ }
+ \smallskip
+ \schema
+ {
+ \schemabox{\ifx\fmtname\nameoflatex\gk{logik~hs}\else\gk{logik\=es}\fi, ut}
+ }
+ {
+ \schemabox{Angelorum.} \smallskip \schemabox{Hominum: Ad\ae{},\\ Ev\ae{} \& procreatorum\\ exipsis.\strut}
+ }
+ }
+ \schema
+ {
+ \schemabox{Sustenatione\\ natur\ae{} laps\ae{},}
+ }
+ {
+ \schemabox{Angelorum malorum,} \smallskip \schemabox{Hominum: Ad\ae{}, Ev\ae{}\\ \& procreatorum exipsis.}
+ }
+ \Schema{2.6ex}{8.8ex}
+ {
+ \schemabox{Beneficiis\\ erga Ecc-\\ lesiam: ea\\ versantur\\ aut circa}
+ }
+ {
+ \Schema{2.2ex}{7ex}
+ {
+ \schemabox{Res, ut}
+ }
+ {
+ \schema
+ {
+ \schemabox{Verbum}
+ }
+ {
+ \schemabox{Legis} \smallskip \schemabox{Evangelii} \smallskip \schemabox{Sacramentorum}
+ }
+ \smallskip
+ \schema
+ {
+ \schemabox{Signa vel Veteris\\ vel Novi Testa-\\ mentum ut sunt:}
+ }
+ {
+ \schemabox{Ceremoni\ae{}} \smallskip \schemabox{Miracula}
+ }
+ }
+ \smallskip
+ \Schema{0.6ex}{5.5ex}
+ {
+ \schemabox{Personas}
+ }
+ {
+ \schema
+ {
+ \schemabox{Ecclesi\ae{}}
+ }
+ {
+ \schemabox{Universalis} \smallskip \schemabox{Particularis}
+ }
+ \smallskip
+ \schemabox{Politi\ae{} ut Magistratuum}
+ \smallskip
+ \schemabox{\OE{}conomi\ae{} ut privatorum}
+ }
+ }\vskip2ex
+ }
+ }
+}
+$$
+\vfil
+\egroup
+
+\eject
+
+$$
+\Schema{-1.4ex}{10ex}
+{
+ \schemabox{Qu\ae{} sit\\ \textsc{Dei}, vel}
+}
+{
+ \Schema{-1ex}{5ex}
+ {
+ \schemabox{\textsc{Essentia}, in}
+ }
+ {
+ \vskip1ex\schemabox{Unitate divina,}
+ \medskip
+ \Schema{0ex}{3.4ex}
+ {
+ \schemabox{Tribus perso-\\ nis divinitatis}
+ }
+ {
+ \Schema[close]{0ex}{3.4ex}
+ {
+ \NudgeSB\schemabox{Patre,\\ Filio,\\ Spiritui Sancto}
+ }
+ {
+ \schemabox{\ifx\fmtname\nameoflatex\gk{<omoous'iois}\else\gk{homoousiois}\fi\\ \& co\ae{}ternis}
+ }
+ }
+ }
+ \medskip
+ \Schema{-0.2ex}{6.4ex}
+ {
+ \schemabox{\textsc{Voluntas},\\ revelatur in\\ actione, sive}
+ }
+ {
+ \Schema{0ex}{3.4ex}
+ {
+ \schemabox{Universali}
+ }
+ {
+ \Schema[close]{0ex}{3.4ex}
+ {
+ \schemabox{Creationis,\\Sustenationis,\\ Propagationis,}
+ }
+ {
+ \schemabox{rerum creatarum.}
+ }
+ }
+ \medskip
+ \schema
+ {
+ \schemabox{Speciali, in beneficiis\\ erga Ecclesiam, eam}
+ }
+ {
+ \schemabox{Colligendo.\\ Justificando.\\ Conservando.\\
+ Glorificando.}
+ }
+ }
+}
+$$
+
+\vfill
+% Use here in Plain TeX.
+\newbox\mybox
+$$
+\Schema{-0.2ex}{14.4ex}
+{\schemabox{\bf Curricula\\\bf Texts}}
+{
+ \DoBrackets%
+ % Doable in LaTeX, not in Plain TeX, because \outer.
+ % \newbox\mybox%
+ \setbox\mybox=\hbox{\bf III. Philosophical }%
+ \dimen0=\wd\mybox%
+ \schema
+ {\schemabox[\dimen0]{\bf I. General\\Studies}}
+ {\schemabox{1. Collected Works\\2. Encyclopedias}}
+ \smallskip
+ \schema
+ {\schemabox[\dimen0]{\bf II. Literary\\Disciplines}}
+ {\schemabox{1. Philology\\
+ 2. Historical Introduction\\
+ 3. Literary Theory\\
+ 4. Application}}
+ \smallskip
+ \schema
+ {\schemabox[\dimen0]{\bf III. Philosophical\\Disciplines}}
+ {\schemabox{1. Source Texts\\
+ 2. History of Philosophy\\
+ 3. General Surveys\\
+ 4. Specific Studies}}
+ \smallskip
+ \schema
+ {\schemabox[\dimen0]{\bf IV. Historical\\Disciplines}}
+ {\schemabox{1. General Surveys\\
+ 2. Specialized Works}}
+}
+$$
+\ifx\fmtname\nameoflatex
+ \end{document}
+\else
+ \ifx\fmtname\nameoflollipop
+ \Stop
+ \else
+ \bye
+ \fi
+\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schemata.doc.tlpobj new/tlpkg/tlpobj/schemata.doc.tlpobj
--- old/tlpkg/tlpobj/schemata.doc.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/schemata.doc.tlpobj 2020-03-16 02:21:43.000000000 +0100
@@ -1,11 +1,11 @@
name schemata.doc
category Package
-revision 39510
+revision 54326
shortdesc doc files of schemata
relocated 1
-docfiles size=130
- RELOC/doc/generic/schemata/Makefile
+docfiles size=183
RELOC/doc/generic/schemata/README
RELOC/doc/generic/schemata/README.txt
- RELOC/doc/generic/schemata/schemata.hd
RELOC/doc/generic/schemata/schemata.pdf
+ RELOC/doc/generic/schemata/schemata.png
+ RELOC/doc/generic/schemata/schematest.tex
++++++ schemata.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/generic/schemata/schemata.sty new/tex/generic/schemata/schemata.sty
--- old/tex/generic/schemata/schemata.sty 2016-01-30 23:59:40.000000000 +0100
+++ new/tex/generic/schemata/schemata.sty 2020-03-15 22:31:09.000000000 +0100
@@ -5,308 +5,285 @@
%% The original source files were:
%%
%% schemata.dtx (with options: `package')
+%%
%% --------:| ----------------------------------------------------------------
%% schemata:| Generic package to aid construction of topical categories
%% Author:| Charles P. Schaum
-%% E-mail:| charles dot schaum at comcast dot net
+%% E-mail:| charles dot schaum(a)comcast.net
%% License:| Released under the LaTeX Project Public License v1.3c or later
%% See:| http://www.latex-project.org/lppl.txt
%%
-\expandafter\ifx\csname newenvironment\endcsname\relax\else
-\NeedsTeXFormat{LaTeX2e}[1999/12/01]
+{\expandafter}\expandafter\ifx \csname schemataLaTeX\endcsname\relax
+ \def\schemataLaTeX{LaTeX2e}\fi
+\ifx\fmtname\schemataLaTeX
+\expandafter\NeedsTeXFormat\expandafter{\schemataLaTeX}
\ProvidesPackage{schemata}
- [2016/01/25 v0.8 generic package to aid construction of topical categories]
+ [2020/03/14 v1.1 generic package to aid construction of topical categories]
+\fi
+\ifx\fmtname\schemataLaTeX\else
+ \catcode`@=11\relax
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \catcode`@=11%
- \def\DoBraces{\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}%
- \DoBraces%
-\else
- \DeclareOption{braces}{\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
- \DeclareOption{brackets}{\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
- \DeclareOption{parens}{\let\@schemata@LD( \let\@schemata@RD)}
+\newbox\@schemata@rhs
+\newbox\@schemata@lhs
+\newdimen\@schemata@rheight
+\newdimen\@schemata@lheight
+\newif\if@schemata@LCBox
+\newif\if@schemata@SWBox
+\newif\if@schemata@NudgeBox
+\ifx\fmtname\schemataLaTeX
+ \DeclareOption{braces}%
+ {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
+ \DeclareOption{brackets}%
+ {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
+ \DeclareOption{parens}%
+ {\let\@schemata@LD( \let\@schemata@RD)}
+ \DeclareOption{groups}%
+ {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
\ExecuteOptions{braces}
\ProcessOptions\relax
+\else
+ \let\@schemata@LD\lbrace%
+ \let\@schemata@RD\rbrace%
+\fi
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\DoBraces}%
+ {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
+\else
+ \def\DoBraces%
+ {\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}
+\fi
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\DoBrackets}%
+ {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
+\else
+ \def\DoBrackets%
+ {\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}
\fi
-\newbox\@rhs%
-\newbox\@lhs%
-\newdimen\@rheight%
-\newdimen\@lheight%
-\newif\if@schemata@LCBox%
-\newif\if@schemata@SWBox%
-\newif\if@schemata@NudgeBox%
-\expandafter\ifx\csname newenvironment\endcsname\relax
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\DoParens}%
+ {\let\@schemata@LD( \let\@schemata@RD)}
\else
- \newcommand{\DoBraces}{\let\@schemata@LD\lbrace \let\@schemata@RD\rbrace}%
+ \def\DoParens%
+ {\let\@schemata@LD( \let\@schemata@RD)}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\DoBrackets{\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\DoGroups}%
+ {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
\else
- \newcommand{\DoBrackets}{\let\@schemata@LD\lbrack \let\@schemata@RD\rbrack}%
+ \def\DoGroups%
+ {\let\@schemata@LD\lgroup \let\@schemata@RD\rgroup}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\DoParens{\let\@schemata@LD( \let\@schemata@RD)}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\LCschema}{\@schemata@LCBoxtrue}
\else
- \newcommand{\DoParens}{\let\@schemata@LD( \let\@schemata@RD)}%
+ \def\LCschema{\@schemata@LCBoxtrue}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\LCschema{\@schemata@LCBoxtrue}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\UCschema}{\@schemata@LCBoxfalse}
\else
- \newcommand{\LCschema}{\@schemata@LCBoxtrue}%
+ \def\UCschema{\@schemata@LCBoxfalse}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\UCschema{\@schemata@LCBoxfalse}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\SwitchSB}{\@schemata@SWBoxtrue}%
\else
- \newcommand{\UCschema}{\@schemata@LCBoxfalse}%
+ \def\SwitchSB{\@schemata@SWBoxtrue}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\SwitchSB{\@schemata@SWBoxtrue}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\NudgeSB}{\@schemata@NudgeBoxtrue}
\else
- \newcommand{\SwitchSB}{\@schemata@SWBoxtrue}%
+ \def\NudgeSB{\@schemata@NudgeBoxtrue}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\NudgeSB{\@schemata@NudgeBoxtrue}%
+\ifx\fmtname\schemataLaTeX
+ \newcommand{\SBNudgeFactor}{\kern0.2em}
\else
- \newcommand{\NudgeSB}{\@schemata@NudgeBoxtrue}%
+ \def\SBNudgeFactor{\kern0.2em}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \gdef\schemabox{\futurelet\testchar\@schemabox}
- \gdef\@schemabox{%
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\schemabox}[2][0pt]{\@schemata@schemabox[#1]{#2}}
+\else
+ \def\schemabox{\futurelet\testchar\@schemata@schemab@x}
+ \def\@schemata@schemab@x{%
\ifx[\testchar
- \let\next\@@schemabox%
+ \let\next\@schemata@schemabox%
\else
- \let\next\@@schemab@x%
+ \let\next\@schemata@@schemab@x%
\fi
\next%
}%
- \gdef\@@schemab@x#1{\@@schemabox[0pt]{#1}}
- \gdef\@@schemabox[#1]#2{%
- \ifinner
- \if@schemata@LCBox
- \def\@Adj{}%
- \if@schemata@SWBox\def\@Adj{\strut}\fi
- \else
- \def\@Adj{\strut}%
- \if@schemata@SWBox\def\@Adj{}\fi
- \fi
- \if@schemata@NudgeBox
- \def\(a)Nudge{\kern0.2em}%
- \else
- \def\@Nudge{}%
- \fi
- \ifdim#1<1pt
- \def\\{\@Nudge\egroup\hbox\bgroup\ignorespaces }%
- \vbox{\hbox\bgroup\@Adj\ignorespaces #2\@Nudge\egroup}%
- \else
- \def\\{\hfil\egroup\hbox to #1\bgroup\ignorespaces }%
- \vbox{\hbox to #1\bgroup\@Adj\ignorespaces #2\hfil\egroup}%
- \fi
- \else
- #2%
- \fi
- \@schemata@SWBoxfalse%
- \@schemata@NudgeBoxfalse%
- }%
+ \def\@schemata@@schemab@x#1{\@schemata@schemabox[0pt]{#1}}
+\fi
+\def\@schemata@schemabox[#1]#2{%
+ \ifinner
+ \if@schemata@LCBox
+ \def\@Adj{}%
+ \if@schemata@SWBox\def\@Adj{\strut}\fi
+ \else
+ \def\@Adj{\strut}%
+ \if@schemata@SWBox\def\@Adj{}\fi
+ \fi
+ \if@schemata@NudgeBox
+ \let\@Nudge\SBNudgeFactor%
+ \else
+ \def\@Nudge{}%
+ \fi
+ \ifdim#1<1pt
+ \def\\{\@Nudge\egroup\hbox\bgroup\ignorespaces }%
+ \vbox{\hbox\bgroup\@Adj\ignorespaces #2\@Nudge\egroup}%
+ \else
+ \def\\{\hfil\egroup\hbox to #1\bgroup\ignorespaces }%
+ \vbox{\hbox to #1\bgroup\@Adj\ignorespaces #2\hfil\egroup}%
+ \fi
+ \else
+ #2%
+ \fi
+ \@schemata@SWBoxfalse%
+ \@schemata@NudgeBoxfalse%
+}
+\ifx\fmtname\schemataLaTeX
+ \newcommand{\schema}[3][open]{%
+ \@schemata@schema[#1]{#2}{#3}}
\else
- \newcommand{\schemabox}[2][0pt]{%
- \ifinner
- \if@schemata@LCBox
- \def\@Adj{}%
- \if@schemata@SWBox\def\@Adj{\strut}\fi
- \else
- \def\@Adj{\strut}%
- \if@schemata@SWBox\def\@Adj{}\fi
- \fi
- \if@schemata@NudgeBox
- \def\(a)Nudge{\kern0.2em}%
- \else
- \def\@Nudge{}%
- \fi
- \ifdim#1<1pt
- \def\\{\@Nudge\egroup\hbox\bgroup\ignorespaces }%
- \vbox{\hbox\bgroup\@Adj\ignorespaces #2\@Nudge\egroup}%
- \else
- \def\\{\hfil\egroup\hbox to #1\bgroup\ignorespaces }%
- \vbox{\hbox to #1\bgroup\@Adj\ignorespaces #2\hfil\egroup}%
- \fi
+ \long\def\schema{\futurelet\testchar\@schemata@schem@}
+ \long\def\@schemata@schem@{%
+ \ifx[\testchar
+ \let\next\@schemata@schema%
\else
- #2%
+ \let\next\@schemata@@schem@%
\fi
- \@schemata@SWBoxfalse%
- \@schemata@NudgeBoxfalse%
+ \next%
}%
+ \long\def\@schemata@@schem@#1#2{%
+ \@schemata@schema[open]{#1}{#2}}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \gdef\schema{\futurelet\testchar\@schema}
- \gdef\@schema{\ifx[\testchar \let\next\@@schema%
- \else \let\next\@@schem@ \fi \next}
- \gdef\@@schem@#1#2{\@@schema[open]{#1}{#2}}
- \gdef\@@schema[#1]#2#3{%
- \def\@ption{#1}\def\@pen{open}%
- \ifx\@ption\@pen
- \setbox\@rhs=\vbox{#3}%
- \@rheight=\ht\@rhs%
- \advance\@rheight\dp\@rhs%
- \advance\@rheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \@schemata@lbrace{\@rheight}%
- \vcenter{#3}$}%
- \else
- \setbox\@lhs=\vbox{#2}%
- \@lheight=\ht\@lhs%
- \advance\@lheight\dp\@lhs%
- \advance\@lheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \kern-0.2em\@schemata@rbrace{\@lheight}%
- \vcenter{#3}$}%
- \fi
- }%
+\long\def\@schemata@schema[#1]#2#3{%
+ \def\@ption{#1}\def\@pen{open}%
+ \ifx\@ption\@pen
+ \setbox\@schemata@rhs=\vbox{#3}%
+ \@schemata@rheight=\ht\@schemata@rhs%
+ \advance\@schemata@rheight\dp\@schemata@rhs%
+ \advance\@schemata@rheight by 1.44265ex%
+ \hbox{$\vcenter{#2}%
+ \@schemata@lbrace{\@schemata@rheight}%
+ \vcenter{#3}$}%
+ \else
+ \setbox\@schemata@lhs=\vbox{#2}%
+ \@schemata@lheight=\ht\@schemata@lhs%
+ \advance\@schemata@lheight\dp\@schemata@lhs%
+ \advance\@schemata@lheight by 1.44265ex%
+ \hbox{$\vcenter{#2}%
+ \kern-0.2em\@schemata@rbrace{\@schemata@lheight}%
+ \vcenter{#3}$}%
+ \fi
+}
+\ifx\fmtname\schemataLaTeX
+ \newcommand{\Schema}[5][open]{%
+ \@schemata@Schema[#1]{#2}{#3}{#4}{#5}}
\else
- \newcommand{\schema}[3][open]{%
- \def\@ption{#1}\def\@pen{open}%
- \ifx\@ption\@pen
- \setbox\@rhs=\vbox{#3}%
- \@rheight=\ht\@rhs%
- \advance\@rheight\dp\@rhs%
- \advance\@rheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \@schemata@lbrace{\@rheight}%
- \vcenter{#3}$}%
+ \long\def\Schema{\futurelet\testchar\@schemata@Schem@}
+ \long\def\@schemata@Schem@{%
+ \ifx[\testchar
+ \let\next\@schemata@Schema%
\else
- \setbox\@lhs=\vbox{#2}%
- \@lheight=\ht\@lhs%
- \advance\@lheight\dp\@lhs%
- \advance\@lheight by 1.44265ex%
- \hbox{$\vcenter{#2}%
- \kern-0.2em\@schemata@rbrace{\@lheight}%
- \vcenter{#3}$}%
+ \let\next\@schemata@@Schem@%
\fi
+ \next%
}%
+ \long\def\@schemata@@Schem@#1#2#3#4{%
+ \@schemata@Schema[open]{#1}{#2}{#3}{#4}}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \gdef\Schema{\futurelet\testchar\@Schema}
- \gdef\@Schema{\ifx[\testchar \let\next\@@Schema%
- \else \let\next\@@Schem@ \fi \next}
- \gdef\@@Schem@#1#2#3#4{\@@Schema[open]{#1}{#2}{#3}{#4}}
- \gdef\@@Schema[#1]#2#3#4#5{%
- \def\@ption{#1}%
- \def\@pen{open}%
- \dimen0=#2%
- \ifx\@ption\@pen
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}%
- \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}%
- \else
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em%
- \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}%
+\long\def\@schemata@Schema[#1]#2#3#4#5{%
+ \def\@ption{#1}%
+ \def\@pen{open}%
+ \dimen0=#2%
+ \ifx\@ption\@pen
+ \hbox{$\vcenter{\vskip1.44265\dimen0#4}%
+ \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}%
+ \else
+ \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em%
+ \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}%
+ \fi
+}
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\@schemata@lbrace}[1]{%
+ \ifmmode
+ \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
\fi
- }%
+ }
\else
- \newcommand{\Schema}[5][open]{%
- \def\@ption{#1}%
- \def\@pen{open}%
- \dimen0=#2%
- \ifx\@ption\@pen
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}%
- \@schemata@biglbrace{#2}{#3}\vcenter{#5}$}%
- \else
- \hbox{$\vcenter{\vskip1.44265\dimen0#4}\kern-0.2em%
- \@schemata@bigrbrace{#2}{#3}\vcenter{#5}$}%
+ \def\@schemata@lbrace#1{%
+ \ifmmode
+ \left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD%
\fi
- }%
+ }
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\@schemata@lbrace#1{%
- \ifmmode\left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD\fi}
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\@schemata@rbrace}[1]{%
+ \ifmmode
+ \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
+ \fi
+ }
\else
- \newcommand{\@schemata@lbrace}[1]{%
- \ifmmode\left.\vcenter{\vbox to #1{\vfil}}\right\@schemata@LD\fi}
-\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
\def\@schemata@rbrace#1{%
- \ifmmode\left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.\fi}
-\else
- \newcommand{\@schemata@rbrace}[1]{%
- \ifmmode\left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.\fi}
-\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\@schemata@biglbrace#1#2{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD$}}\fi
+ \ifmmode
+ \left\@schemata@RD\vcenter{\vbox to #1{\vfil}}\right.%
\fi
- }%
+ }
+\fi
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\@schemata@biglbrace}[2]{%
+ \@schemata@@biglbrace{#1}{#2}}
\else
- \newcommand{\@schemata@biglbrace}[2]{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@LD$}}\fi
- \fi
- }%
+ \def\@schemata@biglbrace#1#2{%
+ \@schemata@@biglbrace{#1}{#2}}
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \def\@schemata@bigrbrace#1#2{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD$}}\fi
- \fi
- }%
+\def\@schemata@@biglbrace#1#2{%
+ \dimen0=#1%
+ \dimen2=#2%
+ \dimen4=-\dimen2%
+ \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
+ \ifdim\dimen0<0pt
+ \ifmmode\vcenter{\hbox{$\left.%
+ \vbox to 1.44265\dimen2{\vfil}%
+ \right\@schemata@LD%
+ \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
+ \else
+ \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
+ \atop\left.%
+ \vbox to 1.44265\dimen2{\vfil}%
+ \right\@schemata@LD$}}\fi
+ \fi
+}
+\ifx\fmtname\schemataLaTeX
+ \newcommand*{\@schemata@bigrbrace}[2]{%
+ \@schemata@@bigrbrace{#1}{#2}%
+ }
\else
- \newcommand{\@schemata@bigrbrace}[2]{%
- \dimen0=#1%
- \dimen2=#2%
- \dimen4=-\dimen2%
- \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
- \ifdim\dimen0<0pt
- \ifmmode\vcenter{\hbox{$\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD%
- \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
- \else
- \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
- \atop\left.%
- \vbox to 1.44265\dimen2{\vfil}%
- \right\@schemata@RD$}}\fi
- \fi
- }%
+ \def\@schemata@bigrbrace#1#2{%
+ \@schemata@@bigrbrace{#1}{#2}%
+ }
\fi
-\expandafter\ifx\csname newenvironment\endcsname\relax
- \catcode`@=12
+\def\@schemata@@bigrbrace#1#2{%
+ \dimen0=#1%
+ \dimen2=#2%
+ \dimen4=-\dimen2%
+ \ifdim\dimen4>\dimen2\dimen2=\dimen4\fi
+ \ifdim\dimen0<0pt
+ \ifmmode\vcenter{\hbox{$\left.%
+ \vbox to 1.44265\dimen2{\vfil}%
+ \right\@schemata@RD%
+ \atop\vbox to -1.44265\dimen0{\vfil}$}}\fi
+ \else
+ \ifmmode\vcenter{\hbox{$\vbox to 1.44265\dimen0{\vfil}%
+ \atop\left.%
+ \vbox to 1.44265\dimen2{\vfil}%
+ \right\@schemata@RD$}}\fi
+ \fi
+}
+\ifx\fmtname\schemataLaTeX\else
+ \catcode`@=12\relax
\fi
%%
-%% Copyright (C) 2016 by Charles P. Schaum <charles dot schaum at comcast dot net>
+%% Copyright (C) 2020 by Charles P. Schaum <charles dot schaum(a)comcast.net>
%%
%% This work may be distributed and/or modified under the
%% conditions of the LaTeX Project Public License (LPPL), either
@@ -318,8 +295,10 @@
%% This work is "maintained" (as per LPPL maintenance status) by
%% Charles P. Schaum.
%%
-%% This work consists of the file schemata.dtx and a Makefile.
-%% Running "make" generates the derived files README, schemata.pdf and schemata.sty.
+%% This work consists of the file schemata.dtx, schematest.tex,
+%% schemata.png, and a Makefile.
+%% Running "make" generates the derived files README, schemata.pdf,
+%% and schemata.sty.
%% Running "make inst" installs the files in the user's TeX tree.
%% Running "make install" installs the files in the local TeX tree.
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schemata.tlpobj new/tlpkg/tlpobj/schemata.tlpobj
--- old/tlpkg/tlpobj/schemata.tlpobj 2019-02-28 04:04:53.000000000 +0100
+++ new/tlpkg/tlpobj/schemata.tlpobj 2020-03-16 02:21:43.000000000 +0100
@@ -1,6 +1,6 @@
name schemata
category Package
-revision 39510
+revision 54326
shortdesc Print topical diagrams
relocated 1
longdesc The package facilitates the creation of topical schemata,
@@ -10,7 +10,6 @@
runfiles size=3
RELOC/tex/generic/schemata/schemata.sty
catalogue-ctan /macros/generic/schemata
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics philosophy theology
-catalogue-version 0.8
+catalogue-version 1.1
++++++ schwalbe-chess.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/schwalbe-chess/README new/doc/latex/schwalbe-chess/README
--- old/doc/latex/schwalbe-chess/README 2019-01-04 22:51:01.000000000 +0100
+++ new/doc/latex/schwalbe-chess/README 2020-01-02 23:12:09.000000000 +0100
@@ -1,5 +1,5 @@
schwalbe --- A package for typesetting chessproblems
-Version v2.3 / Stefan Hoening 2012-2018
+Version v2.7 / Stefan Hoening 2012-2018
CONTENTS
Binary files old/doc/latex/schwalbe-chess/schwalbe.pdf and new/doc/latex/schwalbe-chess/schwalbe.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schwalbe-chess.doc.tlpobj new/tlpkg/tlpobj/schwalbe-chess.doc.tlpobj
--- old/tlpkg/tlpobj/schwalbe-chess.doc.tlpobj 2019-02-28 04:05:10.000000000 +0100
+++ new/tlpkg/tlpobj/schwalbe-chess.doc.tlpobj 2020-01-03 01:54:41.000000000 +0100
@@ -1,8 +1,8 @@
name schwalbe-chess.doc
category Package
-revision 49602
+revision 53305
shortdesc doc files of schwalbe-chess
relocated 1
-docfiles size=54
+docfiles size=56
RELOC/doc/latex/schwalbe-chess/README
RELOC/doc/latex/schwalbe-chess/schwalbe.pdf
++++++ schwalbe-chess.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/schwalbe-chess/schwalbe.cls new/tex/latex/schwalbe-chess/schwalbe.cls
--- old/tex/latex/schwalbe-chess/schwalbe.cls 2019-01-04 22:51:01.000000000 +0100
+++ new/tex/latex/schwalbe-chess/schwalbe.cls 2020-01-02 23:12:09.000000000 +0100
@@ -34,9 +34,9 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{schwalbe}[2017/01/31]
+\ProvidesClass{schwalbe}[2019/12/28]
\LoadClass[11pt,a4paper]{article}
-\RequirePackage[12pt]{schwalbe}
+\RequirePackage[12pt]{schwalbe}[2019/12/28]
\RequirePackage[T2A,T1]{fontenc}% fsRUS 140121
\RequirePackage[koi8-r,utf8]{inputenc}% fsRUS 140121
\RequirePackage[russian,german,english,ngerman]{babel}
@@ -109,19 +109,28 @@
\itemsep \parsep}%
\belowdisplayskip \abovedisplayskip
}
+\newcommand{\sw@monat}[1]{%
+\ifcase#1\relax%
+\or Januar\or Februar\or M\"arz\or April\or Mai\or Juni\or Juli\or August\or September\or Oktober\or November\or Dezember\fi%
+}%
+\newcounter{sw@issue}%
+\newcounter{sw@month}%
+\newcounter{sw@year}%
\newcommand{\Heft}[5]{%
\def\heft@band{#1}%
- \def\heft@nr{#2}%
- \def\heft@monat{#3}%
- \def\heft@year{#4}%
+ \setcounter{sw@issue}{#2}%
+ \setcounter{sw@month}{#3}%
+ \setcounter{sw@year}{#4}%
\setcounter{page}{#5}%
\hbox to \textwidth{\vbox to 60mm{\vfill}\hfill}%
\hbox to \textwidth{%
- {\large\bfseries HEFT~#2}%
+ {\large\bfseries%
+ HEFT~#2%
\hfill%
- {\large\bfseries BAND #1}%
+ BAND #1%
\hfill%
- {\large\bfseries #3~#4}%
+ \sw@monat{\value{sw@month}}~#4%
+ }%
}%
\vskip2mm%
\hrule width \textwidth height 1\p@%
@@ -267,6 +276,22 @@
}%
\expandafter\endgroup\@tempd%
}{}
+\newcounter{sw@loesungen@bis@monat}
+\newcounter{sw@loesungen@bis@jahr}
+\newcommand{\LoesungenBis}{%
+ \setcounter{sw@loesungen@bis@monat}{\value{sw@month}}%
+ \setcounter{sw@loesungen@bis@jahr}{\value{sw@year}}%
+ \addtocounter{sw@loesungen@bis@monat}{3}%
+ \ifthenelse{\value{sw@loesungen@bis@monat} > 12}%
+ {%
+ \addtocounter{sw@loesungen@bis@monat}{-12}%
+ \addtocounter{sw@loesungen@bis@jahr}{1}%
+ \sw@monat{\value{sw@loesungen@bis@monat}}\ \arabic{sw@loesungen@bis@jahr}%
+ }%
+ {%
+ \sw@monat{\value{sw@loesungen@bis@monat}}%
+ }%
+}%
\newcommand{\sw@urd@abteilung}{%
\@ifstar%
\@sw@urd@abteilung@one%
@@ -323,8 +348,8 @@
\newcommand{\@sw@lsg@abteilung}[4]{%
\textbf{#1 Nr. #2-#3} (Bearbeiter = #4)%
}
-\newenvironment{Loesungen}[2]{%
- \begingroup%
+\newcommand{\sw@loesungen}[2]{%
+ \begingroup%
\ttitel@skip%
\centerline{\Large\bfseries L\"osungen der Urdrucke aus Heft #1, #2}%
\titel@skip%
@@ -340,8 +365,8 @@
\edef\@tempa{
\write\sw@contents{%
\@nearverbatim\@tempb{%
- {\@nearverbatim\@tempc}%
- {\@nearverbatim\@tempd}%
+ {\@tempc}%
+ {\@tempd}%
{\@nearverbatim\pageref{inhalt\@nameuse{the@inhalt}}}%
}%
}%
@@ -349,6 +374,26 @@
\expandafter\egroup\@tempa%
\parskip.5ex plus 2ex%
\catcode`/=\active%
+}
+\newcounter{sw@loesungen@aus@heft}
+\newcounter{sw@loesungen@aus@monat}
+\newcounter{sw@loesungen@aus@jahr}
+\newcommand{\sw@loesungen@star}{%
+ \setcounter{sw@loesungen@aus@heft}{\value{sw@issue}}%
+ \addtocounter{sw@loesungen@aus@heft}{-3}%
+ \setcounter{sw@loesungen@aus@jahr}{\value{sw@year}}%
+ \setcounter{sw@loesungen@aus@monat}{\value{sw@month}}%
+ \addtocounter{sw@loesungen@aus@monat}{-6}%
+ \ifthenelse{\value{sw@loesungen@aus@monat} < 1}%
+ {%
+ \addtocounter{sw@loesungen@aus@monat}{12}%
+ \addtocounter{sw@loesungen@aus@jahr}{-1}%
+ }{}%
+ \sw@loesungen{\arabic{sw@loesungen@aus@heft}}{\sw@monat{\value{sw@loesungen@aus@monat}} \arabic{sw@loesungen@aus@jahr}}%
+}
+
+\newenvironment{Loesungen}{%
+ \@ifstar{\sw@loesungen@star}{\sw@loesungen}%
}{%
\catcode`/=12%
\endgroup%
@@ -971,6 +1016,10 @@
\expandafter\l@@klist\the\aut@tk; \e@list%
\egroup%
}
+\def\do@dia@job{%
+ \@write@sol\ifvmode\noindent\fi\unhbox\dia@box%
+ \sw@problem%
+}
\def\sw@problemAuthor#1; {%
\bgroup%
\def\@tempc{\problem}%
@@ -1099,6 +1148,8 @@
\def\bsol{\catcode`/=\active\relax}
\def\esol{\catcode`/=12\relax}
\bsol
+\renewcommand{\cpd@begindiagram@hook}{\esol}
+\renewcommand{\cpd@enddiagram@hook}{\bsol}
\renewcommand{\section}{\@startsection{section}{1}{\z@}{2ex}{.5ex}{\normalfont\large\bfseries}}
\renewcommand{\subsection}{\@startsection{subsection}{2}{\z@}{1ex}{.3ex}{\normalfont\bfseries}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/schwalbe-chess/schwalbe.sty new/tex/latex/schwalbe-chess/schwalbe.sty
--- old/tex/latex/schwalbe-chess/schwalbe.sty 2018-08-05 23:02:24.000000000 +0200
+++ new/tex/latex/schwalbe-chess/schwalbe.sty 2020-01-02 23:12:09.000000000 +0100
@@ -34,12 +34,12 @@
%%
%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{schwalbe}[2017/01/31]
+\ProvidesPackage{schwalbe}[2019/12/28]
\DeclareOption{10pt}{\PassOptionsToPackage{10pt}{diagram}}
\DeclareOption{11pt}{\PassOptionsToPackage{11pt}{diagram}}
\DeclareOption{12pt}{\PassOptionsToPackage{12pt}{diagram}}
\ProcessOptions
-\RequirePackage{diagram}
+\RequirePackage{diagram}[2019/12/28]
\newcommand{\rb}[1]{\raisebox{0.4ex}{#1}}
\nocomputer
\setboolean{piececounter}{true}
@@ -66,11 +66,6 @@
\diagramx%
\setboardwidth%
}
-
-\def\do@dia@job{%
- \@write@sol\ifvmode\noindent\fi\unhbox\dia@box%
- \sw@problem%
-}
\setboolean{showacademictitle}{false}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\inner@frame\z@%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/schwalbe-chess.tlpobj new/tlpkg/tlpobj/schwalbe-chess.tlpobj
--- old/tlpkg/tlpobj/schwalbe-chess.tlpobj 2019-02-28 04:05:10.000000000 +0100
+++ new/tlpkg/tlpobj/schwalbe-chess.tlpobj 2020-01-03 01:54:41.000000000 +0100
@@ -1,6 +1,6 @@
name schwalbe-chess
category Package
-revision 49602
+revision 53305
shortdesc Typeset the German chess magazine "Die Schwalbe"
relocated 1
longdesc The package is based on chess-problem-diagrams, which in its
@@ -9,7 +9,6 @@
RELOC/tex/latex/schwalbe-chess/schwalbe.cls
RELOC/tex/latex/schwalbe-chess/schwalbe.sty
catalogue-ctan /macros/latex/contrib/schwalbe-chess
-catalogue-date 2019-01-04 16:33:55 +0100
catalogue-license lppl1.2
catalogue-topics journalpub games class
-catalogue-version 2.3
+catalogue-version 2.7
++++++ scratch3.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scratch3/README new/doc/latex/scratch3/README
--- old/doc/latex/scratch3/README 2019-03-09 23:22:30.000000000 +0100
+++ new/doc/latex/scratch3/README 2020-03-20 22:27:34.000000000 +0100
@@ -3,9 +3,9 @@
L'extension
scratch3
- v0.11
+ v0.16
- 10 mars 2019
+ 20 mars 2020
___________________________________
Author : Christian Tellechea
Binary files old/doc/latex/scratch3/scratch3-fr.pdf and new/doc/latex/scratch3/scratch3-fr.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/scratch3/scratch3-fr.tex new/doc/latex/scratch3/scratch3-fr.tex
--- old/doc/latex/scratch3/scratch3-fr.tex 2019-03-09 23:22:30.000000000 +0100
+++ new/doc/latex/scratch3/scratch3-fr.tex 2020-03-20 22:27:34.000000000 +0100
@@ -103,7 +103,7 @@
\catcode`\<13 \catcode`\>13 \def<{\begingroup$\langle$\itshape}\def>{\/$\rangle$\endgroup}%
\@ifstar\@sverb\@verb}
\endgroup
-\def\longfrscrdate@i#1/#2/#3\@nil{\number#3\relax\space \ifcase#2 \or janvier\or février\or mars\or avril\or mai\or juin\or juillet\or aout\or septembre\or octobre\or novembre\or décembre\fi\space#1}
+\def\longfrscrdate@i#1/#2/#3\@nil{\number#3\relax\ifnum\number#3=1 \noexpand\ier\fi\space \ifcase#2 \or janvier\or février\or mars\or avril\or mai\or juin\or juillet\or aout\or septembre\or octobre\or novembre\or décembre\fi\space#1}
\edef\longfrscrdate{\expandafter\longfrscrdate@i\scrdate\@nil}
\makeatother
\begingroup
@@ -159,7 +159,7 @@
\texttt{\detokenize{https://framagit.org/unbonpetit/scratch3/issues}}
\end{center}
-Les utilisateurs les plus atentifs auront sans oute remarqué que seuls les blocs de type «stylo» sont disponibles parmi ceux qui sont dorénavant considérés comme «extension». Il s'agit, pour l'instant, d'un choix délibéré...
+Les utilisateurs les plus attentifs auront sans doute remarqué que seuls les blocs de type «stylo» sont disponibles parmi ceux qui sont dorénavant considérés comme «extension». Il s'agit, pour l'instant, d'un choix délibéré...
\paragraph{Attention} Il est fortement déconseillé de charger les packages \SCRATCH et \SSCRATCH en raison de plusieurs définitions communes qu'ils partagent et qui conduiraient inévitablement à des dysfonctionnements. L'erreur qui survient ---~et le refus de charger le deuxième~--- lorsqu'on tente de charger ces deux packages ne doivent pas être désactivés par une modification de leurs codes.\medbreak
@@ -320,6 +320,14 @@
Un autre : \booloperator{\booloperator{\ovalvariable{varx} > \ovalnum{1}}
et \booloperator{\ovalvariable{varx} < \ovalnum{5}}}./
+La macro \verb|\boolempty[<dimension>]| permet de tracer un losange vide. L'argument optionnel est une \verb|<dimension>| qui vaut \verb|2em| par défaut.
+
+\exemple/\begin{scratch}
+ \blockifelse{si \boolempty[3em] alors}
+ {\blocklook{dire \ovalnum{le test est vrai}}}
+ {\blocklook{dire \ovalnum{le test est faux}}}
+\end{scratch}/
+
\section{Les blocs de fin}
Ces blocs sont susceptibles de clore un algorithme et n'ont donc pas d'encoche mâle dans leur partie basse. Ils ne peuvent être que du type \suffixe{control} et sont dessinés avec la macro \verb|\blockstop{<texte>}|
@@ -437,6 +445,12 @@
\cleval{scale}{coefficient}\label{cle-scale}
Représente l'échelle à laquelle est représenté le dessin. La valeur est ramenée si nécessaire dans l'intervalle [0.2 ; 5].
+Les blocs ovales ou losanges, qui peuvent se trouver à l'extérieur de l'environnement scrtach, sont affectés par la valeur de \texttt{scale} :
+
+\exemple/\setscratch{scale=1}Échelle 1 : \ovalvariable{var} et \booloperator{\ovalmove{abscisse x} < \ovalnum{7}}\par
+Échelle 0.75 :\setscratch{scale=.75} : \ovalvariable{var} et \booloperator{\ovalmove{abscisse x} < \ovalnum{7}}\par
+Échelle 1.25 :\setscratch{scale=1.25} : \ovalvariable{var} et \booloperator{\ovalmove{abscisse x} < \ovalnum{7}}/
+
\cleval{init arcangle}{angle}
Représente l'angle avec l'horizontale de l'arc de cercle tracé dans la partie haute des blocs de départ. La valeur est ramenée si nécessaire dans l'intervalle [20 ; 40].
@@ -579,7 +593,7 @@
\end{scratch}/
\section{Mot de la fin}
-Le code de cette extension démontre mon immense ignorance de ti\textit kz/pgf et les méthodes de programmation qui lui sont propres que, décidément, je ne comprendrai jamais! C'est sans doute le trop grand éloignement avec la logique de \TeX{} et la documentation de ti\textit kz/pgf, aussi indigeste qu'illisible, qui explique cette incompatibilité d'humeur et mon désintérêt à l'égard de ti\textit kz. Toujours est-il que cette extension fonctionne, avec une lenteur certaine que j'attribue à ma programmation hasardeuse ainsi qu'à la lenteur intrinsèque de ti\textit kz.
+Le code de cette extension démontre mon immense ignorance de ti\textit kz/pgf et les méthodes de programmation qui lui sont propres que décidément, je ne comprendrai jamais! C'est sans doute le trop grand éloignement avec la logique de \TeX{} et la documentation de ti\textit kz/pgf, aussi indigeste qu'illisible, qui explique cette incompatibilité d'humeur et mon désintérêt à l'égard de ti\textit kz. Toujours est-il que cette extension fonctionne, avec une lenteur certaine que j'attribue autant à ma programmation hasardeuse qu'à la lenteur intrinsèque de ti\textit kz.
Toute remarque, remontée de bug ---~je n'ose pas dire amélioration du code~---, demande d'implémentation de fonctionnalité est bien évidemment bienvenue; j'invite les utilisateurs à m'en faire part \emph{via} email à \texttt{unbonpetit(a)netc.fr}
@@ -591,4 +605,23 @@
>Correction d'un bug dans \verb|\scr_blockloop| : la couleur \verb|\scr_current_blockcolor| y est désormais définie;
>Correction d'un bug dans \verb|\boolmoreblocks| : la couleur est correcte et \verb|rounded corners| désormais est nul pour le tracé d'un losange.
\end{version}
+\begin{version}{0.12}{18/05/2019}
+ >Correction d'un bug dans \verb|\ovalnum|;
+ >Correction d'un bug dans \verb|\scr_ovalbox|.
+\end{version}
+\begin{version}{0.13}{01/07/2019}
+ >Mise en place de \verb|\relax| pour éviter le bug de \verb|\lastkern| avec Xe\LaTeX.
+\end{version}
+\begin{version}{0.14}{01/10/2019}
+ >Gestion de l'échelle (via clé "\texttt{scale}") améliorée.
+ >Hors de l'environnement, les ovales et les losanges sont affectés par la clé "\texttt{scale}" si elle est spécifiée via \verb|\setscratch|.
+ >Erreur de tracé corrigée dans \verb|\scr_blockloop|.
+ >Nouveau losange vide : \verb|\boolempty[<dimension>]|.
+\end{version}
+\begin{version}{0.15}{05/03/2020}
+ >Bug corrigé dans les blocs normaux: l'échelle est désormais réinitialisée si besoin.
+\end{version}
+\begin{version}{0.16}{20/03/2020}
+ >Le bug corrigé dans la v0.15 est fautif, \verb|scr_scale| est désormais initialisée dans \verb|\initmoreblocks|.
+\end{version}
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scratch3.doc.tlpobj new/tlpkg/tlpobj/scratch3.doc.tlpobj
--- old/tlpkg/tlpobj/scratch3.doc.tlpobj 2019-03-10 02:24:11.000000000 +0100
+++ new/tlpkg/tlpobj/scratch3.doc.tlpobj 2020-03-20 23:58:41.000000000 +0100
@@ -1,9 +1,9 @@
name scratch3.doc
category Package
-revision 50304
+revision 54435
shortdesc doc files of scratch3
relocated 1
-docfiles size=132
+docfiles size=134
RELOC/doc/latex/scratch3/README
RELOC/doc/latex/scratch3/scratch3-fr.pdf
RELOC/doc/latex/scratch3/scratch3-fr.tex
++++++ scratch3.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/scratch3/scratch3.sty new/tex/latex/scratch3/scratch3.sty
--- old/tex/latex/scratch3/scratch3.sty 2019-03-09 23:22:30.000000000 +0100
+++ new/tex/latex/scratch3/scratch3.sty 2020-03-20 22:27:34.000000000 +0100
@@ -1,12 +1,13 @@
+% !BIB TS-program =
% !TeX encoding = ISO-8859-1
% Ce fichier contient le code de l'extension "scratch3"
%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
\def\scrname{ scratch3 }%
-\def\scrver { 0.11 }%
+\def\scrver { 0.16 }%
% %
-\def\scrdate{ 2019/03/10 }%
+\def\scrdate{ 2020/03/20 }%
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%
@@ -17,9 +18,9 @@
% Package URL: https://www.ctan.org/pkg/scratch3
% Bug tracker: https://framagit.org/unbonpetit/scratch3/issues
% Repository : https://framagit.org/unbonpetit/scratch3/tree/master
-% Copyright : Christian Tellechea 2019
+% Copyright : Christian Tellechea 2020
% Licence : Released under the LaTeX Project Public License v1.3c
-% or later, see http://www.latex-project.org/lppl.txt
+% or later, see http://www.latex-project.org/lppl.txtf
% Files : 1) scratch3.sty
% 2) scratch3-fr.tex
% 3) scratch3-fr.pdf
@@ -70,7 +71,12 @@
num start = 1 ,% numéro de départ
baseline = 1 ,% alignement sur le 1er bloc (en partant du haut)
}
-\newcommand*\numblock[1]{\color{black}\footnotesize\bfseries#1}
+\newcommand*\numblock[1]{%
+ \color{black}%
+ \footnotesize
+ \bfseries
+ #1%
+}
\newcommand*\resetscratch{\csname skv_[\scrname]\endcsname\scr_setcolors}
\newcommand*\setscratch[1]{\setKV[\scrname]{#1}\scr_setcolors}
\newcommand*\setdefaultscratch[1]{\setKVdefault[\scrname]{#1}\scr_setcolors}
@@ -111,6 +117,8 @@
\fi
\fi
}
+\newif\if_inpicture
+\_inpicturefalse
\newcount\scr_loopnest
\newcount\scr_blocknum
\newbox \scr_box
@@ -122,6 +130,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\def\scr_normalblock#1#2{% #1=couleur #2=texte
\def\scr_current_blockcolor{#1}%
+% \if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi% bugfix 0.15 (regression) --> bugfix 0.16
\def\scr_currentstuff{%
\if_pen
\scr_drawpen
@@ -135,6 +144,7 @@
\kern.6em
\fi
\useKV[\scrname]{pre text}%
+ \_inpicturetrue
#2%
\scr_blockstrut
}%
@@ -147,16 +157,27 @@
\edef\scr_boxht{\the\ht\scr_box}%
\edef\scr_totht{\the\dimexpr\ht\scr_box+\dp\scr_box\relax}%
\draw[
- draw={\ifboolKV[\scrname]{print}{scr_linegray!\scr_contrast!black}{#1dd}},
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray!\scr_contrast!black}
+ {#1dd}
+ },
line width=\scr_linewidth,
- rounded corners=0.4*\scr_ex,
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{#1}},
+ rounded corners=0.4*\scr_ex*\scr_scale,
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray}
+ {none}%
+ }
+ {#1}%
+ },
yshift=\scr_yoffset,
xshift=\scr_xoffset
]
(0,0)--++(0.66666*\scr_notch,0)--++(\scr_corner,-\scr_corner)--++(\scr_notch,0)--++(\scr_corner,\scr_corner)--++(\scr_boxwd+2*\scr_xsep-\scr_corner*2-\scr_notch*1.66666,0)% ligne sup
--++(0,-\scr_totht-\scr_ysepsup-\scr_ysepinf-\scr_corner)% ligne est
- --++(-\scr_boxwd-2*\scr_xsep+\scr_corner*2+\scr_notch*1.66666,0)--++(-\scr_corner,-\scr_corner)--++(-\scr_notch,0)--++(-\scr_corner,\scr_corner)--++(-0.66666*\scr_notch,0)% logne sud
+ --++(-\scr_boxwd-2*\scr_xsep+\scr_corner*2+\scr_notch*1.66666,0)--++(-\scr_corner,-\scr_corner)--++(-\scr_notch,0)--++(-\scr_corner,\scr_corner)--++(-0.66666*\scr_notch,0)% ligne sud
--cycle;
\node[
at=(origin),
@@ -164,7 +185,11 @@
anchor=base west,
xshift=\scr_xoffset+\scr_xsep,
yshift=\scr_yoffset-\scr_boxht-\scr_corner-\scr_ysepsup,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\number\scr_blocknum)
{\scr_currentstuff};
@@ -205,10 +230,21 @@
\edef\scr_boxht{\the\ht\scr_box}%
\edef\scr_totht{\the\dimexpr\ht\scr_box+\dp\scr_box\relax}%
\draw[
- draw={\ifboolKV[\scrname]{print}{scr_linegray!\scr_contrast!black}{\scr_current_blockcolor dd}},
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray!\scr_contrast!black}
+ {\scr_current_blockcolor dd}%
+ },
line width=\scr_linewidth,
- rounded corners=0.4*\scr_ex,
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}},
+ rounded corners=0.4*\scr_ex*\scr_scale,
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ },
yshift=\scr_yoffset,
xshift=\scr_xoffset
]
@@ -220,7 +256,11 @@
anchor=base west,
xshift=\scr_xoffset+\scr_xsep,
yshift=\scr_yoffset-\scr_boxht-\scr_corner-\scr_ysepsup,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\number\scr_blocknum)
{\scr_currentstuff};
@@ -247,6 +287,7 @@
\def\scr_current_blockcolor{#1}%
\def\scr_currentstuff{%
\useKV[\scrname]{pre text}%
+ \_inpicturetrue
#2%
\scr_blockstrut
}%
@@ -259,10 +300,21 @@
\edef\scr_boxht{\the\ht\scr_box}%
\edef\scr_totht{\the\dimexpr\ht\scr_box+\dp\scr_box\relax}%
\draw[
- draw={\ifboolKV[\scrname]{print}{scr_linegray!\scr_contrast!black}{#1dd}},
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray!\scr_contrast!black}
+ {#1dd}%
+ },
line width=\scr_linewidth,
- rounded corners=0.4*\scr_ex,
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}},
+ rounded corners=0.4*\scr_ex*\scr_scale,
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ },
yshift=\scr_yoffset,
xshift=\scr_xoffset
]
@@ -275,7 +327,11 @@
anchor=base west,
xshift=\scr_xoffset+\scr_xsep,
yshift=\scr_yoffset-\scr_boxht-\scr_corner-\scr_ysepsup,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\number\scr_blocknum)
{\scr_currentstuff};
@@ -301,6 +357,8 @@
\newcommand*\initmoreblocks[1]{%
\def\scr_currentstuff{%
\useKV[\scrname]{pre text}%
+ \_inpicturetrue
+ \def\scr_scale{1}% Bugfix 0.16
#1%
\scr_blockstrut
}%
@@ -314,14 +372,25 @@
\edef\scr_totht{\the\dimexpr\ht\scr_box+\dp\scr_box\relax}%
\def\scr_current_blockcolor{scrmoreblocks}%
\draw[
- draw={\ifboolKV[\scrname]{print}{scr_linegray!\scr_contrast!black}{\scr_current_blockcolor dd}},
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}},
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray!\scr_contrast!black}
+ {\scr_current_blockcolor dd}%
+ },
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ },
yshift=\scr_yoffset,
xshift=\scr_xoffset,
- rounded corners=0.4*\scr_ex
+ rounded corners=0.4*\scr_ex*\scr_scale
]
- (0,-\scr_totht-\scr_ysepsup-\scr_ysepinf-\scr_corner)[rounded corners=2*\scr_ex]--(0,0)--(\scr_boxwd+2*\scr_xsep,0)% ligne sup
- [rounded corners=0.4*\scr_ex]--++(0,-\scr_totht-\scr_ysepsup-\scr_ysepinf-\scr_corner)% ligne est
+ (0,-\scr_totht-\scr_ysepsup-\scr_ysepinf-\scr_corner)[rounded corners=2*\scr_ex*\scr_scale]--(0,0)--(\scr_boxwd+2*\scr_xsep,0)% ligne sup
+ [rounded corners=0.4*\scr_ex*\scr_scale]--++(0,-\scr_totht-\scr_ysepsup-\scr_ysepinf-\scr_corner)% ligne est
--++(-\scr_boxwd-2*\scr_xsep+\scr_corner*2+\scr_notch*1.66666,0)--++(-\scr_corner,-\scr_corner)--++(-\scr_notch,0)--++(-\scr_corner,\scr_corner)--++(-.66666*\scr_notch,0)% ligne sud
--cycle
node[
@@ -330,7 +399,11 @@
anchor=base west,
xshift=\scr_xoffset+\scr_xsep,
yshift=\scr_yoffset-\scr_boxht-\scr_corner-\scr_ysepsup,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\number\scr_blocknum)
{\scr_currentstuff};
@@ -370,6 +443,7 @@
\setbox\scr_box\hbox{%
\pgfinterruptpicture
\useKV[\scrname]{pre text}%
+ \_inpicturetrue
#1%
\scr_blockstrut
\endpgfinterruptpicture
@@ -435,8 +509,15 @@
\draw[
draw=\scr_current_linecolor,
line width=\scr_linewidth,
- rounded corners=0.4*\scr_ex,
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}}
+ rounded corners=0.4*\scr_ex*\scr_scale,
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ }
]
(\csname toploopx\number\scr_loopnest\endcsname,\csname toploopy\number\scr_loopnest\endcsname)--++(0.66666*\scr_notch,0)--++(\scr_corner,-\scr_corner)--++(\scr_notch,0)--++(\scr_corner,\scr_corner)--++(\csname scr_txtloopwd\number\scr_loopnest\endcsname+2*\scr_xsep-\scr_corner*2-\scr_notch*1.66666,0)% ligne sup
--++(0,-\csname scr_txtlooptotht\number\scr_loopnest\endcsname-\scr_ysepsup-\scr_ysepinf-\scr_corner)% ligne est "|"
@@ -463,7 +544,7 @@
\else
--++(-\csname scr_txtloopwd\number\scr_loopnest\endcsname-2*\scr_xsep+\scr_corner*2+\scr_notch*1.66666,0)--++(-\scr_corner,-\scr_corner)--++(-\scr_notch,0)--++(-\scr_corner,\scr_corner)--++(-.66666*\scr_notch,0)% ligne Sud "\--\__/---------"
\fi
- --(\csname toploopx\number\scr_loopnest\endcsname,\csname toploopy\number\scr_loopnest\endcsname-\scr_corner)--cycle;% remontée tout en haut et cycle
+ --cycle;% remontée tout en haut et cycle ## bugfix 0.14
\advance\scr_xoffset\dimexpr-\scr_loopblockwidth\relax
\csname scr_numblockif\number\scr_loopnest\endcsname% numérote ou pas le texte dans le bandeau du haut
\node[
@@ -472,10 +553,19 @@
anchor=base west,
xshift=\csname toploopx\number\scr_loopnest\endcsname+\scr_xsep,
yshift=\csname toploopy\number\scr_loopnest\endcsname-\csname scr_txtloopht\number\scr_loopnest\endcsname-\scr_corner-\scr_ysepsup,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\csname blocnum\number\scr_loopnest\endcsname)
- {\useKV[\scrname]{pre text}#1\scr_blockstrut};
+ {%
+ \useKV[\scrname]{pre text}%
+ \_inpicturetrue
+ #1%
+ \scr_blockstrut
+ };
\ifcat\relax\detokenize{#3}\relax\else
\node[
at=(origin),
@@ -483,10 +573,17 @@
anchor=base west,
xshift=\csname toploopx\number\scr_loopnest\endcsname+\scr_xsep,
yshift=\csname bottomify\number\scr_loopnest\endcsname-\scr_loopblockheight-\scr_corner,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(txt\csname blocelsenum\number\scr_loopnest\endcsname)
- {\useKV[\scrname]{pre text}\useKV[\scrname]{else word}};
+ {%
+ \useKV[\scrname]{pre text}%
+ \useKV[\scrname]{else word}%
+ };
\csname scr_numblockelse\number\scr_loopnest\endcsname% numérotation bloc else ou pas
\fi
\ifnum#5=1 %fleche
@@ -495,7 +592,7 @@
\scr_arrowcolor,
line width=1.5pt,
-{Triangle[length=\scr_scale*1.25ex,width=\scr_scale*1.5ex]},
- rounded corners=1pt
+ rounded corners=1pt*\scr_scale
]
(\scr_xoffset+\scr_xsep*2+\csname scr_txtloopwd\number\scr_loopnest\endcsname-\scr_ex*3.5+1pt,\scr_yoffset+\scr_linewidth+\scr_ysepinf-1.25pt)--++(\scr_loopblockheight,0)--++(0,\scr_loopblockheight+\scr_corner*0.5);
\edef\scr_arrowcolor{\ifboolKV[\scrname]{print}{scr_flaggray}{white}}% colmeur de la flèche
@@ -503,7 +600,7 @@
\scr_arrowcolor,
line width=\scr_scale*1.5pt,
-{Triangle[length=\scr_scale*1.25ex,width=\scr_scale*1.5ex]},
- rounded corners=1pt
+ rounded corners=1pt*\scr_scale
]
(\scr_xoffset+\scr_xsep*2+\csname scr_txtloopwd\number\scr_loopnest\endcsname-\scr_ex*3.5,\scr_yoffset+\scr_linewidth+\scr_ysepinf)--++(\scr_loopblockheight,0)--++(0,\scr_loopblockheight+\scr_corner*0.5);
\fi
@@ -521,25 +618,51 @@
\fi
\scr_setcolors
\def\scr_current_blockcolor{#2}%
+ \unless\ifdefined\scr_contrast% bugfix 0.11
+ \scr_normalizedec\scr_contrast contrast[0,100]%
+ \edef\scr_contrast{\number\numexpr100-\scr_contrast}%
+ \fi
+ \if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi
\begin{tikzpicture}[
baseline=(x.base),
x=1ex,
y=1ex,
inner ysep=0.25ex,
inner xsep=0.1ex,
- line width={\the\dimexpr\useKV[\scrname]{line width}\relax}
+ line width={\the\dimexpr\useKV[\scrname]{line width}\relax},
+ scale=\scr_scale,
+ every node/.style={scale=\scr_scale}
]
\node[
line width={\the\dimexpr\useKV[\scrname]{line width}\relax},
rounded rectangle,
- draw={\ifboolKV[\scrname]{print}{scr_linegray!\scr_contrast!black}{#2dd}},
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray\if1#1!85!black\fi}{none}}{\scr_current_blockcolor\if1#1d\fi}},
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray!\scr_contrast!black}
+ {#2dd}%
+ },
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray\if1#1!85!black\fi}
+ {none}%
+ }
+ {\scr_current_blockcolor\if1#1d\fi}%
+ },
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(x)
{%
- \useKV[\scrname]{pre text}\relax\scr_ovalstrut\kern\scr_ovalsentinel sp
+ \useKV[\scrname]{pre text}\relax
+ \scr_ovalstrut
+ \kern\scr_ovalsentinel sp
+ \_inpicturetrue
#3%
+ \relax% pour contourner bug dans XeLaTeX
\if1#1% si triangle de sélection
\kern1ex
\scr_menuselectarrow
@@ -560,7 +683,7 @@
baseline=-1ex,
x=1.5ex,
y=1.5ex,
- rounded corners=1.5pt
+ rounded corners=1.5pt*\scr_scale
]
\draw[
fill=white,
@@ -572,24 +695,43 @@
% dessine un menu %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\newcommand*\selectmenu[1]{% #1=texte du menu (sera composé et suivi du triangle de sélection)
+ \if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi
\begin{tikzpicture}[
anchor=base west,
baseline=(textmenu.base west),
outer sep=0pt,
inner sep=0pt,
- minimum size=0pt
+ minimum size=0pt,
+ scale=\scr_scale,
+ every node/.style={scale=\scr_scale}
]
\node[
rectangle,
- rounded corners=1.5pt,
- draw={\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor dd}},
+ rounded corners=1.5pt*\scr_scale,
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray}
+ {\scr_current_blockcolor dd}%
+ },
inner sep=0.2em,
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray!85!black}{none}}{\scr_current_blockcolor}},
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray!85!black}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ },
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(textmenu)
{%
\useKV[\scrname]{pre text}%
+ \_inpicturetrue
#1%
\scr_ovalstrut
\hskip.6666em
@@ -608,20 +750,28 @@
\edef\_{\the\dimexpr.53033\dimexpr \scr_linewidth\relax\relax}%
\def\scr_current_blockcolor{#1}%
\edef\scr_boolsep{\useKV[\scrname]{bool sep}}%
+ \if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi
\begin{tikzpicture}[
inner sep=0pt,
outer sep=0pt,
minimum size=0pt,
baseline=(x.base),
line width=\scr_linewidth,
- rounded corners=0pt% BUGFIX 0.11
+ rounded corners=0pt,% BUGFIX 0.11
+ scale=\scr_scale,
+ every node/.style={scale=\scr_scale}
]
\setbox\scr_box\hbox{%
\pgfinterruptpicture
\useKV[\scrname]{pre text}%
\scr_ovalstrut
\kern\scr_boolsentinel sp
- #2%
+ \_inpicturetrue
+ \if_boolempty
+ \vrule width#2 height0pt depth0pt\relax
+ \else
+ #2%
+ \fi
\xdef\scr_endkern{\number\lastkern}%
\endpgfinterruptpicture
}%
@@ -633,8 +783,19 @@
]
(\ifnum\scr_previouskern=\scr_boolsentinel-\scr_boolsep*.41421\else -\scr_totheight/2\fi,-\scr_boolsep)rectangle(\scr_retainedwd+\scr_totheight/2,\scr_totheight+\scr_boolsep);%
\draw[
- fill={\ifboolKV[\scrname]{print}{\ifboolKV[\scrname]{fill blocks}{scr_fillgray}{none}}{\scr_current_blockcolor}},
- draw={\ifboolKV[\scrname]{print}{scr_linegray}{#1dd}}
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {\ifboolKV[\scrname]{fill blocks}
+ {scr_fillgray\if_boolempty!85!black\fi}
+ {none}%
+ }
+ {\scr_current_blockcolor}%
+ },
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray}
+ {#1dd}%
+ }
]
(\scr_boolsep,-\scr_boolsep)--++(\scr_retainedwd-\scr_boolsep*2,0)--++(\scr_totheight/2+\scr_boolsep,\scr_totheight/2+\scr_boolsep)--++(-\scr_totheight/2-\scr_boolsep,\scr_totheight/2+\scr_boolsep)--++(-\scr_retainedwd+\scr_boolsep*2,0)--++(-\scr_totheight/2-\scr_boolsep,-\scr_totheight/2-\scr_boolsep)--cycle;%
\node[
@@ -643,7 +804,11 @@
minimum size=0pt,
draw=none,
anchor=south west,
- text={\ifboolKV[\scrname]{print}{\useKV[\scrname]{text color}}{white}}
+ text={%
+ \ifboolKV[\scrname]{print}
+ {\useKV[\scrname]{text color}}
+ {white}%
+ }
]
(x)
{%
@@ -651,11 +816,17 @@
\scr_ovalstrut
\kern\_%
\kern\scr_boolsentinel sp
- #2%
+ \_inpicturetrue
+ \if_boolempty
+ \vrule width#2 height0pt depth0pt\relax
+ \else
+ #2%
+ \fi
\kern\_%
};%
\end{tikzpicture}%
\endgroup
+ \_boolemptyfalse
\kern\scr_boolsentinel sp
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -699,39 +870,51 @@
\definecolor{penline} {HTML}{595e73}%
\definecolor{penblue} {HTML}{4c8eea}%
\definecolor{penvline} {HTML}{0da57a}%
+\definecolor{boolempty} {HTML}{cf8b17}% new 0.14
+\definecolor{boolemptyd} {HTML}{cf8b17}% new 0.14
+\definecolor{boolemptydd} {HTML}{cf8b17}% new 0.14
+
\newenvironment{scratch}[1][]
{\skv_ifempty{#1}{}{\setscratch{#1}}%
\sffamily
\edef\scr_ex{\the\dimexpr1ex\relax}% valeur d'1ex pour le tracé de la flèche
\edef\scr_em{\the\dimexpr1em\relax}%
- \scr_normalizedim\scr_corner corner[\scr_ex/3,\scr_ex]%
- \scr_normalizedim\scr_notch notch[\scr_em/3,\scr_em*3]%
- \scr_normalizedec\scr_scale scale[0.2,5]% échelle
- \scr_normalizedim\scr_xsep x sep[0pt,\scr_em]%
- \scr_normalizedim\scr_ysepsup y sepsup[1pt,\scr_ex*3]%
- \scr_normalizedim\scr_ysepinf y sepinf[1pt,\scr_ex*3]%
- \scr_normalizedim\scr_linewidth line width[0pt,5pt]% épaisseur des lignes soumises à l'échelle
- \scr_normalizedim\scr_loopblockwidth loop width[3pt,\scr_em*3]%
- \scr_normalizedim\scr_loopblockheight loop height[3pt,\scr_ex*3]%
- \scr_normalizedec\scr_initarcangle init arcangle[20,40]%
- \scr_normalizedim\scr_initarclength init arclength[\scr_em*3,\scr_em*8]%
- \scr_normalizedim\scr_numsep num sep[0pt,\scr_em*3/2]%
- \scr_normalizedec\scr_contrast contrast[0,100]%
+ \scr_normalizedim\scr_corner corner [\scr_ex/3,\scr_ex]%
+ \scr_normalizedim\scr_notch notch [\scr_em/3,\scr_em*3]%
+ \scr_normalizedec\scr_scale scale [0.2,5]% échelle
+ \scr_normalizedim\scr_xsep x sep [0pt,\scr_em]%
+ \scr_normalizedim\scr_ysepsup y sepsup [1pt,\scr_ex*3]%
+ \scr_normalizedim\scr_ysepinf y sepinf [1pt,\scr_ex*3]%
+ \scr_normalizedim\scr_linewidth line width [0pt,5pt]% épaisseur des lignes soumises à l'échelle
+ \scr_normalizedim\scr_loopblockwidth loop width [3pt,\scr_em*3]%
+ \scr_normalizedim\scr_loopblockheight loop height [3pt,\scr_ex*3]%
+ \scr_normalizedec\scr_initarcangle init arcangle [20,40]%
+ \scr_normalizedim\scr_initarclength init arclength [\scr_em*3,\scr_em*8]%
+ \scr_normalizedim\scr_numsep num sep [0pt,\scr_em*3/2]%
+ \scr_normalizedec\scr_contrast contrast [0,100]%
\edef\scr_contrast{\number\numexpr100-\scr_contrast}%
\edef\scr_minwd{\the\dimexpr\scr_corner*4+\scr_notch*3-\scr_xsep*2}%
\edef\scr_valign{\useKV[\scrname]{baseline}}%
\scr_blocknum\number\numexpr\useKV[\scrname]{num start}\relax\relax
\setbox\scr_box\hbox{\scr_blockstrut}\edef\scr_blockstruttotht{\the\dimexpr\ht\scr_box+\dp\scr_box\relax}% haut totale du strut
\def\turnleft{\turn_arrow{}}\def\turnright{\turn_arrow{xscale=-1}}%
- \let\blockmove \scr_blockmove \let\blocklook \scr_blocklook
- \let\blocksound \scr_blocksound \let\blocklist \scr_blocklist
- \let\blockpen \scr_blockpen \let\blockvariable \scr_blockvariable
- \let\blockevent \scr_blockevent \let\blockinit \scr_blockinit
- \let\blockrepeat \scr_blockrepeat \let\blockinfloop \scr_blockinfloop
- \let\blockifelse \scr_blockifelse \let\blockif \scr_blockif
- \let\blockinitclone\scr_blockinitclone \let\blockcontrol \scr_blockcontrol
- \let\blocksensing \scr_blocksensing \let\blockmoreblocks\scr_blockmoreblocks
- \let\namemoreblocks\scr_namemoreblocks
+ \let\blockmove \scr_blockmove
+ \let\blocklook \scr_blocklook
+ \let\blocksound \scr_blocksound
+ \let\blocklist \scr_blocklist
+ \let\blockpen \scr_blockpen
+ \let\blockvariable \scr_blockvariable
+ \let\blockevent \scr_blockevent
+ \let\blockinit \scr_blockinit
+ \let\blockrepeat \scr_blockrepeat
+ \let\blockinfloop \scr_blockinfloop
+ \let\blockifelse \scr_blockifelse
+ \let\blockif \scr_blockif
+ \let\blockinitclone \scr_blockinitclone
+ \let\blockcontrol \scr_blockcontrol
+ \let\blocksensing \scr_blocksensing
+ \let\blockmoreblocks\scr_blockmoreblocks
+ \let\namemoreblocks \scr_namemoreblocks
\scr_xoffset0pt \scr_yoffset0pt
\catcode`\:12 \catcode`\;12 \catcode`\!12 \catcode`\?12 \catcode`\_12
\csname skv_\if c\expandafter\scr_firsttonil\scr_valign c\_nil first\else second\fi\endcsname
@@ -744,19 +927,21 @@
\begin{tikzpicture}[
baseline=(txt\scr_valign.base),
}%
- transform shape,
+ scale=\scr_scale,
+ every node/.style={scale=\scr_scale},
line width=\scr_linewidth,
inner sep=0pt,
outer sep=0pt,
minimum size=0pt,
- line cap=round,
- scale=\scr_scale
+ line cap=round
]
+ \_inpicturetrue
\node[shape=coordinate](origin){};% origine
}%
{%
\end{tikzpicture}%
\scr_scratchend
+ \_inpicturefalse% par pure sécurité
}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -775,21 +960,30 @@
\kern-.66667ex\relax
\fi
\edef\scr_linewidth{\the\dimexpr\useKV[\scrname]{line width}\relax}%
- \ifdefined\scr_current_blockcolor\else
+ \ifdefined\scr_current_blockcolor% bugfix 0.11
+ \edef\scr_current_blockcolor{\scr_current_blockcolor dd}%
+ \else
\def\scr_current_blockcolor{black}%
\fi
+ \if_inpicture\def\scr_scale{1}\else\scr_normalizedec\scr_scale scale[0.2,5]\fi
\begin{tikzpicture}[
baseline=(x.base),
x=1ex,
y=1ex,
inner ysep=0.25ex,
inner xsep=0.1ex,
- line width=\scr_linewidth
+ line width=\scr_linewidth,
+ scale=\scr_scale,
+ every node/.style={scale=\scr_scale}
]
\node[
line width=\scr_linewidth,
rounded rectangle,
- draw={\ifboolKV[\scrname]{print}{scr_linegray}{\scr_current_blockcolor dd}},
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray}
+ {\scr_current_blockcolor}%
+ },
fill=white,
text=black
]
@@ -798,16 +992,23 @@
\useKV[\scrname]{pre text}\relax
\scr_ovalstrut
\kern\scr_ovalsentinel sp
+ \_inpicturetrue
#1%
- \ifnum\lastkern=\scr_ovalsentinel
- \unkern\kern-.66667ex\relax
- \fi
+ \relax% pour contourner bug dans XeLaTeX
+ \ifnum\lastkern=\scr_ovalsentinel\relax\expandafter\scr_execfirst\else\expandafter\scr_execsecond\fi
+ {\unkern
+ \kern-.66667ex\relax
+ }
+ {}%
};%
\end{tikzpicture}%
\endgroup
\kern\scr_ovalsentinel sp
}
-\def\turn_arrow#1{\tikz[baseline=.25ex,x=6.5ex,y=6.5ex,#1]\draw[-{Triangle[angle=45:0.5ex 0.5ex,flex]},line width=.3333ex](0,0) arc[start angle=-80,end angle=190,radius=1ex];}
+\def\turn_arrow#1{%
+ \tikz[baseline=.25ex,x=6.5ex,y=6.5ex,#1]
+ \draw[-{Triangle[angle=45:0.5ex 0.5ex,flex]},line width=.3333ex](0,0) arc[start angle=-80,end angle=190,radius=1ex];%
+}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% menu apparence %
@@ -836,7 +1037,7 @@
\def\scr_drawpen{% dessin du crayon
\begin{tikzpicture}[
rotate=45,
- rounded corners=.4pt,
+ rounded corners=.4pt*\scr_scale,
line width=.5pt,
x=5ex,
y=5ex,
@@ -847,19 +1048,27 @@
]
\draw[
penline,
- fill={\ifboolKV[\scrname]{print}{scr_linegray}{penblue}}
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray}
+ {penblue}%
+ }
]
(0,0)--(22:0.1)..controls(0.13,0.04)and(0.13,-0.04)..(-22:0.1)[sharp corners]--cycle;
\draw[
penline,
fill=white,
- rounded corners=.2pt
+ rounded corners=.2pt*\scr_scale
]
- (22:0.1)--(22:0.2)[rounded corners=0.05pt]--(.56,.07492)..controls(.62,0.04)and(.62,-0.04)..(.56,-.07492)[rounded corners=2pt]--(-22:.2)[rounded corners=0.05pt]--(-22:0.1)..controls(0.13,-0.04)and(0.13,0.04)..(22:0.1);
+ (22:0.1)--(22:0.2)[rounded corners=0.05pt*\scr_scale]--(.56,.07492)..controls(.62,0.04)and(.62,-0.04)..(.56,-.07492)[rounded corners=2pt*\scr_scale]--(-22:.2)[rounded corners=0.05pt*\scr_scale]--(-22:0.1)..controls(0.13,-0.04)and(0.13,0.04)..(22:0.1);
\draw[
penline,
- fill={\ifboolKV[\scrname]{print}{scr_linegray}{penblue}},
- rounded corners=.2pt
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {scr_linegray}
+ {penblue}%
+ },
+ rounded corners=.2pt*\scr_scale
]
(.56,.07492)--(.88,.07492)..controls(.92,0.04)and(.92,-0.04)..(0.88,-.07492)[sharp corners]--(.56,-.07492)..controls(.62,-0.04)and(.62,0.04)..cycle;
\draw[penline](.84,0.07492)..controls(.7,.24)and(.58,0.02)..(.5,0.16);
@@ -912,7 +1121,9 @@
}%
}
\newcommand*\boollist{\scr_boolbox{scrlist}}
-
+\newif\if_boolempty
+\_boolemptyfalse
+\newcommand*\boolempty[1][2em]{\_boolemptytrue\scr_boolbox{boolempty}{#1}}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% menu événement %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -927,8 +1138,16 @@
]
\draw[
line width=\scr_linewidth,
- draw={\ifboolKV[\scrname]{print}{scr_flaggray}{flagcontour}},
- fill={\ifboolKV[\scrname]{print}{scr_flaggray!85!white}{greenflag}}
+ draw={%
+ \ifboolKV[\scrname]{print}
+ {scr_flaggray}
+ {flagcontour}%
+ },
+ fill={%
+ \ifboolKV[\scrname]{print}
+ {scr_flaggray!85!white}
+ {greenflag}%
+ }
]
(0,0.95)..controls(.4,1.4) and (.7,.7)..(1,1)--(1,.4)..controls(.7,0.1)and(.4,.8)..(0,.4)--cycle;
\filldraw[{\ifboolKV[\scrname]{print}{scr_flaggray}{flagcontour}}]
@@ -1002,3 +1221,22 @@
| | | \scr_blockloop |
| | | * \boolmoreblocks n'est plus bugguée |
|---------+------------+------------------------------------------------------|
+| 0.12 | 18/05/2019 | * bug corrigé dans \ovalnum |
+| | | * bug corrigé dans \scr_ovalbox |
+|---------+------------+------------------------------------------------------|
+| 0.13 | 01/07/2019 | * \relax ajoutés pour éviter le bug de XeLaTeX |
+| | | concernant \lastkern |
+|---------+------------+------------------------------------------------------|
+| 0.14 | 01/10/2019 | * gestion de l'échelle (via clé "scale") améliorée |
+| | | * hors de l'environnement, les ovales et les losanges|
+| | | sont affectés par la clé scale si elle est |
+| | | spécifiée via \setscratch |
+| | | * erreur de tracé corrigée dans \scr_blockloop |
+| | | * nouveau losange vide : \boolempty[<dimension>] |
+|---------+------------+------------------------------------------------------|
+| 0.15 | 05/03/2020 | * l'échelle n'était pas initialisée dans les blocs |
+| | | normaux |
+|---------+------------+------------------------------------------------------|
+| 0.16 | 20/03/2020 | * regression 0.15 --> l'échelle est désormais |
+| | | initialisée dans \initmoreblocks |
+|---------+------------+------------------------------------------------------|
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scratch3.tlpobj new/tlpkg/tlpobj/scratch3.tlpobj
--- old/tlpkg/tlpobj/scratch3.tlpobj 2019-03-10 02:24:12.000000000 +0100
+++ new/tlpkg/tlpobj/scratch3.tlpobj 2020-03-20 23:58:41.000000000 +0100
@@ -1,18 +1,17 @@
name scratch3
category Package
-revision 50304
+revision 54435
shortdesc Draw programs like "scratch"
relocated 1
longdesc This package permits to draw program charts in the style of the
longdesc scatch project (scratch.mit.edu). It depends on the other LaTeX
longdesc packages TikZ and simplekv.
-runfiles size=11
+runfiles size=12
RELOC/tex/latex/scratch3/scratch3.sty
catalogue-also tikzcodeblocks
catalogue-contact-bugs https://framagit.org/unbonpetit/scratch3/issues
catalogue-contact-repository https://framagit.org/unbonpetit/scratch3/tree/master
catalogue-ctan /macros/latex/contrib/scratch3
-catalogue-date 2019-03-09 17:34:02 +0100
catalogue-license lppl1.3c
catalogue-topics games pgf-tikz
-catalogue-version 0.11
+catalogue-version 0.16
++++++ scsnowman.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scsnowman.doc.tlpobj new/tlpkg/tlpobj/scsnowman.doc.tlpobj
--- old/tlpkg/tlpobj/scsnowman.doc.tlpobj 2019-02-28 04:05:13.000000000 +0100
+++ new/tlpkg/tlpobj/scsnowman.doc.tlpobj 2020-03-04 23:53:47.000000000 +0100
@@ -1,6 +1,6 @@
name scsnowman.doc
category Package
-revision 47953
+revision 54080
shortdesc doc files of scsnowman
relocated 1
docfiles size=130
++++++ scsnowman.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/scsnowman.tlpobj new/tlpkg/tlpobj/scsnowman.tlpobj
--- old/tlpkg/tlpobj/scsnowman.tlpobj 2019-02-28 04:05:13.000000000 +0100
+++ new/tlpkg/tlpobj/scsnowman.tlpobj 2020-03-04 23:53:47.000000000 +0100
@@ -1,6 +1,6 @@
name scsnowman
category Package
-revision 47953
+revision 54080
shortdesc Snowman variants using TikZ
relocated 1
longdesc This LaTeX package provides a command \scsnowman which can
@@ -12,7 +12,6 @@
RELOC/tex/latex/scsnowman/sctkzsym-base.sty
catalogue-contact-repository https://github.com/aminophen/scsnowman
catalogue-ctan /graphics/pgf/contrib/scsnowman
-catalogue-date 2018-06-07 18:24:21 +0200
catalogue-license bsd2
-catalogue-topics pgf-tikz
+catalogue-topics amusements graphics pgf-tikz
catalogue-version 1.2d
++++++ seetexk.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/dvibook.man1.pdf and new/texmf-dist/doc/man/man1/dvibook.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dviconcat.man1.pdf and new/texmf-dist/doc/man/man1/dviconcat.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dviselect.man1.pdf and new/texmf-dist/doc/man/man1/dviselect.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/dvitodvi.man1.pdf and new/texmf-dist/doc/man/man1/dvitodvi.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/seetexk.doc.tlpobj new/tlpkg/tlpobj/seetexk.doc.tlpobj
--- old/tlpkg/tlpobj/seetexk.doc.tlpobj 2019-03-27 02:26:39.000000000 +0100
+++ new/tlpkg/tlpobj/seetexk.doc.tlpobj 2019-11-19 01:55:52.000000000 +0100
@@ -1,6 +1,6 @@
name seetexk.doc
category TLCore
-revision 50602
+revision 52851
shortdesc doc files of seetexk
docfiles size=27
texmf-dist/doc/man/man1/dvibook.1
++++++ semantic-markup.doc.tar.xz ++++++
Binary files old/doc/latex/semantic-markup/semantic-markup.pdf and new/doc/latex/semantic-markup/semantic-markup.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/semantic-markup/semantic-markup.tex new/doc/latex/semantic-markup/semantic-markup.tex
--- old/doc/latex/semantic-markup/semantic-markup.tex 2018-05-26 00:32:04.000000000 +0200
+++ new/doc/latex/semantic-markup/semantic-markup.tex 2020-01-30 23:20:36.000000000 +0100
@@ -18,6 +18,7 @@
\author{Andrew A. Cashner%
\thanks{\href{mailto:andrewacashner@gmail.com}{\nolinkurl{andrewacashner@gmail.com}}}%
}
+\date{January 29, 2020}
\begin{document}
\maketitle
@@ -147,7 +148,9 @@
\end{tabular}
\end{center}
-For stacked numerals, as in meter signatures or figured bass, we provide two simple options, \verb|\musfig| using \verb|\genfrac| from \texttt{amsmath}, and \verb|\meter|, which uses \verb|\Takt| from the \texttt{harmony} package, which spaces the numerals more closely.
+For stacked numerals, as in meter signatures or figured bass, we provide two
+simple options, \verb|\musfig| using \verb|\Shortstack| from
+\texttt{stackengine}, and \verb|\meter|, which is an alias for the same thing.
Both commands take two arguments, one for the top numeral and the second for the bottom numeral.
You could write, for example:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semantic-markup.doc.tlpobj new/tlpkg/tlpobj/semantic-markup.doc.tlpobj
--- old/tlpkg/tlpobj/semantic-markup.doc.tlpobj 2019-02-28 04:05:18.000000000 +0100
+++ new/tlpkg/tlpobj/semantic-markup.doc.tlpobj 2020-01-31 01:55:51.000000000 +0100
@@ -1,9 +1,9 @@
name semantic-markup.doc
category Package
-revision 47837
+revision 53607
shortdesc doc files of semantic-markup
relocated 1
-docfiles size=70
+docfiles size=69
RELOC/doc/latex/semantic-markup/README
RELOC/doc/latex/semantic-markup/semantic-markup.pdf
RELOC/doc/latex/semantic-markup/semantic-markup.tex
++++++ semantic-markup.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/semantic-markup/semantic-markup.sty new/tex/latex/semantic-markup/semantic-markup.sty
--- old/tex/latex/semantic-markup/semantic-markup.sty 2018-05-26 00:32:04.000000000 +0200
+++ new/tex/latex/semantic-markup/semantic-markup.sty 2020-01-30 23:20:36.000000000 +0100
@@ -1,7 +1,7 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{semantic-markup}[2018/05/21
+\ProvidesPackage{semantic-markup}[2020/01/29
Macros for TEI-like semantic markup]
-% Copyright 2018 Andrew A. Cashner, andrewacashner(a)gmail.com
+% Copyright 2020 Andrew A. Cashner, andrewacashner(a)gmail.com
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either
@@ -18,6 +18,8 @@
% and the documentation file semantic-markup.tex.
% CHANGE LOG
+% 2020-01-29 - \musfig uses stackengine now instead of amsmath
+% 2018-09-07 - ! and ? removed from autopunct for csquotes
% 2018-05-21 - Use fontspec's definition of `\strong` if it is loaded
% - Use musicography's definition of `\fl`, `\sh`, `\na` commands if
% it is loaded
@@ -49,7 +51,7 @@
% Put end punctuation inside quotation marks
% for the specified marks
\renewcommand{\mktextquote}[6]{#1#2#4#5#3#6}
- \DeclareAutoPunct{.,!?}
+ \DeclareAutoPunct{.,}
\fi
% NB: fontspec defines its own \strong command, so only define this if fontspec
@@ -99,13 +101,13 @@
%*******************
% Identify problem spot in draft
-\NewDocumentCommand{\XXX}{ O{\add{FIX}} }{%
- \strong{#1}%
+\NewDocumentCommand{\XXX}{ O{FIX} }{%
+ \strong{\add{#1}}%
}
% Indicate citation to be filled in later
% Optional argument for indicating the source
\NewDocumentCommand{\citXXX}{ o }{%
- \footnote{\strong{\add{Citation needed}\IfValueTF{#1}{#1}{}}}%
+ \footnote{\strong{\add{Citation needed\IfValueTF{#1}{: #1}{}}}}%
}
%*******************
@@ -153,13 +155,13 @@
\NewDocumentCommand{\octave}{ }{\textsubscript}
% Music figures
-\RequirePackage{amsmath}
+\RequirePackage{stackengine}
+\setstackgap{S}{2pt}
\NewDocumentCommand{\musfig}{ m m }{%
- $\genfrac{}{}{0pt}{1}{\text{#1}}{\text{#2}}$%
-}
+ \Shortstack{#1 #2}%
+}
% Meter signatures
-\RequirePackage[rm]{harmony}
-\NewDocumentCommand{\meter}{ m m }{\Takt{#1}{#2}}
+\NewDocumentCommand{\meter}{}{\musfig}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/semantic-markup.tlpobj new/tlpkg/tlpobj/semantic-markup.tlpobj
--- old/tlpkg/tlpobj/semantic-markup.tlpobj 2019-02-28 04:05:18.000000000 +0100
+++ new/tlpkg/tlpobj/semantic-markup.tlpobj 2020-01-31 01:55:51.000000000 +0100
@@ -1,6 +1,6 @@
name semantic-markup
category Package
-revision 47837
+revision 53607
shortdesc Meaningful semantic markup in the spirit of the Text Encoding Initiative
relocated 1
longdesc The package provides simple commands to allow authors
@@ -18,6 +18,5 @@
runfiles size=2
RELOC/tex/latex/semantic-markup/semantic-markup.sty
catalogue-ctan /macros/latex/contrib/semantic-markup
-catalogue-date 2018-05-24 21:39:42 +0200
catalogue-license lppl1.3
catalogue-topics humanities linguistic
++++++ serbian-lig.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/serbian-lig/Changes.txt new/doc/latex/serbian-lig/Changes.txt
--- old/doc/latex/serbian-lig/Changes.txt 2018-07-14 23:25:53.000000000 +0200
+++ new/doc/latex/serbian-lig/Changes.txt 2019-12-14 23:27:07.000000000 +0100
@@ -1,58 +1,13 @@
-Changes 2018/04/22
+Changes 2019/12/10
Add new macro in serbian-lig.sty file:
-line 48 \anfilade
-line 104 \biografijom
-line 209 \diskvalifikacijom
-line 210 \definitivne
-line 251 \fiar
-line 271 \figuricu
-line 295 \fizikalcima
-line 343 \fijukom
-line 354 \fiksatorima
-line 355 \fiksatore
-line 356 \fiksatori
-line 470 \filozofiranja
-line 476 \filozofsko
-line 604 \finte
-line 610 \fiokicama
-line 642 \fotografijom
-line 643 \fotografijama
-line 644 \fotografiju
-line 645 \fotografiji
-line 656 \fizioloskoj
-line 657 \fizikalac
-line 658 \fizikalca
-line 664 \fitnesa
-line 664 \filozofskim
-line 669 \figurativno
-line 708 \grafitnom
-line 739 \hipertrofirani
-line 754 \hijeroglifima
-line 772 \identifikaciji
-line 829 \klasifikujem
-line 835 \karanfilima
-line 838 \litografije
-line 872 \metafizicka
-line 873 \mefistofelovskog
-line 881 \modifikacija
-line 900 \najefikasniji
-line 921 \najprefinjeniji
-line 935 \ofisnog
-line 936 \ofisnom
-line 1014 \personifikovan
-line 1050 \prefinjenost
-line 1051 \prefinjenosti
-line 1124 \rafiniranom
-line 1129 \rafinisani
-line 1150 \samoidentifikacija
-line 1213 \sufijskim
-line 1287 \zafijuche
-line 1362 \flastere
-line 1404 \flertovati
-line 1425 \floret
-line 1452 \flotila
-line 1426 \floreti
-line 1427 \floretom
\ No newline at end of file
+line 672 \filcanim
+line 673 \filcanog
+line 674 \filozofiranje
+line 847 \kalfinoj
+line 848 \karanfilce
+
+line 1733 \Gertelfingenu
+line 1734 \Gertelfingen
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/serbian-lig/README.txt new/doc/latex/serbian-lig/README.txt
--- old/doc/latex/serbian-lig/README.txt 2018-07-14 23:25:53.000000000 +0200
+++ new/doc/latex/serbian-lig/README.txt 2019-12-14 23:27:07.000000000 +0100
@@ -6,7 +6,7 @@
This package provide disable >fi< and >fl< ligatures
for serbian language in latin scripts.
- Copyright (C) 2018 Zoran Filipovi\'{c}
+ Copyright (C) 2019 Zoran Filipovi\'{c}
This program can be redistributed and/or modified under
the terms of the LaTeX Project Public License Distributed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-lig.doc.tlpobj new/tlpkg/tlpobj/serbian-lig.doc.tlpobj
--- old/tlpkg/tlpobj/serbian-lig.doc.tlpobj 2019-02-28 04:05:20.000000000 +0100
+++ new/tlpkg/tlpobj/serbian-lig.doc.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name serbian-lig.doc
category Package
-revision 48197
+revision 53127
shortdesc doc files of serbian-lig
relocated 1
docfiles size=122
++++++ serbian-lig.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/serbian-lig/serbian-lig.sty new/tex/latex/serbian-lig/serbian-lig.sty
--- old/tex/latex/serbian-lig/serbian-lig.sty 2018-07-14 23:25:53.000000000 +0200
+++ new/tex/latex/serbian-lig/serbian-lig.sty 2019-12-14 23:27:07.000000000 +0100
@@ -1,6 +1,6 @@
%% serbian-lig.sty
-%% Copyright 2011 Zoran Filipoviæ
+%% Copyright 2019 Zoran Filipoviæ
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -528,6 +528,7 @@
\def\filtrirate{f\kern 0.03em iltrirate\xspace}
\def\filu{f\kern 0.03em ilu\xspace}
\def\filc{f\kern 0.03em ilc\xspace}
+\def\filcani{f\kern 0.03em ilcani\xspace}
\def\filcom{f\kern 0.03em ilcom\xspace}
\def\fildzana{f\kern 0.03em ildna\xspace}
\def\fildzanom{f\kern 0.03em ildnom\xspace}
@@ -668,6 +669,9 @@
\def\fitnesa{f\kern 0.03em itnesa\xspace}
\def\filozofskim{f\kern 0.03em ilozofskim\xspace}
\def\figurativno{f\kern 0.03em igurativno\xspace}
+\def\filcanim{f\kern 0.03em ilcanim\xspace}
+\def\filcanog{f\kern 0.03em ilcanog\xspace}
+\def\filozofiranje{f\kern 0.03em ilozofiranje\xspace}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% words that begin with lower case -g- %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -840,6 +844,8 @@
\def\kinematografija{kinematograf\kern 0.03em {\ij}a\xspace}
\def\kvalifikacijski{kvalif\kern 0.03em ikac{\ij}ski\xspace}
\def\karanfilima{karanf\kern 0.03em ilima\xspace}
+\def\kalfinoj{kalf\kern 0.03em inoj\xspace}
+\def\karanfilce{karanf\kern 0.03em ilèe\xspace}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%% words that begin with lower case -l- %%
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -1723,4 +1729,6 @@
\def\Teofilom{Teof\kern 0.03em ilom\xspace}
\def\Teofilu{Teof\kern 0.03em ilu\xspace}
\def\Trifica{Trif\kern 0.03em iæa\xspace}
-\def\Culafic{Æulaf\kern 0.03em iæ\xspace}
\ No newline at end of file
+\def\Culafic{Æulaf\kern 0.03em iæ\xspace}
+\def\Gertelfingenu{Gertelf\kern 0.03em ingenu\xspace}
+\def\Gertelfingen{Gertelf\kern 0.03em ingen\xspace}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/serbian-lig.tlpobj new/tlpkg/tlpobj/serbian-lig.tlpobj
--- old/tlpkg/tlpobj/serbian-lig.tlpobj 2019-02-28 04:05:21.000000000 +0100
+++ new/tlpkg/tlpobj/serbian-lig.tlpobj 2019-12-15 01:53:41.000000000 +0100
@@ -1,6 +1,6 @@
name serbian-lig
category Package
-revision 48197
+revision 53127
shortdesc Control ligatures in Serbian
relocated 1
longdesc The package suppresses fi and fl (and other ligatures) in
@@ -8,6 +8,5 @@
runfiles size=20
RELOC/tex/latex/serbian-lig/serbian-lig.sty
catalogue-ctan /language/serbian/filipovic/serbian-lig
-catalogue-date 2018-07-14 14:14:22 +0200
catalogue-license lppl1.3
catalogue-topics serbian
++++++ shadethm.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shadethm/1st_read.me new/doc/latex/shadethm/1st_read.me
--- old/doc/latex/shadethm/1st_read.me 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/shadethm/1st_read.me 2020-01-08 22:54:05.000000000 +0100
@@ -25,4 +25,4 @@
shadethm.sty, colored.sth, shadeins.sth, 1st_read.me;
the second two provide package options to the first.
-hefferon(a)smcvax.smcvt.edu
+jhefferon(a)smcvt.edu
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shadethm/README new/doc/latex/shadethm/README
--- old/doc/latex/shadethm/README 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/shadethm/README 2020-01-08 22:54:05.000000000 +0100
@@ -0,0 +1,10 @@
+These materials are obsolete. There are a number of more recent, more
+powerful packages that have capabilities that greatly extend the
+simple ones here. A new project should use one of those.
+
+These files only continue to be available to help people who are working
+with an old project. For more information on the commands available
+using the materials here, see the file 1st_read.me.
+
+--Jim Hefferon, package author
+ 2020-Jan-08
\ No newline at end of file
Binary files old/doc/latex/shadethm/shadethm-doc.pdf and new/doc/latex/shadethm/shadethm-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/shadethm/shadethm-doc.tex new/doc/latex/shadethm/shadethm-doc.tex
--- old/doc/latex/shadethm/shadethm-doc.tex 2010-11-04 23:58:38.000000000 +0100
+++ new/doc/latex/shadethm/shadethm-doc.tex 2020-01-08 22:54:05.000000000 +0100
@@ -7,6 +7,13 @@
\usepackage{textcomp}
\usepackage{microtype}
\usepackage{hyperref}
+ \hypersetup{
+ colorlinks=true, % false: boxed links; true: colored links
+ linkcolor=blue, % color of internal links (change box color with linkbordercolor)
+ citecolor=blue, % color of links to bibliography
+ filecolor=blue, % color of file links
+ urlcolor=blue % color of external links
+ }
\newcommand*{\mail}[1]{\href{mailto:#1}{\texttt{#1}}}
\newcommand*{\pkg}[1]{\textsf{#1}}
@@ -24,14 +31,21 @@
\title{The \pkg{shadethm} package}
\subtitle{ Shaded theorem environments in \LaTeX,\\with \cmd{\newshadetheorem} in addition to \cmd{\newtheorem}}
-\author{Jim Hefferon\thanks{\mail{hefferon(a)smcvax.smcvt.edu}}}
-\date{1999/11/23}
+\author{Jim Hef{}feron\thanks{\mail{jhefferon(a)smcvt.edu}}}
+\date{2020/01/08}
\begin{document}
\maketitle
+\section{This package is obsolete}
+New projects should not use this package.
+There are a number of newer and more powerful packages that are available.
+
+This material only remains available for people supporting existing
+projects.
+
\section{Usage}
@@ -84,8 +98,8 @@
but this one drops that requirement. If you didn't use the old version,
forget about it.
-\item Uses the \pkg{graphics} package. Look for it in the \href{http://ctan.org/}{CTAN} \TeX-archive nearest
- you, for instance at \href{http://tug.ctan.org/}{\texttt{tug.ctan.org}}.
+% \item Uses the \pkg{graphics} package. Look for it in the \href{http://ctan.org/}{CTAN} \TeX-archive nearest
+% you, for instance at \href{http://tug.ctan.org/}{\texttt{tug.ctan.org}}.
\item Works with \pkg{amsthm.sty}.
@@ -123,15 +137,15 @@
looks good out of my printer, while a darker shade like~.92 is needed
to make it copy well. (Black is~0, white is~1.)
-\item[(\ref{item:i}*)] \desc{\texttt{shaderulecolor}}
+\item \desc{\texttt{shaderulecolor}}
The shading color of the border of the shaded box.
See (\ref{item:i}). If \cmd{\shadeboxrule} is set to 0\,pt then this won't print anyway.
-\item[(\ref{item:i}**)] \desc{\cmd{\shadeboxrule}}
+\item \desc{\cmd{\shadeboxrule}}
The width of the border around the shading. Set it to
0\,pt (not just 0) to make it disappear.
-\item[(\ref{item:i}***)] \desc{\cmd{\shadeboxsep}}
+\item \desc{\cmd{\shadeboxsep}}
The length by which the shade box surrounds the text.
\item \desc{\cmd{\shadesetinsideminipage}}
@@ -162,17 +176,20 @@
\section{Bugs}
+Note that this material is obsolete.
+The bug listed will not be fixed.
+
\begin{enumerate}
\item Page breaks are a problem since it sets the theorem before it is shaded.
The theorem is put into a \env{minipage} in order to have the right line breaks
- put in, but then can't be broken across pages. I'd be interested in any
- fixes for this. DA?
+ put in, but then can't be broken across pages.
\end{enumerate}
\section{License}
-Copyright 1999 Jim Hefferon \mail{jim(a)joshua.smcvt.edu}\\
+Copyright 1999-2020 Jim Hefferon \mail{jhefferon(a)smcvt.edu}.
+
This program can redistributed and/or modified under the terms
of the \LaTeX\ Project Public License Distributed from CTAN
archives in directory \href{http://ctan.org/macros/latex/base/lppl.txt}{\nolinkurl{macros/latex/base/lppl.txt}}; either
@@ -184,6 +201,7 @@
\section{History}
\begin{description}
+\item[\texttt{20I08} jh \mail{jhefferon(a)smcvt.edu}] Declare package obsolete to keep people from mistakenly starting new projects with it.
\item[\texttt{99XI23} jh] Redid the parsing to stick to \cmd{\newcommand}-style calls. Needed
to put in some oppresive \cmd{\expandafter} strings.
\item[\texttt{99VII09} jh \mail{tex(a)joshua.smcvt.edu}] Fixed the number within situation. LPPL
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shadethm.doc.tlpobj new/tlpkg/tlpobj/shadethm.doc.tlpobj
--- old/tlpkg/tlpobj/shadethm.doc.tlpobj 2019-02-28 04:05:27.000000000 +0100
+++ new/tlpkg/tlpobj/shadethm.doc.tlpobj 2020-01-09 01:59:33.000000000 +0100
@@ -1,10 +1,11 @@
name shadethm.doc
category Package
-revision 20319
+revision 53350
shortdesc doc files of shadethm
relocated 1
-docfiles size=93
+docfiles size=94
RELOC/doc/latex/shadethm/1st_read.me
+ RELOC/doc/latex/shadethm/README
RELOC/doc/latex/shadethm/shadetest.pdf
RELOC/doc/latex/shadethm/shadetest.tex
RELOC/doc/latex/shadethm/shadethm-doc.pdf
++++++ shadethm.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shadethm.tlpobj new/tlpkg/tlpobj/shadethm.tlpobj
--- old/tlpkg/tlpobj/shadethm.tlpobj 2019-02-28 04:05:27.000000000 +0100
+++ new/tlpkg/tlpobj/shadethm.tlpobj 2020-01-09 01:59:33.000000000 +0100
@@ -1,6 +1,6 @@
name shadethm
category Package
-revision 20319
+revision 53350
shortdesc Theorem environments that are shaded
relocated 1
longdesc Extends the \newtheorem command. If you say
@@ -12,12 +12,17 @@
longdesc package require their body to remain on one page; the mdframed
longdesc package can frame and shade theorems, and its environments
longdesc break at the end of a page; users are generally recommended,
-longdesc therefore, to use mdframed.
+longdesc therefore, to use mdframed. In the same spirit, the author told
+longdesc us in January 2020: "These materials are obsolete. There are a
+longdesc number of more recent, more powerful packages that have
+longdesc capabilities that greatly extend the simple ones here. A new
+longdesc project should use one of those. These files only continue to
+longdesc be available to help people who are working with an old
+longdesc project."
runfiles size=8
RELOC/tex/latex/shadethm/colored.sth
RELOC/tex/latex/shadethm/shadein.sth
RELOC/tex/latex/shadethm/shadethm.sty
catalogue-ctan /macros/latex/contrib/shadethm
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths-theorem decoration
++++++ shipunov.doc.tar.xz ++++++
++++ 4415 lines of diff (skipped)
++++++ shipunov.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/shipunov/biokey2html.bat new/scripts/shipunov/biokey2html.bat
--- old/scripts/shipunov/biokey2html.bat 2008-02-19 18:05:28.000000000 +0100
+++ new/scripts/shipunov/biokey2html.bat 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-@echo off
-perl -w biokey2html1.pl %1 > %12
-perl -w biokey2html2.pl %12 > %1.tmp
-perl -w biokey2html3.pl %1.tmp > %1.html
-if exist %1.tmp del %1.tmp
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/shipunov/biokey2html.sh new/scripts/shipunov/biokey2html.sh
--- old/scripts/shipunov/biokey2html.sh 2013-03-12 01:01:41.000000000 +0100
+++ new/scripts/shipunov/biokey2html.sh 1970-01-01 01:00:00.000000000 +0100
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-export PATH=.:{$PATH}
-biokey2html1.pl $1 > $12
-biokey2html2.pl $12 > /tmp/$1.$$
-biokey2html3.pl /tmp/$1.$$ > $1.html
-
-#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/shipunov/biokey2html1.pl new/scripts/shipunov/biokey2html1.pl
--- old/scripts/shipunov/biokey2html1.pl 2008-02-19 18:05:28.000000000 +0100
+++ new/scripts/shipunov/biokey2html1.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,30 +0,0 @@
-#!/usr/bin/perl -w
-
-$/="";
-
-print STDERR "Making relative LaTeX key... \n";
-
-&ochki();
-
-print "\n";
-while(<>){
- s/\\Z(\d+)\./\\TEZA{$ochki[$1-1]}/g;
- s/\\T+?\s*(\d+)\./\\SSYLKA{$ochki[$1-1]}/sg;
- s/\\ZZ(\d+)\((\d+)\)\./\\STEZA{$ochki[$1-1]}{$ochki[$2-1]}/g;
- print;
-}
-
-# fill array to links
-sub ochki {
-$B0 = $B1 = $nom = "";
-@ochki = ();
- for ($x = 0; $x < 26; $x++) {
- for ($y = 0; $y < 26; $y++) {
- $B0 = chr($y + 65);
- $B1 = chr($x + 65);
- $nom = "$B1$B0";
- @ochki = (@ochki, $nom)
- }
- }
-}
-#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/shipunov/biokey2html2.pl new/scripts/shipunov/biokey2html2.pl
--- old/scripts/shipunov/biokey2html2.pl 2008-02-19 18:05:28.000000000 +0100
+++ new/scripts/shipunov/biokey2html2.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-#!/usr/bin/perl -w
-
-print STDERR "Making HTML title and paragrafs tags... \n";
-
-while(<>){
- s@^\s+?$@\n<p>@g;
-print;
-}
-
-BEGIN {
-print <<END_OF_BEGIN
-<!doctype html public \"-//w3c//dtd html 4.0 transitional//en\">
-<html>
-<head>
- \t<meta http-equiv=\"Content-Type\" content=\"text/html\">
- \t<link type="text/css" rel="stylesheet" href="ws_key.css">
-</head>
-<body>
-
-END_OF_BEGIN
-}
-
-END{
-print <<END_OF_END
-
-</body>
-</html>
-END_OF_END
-}
-
-#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/scripts/shipunov/biokey2html3.pl new/scripts/shipunov/biokey2html3.pl
--- old/scripts/shipunov/biokey2html3.pl 2008-02-19 18:05:28.000000000 +0100
+++ new/scripts/shipunov/biokey2html3.pl 1970-01-01 01:00:00.000000000 +0100
@@ -1,89 +0,0 @@
-#!/usr/bin/perl -w
-$/ = "";
-
-use File::Basename;
-
-$kl = $ARGV[0];
-if ($kl && ($kl =~ /-h|-\?/)) {&message(); exit(1);}
-
-$file = @ARGV;
-if ($file < 1) {&message(); exit(1);}
-
-$a = $ARGV[0];
-open(VCHOD, "$a") || die "Sorry, I cannot open $a: $!\n";
-
-print STDERR "Making reference tags... \n";
-
-&hesh_stup();
-
-while(<VCHOD>){
-
- &format1();
- &name_href();
- &format2();
- print;
-}
-
-sub hesh_stup {
- $schet_stup = 0;
- while(<VCHOD>){
- if (/\\TEZA{(\w\w)}/) {$schet_stup++; $stup{"$1"} = "$schet_stup";}
- if (/\\STEZA{(\w\w)}{(\w\w)}/) {$schet_stup++; $stup{"$1"} = "$schet_stup";}
- }
- seek (VCHOD, 0, 0);
-}
-
-END {
- close (VCHOD);
-}
-
-sub format1 {
- s@<!--(.*)-->@$1@g;
- s@(\\TEZA{\w\w})@<span class="TEZA">$1\.</span>@gi;
- s@(\\STEZA{\w\w}{\w\w})@<span class="STEZA">$1\.</span>@gi;
- s@(\\SSYLKA{\w\w})@ ... <span class="SSYLKA">$1\.</span>@gi;
-}
-
-sub name_href {
- s@\\TEZA{(\w\w)}@<a name=\"$1\">$stup{$1}<\/a>@g;
- s@\\STEZA{(\w\w)}{(\w\w)}@<a name=\"$1\">$stup{$1}<\/a>\(<a href=\"#$2\">$stup{$2}<\/a>\)@g;
- s@\\SSYLKA{(\w\w)}@<a href=\"#$1\">$stup{$1}<\/a>@g;
-}
-
-sub format2 {
- s@\\documentclass.*@@gi;
- s@\\usepackage.*@@gi;
- s@\\begin.*@@gi;
- s@\\end.*@@gi;
- s@<p>%@@gi;
- s@\\i *{}@i@gsi;
- s@\$\\times\$@×\;@gi;
- s@\\#@-@gi;
- s@\\<|<<@«\;@g;
- s@\\>|>>@»\;@g;
- s@~@ \;@gi;
- s@---|\\---@—@gi;
- s@(\\T+?)(.*?)\n\n@ ...
- <!--<a href="">--><span class="SP">$2</span><!--</a>-->\n\n@gsi;
- s@\\KN (.+?) @<em>$1</em> @gsi;
- s@\\NN (.+?) (.+?) @<em>$1 $2</em> @gsi;
- s@\\K *{(.+?)}@<em>$1</em>@gsi;
- s@\\J *{(.+?)}@<strong>$1</strong>@gsi;
- s@\\textit *{(.+?)}@<em>$1</em>@gsi;
- s@\\textbf *{(.+?)}@<strong>$1</strong>@gsi;
- s@<p>\\FK@<p class="FK">@sgi;
- s@<p>@<p class="ST">@sgi;
- s@\\AN@–@gi;
- s@\\AAN|\\AAAN@=@gi;
- s@ +?@ @sgi;
- s@\\'@@sgi;
- s@\\i{}@@sgi;
-}
-
-sub message {
-$Me = basename($0);
-print <<END_OF_MESSAGE
-USAGE: $Me [-h|-?] File1 [>File2]
-END_OF_MESSAGE
-}
-#
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/add2-shipunov.sty new/tex/latex/shipunov/add2-shipunov.sty
--- old/tex/latex/shipunov/add2-shipunov.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/shipunov/add2-shipunov.sty 2019-10-10 23:58:46.000000000 +0200
@@ -0,0 +1,49 @@
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
+
+\ProvidesPackage{add2}%
+ [2019/10/03 v1.01 Save trees: fit as many as possible into the page]
+
+\newif\if@LND % landscape
+\DeclareOption{land}{\@LNDtrue}
+\DeclareOption{port}{\@LNDfalse}
+\newif\if@CLUB % to get rid of widow and orphan lines
+\DeclareOption{club}{\@CLUBtrue}
+\DeclareOption{noclub}{\@CLUBfalse}
+
+\ExecuteOptions{port,club}
+\ProcessOptions
+
+\if@CLUB\else
+
+\clubpenalty=10000
+\widowpenalty=10000
+\brokenpenalty=10000
+
+\fi
+
+\topmargin=-2cm
+\headheight=0cm
+\headsep=.5cm
+
+\renewcommand{\baselinestretch}{.95}
+
+\if@LND
+
+ \message{WARNING: Landscape mode!}
+ \textwidth=26cm
+ \footskip=1cm
+ \textheight=18.5cm
+ \oddsidemargin=-2.5cm
+ \evensidemargin=-2.5cm
+
+\else
+
+ \textheight=25.5cm
+ \footskip=.5cm
+ \textwidth=19cm
+ \oddsidemargin=-1.25cm
+ \evensidemargin=-1.75cm
+
+\fi
+
+\endinput
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/altverse.sty new/tex/latex/shipunov/altverse.sty
--- old/tex/latex/shipunov/altverse.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/altverse.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov, plantago(a)herba.msu.ru
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{altverse}
[2008/02/15 v0.3 Typesetting simple verses with `xtab' package]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/autolist.sty new/tex/latex/shipunov/autolist.sty
--- old/tex/latex/shipunov/autolist.sty 2010-10-27 01:30:53.000000000 +0200
+++ new/tex/latex/shipunov/autolist.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Authors: A. Shipunova and A. Shipunov, plantago(a)herba.msu.ru
+% Authors: Anna Shipunova and Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{autolist}%
[2010/10/24 v0.4 Various lists]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/biokey.sty new/tex/latex/shipunov/biokey.sty
--- old/tex/latex/shipunov/biokey.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/biokey.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,7 +1,14 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{biokey}%
- [2008/02/11 v3.1 Typesetting biological identification keys]
+ [2019/10/02 v.3.11 Typesetting biological identification keys]
+
+% 20191002 \ZZZ updated, \DD added
+% 20150911 \Ver@T added to make keys more readable
+% 20150912 Alien stuff removed, \FK supplied with the short vertical space
+% 20150913 Antitheses aligned better now, comments' breaks adjusted
+% 20150916 Better aligment for backtrack links
+% 20150920 'biokey' environment resets theses counter (if hyperref is used, specify 'hypertexnames=false')
\newlength\TML@a
\newlength\TML@b
@@ -29,7 +36,8 @@
\penalty800\dbox@fill\penalty400%
\vadjust{}\penalty10000\dbox@fil}
\def\T#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
-% `Automatically' paragraph aligment
+\def\TT#1\par{{\dot@leaders\SHRIFTN{#1}\par}\par}
+% `Automatic' paragraph aligment
\def\TTTT#1\par{{\tolerance 9999 \dot@leaders\SHRIFTN{#1}\par}\par}
% Old style reference
@@ -58,10 +66,6 @@
\def\NNN#1\par{{\nopagebreak\par%
\Indent@C\SHRIFTN{#1}\par}\par}
-% PUNCTS
-% Common punct
-\let\TT=\T
-
% Hanging punct
\def\VT{\@ifstar{\H@P}{\H@@P}}
% Leaders stopped on right margin of text
@@ -78,22 +82,24 @@
% Lengths (hang = 2em)
\settowidth{\TML(a)b}{\SHRIFTZ{.}}
-\TML(a)a=1.5em
+\TML(a)a=1.6em % found visually
\addtolength{\TML@a}{-\TML@b}
-\addtolength{\TML(a)b}{0.5em}
+\addtolength{\TML(a)b}{0.6em} % found visually
+\def\Ver(a)T{\vspace{.5\baselineskip}}
\def\Indent@T{\hangindent2em\noindent}
\def\OTSTUP{2em}
\def\Indent@C{\parindent\OTSTUP\hangindent\parindent}
% Common thesa
-\def\Z#1. {\Indent(a)T\makebox[1.5em][r]%
+\def\Z#1. {\Ver@T\Indent@T\makebox[1.5em][r]%
{\SHRIFTZ{#1.}}\hspace{0.5em}}
% Thesa with back reference
-\def\ZZ#1(#2).{\Indent@T\makebox[\TML@a][r]%
+\def\ZZ#1(#2).{\Ver@T\Indent@T\makebox[\TML@a][r]%
{\SHRIFTZ{#1}}\hspace{0.45em}\SHRIFTZ{(#2).}}
% Antitheses
-\def\ZZZ#1{\Indent@T\makebox[\TML@a][r]%
- {#1}\hspace{\TML@b}}
+\def\ZZZ#1{\Indent(a)T\makebox[1.5em][r]{#1}% older variant: \makebox[\TML@a][r]
+ \hspace{0.5em}} % to make exactly 2em box like in \TE and \SE
+
% First
\def\AN{\ZZZ{$-$}}
% You can replace it to $+$
@@ -104,21 +110,21 @@
\def\AAAN{\ZZZ{$\equiv$}}
% COMMENTS
-\def\FK#1\par{{\nopagebreak\smallskip%
+\def\FK#1\par{{\nopagebreak\vspace{.1\baselineskip}\nopagebreak%
\Indent@C%
\footnotesize#1\par\smallskip}}
% You can use it as `numberless thesa'
-\def\KOM#1\par{{\nopagebreak\smallskip%
+\def\KOM#1\par{{\nopagebreak\Ver@T%
\Indent@C#1\par\smallskip}}
-% Comment for object
-\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip
+% Comment for the object
+\def\VPRAVO#1 \par{{\nopagebreak\vskip-\parskip\nopagebreak%
\hbox to \linewidth {\hfil #1}\par}}
-% AUTOMATICAL KEYS
-\def\TEZA#1{\refstepcounter{TMC@Ba}\label{#1}%
+% AUTOMATIC KEYS
+\def\TEZA#1{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
\Indent(a)T\makebox[1.5em][r]%
{\SHRIFTZ{\arabic{TMC(a)Ba}.}}\hspace{0.5em}\ignorespaces}
-\def\STEZA#1#2{\refstepcounter{TMC@Ba}\label{#1}%
+\def\STEZA#1#2{\Ver@T\refstepcounter{TMC@Ba}\label{#1}%
\Indent@T\makebox[\TML@a][r]%
{\SHRIFTZ{\arabic{TMC(a)Ba}}}\hspace{0.45em}\SHRIFTZ{(\ref{#2}).}}
\def\SSYLKA#1{\T\ref{#1}.}
@@ -126,8 +132,9 @@
\let\TE\TEZA
\let\SE\STEZA
\let\SS\SSYLKA
+\def\DD#1{\T\ref{#1}.} % this is fo the case when \SS does not work
-% LEVELED KEYS
+% IDENTED KEYS
\newenvironment{SDVIG}[1][1]
{\TML@c=#1em \let\TML@@c\TML@c
\def\Indent@T{\hangindent=2em\parindent=0em
@@ -140,8 +147,7 @@
\let\LE\SDVIG
\let\endLE\endSDVIG
-% KEYS WITH MARKERS ON LEFT PAGE MARGIN
-
+% KEYS WITH MARKERS ON THE LEFT PAGE MARGIN
\if@MARG
\def\Indent@C{\relax}%
\def\Z#1. {\noindent\makebox[0em][r]%
@@ -154,11 +160,10 @@
\else\relax
\fi
-% Some useful stuff
-\let\K=\textit
-\let\J=\textbf
-\def\KN#1 {\textit{#1 }}
-\def\NN#1 #2 {\textit{#1 #2 }}
-\def\IN#1.#2.{#1.\,#2.~\ignorespaces}
+% ENVIRONMENT WHICH RESETS THESES COUNTER
+% If hyperref used, requires option "hypertexnames=false"
+\newenvironment{biokey}{%
+ \setcounter{TMC@Ba}{0}%
+ \relax}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/biolist.sty new/tex/latex/shipunov/biolist.sty
--- old/tex/latex/shipunov/biolist.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/biolist.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{biolist}%
[2008/02/06 v0.1 Typesetting species lists for floras (and faunas)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/boldline.sty new/tex/latex/shipunov/boldline.sty
--- old/tex/latex/shipunov/boldline.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/boldline.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{boldline}%
[2008/02/04 v0.2 Adjust line width in tables]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/cassete.cls new/tex/latex/shipunov/cassete.cls
--- old/tex/latex/shipunov/cassete.cls 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/cassete.cls 2019-10-10 23:58:46.000000000 +0200
@@ -1,8 +1,8 @@
-% Author: A. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{cassete}
- [2008/02/05 v0.2 Labels for audiocassetes]
+ [2008/02/05 v0.2 Labels for audiocassettes]
\DeclareOption*{\PassOptionsToClass{\CurrentOption}{article}}
\ProcessOptions\relax
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/classif2.sty new/tex/latex/shipunov/classif2.sty
--- old/tex/latex/shipunov/classif2.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/classif2.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,14 +1,11 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{classif2}%
[2008/02/10 v2.2 Layout for biological classifications]
-% Todo: Detailed comments and documentation
-
-% Changes:
% 2002/04/15 \IHOOK added (for indent justification)
% 2007/06/23 Infraregnum added
-% 2007/07/26 Improved for numeric ranges
+% 2007/07/26 Improved for numeric ranges
% 2008/02/06 Abbreviations added
\newif\if@Names
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/dline-shipunov.sty new/tex/latex/shipunov/dline-shipunov.sty
--- old/tex/latex/shipunov/dline-shipunov.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/shipunov/dline-shipunov.sty 2019-10-10 23:58:46.000000000 +0200
@@ -0,0 +1,37 @@
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
+
+\ProvidesPackage{dline}
+ [2019/10/03 v1.01 Double line on the left of text, based on "lineno" and "bframe"]
+
+\DeclareOption*{\PassOptionsToPackage{\CurrentOption}{lineno}}
+\ProcessOptions*
+\RequirePackage{lineno}
+
+\newbox\dlinebox
+
+% In principle, this is possible to redefiine...
+\newdimen\dlinerule \dlinerule=\fboxrule
+\newdimen\ddlinerule \ddlinerule=3\fboxrule
+\newdimen\dlinesep \dlinesep=3\fboxsep
+\newdimen\ddlinesep \ddlinesep=\fboxsep
+
+\newenvironment{dline}
+ {\par
+ \@tempdima\textwidth
+ \advance\@tempdima 2\dlinesep
+ \setbox\dlinebox\hbox to\textwidth{%
+ \hskip-\dlinesep
+ \vrule\@width\dlinerule\@height\baselineskip\@depth\ddlinesep
+ \hskip-\ddlinesep
+ \vrule\@width\ddlinerule\@height\baselineskip\@depth\ddlinesep
+ }%
+ \nobreak
+ \runninglinenumbers
+ \def\makeLineNumber{\copy\dlinebox\hss}%
+ }
+ {\par
+ \@tempdima\textwidth
+ \advance\@tempdima 2\dlinesep
+ }
+
+\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/drcaps.sty new/tex/latex/shipunov/drcaps.sty
--- old/tex/latex/shipunov/drcaps.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/drcaps.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{drcaps}%
[2008/02/05 v0.2 Various drop caps]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/etiketka.cls new/tex/latex/shipunov/etiketka.cls
--- old/tex/latex/shipunov/etiketka.cls 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/etiketka.cls 2019-10-10 23:58:46.000000000 +0200
@@ -1,7 +1,7 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesClass{etiketka}%
- [2008/02/16 v2.7 Herbarium labels]
+ [2013/01/18 v2.9 Herbarium labels]
\newif\if@NOL
\newcounter{etiketka@}
@@ -17,8 +17,8 @@
\LoadClass{article}
-% SPECIFIC LAYOUT
-\topmargin-14mm
+% DEFAULT LAYOUT (TO CHANGE, USE geometry PACKAGE)
+\topmargin-9mm
\headheight0mm
\headsep0mm
\textheight254mm
@@ -101,23 +101,31 @@
\vspace*{1.2em}}
% NAMES
-% You can input something as \Name Plantago {} {}
+% One can input something as \Name Plantago {} {}
% Empty line after required!
\def\Name#1 #2 #3\par{{\NameStyle
\textit{#1 #2} #3\par}%
\vspace*{-.7\baselineskip}
\NameRule
\vspace*{.2cm}}
-% Anonimous label
+
+% Anonymous label
% Empty line after required!
\def\Without{\Name {\rule{0pt}{1ex}} {} {}}
+% Empty line after required!
+\def\NameFam#1 #2 #3|#4\par{{\NameStyle
+ \textit{#1 #2} #3 #4\par}%
+ \vspace*{-.7\baselineskip}
+ \NameRule
+ \vspace*{.2cm}}
+
% REGION, DISTRICT AND LOCAL ADDRESS
% Empty line after required!
\def\Dist#1\par{{\parindent 2em\hangindent 2em#1\par}}
\def\Loc#1\par{{\parindent 4em\hangindent 4em#1\par}}
-% COORDINATES
+% COORDINATES IN DEGREES
\def\CGrad#1#2{#1$^\circ$ \East,
#2$^\circ$ \North{}}
\def\CMin#1#2#3#4{#1$^\circ$~#2$^\prime$ \East,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/flower.sty new/tex/latex/shipunov/flower.sty
--- old/tex/latex/shipunov/flower.sty 2010-10-27 01:30:53.000000000 +0200
+++ new/tex/latex/shipunov/flower.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,7 +1,9 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{flower}%
- [2010/10/24 v1.3 Typesetting botanical sings]
+ [2019/10/03 v1.31 Typesetting botanical sings]
+
+% 20191002 symmetry signs are now 'mathpunct', to ensure space after them
% Fonts `wasy' required
\DeclareRobustCommand\wasyfamily
@@ -17,11 +19,11 @@
% Hermafroditic
\def\Herm{\mbox{\ensuremath{\Mal}\kern-.82em\lower.27ex\hbox{\ensuremath{\Fem}}\kern.2em}}
% Asymmetry
-\DeclareMathSymbol{\Asx}{\mathord}{WASY}{"12}
+\DeclareMathSymbol{\Asx}{\mathpunct}{WASY}{"12}
% Actinomorphy
-\DeclareMathSymbol{\Act}{\mathord}{WASY}{"42}
+\DeclareMathSymbol{\Act}{\mathpunct}{WASY}{"42}
% Zygomorphy
-\DeclareMathSymbol{\Zyg}{\mathord}{symbols}{"22}
+\DeclareMathSymbol{\Zyg}{\mathpunct}{symbols}{"22}
% NEW SYMMETRY SIGNS FROM Prenner et al., 2010
% Median monosymmetry (downwards arrow; Unicode: 2193): \downarrow
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/isyntax.sty new/tex/latex/shipunov/isyntax.sty
--- old/tex/latex/shipunov/isyntax.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/isyntax.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,3 +1,5 @@
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
+
\ProvidesPackage{isyntax}
[2008/02/07 v0.3 Interactive syntax check]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/numerus.sty new/tex/latex/shipunov/numerus.sty
--- old/tex/latex/shipunov/numerus.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/numerus.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,7 +1,10 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
+% Russian encoding below: Windows-1251
\ProvidesPackage{numerus}%
- [2008/02/07 v1.2 Spell numbers in Russian words]
+ [2019/10/03 v1.21 Spell numbers in Russian words]
+
+% 20191003: "numeral" -> "numerus"
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -19,6 +22,9 @@
% <×èñëî>: öèôðà < 999 äëÿ ïîðÿäêîâûõ ÷èñëèòåëüíûõ è < 999999 äëÿ %
% êîëè÷åñòâåííûõ, èëè ñ÷åò÷èê, ïðèíèìàþùèé àíàëîãè÷íûå %
% çíà÷åíèÿ %
+% ÂÍÈÌÀÍÈÅ: ïàêåò íå ðàáîòàåò ñ îãëàâëåíèÿìè è %
+% ñ áîëåå ÷åì îäíîáàéòîâûìè êîäèðîâêàìè %
+% ïîðÿäêîâûå íîìåðà áîëüøå 999 íå ïîääåðæèâàþòñÿ %
% %
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% %
@@ -83,19 +89,19 @@
\fi\fi\fi\fi\fi\fi}
% Îøèáêè
-\def\Oshibka@Arg{\PackageWarning{numeral}{%
+\def\Oshibka@Arg{\PackageWarning{numerus}{%
`propis' got wrong mandatory argument!^^J%
Command did not executed}}
-\def\Oshibka@Otr{\PackageWarning{numeral}{%
+\def\Oshibka@Otr{\PackageWarning{numerus}{%
`propis' got argument < 0!^^J%
Command did not executed}}
-\def\Oshibka@Tys{\PackageWarning{numeral}{%
-Ordinal numerals > 999 not supported :(^^J%
+\def\Oshibka@Tys{\PackageWarning{numerus}{%
+Ordinal numeruss > 999 not supported :(^^J%
Command did not executed}}
-\def\Îøèáêà@Mill{\PackageWarning{numeral}{%
+\def\Îøèáêà@Mill{\PackageWarning{numerus}{%
`propis' got argument > 999 999!^^J%
Command did not executed}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/punct.sty new/tex/latex/shipunov/punct.sty
--- old/tex/latex/shipunov/punct.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/punct.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,9 +1,9 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{punct}%
- [2008/02/06 v0.3 Straight punctuation with italic text]
+ [2008/02/06 v0.3 Straight punctuation within italic text]
-% Catcodes redefined! May be dangerous...
+% ATTENTION! Catcodes redefined---this might be dangerous!
\def\PUNactive{%
\let\Z@P=,%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/qqru-shipunov.sty new/tex/latex/shipunov/qqru-shipunov.sty
--- old/tex/latex/shipunov/qqru-shipunov.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/shipunov/qqru-shipunov.sty 2019-10-10 23:58:46.000000000 +0200
@@ -0,0 +1,56 @@
+% Author: Alexey B. Shipunov (dactylorhiza(a)gmail.com)
+% Companion Perl script: txt2qq.pl
+
+\ProvidesPackage{qqru}%
+ [2019/10/04 v0.32 Universal quotes for Russian and English]
+
+\newif\if@QQRU
+\DeclareOption{ru}{\@QQRUtrue}
+\DeclareOption{en}{\@QQRUfalse}
+\newif\if@CONVERT
+\DeclareOption{convert}{\@CONVERTtrue}
+\DeclareOption{noconvert}{\@CONVERTfalse}
+
+\ExecuteOptions{ru,nconvert}
+\ProcessOptions
+
+\if@QQRU
+
+ \def\<{<<}
+ \def\>{>>}
+
+\else
+
+ \def\<{``}
+ \def\>{''}
+
+\fi
+
+\if@CONVERT
+
+{%
+\catcode`\"=\active
+\catcode`\@=11
+\gdef\beginconvertquotes{%
+ \global\catcode`\"=\active
+ \global\chardef\dq=`\"
+ \global\let\dblqu@te=L
+ }
+\gdef"{%
+ \ifinner\else\ifvmode\let\dblqu@te=L\fi\fi
+ \if L\dblqu@te\<\global\let\dblqu@te=R%
+ \else
+ \let\xxx=\spacefactor
+ \>\global\let\dblqu@te=L%
+ \spacefactor\xxx
+ \fi
+ }
+}
+
+\gdef\endconvertquotes{%
+ \catcode`\"=12
+ }
+
+\AtBeginDocument{\beginconvertquotes}
+
+\else\fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/sltables.sty new/tex/latex/shipunov/sltables.sty
--- old/tex/latex/shipunov/sltables.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/sltables.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,11 +1,11 @@
-% Modified from the original sources by A. Shipunov (plantago(a)herba.msu.ru)
+% Modified from the original LaTeX 2.09 sources by Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{sltables}
[2008/02/07 v1.2 S-Tables LaTeX package]
-%% Some modifications to LaTeX:
-%% Add LaTeX 2.09 counter
+% Some modifications to LaTeX: aded LaTeX 2.09 counter
\newcount\mscount
+
%
% S-Tables Macro v1.0, ACS, TAMU (RANHELP(a)VENUS.TAMU.EDU)
%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/starfn.sty new/tex/latex/shipunov/starfn.sty
--- old/tex/latex/shipunov/starfn.sty 2008-02-19 18:05:28.000000000 +0100
+++ new/tex/latex/shipunov/starfn.sty 2019-10-10 23:58:46.000000000 +0200
@@ -1,4 +1,4 @@
-% Author: Alexey B. Shipunov (plantago(a)herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
\ProvidesPackage{starfn}%
[2008/02/16 v0.4 Footnote marks as stars on each page: Russian typographic tradition]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/shipunov/textfrac-shipunov.sty new/tex/latex/shipunov/textfrac-shipunov.sty
--- old/tex/latex/shipunov/textfrac-shipunov.sty 1970-01-01 01:00:00.000000000 +0100
+++ new/tex/latex/shipunov/textfrac-shipunov.sty 2019-10-10 23:58:46.000000000 +0200
@@ -0,0 +1,14 @@
+% Author: Alexey Shipunov, dactylorhiza(a)gmail.com
+
+\ProvidesPackage{textfrac}%
+ [2019/10/03 v1.01 Simple slanted fractions, see TeXbook, ex. 11.6]
+
+% Packages "nicefrac" and "xfrac" might be better
+
+\ProvidesPackage{textfrac}
+
+\def\textfrac#1/#2{\leavevmode\kern.1em
+\raise.5ex\hbox{\scriptsize #1}\kern-.1em
+/\kern-.15em\lower.25ex\hbox{\scriptsize #2}}
+
+\def\TextFrac#1#2{\textfrac{#1}/{#2}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/shipunov.tlpobj new/tlpkg/tlpobj/shipunov.tlpobj
--- old/tlpkg/tlpobj/shipunov.tlpobj 2019-02-28 04:05:29.000000000 +0100
+++ new/tlpkg/tlpobj/shipunov.tlpobj 2019-10-11 01:54:26.000000000 +0200
@@ -1,32 +1,52 @@
name shipunov
category Package
-revision 29349
+revision 52334
shortdesc A collection of LaTeX packages and classes
relocated 1
longdesc The bundle collects packages and classes, along with one
longdesc bibliography style and examples and scripts for converting TeX
longdesc files. Many of the files in the collection are designed to
longdesc support field biologists and/or Russian writers, while others
-longdesc have wider application. The collection includes (among others):
-longdesc altverse, a simple verse typesetting package; autolist, which
-longdesc provides various list formatting facilities; biokey, which
-longdesc provides a mechanism for typesetting biological identification
-longdesc lists; biolist, which typesets species lists; boldline, which
-longdesc typesets heavier separating lines in tables; cassete, which
-longdesc lays out audio cassette inserts; classif2, which typesets
-longdesc classification lists; drcaps, which provides dropped capital
-longdesc macros; etiketka, a class for typesetting business-card-sized
-longdesc information (including business cards); flower, for typesetting
-longdesc lists of flower formulae; isyntax; numerus; punct; sltables,
-longdesc which develops on the stables package, for use in a LaTeX
-longdesc context; and starfn.
-runfiles size=29
+longdesc have wider application. The collection includes: add2 - Save
+longdesc trees. Quick way to fit as many as possible into one page. Good
+longdesc for handouts. altverse - Typesetting verses. Straightforward
+longdesc typesetting, using the xtab package to aid layout. autolist -
+longdesc More lists. A means to define various sorts of list. biokey -
+longdesc Flexible identification key tables in LaTeX. The package
+longdesc provides straightforward macros to typeset sets of biological
+longdesc identification keys. Layout is flexible, and the macros will be
+longdesc useful in other disciplines. biolist - List observed species.
+longdesc Pretty formatting of species lists of flora and fauna. boldline
+longdesc - Heavier lines in tables. The package provides commands
+longdesc replacing \hline and \cline, as well as a table preamble
+longdesc element that generates heavy lines. cassete (with one 't') -
+longdesc Print labels for audio cassettes. This is a LaTeX2e class file
+longdesc (the only other cassette package on CTAN is cassette (with two
+longdesc 't'), written for Plain TeX). classif2 - Biological
+longdesc classification tables. The package defines an environment
+longdesc classif that simplifies the process of typesetting
+longdesc classification tables. dline - Double line on the left of text.
+longdesc drcaps - Simple dropped capitals. The package offers simple
+longdesc macros for dropped capitals, in a couple of forms. etiketka -
+longdesc Class for typesetting business-card-sized information
+longdesc (including business cards). flower - Typesetting lists of
+longdesc flower formulas. isyntax - Interactively check LaTeX file
+longdesc syntax. numerus - Spell numbers in Russian words. punct -
+longdesc Within italicized text, punctuation is still straight, this is
+longdesc typographically more aesthetic. qqru - Universal quotation
+longdesc marks, for Russian and English. It is able also to convert
+longdesc uniform typewriter "quotes" into left or right typographic
+longdesc quotes. rusnat - Bibliography style file, now deprecated.
+longdesc sltables - Simplified tables for LaTeX. These macros develop
+longdesc the concepts of the stables, which are designed to offer table
+longdesc macros whose use is "as simple as one might hope". Some would
+longdesc claim that LaTeX's built-in table specifications are as simple
+longdesc as one might hope, but this package offers many short-cuts and
+longdesc optimization of the mechanisms of tables. starfn - Stars as
+longdesc footnote marks. textfrac - Simple slanted fractions.
+runfiles size=28
RELOC/bibtex/bst/shipunov/rusnat.bst
- RELOC/scripts/shipunov/biokey2html.bat
- RELOC/scripts/shipunov/biokey2html.sh
- RELOC/scripts/shipunov/biokey2html1.pl
- RELOC/scripts/shipunov/biokey2html2.pl
- RELOC/scripts/shipunov/biokey2html3.pl
+ RELOC/tex/latex/shipunov/add2-shipunov.sty
RELOC/tex/latex/shipunov/altverse.sty
RELOC/tex/latex/shipunov/autolist.sty
RELOC/tex/latex/shipunov/biokey.sty
@@ -34,16 +54,19 @@
RELOC/tex/latex/shipunov/boldline.sty
RELOC/tex/latex/shipunov/cassete.cls
RELOC/tex/latex/shipunov/classif2.sty
+ RELOC/tex/latex/shipunov/dline-shipunov.sty
RELOC/tex/latex/shipunov/drcaps.sty
RELOC/tex/latex/shipunov/etiketka.cls
RELOC/tex/latex/shipunov/flower.sty
RELOC/tex/latex/shipunov/isyntax.sty
RELOC/tex/latex/shipunov/numerus.sty
RELOC/tex/latex/shipunov/punct.sty
+ RELOC/tex/latex/shipunov/qqru-shipunov.sty
RELOC/tex/latex/shipunov/sltables.sty
RELOC/tex/latex/shipunov/starfn.sty
+ RELOC/tex/latex/shipunov/textfrac-shipunov.sty
catalogue-ctan /macros/latex/contrib/shipunov
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl
+catalogue-date 2019-10-08 16:24:18 +0200
+catalogue-license lppl1.3
catalogue-topics collection
-catalogue-version 1.1
+catalogue-version 1.2
++++++ sidenotes.doc.tar.xz ++++++
Binary files old/doc/latex/sidenotes/caesar_example.pdf and new/doc/latex/sidenotes/caesar_example.pdf differ
Binary files old/doc/latex/sidenotes/sidenotes.pdf and new/doc/latex/sidenotes/sidenotes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sidenotes.doc.tlpobj new/tlpkg/tlpobj/sidenotes.doc.tlpobj
--- old/tlpkg/tlpobj/sidenotes.doc.tlpobj 2019-02-28 04:05:31.000000000 +0100
+++ new/tlpkg/tlpobj/sidenotes.doc.tlpobj 2020-03-25 16:13:17.000000000 +0100
@@ -1,9 +1,9 @@
name sidenotes.doc
category Package
-revision 40658
+revision 54524
shortdesc doc files of sidenotes
relocated 1
-docfiles size=76
+docfiles size=79
RELOC/doc/latex/sidenotes/README
RELOC/doc/latex/sidenotes/caesar_example.pdf
RELOC/doc/latex/sidenotes/caesar_example.tex
++++++ sidenotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/sidenotes/caesar_book.cls new/tex/latex/sidenotes/caesar_book.cls
--- old/tex/latex/sidenotes/caesar_book.cls 2016-04-21 22:56:46.000000000 +0200
+++ new/tex/latex/sidenotes/caesar_book.cls 2020-03-24 21:53:35.000000000 +0100
@@ -1,5 +1,5 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesFile{caesar_book.cls}[2016/04/21 v1.00 Caesar book]
+\ProvidesFile{caesar_book.cls}[2020/03/24 v1.00a Caesar book]
% Load the amsmath and the mhchem package before loading microtype
\RequirePackage{amsmath}% better math handling
\RequirePackage[version=3]{mhchem}% chemical formulas
@@ -42,8 +42,8 @@
\RequirePackage{ifluatex}
\ifluatex% in LuaLateX we use fontspec
\RequirePackage{fontspec}%
- \RequirePackage[vargreek-shape=TeX]{unicode-math}%
- \setmathfont{Asana-Math.otf}% asana math works well with palatino
+ \RequirePackage{unicode-math}%
+ \setmathfont{TeX Gyre Pagella Math}% use corresponding math font
\setmainfont[Ligatures=TeX, Numbers=OldStyle]{Tex Gyre Pagella}% free Palatino clone
\setmonofont{Tex Gyre Cursor}% works okay with palatino
\setsansfont{Tex Gyre Heros}% work okay with palatino
@@ -95,6 +95,7 @@
% compatibility with T-L
%
% titlepage
+\RequirePackage{ifthen}
\newcommand{\publisher}[1]{\gdef\caesar@publisher{#1}}
\gdef\caesar@thesis{}
\newcommand{\thesis}[1]{\gdef\caesar@thesis{#1}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/sidenotes.tlpobj new/tlpkg/tlpobj/sidenotes.tlpobj
--- old/tlpkg/tlpobj/sidenotes.tlpobj 2019-02-28 04:05:31.000000000 +0100
+++ new/tlpkg/tlpobj/sidenotes.tlpobj 2020-03-25 16:13:17.000000000 +0100
@@ -1,6 +1,6 @@
name sidenotes
category Package
-revision 40658
+revision 54524
shortdesc Typeset notes containing rich content, in the margin
relocated 1
longdesc The package allows typesetting of texts with notes, figures,
@@ -11,7 +11,6 @@
RELOC/tex/latex/sidenotes/sidenotes.sty
catalogue-also footmisc
catalogue-ctan /macros/latex/contrib/sidenotes
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics marginal
-catalogue-version 1.00
+catalogue-version 1.00a
1
0