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
+
+- 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
+
+- 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
+
+- Correct obsoletes for new packages
+
+-------------------------------------------------------------------
+Wed May 6 11:27:35 UTC 2020 - Dr. Werner Fink
+
+- Scan *.def files as well for RequirePackage
+
+-------------------------------------------------------------------
+Tue May 5 13:55:07 UTC 2020 - Dr. Werner Fink
+
+- 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
+
+- 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
+
+- 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
+
+- 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@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@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@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@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@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{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\@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\@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
%%
%% 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@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@gmail.com
+% Copyright 2020 Andrew A. Cashner, andrewacashner@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@smcvax.smcvt.edu
+jhefferon@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@smcvax.smcvt.edu}}}
-\date{1999/11/23}
+\author{Jim Hef{}feron\thanks{\mail{jhefferon@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@joshua.smcvt.edu}\\
+Copyright 1999-2020 Jim Hefferon \mail{jhefferon@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@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@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 <
-<html>
-<head>
- \t
- \t<link type="text/css" rel="stylesheet" href="ws_key.css">
-</head>
-<body>
-
-END_OF_BEGIN
-}
-
-END{
-print <$stup{$1}<\/a>@g;
- s@\\STEZA{(\w\w)}{(\w\w)}@$stup{$1}<\/a>\($stup{$2}<\/a>\)@g;
- s@\\SSYLKA{(\w\w)}@$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 <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@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@herba.msu.ru
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru
+% Authors: Anna Shipunova and Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@b}{\SHRIFTZ{.}}
-\TML@a=1.5em
+\TML@a=1.6em % found visually
\addtolength{\TML@a}{-\TML@b}
-\addtolength{\TML@b}{0.5em}
+\addtolength{\TML@b}{0.6em} % found visually
+\def\Ver@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@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@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@T\makebox[1.5em][r]%
{\SHRIFTZ{\arabic{TMC@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@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@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@herba.msu.ru)
+% Modified from the original LaTeX 2.09 sources by Alexey Shipunov, dactylorhiza@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@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@herba.msu.ru)
+% Author: Alexey Shipunov, dactylorhiza@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@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