Hello community,
here is the log from the commit of package texlive-specs-p for openSUSE:Factory checked in at 2020-05-29 21:18:36
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-p (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-p"
Fri May 29 21:18:36 2020 rev:40 rq:806906 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.changes 2019-11-07 23:11:34.528209403 +0100
+++ /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/texlive-specs-p.changes 2020-05-29 21:30:12.153368500 +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
+
+-------------------------------------------------------------------
Old:
----
mychemistry.doc.tar.xz
mychemistry.tar.xz
New:
----
metastr.doc.tar.xz
metastr.tar.xz
mismath.doc.tar.xz
mismath.tar.xz
mlacls.doc.tar.xz
mlacls.tar.xz
mleftright.doc.tar.xz
mleftright.tar.xz
modes.doc.tar.xz
modes.tar.xz
mpfonts.doc.tar.xz
mpfonts.tar.xz
musical.doc.tar.xz
musical.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-p.spec ++++++
++++ 12232 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/texlive-specs-p.spec
++++++ merriweather.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/merriweather/README new/doc/fonts/merriweather/README
--- old/doc/fonts/merriweather/README 2014-06-19 22:22:31.000000000 +0200
+++ new/doc/fonts/merriweather/README 2019-10-14 22:44:59.000000000 +0200
@@ -1,4 +1,4 @@
-This is the README for the merriweather package, version 2014-06-19.
+This is the README for the merriweather package, version 2019-10-13.
This package provides LaTeX, pdfLaTeX, XeLaTeX and LuaLaTeX support for
the Merriweather and MerriweatherSans families of fonts, designed by
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/merriweather.doc.tlpobj new/tlpkg/tlpobj/merriweather.doc.tlpobj
--- old/tlpkg/tlpobj/merriweather.doc.tlpobj 2019-02-28 03:53:31.000000000 +0100
+++ new/tlpkg/tlpobj/merriweather.doc.tlpobj 2019-10-15 01:55:28.000000000 +0200
@@ -1,6 +1,6 @@
name merriweather.doc
category Package
-revision 34315
+revision 52380
shortdesc doc files of merriweather
relocated 1
docfiles size=31
++++++ merriweather.tar.xz ++++++
++++ 3998 lines of diff (skipped)
++++++ metafont.doc.tar.xz ++++++
Binary files old/texmf-dist/doc/man/man1/inimf.man1.pdf and new/texmf-dist/doc/man/man1/inimf.man1.pdf differ
Binary files old/texmf-dist/doc/man/man1/mf-nowin.man1.pdf and new/texmf-dist/doc/man/man1/mf-nowin.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mf.1 new/texmf-dist/doc/man/man1/mf.1
--- old/texmf-dist/doc/man/man1/mf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MF 1 "17 January 2018" "Web2C 2019"
+.TH MF 1 "6 August 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
@@ -252,6 +252,13 @@
.I %&
line.
.TP
+.BI -cnf-line \ string
+Parse
+.I string
+as a
+.I texmf.cnf
+configuration line. See the Kpathsea manual.
+.TP
.B -file-line-error
Print error messages in the form
.I file:line:error
Binary files old/texmf-dist/doc/man/man1/mf.man1.pdf and new/texmf-dist/doc/man/man1/mf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metafont.doc.tlpobj new/tlpkg/tlpobj/metafont.doc.tlpobj
--- old/tlpkg/tlpobj/metafont.doc.tlpobj 2019-03-27 02:25:21.000000000 +0100
+++ new/tlpkg/tlpobj/metafont.doc.tlpobj 2020-03-14 01:43:10.000000000 +0100
@@ -1,6 +1,6 @@
name metafont.doc
category Package
-revision 50602
+revision 54276
shortdesc doc files of metafont
docfiles size=36
texmf-dist/doc/man/man1/inimf.1
++++++ metafont.tar.xz ++++++
++++ 2621 lines of diff (skipped)
++++++ metapost.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/dvitomp.1 new/texmf-dist/doc/man/man1/dvitomp.1
--- old/texmf-dist/doc/man/man1/dvitomp.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/dvitomp.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH DVITOMP 1 "16 June 2015" "Web2C 2019"
+.TH DVITOMP 1 "16 June 2015" "Web2C 2020"
.\" man page by Jim Van Zandt
.SH NAME
dvitomp \- convert a TeX DVI file to a MetaPost MPXFILE
Binary files old/texmf-dist/doc/man/man1/dvitomp.man1.pdf and new/texmf-dist/doc/man/man1/dvitomp.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mpost.1 new/texmf-dist/doc/man/man1/mpost.1
--- old/texmf-dist/doc/man/man1/mpost.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mpost.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MPOST 1 "31 December 2018" "Web2C 2019"
+.TH MPOST 1 "31 December 2018" "Web2C 2020"
.\"=====================================================================
.de URL
\\$2 \(laURL: \\$1 \(ra\\$3
Binary files old/texmf-dist/doc/man/man1/mpost.man1.pdf and new/texmf-dist/doc/man/man1/mpost.man1.pdf differ
Binary files old/texmf-dist/doc/metapost/base/mpman.pdf and new/texmf-dist/doc/metapost/base/mpman.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/metapost/base/source-manual/README new/texmf-dist/doc/metapost/base/source-manual/README
--- old/texmf-dist/doc/metapost/base/source-manual/README 2011-04-05 17:03:39.000000000 +0200
+++ new/texmf-dist/doc/metapost/base/source-manual/README 2019-06-01 23:52:22.000000000 +0200
@@ -4,8 +4,9 @@
"A User's Manual for MetaPost", "Drawing Boxes with MetaPost",
"Drawing Graphs with MetaPost" and the introductory article "The
MetaPost System", written by John D. Hobby.
-They were converted to more modern LaTeX by Dylan Thurston and are
-currently maintained by Troy Henderson and Stephan Hennig. The manual
+They were converted to more modern LaTeX by Dylan Thurston,
+later updated Troy Henderson and Stephan Hennig, and currently
+maintained by the MetaPost developers. The manual
may be freely used and modified, but John Hobby makes these requests:
- I request that it remain clear that I am the author of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/metapost/base/source-manual/mpman.tex new/texmf-dist/doc/metapost/base/source-manual/mpman.tex
--- old/texmf-dist/doc/metapost/base/source-manual/mpman.tex 2018-02-19 16:31:52.000000000 +0100
+++ new/texmf-dist/doc/metapost/base/source-manual/mpman.tex 2019-06-01 23:52:22.000000000 +0200
@@ -12,7 +12,7 @@
\fi
\documentclass{article} % article is NOT the original style
\usepackage[nofancy]{svninfo}% Access VCS information.
-\svnInfo $Id: mpman.tex 2139 2018-02-19 14:38:47Z luigi.scarso@gmail.com $
+\svnInfo $Id: mpman.tex 2140 2019-06-01 14:38:47Z luigi.scarso@gmail.com $
%\svnInfo $Id: mpman.tex 2139 2018-02-19 14:38:47Z luigi.scarso@gmail.com $
\newcommand*{\mpversion}{2.00}
@@ -113,10 +113,12 @@
\vskip3bp
\centerline{and the MetaPost development team}
\vskip20.8bp% actually 31.8bp (-11bp)
- \centerline{\large documented version: \mpversion\ (2.0rc2)}
+ \centerline{\large documented version: \mpversion}
\vskip3bp
\tracingall \centerline{\svnInfoMaxToday} \tracingnone
- \vfil
+ \vskip\baselineskip
+ \centerline{Web page: {\tt https://tug.org/metapost}}
+ \centerline{Mailing list: {\tt https://lists.tug.org/metapost}}
\vfil
\vfil
}
@@ -169,23 +171,25 @@
based on Knuth's \MF\ to a large extent. Appendix~\ref{MPvsMF} gives a
detailed comparison of MetaPost and \MF.
-MetaPost documentation is completed by ``Drawing Boxes with MetaPost''
-and ``Drawing Graphs with MetaPost''---the manuals of the \texttt{boxes}
-and \texttt{graph} packages originally developed by John~D. Hobby.
+The basic MetaPost documentation is completed with ``Drawing Boxes with
+MetaPost'' and ``Drawing Graphs with MetaPost''---the manuals of the
+\texttt{boxes} and \texttt{graph} packages originally developed by
+John~D. Hobby.
-The MetaPost home page is \url{http://tug.org/metapost}. It has links
+The MetaPost home page is \url{https://tug.org/metapost}. It has links
to much additional information, including many articles that have been
-written about MetaPost. For general help, try the
+written about MetaPost. For general help and discussion, try the
\url{metapost@tug.org} mailing list; you can subscribe to this list at
-\url{http://tug.org/mailman/listinfo/metapost}.
+\url{https://lists.tug.org/metapost}.
-The development is currently hosted at
-\url{https://serveur-svn.lri.fr/svn/modhel/metapost}; visit this site for
-the current development team members and sources (currently no web interface, only anonymouse svn access).
-
-Please report bugs and request enhancements either on the
-\url{metapost@tug.org} list, or through the address given above.
-(Please do not send reports directly to Dr.\ Hobby any more.)
+The development repository is currently hosted at
+\url{https://serveur-svn.lri.fr/svn/modhel/metapost}; web browsing and
+anonymous svn checkout are allowed with username \texttt{anonsvn} and
+password \texttt{anonsvn}.
+
+If bug reports get no reply from \url{metapost@tug.org}, feel free to
+resend to \url{mp-implementors@tug.org}. (Please do not send reports
+directly to Dr.~Hobby in any event.)
\section{Basic Drawing Statements}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metapost.doc.tlpobj new/tlpkg/tlpobj/metapost.doc.tlpobj
--- old/tlpkg/tlpobj/metapost.doc.tlpobj 2019-03-27 02:25:26.000000000 +0100
+++ new/tlpkg/tlpobj/metapost.doc.tlpobj 2020-03-04 23:52:31.000000000 +0100
@@ -1,8 +1,8 @@
name metapost.doc
category Package
-revision 50602
+revision 54070
shortdesc doc files of metapost
-docfiles size=818
+docfiles size=828
texmf-dist/doc/man/man1/dvitomp.1
texmf-dist/doc/man/man1/dvitomp.man1.pdf
texmf-dist/doc/man/man1/mpost.1
++++++ metapost.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metapost.tlpobj new/tlpkg/tlpobj/metapost.tlpobj
--- old/tlpkg/tlpobj/metapost.tlpobj 2019-03-27 02:25:27.000000000 +0100
+++ new/tlpkg/tlpobj/metapost.tlpobj 2020-03-04 23:52:32.000000000 +0100
@@ -1,6 +1,6 @@
name metapost
category Package
-revision 50602
+revision 54070
shortdesc A development of Metafont for creating graphics
longdesc MetaPost uses a language based on that of Metafont to produce
longdesc precise technical illustrations. Its output is scalable
@@ -97,6 +97,5 @@
catalogue-contact-home http://tug.org/metapost
catalogue-contact-repository https://tug.org/svn/texlive/trunk/Build/source/texk/web2c/mplibdir
catalogue-contact-support http://lists.tug.org/metapost
-catalogue-date 2018-12-31 06:55:45 +0100
catalogue-license lgpl
catalogue-topics graphics-engn
++++++ metrix.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/metrix/README new/doc/latex/metrix/README
--- old/doc/latex/metrix/README 2016-01-21 23:21:24.000000000 +0100
+++ new/doc/latex/metrix/README 2019-05-14 23:41:19.000000000 +0200
@@ -20,9 +20,13 @@
# License
-This material is subject to the LaTeX Project Public License.
-See http://mirror.ctan.org/help/Catalogue/licenses.lppl.html
-for the details of that license.
+License:
+This material is subject to the LaTeX Project Public License
+(LPPL), either version 1.3c of this license or (at your
+option) any later version. The latest version of this
+license is in the file
+
+ http://www.latex-project.org/lppl.txt
# Files
Binary files old/doc/latex/metrix/metrix.pdf and new/doc/latex/metrix/metrix.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metrix.doc.tlpobj new/tlpkg/tlpobj/metrix.doc.tlpobj
--- old/tlpkg/tlpobj/metrix.doc.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/metrix.doc.tlpobj 2019-10-10 02:04:17.000000000 +0200
@@ -1,8 +1,8 @@
name metrix.doc
category Package
-revision 40099
+revision 52323
shortdesc doc files of metrix
relocated 1
-docfiles size=128
+docfiles size=154
RELOC/doc/latex/metrix/README
RELOC/doc/latex/metrix/metrix.pdf
++++++ metrix.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/metrix/metrix.sty new/tex/latex/metrix/metrix.sty
--- old/tex/latex/metrix/metrix.sty 2016-03-21 21:46:28.000000000 +0100
+++ new/tex/latex/metrix/metrix.sty 2019-10-09 23:56:26.000000000 +0200
@@ -20,9 +20,9 @@
%% original source files, as listed above, are part of the
%% same distribution. (The sources need not necessarily be
%% in the same archive or directory.)
-%% File: metrix.dtx Copyright (C) 2013-2015 Tobias Weh
+%% File: metrix.dtx Copyright (c) Tobias Weh
%%
-%% It may be distributed and/or modified under the conditions of the
+%% This file may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
%% license or (at your option) any later version. The latest version
%% of this license is in the file
@@ -43,9 +43,9 @@
\endinput
}
\def\metrixFileName{metrix}
-\def\metrixFileDescription{Typset prosody/metric symbols.}
-\def\metrixFileDate{2016/03/21}
-\def\metrixFileVersion{1.3}
+\def\metrixFileDescription{Typeset prosody/metric symbols.}
+\def\metrixFileDate{2019/10/09}
+\def\metrixFileVersion{1.5}
\ProvidesExplPackage
{\metrixFileName}{\metrixFileDate}{\metrixFileVersion}{\metrixFileDescription}
\RequirePackage{xparse}
@@ -54,6 +54,27 @@
\ExplSyntaxOff
\usetikzlibrary{calc}
\ExplSyntaxOn
+\RequirePackage{textcomp}
+\tl_const:Nn \c__metrix_acute_accent_tl { / }
+\tl_const:Nn \c__metrix_grave_accent_tl { * }
+\tl_new:N \l__metrix_words_tl
+\seq_new:N \l__metrix_syllables_seq
+\seq_new:N \l__metrix_symbols_seq
+\seq_new:N \l__metrix_short_breaks_seq
+\seq_new:N \l__metrix_foot_breaks_seq
+\prop_new:N \l__metrix_highlights_prop
+\seq_new:N \l__metrix_highlight_seq
+\seq_new:N \l__metrix_highlight_pos_seq
+\quark_new:N \q__metrix_space_marker
+\int_new:N \l__metrix_process_int
+\bool_new:N \l__metrix_short_syllable_bool
+\box_new:N \l__metrix_syllable_box
+\tl_new:N \g__metrix_variable_shortsyllablelimit_tl
+\tl_set:Nn \g__metrix_variable_shortsyllablelimit_tl { 0.8em }
+\tl_new:N \l__metrix_current_symbol_tl
+\tl_new:N \l__metrix_current_symbol_head_tl
+\bool_new:N \l__metrix_has_acute_accent_bool
+\bool_new:N \l__metrix_has_grave_accent_bool
\tl_new:N \g__metrix_variable_symbollinewidth_tl
\tl_set:Nn \g__metrix_variable_symbollinewidth_tl { 0.04em }
\tl_new:N \g__metrix_variable_bigsymbollinewidth_tl
@@ -97,11 +118,11 @@
\tl_new:N \g__metrix_variable_bowlooseness_tl
\tl_set:Nn \g__metrix_variable_bowlooseness_tl { 0.75 }
\tl_new:N \g__metrix_variable_symbolcolor_tl
-\tl_set:Nn \g__metrix_variable_symbolcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_symbolcolor_tl { . }
\tl_new:N \g__metrix_variable_accentcolor_tl
-\tl_set:Nn \g__metrix_variable_accentcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_accentcolor_tl { . }
\tl_new:N \g__metrix_variable_bowcolor_tl
-\tl_set:Nn \g__metrix_variable_bowcolor_tl { black }
+\tl_set:Nn \g__metrix_variable_bowcolor_tl { . }
\tl_new:N \g__metrix_variable_highlightcolor_tl
\tl_set:Nn \g__metrix_variable_highlightcolor_tl { red }
\tl_new:N \g__metrix_variable_fillcolor_tl
@@ -112,24 +133,15 @@
\tl_set:Nn \g__metrix_variable_breakgap_tl { 0.6em }
\tl_new:N \g__metrix_variable_emptywidth_tl
\tl_set:Nn \g__metrix_variable_emptywidth_tl { 1em }
-\tl_new:N \l__metrix_words_tl
-\seq_new:N \l__metrix_syllables_seq
-\seq_new:N \l__metrix_symbols_seq
-\seq_new:N \l__metrix_short_breaks_seq
-\seq_new:N \l__metrix_foot_breaks_seq
-\prop_new:N \l__metrix_highlights_prop
-\seq_new:N \l__metrix_highlight_seq
-\seq_new:N \l__metrix_highlight_pos_seq
-\quark_new:N \q__metrix_space_marker
-\int_new:N \l__metrix_process_int
-\bool_new:N \l__metrix_short_syllable_bool
-\box_new:N \l__metrix_syllable_box
-\tl_new:N \g__metrix_variable_shortsyllablelimit_tl
-\tl_set:Nn \g__metrix_variable_shortsyllablelimit_tl { 0.8em }
+\tl_new:N \g__metrix_variable_acute_tl
+\tl_set:Nn \g__metrix_variable_acute_tl { \textasciiacute }
+\tl_new:N \g__metrix_variable_grave_tl
+\tl_set:Nn \g__metrix_variable_grave_tl { \textasciigrave }
\cs_generate_variant:Nn \prop_item:Nn { No , Nf , NV , Nx }
\cs_generate_variant:Nn \prop_put:Nnn { Nnx , Nxx , Nff , Noo }
\cs_generate_variant:Nn \seq_item:Nn { Nf , NV , Nx }
\cs_generate_variant:Nn \seq_set_split:Nnn { Nnf , NnV , Nnx }
+\cs_generate_variant:Nn \tl_remove_once:Nn { NV }
\cs_new_protected:Npn \__metrix_metrics:nn #1 #2
{
\tl_set:Nx \l__metrix_words_tl { \tl_trim_spaces:n { #2 } }
@@ -253,7 +265,7 @@
\int_incr:N \l__metrix_process_int
\int_compare:nT { \l__metrix_process_int > 1 }
{
- \hspace{\usemetrixvar{symbolsep}}
+ \hspace { \usemetrixvar{symbolsep} }
}
\str_case:nnF { ##1 }
{
@@ -331,16 +343,32 @@
}
\cs_new_protected:Npn \__metrix_print_symbol:
{
+ \tl_set:Nx \l__metrix_current_symbol_tl
+ {
+ \seq_item:Nn \l__metrix_symbols_seq { \l__metrix_process_int }
+ }
+ \tl_set:Nx \l__metrix_current_symbol_head_tl
+ {
+ \tl_head:N \l__metrix_current_symbol_tl
+ }
+ \tl_case:NnT \l__metrix_current_symbol_head_tl
+ {
+ \c__metrix_acute_accent_tl { \bool_set_true:N \l__metrix_has_acute_accent_bool }
+ \c__metrix_grave_accent_tl { \bool_set_true:N \l__metrix_has_grave_accent_bool }
+ }
+ {
+ \tl_remove_once:NV \l__metrix_current_symbol_tl \l__metrix_current_symbol_head_tl
+ }
\cs_if_exist_use:cF
{
- __metrix_\seq_item:Nn \l__metrix_symbols_seq
- { \l__metrix_process_int }_mark:
+ __metrix_
+ \tl_use:N \l__metrix_current_symbol_tl
+ _mark:
}
{
\__metrix_error_msg:n
{
- Unknown~symbol~abbreviation~'\seq_item:Nn
- \l__metrix_symbols_seq { \l__metrix_process_int }'.
+ Unknown~symbol~abbreviation~'\tl_use:N \l__metrix_current_symbol_tl'.
}
}
}
@@ -372,9 +400,8 @@
}
\cs_new_protected:Npn \__metrix_break_gap:
{
- \hspace{\usemetrixvar{breakgap}}
+ \hspace { \usemetrixvar { breakgap } }
}
-
\cs_new:Npn \__metrix_break_node:n #1
{
\group_begin:
@@ -387,10 +414,9 @@
;
\group_end:
}
-
\cs_new_protected:Npn \__metrix_e_gap:
{
- \hspace*{\usemetrixvar{emptywidth}}
+ \hspace* { \usemetrixvar { emptywidth } }
}
\cs_new_protected:Npn \__metrix_evaluate_higlights:n #1
{
@@ -459,6 +485,14 @@
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.225];
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.225,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
\cs_new:Npn \__metrix___mark:
@@ -467,11 +501,27 @@
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) -- ++(0.4,0);
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.2,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
{
\begin{tikzpicture}[every~metrix~symbol]
\draw (0,0) -- ++(0.75,0);
+ \bool_if:NT \l__metrix_has_acute_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { acute } };
+ }
+ \bool_if:NT \l__metrix_has_grave_accent_bool
+ {
+ \node [every~metrix~ictus~node] at (0.375,0) { \usemetrixvar { grave } };
+ }
\end{tikzpicture}
}
}
@@ -526,6 +576,24 @@
\draw (-0.2,-0.2) -- (0.2,0.2);
\end{tikzpicture}
}
+\cs_new:Npn \__metrix_v_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) -- (0.225,-0.225) -- (0.45,0);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_A_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) -- (0.225,0.225) -- (0.45,0);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_o_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) circle [radius=0.2];
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_oo_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -542,6 +610,15 @@
+(0,-\usemetrixvar{gap})$);
\end{tikzpicture}
}
+\cs_new:Npn \__metrix__u_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (0,0) arc [start~angle=0, end~angle=180, radius=-0.2];
+ \draw ($(0,0)+(-0.5\pgflinewidth,0.5\pgflinewidth)+(0,\usemetrixvar{gap})$) --
+ ($(0.4,0)+(0.5\pgflinewidth,0.5\pgflinewidth)
+ +(0,\usemetrixvar{gap})$);
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_n_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -550,6 +627,18 @@
circle [radius=0.7\pgflinewidth];
\end{tikzpicture}
}
+\cs_new:Npn \__metrix_p_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (-0.2,-0.2) -- (0.2,0.2);
+ \end{tikzpicture}
+ }
+\cs_new:Npn \__metrix_s_mark:
+ {
+ \begin{tikzpicture}[every~metrix~symbol]
+ \draw (-0.2,0.2) -- (0.2,-0.2);
+ \end{tikzpicture}
+ }
\cs_new:Npn \__metrix_l_mark:
{
\begin{tikzpicture}[every~metrix~symbol]
@@ -739,6 +828,9 @@
every metrix symbol node/.style={
inner sep=0pt, anchor=center,
},
+ every metrix ictus node/.style={
+ overlay,
+ },
every metrix break node/.style={
inner sep=0pt, anchor=base,
},
@@ -838,25 +930,25 @@
\string\verseref\space can~only~be~used~in~{metricverses}~env.
}
}
-\NewDocumentEnvironment{metricverses} { }
+\NewDocumentEnvironment { metricverses } { }
{
\RenewDocumentCommand { \verseref } { m }
{
\__metrix_print_vers_ref:n { ##1 }
}
\par
- \addvspace{0.7\baselineskip}
- \fp_compare:nT { \usemetrixvar{symbolshift} < 0.0 }
+ \addvspace { 0.7\baselineskip }
+ \fp_compare:nT { \usemetrixvar { symbolshift } < 0.0 }
{
- \vspace{\usemetrixvar{symbolshift}}
+ \vspace { \usemetrixvar { symbolshift } }
}
- \addtolength{\baselineskip}{0.6\baselineskip}
+ \addtolength { \baselineskip } { 0.6\baselineskip }
}
{
\par
- \addtolength{\baselineskip}{-0.6\baselineskip}
- \vspace{\baselineskip}
- \noindent\ignorespacesafterend
+ \addtolength { \baselineskip } { -0.6\baselineskip }
+ \vspace { \baselineskip }
+ \noindent \ignorespacesafterend
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/metrix.tlpobj new/tlpkg/tlpobj/metrix.tlpobj
--- old/tlpkg/tlpobj/metrix.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/metrix.tlpobj 2019-10-10 02:04:18.000000000 +0200
@@ -1,18 +1,20 @@
name metrix
category Package
-revision 40099
+revision 52323
shortdesc Typeset metric marks for Latin text
relocated 1
longdesc The package may be used to type the prosodics/metrics of
longdesc (latin) verse; it provides macros to typeset the symbols
longdesc standing alone, and in combination with symbols, giving
-longdesc automatic alignment. The package requires tikz (including the
-longdesc calc library, and the xparse package (thus also requiring the
-longdesc experimental LaTeX 3 environment).
-runfiles size=7
+longdesc automatic alignment. The package requires TikZ (including the
+longdesc calc library), xpatch, and xparse (thus also requiring the
+longdesc experimental LaTeX3 environment).
+runfiles size=8
RELOC/tex/latex/metrix/metrix.sty
+catalogue-contact-bugs https://github.com/tweh/metrix/issues
+catalogue-contact-repository https://github.com/tweh/metrix
catalogue-ctan /macros/latex/contrib/metrix
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
+catalogue-date 2019-10-09 13:48:07 +0200
+catalogue-license lppl1.3c
catalogue-topics latin verse expl3
-catalogue-version 1.3
+catalogue-version 1.5
++++++ mex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mex.doc.tlpobj new/tlpkg/tlpobj/mex.doc.tlpobj
--- old/tlpkg/tlpobj/mex.doc.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/mex.doc.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mex.doc
category Package
-revision 45678
+revision 54227
shortdesc doc files of mex
docfiles size=31
texmf-dist/doc/mex/base/00readme
++++++ mex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mex.tlpobj new/tlpkg/tlpobj/mex.tlpobj
--- old/tlpkg/tlpobj/mex.tlpobj 2019-02-28 03:54:00.000000000 +0100
+++ new/tlpkg/tlpobj/mex.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mex
category Package
-revision 45678
+revision 54227
shortdesc Polish formats for TeX
longdesc MeX is an adaptation of Plain TeX (MeX) and LaTeX209 (LaMeX)
longdesc formats to the Polish language and to Polish printing customs.
@@ -11,6 +11,7 @@
depend hyphen-polish
depend pdftex
depend tex
+depend hyph-utf8
depend hyphen-base
depend knuth-lib
depend plain
@@ -18,9 +19,9 @@
depend enctex
depend utf8mex
depend mex.ARCH
-execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
-execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
-execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini" fmttriggers=hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files,enctex,utf8mex
+execute AddFormat name=mex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *mex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
+execute AddFormat name=pdfmex engine=pdftex patterns=mexconf.tex options="-translate-file=cp227.tcx *pdfmex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files
+execute AddFormat name=utf8mex engine=pdftex patterns=mexconf.tex options="-enc *utf8mex.ini" fmttriggers=hyph-utf8,hyphen-base,hyphen-polish,knuth-lib,pl,plain,tex-ini-files,enctex,utf8mex
runfiles size=13
texmf-dist/tex/mex/base/lamex.tex
texmf-dist/tex/mex/base/mex.tex
@@ -30,7 +31,6 @@
texmf-dist/tex/mex/config/mex.ini
texmf-dist/tex/mex/config/pdfmex.ini
catalogue-ctan /language/polish/mex105.zip
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics format polish
catalogue-version 1.05
++++++ mflogo-font.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflogo-font.doc.tlpobj new/tlpkg/tlpobj/mflogo-font.doc.tlpobj
--- old/tlpkg/tlpobj/mflogo-font.doc.tlpobj 2019-02-28 03:54:01.000000000 +0100
+++ new/tlpkg/tlpobj/mflogo-font.doc.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name mflogo-font.doc
category Package
-revision 36898
+revision 54512
shortdesc doc files of mflogo-font
relocated 1
docfiles size=1
++++++ mflogo-font.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflogo-font.tlpobj new/tlpkg/tlpobj/mflogo-font.tlpobj
--- old/tlpkg/tlpobj/mflogo-font.tlpobj 2019-02-28 03:54:01.000000000 +0100
+++ new/tlpkg/tlpobj/mflogo-font.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name mflogo-font
category Package
-revision 36898
+revision 54512
shortdesc Metafont logo font
relocated 1
longdesc These fonts were created in Metafont by Knuth, for his own
@@ -28,8 +28,7 @@
RELOC/fonts/type1/hoekwater/mflogo-font/logosl10.pfb
RELOC/fonts/type1/hoekwater/mflogo-font/logosl8.pfb
RELOC/fonts/type1/hoekwater/mflogo-font/logosl9.pfb
-catalogue-ctan /fonts/mflogo/ps-type1/hoekwater
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-ctan /fonts/mflogo
catalogue-license knuth
catalogue-topics font font-mf font-type1
catalogue-version 1.002
++++++ mflua.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mflua.tlpobj new/tlpkg/tlpobj/mflua.tlpobj
--- old/tlpkg/tlpobj/mflua.tlpobj 2019-04-07 01:38:04.000000000 +0200
+++ new/tlpkg/tlpobj/mflua.tlpobj 2020-03-04 23:52:35.000000000 +0100
@@ -1,6 +1,6 @@
name mflua
category TLCore
-revision 50829
+revision 54074
shortdesc configuration and base files for MFLua
longdesc For information on this Lua-enabled Metafont, see, for example:
longdesc tug.org/TUGboat/tb32-2/tb101scarso.pdf.
++++++ mfware.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftodvi.1 new/texmf-dist/doc/man/man1/gftodvi.1
--- old/texmf-dist/doc/man/man1/gftodvi.1 2019-03-26 15:41:17.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftodvi.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTODVI 1 "25 March 2019" "Web2C 2019"
+.TH GFTODVI 1 "25 March 2019" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftodvi.man1.pdf and new/texmf-dist/doc/man/man1/gftodvi.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftopk.1 new/texmf-dist/doc/man/man1/gftopk.1
--- old/texmf-dist/doc/man/man1/gftopk.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftopk.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTOPK 1 "16 June 2015" "Web2C 2019"
+.TH GFTOPK 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftopk.man1.pdf and new/texmf-dist/doc/man/man1/gftopk.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/gftype.1 new/texmf-dist/doc/man/man1/gftype.1
--- old/texmf-dist/doc/man/man1/gftype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/gftype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH GFTYPE 1 "16 June 2015" "Web2C 2019"
+.TH GFTYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/gftype.man1.pdf and new/texmf-dist/doc/man/man1/gftype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mft.1 new/texmf-dist/doc/man/man1/mft.1
--- old/texmf-dist/doc/man/man1/mft.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/mft.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH MFT 1 "27 May 2018" "Web2C 2019"
+.TH MFT 1 "27 May 2018" "Web2C 2020"
.\"=====================================================================
.if n .ds MP MetaPost
.if t .ds MP MetaPost
Binary files old/texmf-dist/doc/man/man1/mft.man1.pdf and new/texmf-dist/doc/man/man1/mft.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pktogf.1 new/texmf-dist/doc/man/man1/pktogf.1
--- old/texmf-dist/doc/man/man1/pktogf.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pktogf.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PKTOGF 1 "16 June 2015" "Web2C 2019"
+.TH PKTOGF 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/pktogf.man1.pdf and new/texmf-dist/doc/man/man1/pktogf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/pktype.1 new/texmf-dist/doc/man/man1/pktype.1
--- old/texmf-dist/doc/man/man1/pktype.1 2019-02-28 20:09:21.000000000 +0100
+++ new/texmf-dist/doc/man/man1/pktype.1 2020-03-04 17:04:42.000000000 +0100
@@ -1,4 +1,4 @@
-.TH PKTYPE 1 "16 June 2015" "Web2C 2019"
+.TH PKTYPE 1 "16 June 2015" "Web2C 2020"
.\"=====================================================================
.if n .ds MF Metafont
.if t .ds MF Metafont
Binary files old/texmf-dist/doc/man/man1/pktype.man1.pdf and new/texmf-dist/doc/man/man1/pktype.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mfware.doc.tlpobj new/tlpkg/tlpobj/mfware.doc.tlpobj
--- old/tlpkg/tlpobj/mfware.doc.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/mfware.doc.tlpobj 2020-03-04 23:52:36.000000000 +0100
@@ -1,6 +1,6 @@
name mfware.doc
category TLCore
-revision 50602
+revision 54070
shortdesc doc files of mfware
docfiles size=42
texmf-dist/doc/man/man1/gftodvi.1
++++++ mfware.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mfware.tlpobj new/tlpkg/tlpobj/mfware.tlpobj
--- old/tlpkg/tlpobj/mfware.tlpobj 2019-03-27 02:25:51.000000000 +0100
+++ new/tlpkg/tlpobj/mfware.tlpobj 2020-03-04 23:52:36.000000000 +0100
@@ -1,6 +1,6 @@
name mfware
category TLCore
-revision 50602
+revision 54070
shortdesc Supporting tools for use with Metafont
longdesc A collection of programs (as web source) for processing the
longdesc output of Metafont.
@@ -14,6 +14,5 @@
catalogue-contact-repository http://tug.org/svn/texlive/trunk/Build/source/texk/web2c/
catalogue-contact-support http://lists.tug.org/tex-k
catalogue-ctan /systems/knuth/dist/mfware
-catalogue-date 2018-12-31 06:12:45 +0100
catalogue-license knuth
catalogue-topics collection
++++++ mhchem.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mhchem.doc.tlpobj new/tlpkg/tlpobj/mhchem.doc.tlpobj
--- old/tlpkg/tlpobj/mhchem.doc.tlpobj 2019-02-28 03:54:17.000000000 +0100
+++ new/tlpkg/tlpobj/mhchem.doc.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name mhchem.doc
category Package
-revision 48088
+revision 52662
shortdesc doc files of mhchem
relocated 1
docfiles size=88
++++++ mhchem.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mhchem.tlpobj new/tlpkg/tlpobj/mhchem.tlpobj
--- old/tlpkg/tlpobj/mhchem.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/mhchem.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name mhchem
category Package
-revision 48088
+revision 52662
shortdesc Typeset chemical formulae/equations and Risk and Safety phrases
relocated 1
longdesc The bundle provides three packages: The mhchem package provides
@@ -11,7 +11,12 @@
longdesc package provides commands for the official Risk and Safety (R
longdesc and S) Phrases that are used to label chemicals. The package
longdesc requires the expl3 bundle.
+depend amsmath
depend chemgreek
+depend graphics
+depend l3kernel
+depend l3packages
+depend tools
runfiles size=109
RELOC/tex/latex/mhchem/hpstatement.sty
RELOC/tex/latex/mhchem/mhchem.sty
++++++ miama.doc.tar.xz ++++++
Binary files old/doc/fonts/miama/miama.pdf and new/doc/fonts/miama/miama.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miama.doc.tlpobj new/tlpkg/tlpobj/miama.doc.tlpobj
--- old/tlpkg/tlpobj/miama.doc.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/miama.doc.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,8 +1,8 @@
name miama.doc
category Package
-revision 39837
+revision 54512
shortdesc doc files of miama
relocated 1
-docfiles size=89
+docfiles size=96
RELOC/doc/fonts/miama/README
RELOC/doc/fonts/miama/miama.pdf
++++++ miama.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/lgrfmm.fd new/tex/latex/miama/lgrfmm.fd
--- old/tex/latex/miama/lgrfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/lgrfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -23,12 +23,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{LGR}{fmm}{}
-\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@scale miama-lgr}{}
+\DeclareFontShape{LGR}{fmm}{m}{n}{<-> \fmm@@scale miama-lgr}{}
\DeclareFontShape{LGR}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{LGR}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{LGR}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/miama.sty new/tex/latex/miama/miama.sty
--- old/tex/latex/miama/miama.sty 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/miama.sty 2019-06-19 00:28:12.000000000 +0200
@@ -10,7 +10,7 @@
%%
\NeedsTeXFormat{LaTeX2e}[1994/06/01]
\ProvidesPackage{miama}
-[2016/02/19 v1.0 class to use the typeface Miama Nueva]
+[2019/06/18 v1.1 class to use the typeface Miama Nueva]
%% \CharacterTable
%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
@@ -26,10 +26,11 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\RequirePackage{kvoptions}
-\SetupKeyvalOptions{prefix=fmm@}
-\DeclareStringOption[0.5]{scale}
-\ProcessKeyvalOptions*
+\newcommand*{\fmm@scale}{0.5}
+\RequirePackage{xkeyval}
+\DeclareOptionX{scaled}{\renewcommand*{\fmm@scale}{#1}}
+\DeclareOptionX{scale}{\renewcommand*{\fmm@scale}{#1}}
+\ProcessOptionsX\relax
\DeclareRobustCommand\fmmfamily{%
\not@math@alphabet\fmmfamily\relax
\fontfamily{fmm}\selectfont}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/ot1fmm.fd new/tex/latex/miama/ot1fmm.fd
--- old/tex/latex/miama/ot1fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/ot1fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{OT1}{fmm}{}
-\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@scale miama-ot1}{}
+\DeclareFontShape{OT1}{fmm}{m}{n}{<-> \fmm@@scale miama-ot1}{}
\DeclareFontShape{OT1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{OT1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{OT1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/qxfmm.fd new/tex/latex/miama/qxfmm.fd
--- old/tex/latex/miama/qxfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/qxfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -25,12 +25,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{QX}{fmm}{}
-\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@scale miama-qx}{}
+\DeclareFontShape{QX}{fmm}{m}{n}{<-> \fmm@@scale miama-qx}{}
\DeclareFontShape{QX}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{QX}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{QX}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t1fmm.fd new/tex/latex/miama/t1fmm.fd
--- old/tex/latex/miama/t1fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t1fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T1}{fmm}{}
-\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@scale miama-t1}{}
+\DeclareFontShape{T1}{fmm}{m}{n}{<-> \fmm@@scale miama-t1}{}
\DeclareFontShape{T1}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T1}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T1}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2afmm.fd new/tex/latex/miama/t2afmm.fd
--- old/tex/latex/miama/t2afmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2afmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2A}{fmm}{}
-\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@scale miama-t2a}{}
+\DeclareFontShape{T2A}{fmm}{m}{n}{<-> \fmm@@scale miama-t2a}{}
\DeclareFontShape{T2A}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2A}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2A}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2bfmm.fd new/tex/latex/miama/t2bfmm.fd
--- old/tex/latex/miama/t2bfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2bfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2B}{fmm}{}
-\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@scale miama-t2b}{}
+\DeclareFontShape{T2B}{fmm}{m}{n}{<-> \fmm@@scale miama-t2b}{}
\DeclareFontShape{T2B}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2B}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2B}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t2cfmm.fd new/tex/latex/miama/t2cfmm.fd
--- old/tex/latex/miama/t2cfmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t2cfmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T2C}{fmm}{}
-\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@scale miama-t2c}{}
+\DeclareFontShape{T2C}{fmm}{m}{n}{<-> \fmm@@scale miama-t2c}{}
\DeclareFontShape{T2C}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2C}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T2C}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/t5fmm.fd new/tex/latex/miama/t5fmm.fd
--- old/tex/latex/miama/t5fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/t5fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{T5}{fmm}{}
-\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@scale miama-t5}{}
+\DeclareFontShape{T5}{fmm}{m}{n}{<-> \fmm@@scale miama-t5}{}
\DeclareFontShape{T5}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T5}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{T5}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/miama/x2fmm.fd new/tex/latex/miama/x2fmm.fd
--- old/tex/latex/miama/x2fmm.fd 2016-02-20 00:38:31.000000000 +0100
+++ new/tex/latex/miama/x2fmm.fd 2019-06-19 00:28:12.000000000 +0200
@@ -24,12 +24,13 @@
%% Right bracket \] Circumflex \^ Underscore \_
%% Grave accent \` Left brace \{ Vertical bar \|
%% Right brace \} Tilde \~}
-\providecommand*\fmm@scale{}
-\ifx\fmm@scale\@empty\else
- \edef\fmm@scale{s*[\fmm@scale]}%
+\expandafter\ifx\csname fmm@scale\endcsname\relax
+ \let\fmm@@scale\@empty
+\else
+ \edef\fmm@@scale{s*[\csname fmm@scale\endcsname]}%
\fi
\DeclareFontFamily{X2}{fmm}{}
-\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@scale miama-x2}{}
+\DeclareFontShape{X2}{fmm}{m}{n}{<-> \fmm@@scale miama-x2}{}
\DeclareFontShape{X2}{fmm}{m}{sl}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{X2}{fmm}{m}{it}{<-> ssub * fmm/m/n}{}
\DeclareFontShape{X2}{fmm}{b}{n}{<-> ssub * fmm/m/n}{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miama.tlpobj new/tlpkg/tlpobj/miama.tlpobj
--- old/tlpkg/tlpobj/miama.tlpobj 2019-02-28 03:54:18.000000000 +0100
+++ new/tlpkg/tlpobj/miama.tlpobj 2020-03-24 02:00:02.000000000 +0100
@@ -1,6 +1,6 @@
name miama
category Package
-revision 39837
+revision 54512
shortdesc The Miama Nueva handwriting font with LaTeX support
relocated 1
longdesc Miama Nueva is a handwriting / script font with over 1300
@@ -41,7 +41,6 @@
RELOC/tex/latex/miama/t5fmm.fd
RELOC/tex/latex/miama/x2fmm.fd
catalogue-ctan /fonts/miama
-catalogue-date 2016-06-24 19:18:15 +0200
-catalogue-license lppl1.3
-catalogue-topics font-calligraphic font-cyrillic font-greek font-otf font-type1
-catalogue-version 1.0
+catalogue-license ofl lppl1.3
+catalogue-topics font font-calligraphic font-cyrillic font-greek font-multilingual font-otf font-type1 font-t1enc font-supp
+catalogue-version 1.1
++++++ microtype-de.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype-de.doc.tlpobj new/tlpkg/tlpobj/microtype-de.doc.tlpobj
--- old/tlpkg/tlpobj/microtype-de.doc.tlpobj 2019-02-28 03:54:20.000000000 +0100
+++ new/tlpkg/tlpobj/microtype-de.doc.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,6 +1,6 @@
name microtype-de.doc
category Package
-revision 24549
+revision 54080
shortdesc doc files of microtype-de
relocated 1
docfiles size=451
++++++ microtype.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/microtype/README.md new/doc/latex/microtype/README.md
--- old/doc/latex/microtype/README.md 2019-03-01 23:25:46.000000000 +0100
+++ new/doc/latex/microtype/README.md 2019-11-19 01:01:37.000000000 +0100
@@ -4,7 +4,7 @@
**Subliminal refinements towards typographical perfection**
- (v2.7b -- 2019/02/28)
+ (v2.7d -- 2019/11/18)
Overview
@@ -76,5 +76,5 @@
(2) the identification string is changed.
------------------------------------------------------
-Copyright (c) 2004--2018 R Schlicht ``
+Copyright (c) 2004--2019 R Schlicht ``
------------------------------------------------------
Binary files old/doc/latex/microtype/microtype.pdf and new/doc/latex/microtype/microtype.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/microtype/test-microtype.tex new/doc/latex/microtype/test-microtype.tex
--- old/doc/latex/microtype/test-microtype.tex 2018-01-15 23:21:32.000000000 +0100
+++ new/doc/latex/microtype/test-microtype.tex 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype.doc.tlpobj new/tlpkg/tlpobj/microtype.doc.tlpobj
--- old/tlpkg/tlpobj/microtype.doc.tlpobj 2019-03-02 02:26:07.000000000 +0100
+++ new/tlpkg/tlpobj/microtype.doc.tlpobj 2019-11-19 01:55:50.000000000 +0100
@@ -1,9 +1,9 @@
name microtype.doc
category Package
-revision 50187
+revision 52853
shortdesc doc files of microtype
relocated 1
-docfiles size=412
+docfiles size=417
RELOC/doc/latex/microtype/README.md
RELOC/doc/latex/microtype/microtype.pdf
RELOC/doc/latex/microtype/test-microtype.tex
++++++ microtype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/letterspace.sty new/tex/latex/microtype/letterspace.sty
--- old/tex/latex/microtype/letterspace.sty 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/letterspace.sty 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -33,7 +33,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{letterspace}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Robust letterspacing
(RS)]
\def\MT@MT
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-luatex.def new/tex/latex/microtype/microtype-luatex.def
--- old/tex/latex/microtype/microtype-luatex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-luatex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-luatex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
luatex
(RS)]
@@ -113,7 +113,6 @@
\fi
}
\let\MT@copy@font\relax
-\MT@requires@luatex4{\let\pdfcopyfont\copyfont}\relax
\def\MT@copy@font@{%
\xdef\MT@font@copy{\csname\MT@@font/\MT@pr@context/\MT@ex@context\endcsname}%
\expandafter\ifx\MT@font@copy\relax
@@ -123,7 +122,7 @@
\else
\MT@exp@two@c\let\font@name\MT@font@orig
\fi
- \global\MT@exp@two@c\pdfcopyfont\MT@font@copy\font@name
+ \MT@exp@two@c\MT@lua@copyfont\meaning\font@name\@nil
\MT@map@clist@c\MT@active@features{%
\MT@exp@cs\ifx{MT@\@nameuse{MT@abbr@##1}}\relax\else
\def\@tempa{##1}%
@@ -133,6 +132,7 @@
\fi
\MT@exp@two@c\let\MT@font\MT@font@copy
\let\font@name\MT@font@copy
+ \aftergroup\MT@exp@two@c
\aftergroup\let\aftergroup\font@name\aftergroup\MT@font@copy
}
\def\MT@rem@from@list#1{%
@@ -141,6 +141,8 @@
\MT@font \csname MT@\@tempa @#1font@list\endcsname
\fi
}
+\def\MT@lua@copyfont #1 #2 #3\@nil{%
+ \global\expandafter\font\MT@font@copy=#3\relax}
\def\MT@protrusion{\MT@maybe@do{pr}}
\def\MT@set@pr@codes{%
\MT@nofamilyfalse
@@ -303,10 +305,22 @@
\MT@nonselectedfalse
}
\let\MT@set@ex@codes\MT@set@ex@codes@n
+\directlua{\detokenize{
+ if font.setexpansion == nil then
+ tex.print("\\@firstoftwo")
+ else
+ tex.print("\\@secondoftwo")
+ end
+}}{
\MT@requires@luatex4{\let\pdffontexpand\expandglyphsinfont}\relax
\def\MT@expandfont{%
\pdffontexpand\MT@font \MT@stretch@ \MT@shrink@ \MT@step@ \MT@auto@\relax
}
+}{
+\def\MT@expandfont{%
+ \directlua{font.setexpansion(font.current(),\MT@stretch@,\MT@shrink@,\MT@step@)}%
+}
+}
\def\MT@set@all@ex#1{%
\MT@do@font{\efcode\MT@font\@tempcnta=#1\relax}%
}
@@ -1152,14 +1166,24 @@
\MT@check@step{stretch}%
\MT@check@step{shrink}%
\MT@check@active@set{ex}%
- \CheckCommand*\showhyphens[1]{\setbox0\vbox{%
- \color@begingroup\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
- \gdef\showhyphens##1{\setbox0\vbox{%
- \color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
+ \MT@ifdefined@n@TF{showhyphens }{%
+ \def\MT@temp##1##2{%
+ \expandafter\CheckCommand\csname showhyphens \endcsname[1]{##1}%
+ \DeclareRobustCommand\showhyphens[1]{##2}}%
+ }{%
+ \def\MT@temp##1##2{%
+ \CheckCommand*\showhyphens[1]{##1}%
+ \gdef\showhyphens####1{##2}}%
+ }%
+ \MT@temp
+ {\setbox0\vbox{\color@begingroup
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}
+ {\setbox0\vbox{\color@begingroup\pdfadjustspacing\z@
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
\else
\let\MT@expansion\relax
\MT@info@nl{No font expansion}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-pdftex.def new/tex/latex/microtype/microtype-pdftex.def
--- old/tex/latex/microtype/microtype-pdftex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-pdftex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-pdftex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
pdftex
(RS)]
@@ -1487,14 +1487,24 @@
\MT@check@step{stretch}%
\MT@check@step{shrink}%
\MT@check@active@set{ex}%
- \CheckCommand*\showhyphens[1]{\setbox0\vbox{%
- \color@begingroup\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
- \gdef\showhyphens##1{\setbox0\vbox{%
- \color@begingroup\pdfadjustspacing\z@\everypar{}\parfillskip\z@skip
- \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
- \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
+ \MT@ifdefined@n@TF{showhyphens }{%
+ \def\MT@temp##1##2{%
+ \expandafter\CheckCommand\csname showhyphens \endcsname[1]{##1}%
+ \DeclareRobustCommand\showhyphens[1]{##2}}%
+ }{%
+ \def\MT@temp##1##2{%
+ \CheckCommand*\showhyphens[1]{##1}%
+ \gdef\showhyphens####1{##2}}%
+ }%
+ \MT@temp
+ {\setbox0\vbox{\color@begingroup
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}
+ {\setbox0\vbox{\color@begingroup\pdfadjustspacing\z@
+ \everypar{}\parfillskip\z@skip
+ \hsize\maxdimen\normalfont\pretolerance\m@ne\tolerance\m@ne
+ \hbadness\z@\showboxdepth\z@\ ##1\color@endgroup}}%
\else
\let\MT@expansion\relax
\MT@info@nl{No font expansion}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype-xetex.def new/tex/latex/microtype/microtype-xetex.def
--- old/tex/latex/microtype/microtype-xetex.def 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype-xetex.def 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -30,7 +30,7 @@
%%
\ProvidesFile
{microtype-xetex.def}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Definitions specific to
xetex
(RS)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.cfg new/tex/latex/microtype/microtype.cfg
--- old/tex/latex/microtype/microtype.cfg 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.cfg 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -40,7 +40,7 @@
%%
\ProvidesFile
{microtype.cfg}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
microtype main configuration file
(RS)]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.lua new/tex/latex/microtype/microtype.lua
--- old/tex/latex/microtype/microtype.lua 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.lua 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
--
-- The `microtype' package
-- Subliminal refinements towards typographical perfection
--- Copyright (c) 2004--2018 R Schlicht
+-- Copyright (c) 2004--2019 R Schlicht
--
-- This work may be distributed and/or modified under the conditions of the
-- LaTeX Project Public License, either version 1.3c of this license or (at
@@ -34,16 +34,16 @@
local microtype = microtype
microtype.module = {
name = "microtype",
- version = "2.7b",
- date = "2019/02/28",
+ version = "2.7d",
+ date = "2019/11/18",
description = "microtype module.",
author = "E. Roux, R. Schlicht and P. Gesang",
copyright = "E. Roux, R. Schlicht and P. Gesang",
license = "LPPL",
}
-function microtype.warning(...)
- luatexbase.module_warning("microtype",...)
+function microtype.info(...)
+ luatexbase.module_info("microtype",...)
end
local find = string.find
@@ -143,7 +143,7 @@
if luaotfload and luaotfload.letterspace then
if luaotfload.letterspace.keepligature then
- microtype.warning("overwriting function `keepligature'")
+ microtype.info("overwriting function `keepligature'")
end
luaotfload.letterspace.keepligature = keepligature
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/microtype.sty new/tex/latex/microtype/microtype.sty
--- old/tex/latex/microtype/microtype.sty 2019-03-01 23:25:46.000000000 +0100
+++ new/tex/latex/microtype/microtype.sty 2019-11-19 01:01:37.000000000 +0100
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -29,7 +29,7 @@
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage
{microtype}
- [2019/02/28 v2.7b
+ [2019/11/18 v2.7d
Micro-typographical refinements
(RS)]
\def\MT@MT
@@ -1076,6 +1076,9 @@
\set@display@protect
\let\IeC\@firstofone
\let\@inpenc@undefined@\MT@undefined@char
+ \let\UTF@two@octets@noexpand\@empty
+ \let\UTF@three@octets@noexpand\@empty
+ \let\UTF@four@octets@noexpand\@empty
\def\UTFviii@defined##1{\ifx ##1\relax
\MT@undefined@char{utf8}\else\expandafter ##1\fi}%
\MT@ifdefined@c@T\PrerenderUnicode
@@ -1095,7 +1098,10 @@
\expandafter\MT@exp@two@c\expandafter\MT@is@char\expandafter
\meaning\expandafter\MT@char\MT@charstring\relax\relax\relax
\ifnum\MT@char@ < \z@
- \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax
+ \expandafter\expandafter\expandafter\MT@is@tlig\MT@char\relax\relax
+ \ifnum\MT@char@ < \z@
+ \expandafter\expandafter\expandafter\MT@is@letter\MT@char\relax\relax
+ \fi
\fi
}
\begingroup
@@ -1140,6 +1146,11 @@
}%
}
/x
+\def\MT@is@tlig#1#2{%
+ \ifx#1\remove@tlig
+ \MT@is@number #2\relax\relax
+ \fi
+}
\def\MT@is@composite#1#2\relax{%
\ifx\\#2\\\else
\expandafter\def\expandafter\MT@char\expandafter{\csname\expandafter
@@ -1278,8 +1289,13 @@
}
\def\MT@check@font{\MT@exp@one@n\MT@in@clist\MT@font\MT@font@list}
\def\MT@register@font{\xdef\MT@font@list{\MT@font@list\MT@font,}}
-\def\MT@register@subst@font{\MT@exp@one@n\MT@in@clist\font@name\MT@font@list
- \ifMT@inlist@\else\xdef\MT@font@list{\MT@font@list\font@name,}\fi}
+\def\MT@register@subst@font{%
+ \MT@exp@one@n\MT@in@clist\font@name\MT@font@list
+ \ifMT@inlist@\else
+ \xdef\MT@font@list{\MT@font@list\font@name,}%
+ \expandafter\MT@rem@from@clist\MT@font\MT@font@list
+ \fi
+}
\let\MT@active@features\@empty
\def\MT@check@font@cx{%
\MT@if@true
@@ -1302,6 +1318,8 @@
\MT@exp@cs\MT@xadd
{MT@##1@\csname MT@##1@context\endcsname font@list}%
{\font@name,}%
+ \expandafter\MT@exp@one@n\expandafter\MT@rem@from@clist\expandafter\MT@font
+ \csname MT@##1@\csname MT@##1@context\endcsname font@list\endcsname
\fi
}%
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-CharisSIL.cfg new/tex/latex/microtype/mt-CharisSIL.cfg
--- old/tex/latex/microtype/mt-CharisSIL.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-CharisSIL.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-LatinModernRoman.cfg new/tex/latex/microtype/mt-LatinModernRoman.cfg
--- old/tex/latex/microtype/mt-LatinModernRoman.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-LatinModernRoman.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-PalatinoLinotype.cfg new/tex/latex/microtype/mt-PalatinoLinotype.cfg
--- old/tex/latex/microtype/mt-PalatinoLinotype.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-PalatinoLinotype.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
@@ -322,7 +322,7 @@
fl = { 0,50},
ffl = { 0,50},
ſt = { 0,50},
- st = { 0,50}
+ st = { 0,50}
}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-bch.cfg new/tex/latex/microtype/mt-bch.cfg
--- old/tex/latex/microtype/mt-bch.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-bch.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-blg.cfg new/tex/latex/microtype/mt-blg.cfg
--- old/tex/latex/microtype/mt-blg.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-blg.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-cmr.cfg new/tex/latex/microtype/mt-cmr.cfg
--- old/tex/latex/microtype/mt-cmr.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-cmr.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-euf.cfg new/tex/latex/microtype/mt-euf.cfg
--- old/tex/latex/microtype/mt-euf.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-euf.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-eur.cfg new/tex/latex/microtype/mt-eur.cfg
--- old/tex/latex/microtype/mt-eur.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-eur.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-euroitc.cfg new/tex/latex/microtype/mt-euroitc.cfg
--- old/tex/latex/microtype/mt-euroitc.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-euroitc.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-eus.cfg new/tex/latex/microtype/mt-eus.cfg
--- old/tex/latex/microtype/mt-eus.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-eus.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-msa.cfg new/tex/latex/microtype/mt-msa.cfg
--- old/tex/latex/microtype/mt-msa.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-msa.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-msb.cfg new/tex/latex/microtype/mt-msb.cfg
--- old/tex/latex/microtype/mt-msb.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-msb.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-mvs.cfg new/tex/latex/microtype/mt-mvs.cfg
--- old/tex/latex/microtype/mt-mvs.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-mvs.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-pad.cfg new/tex/latex/microtype/mt-pad.cfg
--- old/tex/latex/microtype/mt-pad.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-pad.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-pmn.cfg new/tex/latex/microtype/mt-pmn.cfg
--- old/tex/latex/microtype/mt-pmn.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-pmn.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ppl.cfg new/tex/latex/microtype/mt-ppl.cfg
--- old/tex/latex/microtype/mt-ppl.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ppl.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ptm.cfg new/tex/latex/microtype/mt-ptm.cfg
--- old/tex/latex/microtype/mt-ptm.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ptm.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-ugm.cfg new/tex/latex/microtype/mt-ugm.cfg
--- old/tex/latex/microtype/mt-ugm.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-ugm.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/microtype/mt-zpeu.cfg new/tex/latex/microtype/mt-zpeu.cfg
--- old/tex/latex/microtype/mt-zpeu.cfg 2018-01-15 23:21:32.000000000 +0100
+++ new/tex/latex/microtype/mt-zpeu.cfg 2019-10-11 23:33:17.000000000 +0200
@@ -10,7 +10,7 @@
%%
%% The `microtype' package
%% Subliminal refinements towards typographical perfection
-%% Copyright (c) 2004--2018 R Schlicht
+%% Copyright (c) 2004--2019 R Schlicht
%%
%% This work may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License, either version 1.3c of this license or (at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/microtype.tlpobj new/tlpkg/tlpobj/microtype.tlpobj
--- old/tlpkg/tlpobj/microtype.tlpobj 2019-03-02 02:26:07.000000000 +0100
+++ new/tlpkg/tlpobj/microtype.tlpobj 2019-11-19 01:55:50.000000000 +0100
@@ -1,6 +1,6 @@
name microtype
category Package
-revision 50187
+revision 52853
shortdesc Subliminal refinements towards typographical perfection
relocated 1
longdesc The package provides a LaTeX interface to the micro-typographic
@@ -20,7 +20,7 @@
longdesc requires pdfTeX or LuaTeX, while the adjustment of interword
longdesc spacing and of kerning only works with pdfTeX. Letterspacing is
longdesc available with pdfTeX or LuaTeX. The alternative package
-longdesc `letterspace', which also works with plain TeX, provides the
+longdesc 'letterspace', which also works with plain TeX, provides the
longdesc user commands for letterspacing only, omitting support for all
longdesc other extensions.
runfiles size=105
@@ -52,7 +52,7 @@
RELOC/tex/latex/microtype/mt-zpeu.cfg
catalogue-also pdfcprot
catalogue-ctan /macros/latex/contrib/microtype
-catalogue-date 2019-03-01 06:53:03 +0100
+catalogue-date 2019-11-18 10:28:58 +0100
catalogue-license lppl1.3c
catalogue-topics micro-layout letterspace
-catalogue-version 2.7b
+catalogue-version 2.7d
++++++ milsymb.doc.tar.xz ++++++
++++ 14865 lines of diff (skipped)
++++++ milsymb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/milsymb/milsymb.sty new/tex/latex/milsymb/milsymb.sty
--- old/tex/latex/milsymb/milsymb.sty 2018-04-29 23:46:45.000000000 +0200
+++ new/tex/latex/milsymb/milsymb.sty 2020-03-16 22:05:08.000000000 +0100
@@ -1,17 +1,17 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-%% MilSymb Style File %%
-%%-------------------- %%
-%% Version: 1.0 %%
-%% Last Updated: 29/04/2018 %%
-%% Github: https://github.com/ralphieraccoon/MilSymb %%
-%% Copyright: Damian Crosby 2018 %%
-%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+%% MilSymb Style File %%
+%%-------------------- %%
+%% Version: 1.02 %%
+%% Last Updated: 2020-03-15 %%
+%% Github: https://github.com/ralphieraccoon/MilSymb %%
+%% Copyright: Damian Crosby 2018 %%
+%% Licence: Creative Commons Attribution-ShareAlike 4.0 International License %%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\NeedsTeXFormat{LaTeX2e}
-\ProvidesPackage{milsymb}[29/04/2018 v1.0]
+\ProvidesPackage{milsymb}[05/07/2019 v1.01]
\RequirePackage{tikz}
-\RequirePackage[T1]{fontenc}
+\RequirePackage{lmodern}
\RequirePackage{fix-cm}
\RequirePackage{arevmath}
\RequirePackage{marvosym}
@@ -19,6 +19,7 @@
\RequirePackage{amssymb}
\RequirePackage{xifthen}
\RequirePackage{xparse}
+\RequirePackage{textcomp}
\definecolor{friendlyA}{RGB}{128, 224, 255}
\definecolor{hostileA}{RGB}{255, 128, 128}
\definecolor{neutralA}{RGB}{170, 255, 170}
@@ -2135,8 +2136,6 @@
frame status/anticipated/.style={/MilSymb/line=dashed},
frame status/uncertain/.style={/MilSymb/line=uncertainline},
fill=gray,
-frame status=normal,
-scale=1,
}
\newcommand*{\clipfriendly}{
(-0.75, -0.5) rectangle (0.75, 0.5)
@@ -2257,8 +2256,10 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2319,6 +2320,8 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
+ frame status=normal,
+ scale=1,
track number=,
call sign=,
position and movement=,
@@ -2683,6 +2686,8 @@
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
@@ -2745,7 +2750,11 @@
\newcounter{exitem}
\newlength{\itemlength}
\NewDocumentEnvironment{landheadquarters}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[shift={(#2)}, scale=\MilSymb@scale, transform shape]
\setcounter{exitem}{0}
@@ -2762,7 +2771,11 @@
\stepcounter{exitem}}
}{\end{scope}}
\NewDocumentEnvironment{landgroup}{ o D(){0,0}}{
-\tikzset{#1}
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\setlength{\itemlength}{0pt}
\begin{scope}[local bounding box=G, shift={(#2)}, scale=\MilSymb@scale, transform shape]
\RenewDocumentCommand\item{m}{
@@ -2906,6 +2919,8 @@
equipment teardown time/.store in=\MilSymb@SymbAE,
common identifier/.store in=\MilSymb@SymbAF,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
faction=none,
main=none,
mobility=none,
@@ -3043,6 +3058,8 @@
altitude value/.store in=\MilSymb@SymbX,
location/.store in=\MilSymb@SymbY,
speed/.store in=\MilSymb@SymbZ,
+ frame status=normal,
+ scale=1,
headquarters=false,
feint or dummy=false,
country indicator=,
@@ -3227,8 +3244,10 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3258,8 +3277,12 @@
\end{scope}
\IfNoValueF{#4}{\node [anchor=west, align=left] at (#3.east) {#4};}
}
-\NewDocumentCommand\OwnShip{o D(){0,0} d() g}{
-\tikzset{#1}
+\NewDocumentCommand\OwnShip{ O{} D(){0,0} d() g}{
+\tikzset{%
+ /MilSymb/.cd,
+ scale=1,
+ #1,
+}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
\draw [ultra thick, friendlyA] (0, 0) circle (0.5);
\draw [ultra thick, friendlyA] (0.5, 0) -- (-0.5, 0);
@@ -3348,8 +3371,10 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3406,13 +3431,15 @@
identification/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
date-time group/.store in= \MilSymb@SymbG,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
identification=,
additional information=,
date-time group=,
- faction=none,
+ faction=friendly,
mine=normal,
neutralised=false,
#1,
@@ -3503,8 +3530,10 @@
position and movement/.store in=\MilSymb@SymbD,
nation/.store in= \MilSymb@SymbE,
additional information/.store in=\MilSymb@SymbF,
- speed leader/.code 2 args={\draw (0,0) -- (##1:##2);},
+ speed leader/.code 2 args={\begin{scope}[shift={(#2)}, scale=\MilSymb@scale]\draw (0,0) -- (##1:##2);\end{scope}},
speed leader/.value required,
+ frame status=normal,
+ scale=1,
track number=,
name=,
position and movement=,
@@ -3544,6 +3573,7 @@
man made/.is if=manmade,
size=small,
man made=false,
+ scale=1,
#1,
}%
\begin{scope}[shift={(#2)}, local bounding box=#3, scale=\MilSymb@scale, transform shape]
@@ -3615,6 +3645,8 @@
offset/.value required,
movement/.code 2 args={\begin{scope}[shift={(#2)}]\ifthenelse{\equal{\MilSymb@drawH}{true}\AND \equal{\MilSymb@selectedfaction}{friendly}}{ \draw [-{Stealth[inset=0pt,scale=1]}] (-0.75, -0.75) -- +($(0, -##1) - (0, -0.75)$) -- +(##2);}{\draw [-{Stealth[inset=0pt,scale=1]}] (0,0) -- +(0, -##1) -- +(##2);}\end{scope}},
movement/.value required,
+ frame status=normal,
+ scale=1,
faction=friendly,
main=none,
upper=none,
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/milsymb.tlpobj new/tlpkg/tlpobj/milsymb.tlpobj
--- old/tlpkg/tlpobj/milsymb.tlpobj 2019-02-28 03:54:22.000000000 +0100
+++ new/tlpkg/tlpobj/milsymb.tlpobj 2020-03-17 02:07:38.000000000 +0100
@@ -1,6 +1,6 @@
name milsymb
category Package
-revision 47482
+revision 54361
shortdesc LaTeX package for TikZ based drawing of military symbols as per NATO APP-6(C)
relocated 1
longdesc The package offers commands to draw military symbols as per
@@ -15,7 +15,6 @@
catalogue-contact-home https://github.com/ralphieraccoon/MilSymb/wiki
catalogue-contact-repository https://github.com/ralphieraccoon/MilSymb
catalogue-ctan /graphics/pgf/contrib/milsymb
-catalogue-date 2018-05-03 05:20:47 +0200
catalogue-license cc-by-sa-4
-catalogue-topics pgf-tikz symbol-supp
-catalogue-version 1.0
+catalogue-topics graphics pgf-tikz symbol-supp
+catalogue-version 1.02
++++++ missaali.doc.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/missaali.doc.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/missaali.doc.tar.xz differ: char 7898598, line 30695
++++++ missaali.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/missaali.tlpobj new/tlpkg/tlpobj/missaali.tlpobj
--- old/tlpkg/tlpobj/missaali.tlpobj 2019-02-28 03:54:32.000000000 +0100
+++ new/tlpkg/tlpobj/missaali.tlpobj 2020-03-24 02:00:06.000000000 +0100
@@ -1,6 +1,6 @@
name missaali
category Package
-revision 42810
+revision 54512
shortdesc A late medieval OpenType textura font
relocated 1
longdesc This package contains the free OpenType Textura font Missaali
@@ -21,7 +21,6 @@
RELOC/fonts/opentype/public/missaali/Missaali-Regular.otf
RELOC/tex/latex/missaali/missaali.sty
catalogue-ctan /fonts/missaali
-catalogue-date 2016-12-31 06:02:05 +0100
-catalogue-license ofllppl1.3
+catalogue-license ofl lppl1.3
catalogue-topics font-otf font-archaic
catalogue-version 1.004
++++++ mla-paper.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mla-paper.doc.tlpobj new/tlpkg/tlpobj/mla-paper.doc.tlpobj
--- old/tlpkg/tlpobj/mla-paper.doc.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mla-paper.doc.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,6 +1,6 @@
name mla-paper.doc
category Package
-revision 20885
+revision 54080
shortdesc doc files of mla-paper
relocated 1
docfiles size=1
++++++ mla-paper.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mla-paper.tlpobj new/tlpkg/tlpobj/mla-paper.tlpobj
--- old/tlpkg/tlpobj/mla-paper.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mla-paper.tlpobj 2020-03-04 23:52:37.000000000 +0100
@@ -1,15 +1,15 @@
name mla-paper
category Package
-revision 20885
+revision 54080
shortdesc Proper MLA formatting
relocated 1
-longdesc The package formats articles using the MLA style. The aim is
-longdesc that students and other academics in the humanities should be
-longdesc able to typeset their materials, properly, with minimal effort
-longdesc on their part.
+longdesc The package formats articles using the MLA style ("MLA" =
+longdesc "Modern Language Association"). The aim is that students and
+longdesc other academics in the humanities should be able to typeset
+longdesc their materials, properly, with minimal effort on their part.
runfiles size=2
RELOC/tex/latex/mla-paper/mla.sty
+catalogue-also mlacls
catalogue-ctan /macros/latex/contrib/mla-paper
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
-catalogue-topics gen-paper
+catalogue-topics gen-paper humanities
++++++ mltex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mltex.doc.tlpobj new/tlpkg/tlpobj/mltex.doc.tlpobj
--- old/tlpkg/tlpobj/mltex.doc.tlpobj 2019-02-28 03:54:33.000000000 +0100
+++ new/tlpkg/tlpobj/mltex.doc.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mltex.doc
category Package
-revision 48634
+revision 54227
shortdesc doc files of mltex
docfiles size=9
texmf-dist/doc/latex/mltex/README
++++++ mltex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mltex.tlpobj new/tlpkg/tlpobj/mltex.tlpobj
--- old/tlpkg/tlpobj/mltex.tlpobj 2019-02-28 03:54:34.000000000 +0100
+++ new/tlpkg/tlpobj/mltex.tlpobj 2020-03-10 23:59:50.000000000 +0100
@@ -1,6 +1,6 @@
name mltex
category Package
-revision 48634
+revision 54227
shortdesc The MLTeX system
longdesc MLTeX is a modification of TeX version >=3.0 that allows the
longdesc hyphenation of words with accented letters using ordinary
@@ -11,12 +11,15 @@
depend hyphen-base
depend babel
depend dehyph
+depend hyph-utf8
+depend l3kernel
depend latexconfig
depend latex-fonts
+depend unicode-data
depend knuth-lib
depend plain
depend mltex.ARCH
-execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=cm,hyphen-base,babel,dehyph,latex,latexconfig,latex-fonts
+execute AddFormat name=mllatex engine=pdftex patterns=language.dat options="-translate-file=cp227.tcx -mltex *mllatex.ini" fmttriggers=cm,hyphen-base,babel,dehyph,hyph-utf8,l3kernel,latex,latexconfig,latex-fonts,unicode-data
execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" fmttriggers=cm,hyphen-base,knuth-lib,plain
runfiles size=8
texmf-dist/tex/latex/mltex/lo1enc.def
@@ -24,7 +27,6 @@
texmf-dist/tex/latex/mltex/mltex.sty
texmf-dist/tex/mltex/config/mltex.ini
catalogue-ctan /systems/generic/mltex
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license knuth
catalogue-topics engine multilingual
catalogue-version 2.2
++++++ moderncv.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderncv.doc.tlpobj new/tlpkg/tlpobj/moderncv.doc.tlpobj
--- old/tlpkg/tlpobj/moderncv.doc.tlpobj 2019-02-28 03:54:37.000000000 +0100
+++ new/tlpkg/tlpobj/moderncv.doc.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name moderncv.doc
category Package
-revision 37992
+revision 52669
shortdesc doc files of moderncv
relocated 1
docfiles size=460
++++++ moderncv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderncv.tlpobj new/tlpkg/tlpobj/moderncv.tlpobj
--- old/tlpkg/tlpobj/moderncv.tlpobj 2019-02-28 03:54:37.000000000 +0100
+++ new/tlpkg/tlpobj/moderncv.tlpobj 2019-11-07 18:46:23.000000000 +0100
@@ -1,6 +1,6 @@
name moderncv
category Package
-revision 37992
+revision 52669
shortdesc A modern curriculum vitae class
relocated 1
longdesc The class provides facilities for typesetting modern
@@ -8,6 +8,16 @@
longdesc is fairly customizable, allowing you to define your own style
longdesc by changing the colours, the fonts, etc. A number of templates
longdesc are provided in the distribution examples subdirectory.
+depend etoolbox
+depend fancyhdr
+depend graphics
+depend hyperref
+depend iftex
+depend l3packages
+depend microtype
+depend tools
+depend url
+depend xcolor
runfiles size=61
RELOC/tex/latex/moderncv/moderncv.cls
RELOC/tex/latex/moderncv/moderncvbodyi.sty
++++++ modiagram.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/modiagram/README new/doc/latex/modiagram/README
--- old/doc/latex/modiagram/README 2015-09-24 01:36:16.000000000 +0200
+++ new/doc/latex/modiagram/README 2019-10-31 23:22:27.000000000 +0100
@@ -1,5 +1,5 @@
--------------------------------------------------------------------------
-the MODIAGRAM package 2015/09/23 v0.2g
+the MODIAGRAM package 2019/10/31 v0.3
easy creation of molecular orbital diagrams
@@ -11,7 +11,7 @@
If you have any ideas, questions, suggestions or bugs to report, please
feel free to contact me.
--------------------------------------------------------------------------
-Copyright 2011--2015 Clemens Niederberger
+Copyright 2011--2019 Clemens Niederberger
This work may be distributed and/or modified under the
conditions of the LaTeX Project Public License, either version 1.3
Binary files old/doc/latex/modiagram/modiagram_en.pdf and new/doc/latex/modiagram/modiagram_en.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/modiagram/modiagram_en.tex new/doc/latex/modiagram/modiagram_en.tex
--- old/doc/latex/modiagram/modiagram_en.tex 2015-09-24 01:36:16.000000000 +0200
+++ new/doc/latex/modiagram/modiagram_en.tex 2019-10-31 23:22:27.000000000 +0100
@@ -13,7 +13,7 @@
% If you have any ideas, questions, suggestions or bugs to report, please
% feel free to contact me.
% --------------------------------------------------------------------------
-% Copyright 2011--2015 Clemens Niederberger
+% Copyright 2011--2019 Clemens Niederberger
%
% This work may be distributed and/or modified under the
% conditions of the LaTeX Project Public License, either version 1.3
@@ -45,9 +45,9 @@
connect,
EnergyAxis,
molecule,
- MOsetup
+ setmodiagram
} ,
- add-envs = { MOdiagram } ,
+ add-envs = { modiagram } ,
add-silent-cmds = {
ch,
draw,
@@ -58,17 +58,19 @@
chemSigma
} ,
abstract = {%
- \begin{MOdiagram}[style=fancy,distance=7cm,AO-width=15pt,labels,names]
+ \begin{modiagram}[style=fancy,distance=7cm,AO-width=15pt,labels,names]
\atom[N]{left}{ 2p = {0;up,up,up} }
\atom[O]{right}{ 2p = {2;pair,up,up} }
\molecule[NO]{
2pMO = {1.8,.4;pair,pair,pair,up},
color = { 2piy*=red }
}
- \end{MOdiagram}
+ \end{modiagram}
}
}
+\newpackagename\modiag{modiagram}
+
\defbibheading{bibliography}{\addsec{References}}
\usepackage{booktabs}
@@ -83,9 +85,14 @@
long = molecular orbital
}
-\expandafter\def\csname libertine@figurestyle\endcsname{LF}
-\usepackage[libertine]{newtxmath}
-\expandafter\def\csname libertine@figurestyle\endcsname{OsF}
+\makeatletter
+\def\libertine@figurestyle{LF}
+\RequirePackage{amsmath}
+\undef\lvert \undef\lVert
+\undef\rvert \undef\rVert
+\RequirePackage[libertine]{newtxmath}
+\def\libertine@figurestyle{OsF}
+\makeatother
\usepackage{chemmacros,chemformula}
\chemsetup{
@@ -98,11 +105,11 @@
{%
\begingroup
\IfNoValueTF{#1}
- {\MOsetup{ style=square,AO-width=8pt }}%
- {\MOsetup{ style=square,AO-width=8pt , #1 }}%
- \begin{MOdiagram}
+ {\setmodiagram{ style=square,AO-width=8pt }}%
+ {\setmodiagram{ style=square,AO-width=8pt , #1 }}%
+ \begin{modiagram}
\AO{s}{0;#2}
- \end{MOdiagram}%
+ \end{modiagram}%
\endgroup
}
@@ -113,7 +120,7 @@
\section{Licence, Requirements}
\license
-\modiagram\ uses \bnd{l3kernel}~\cite{bnd:l3kernel} and
+\modiag\ uses \bnd{l3kernel}~\cite{bnd:l3kernel} and
\bnd{l3packages}~\cite{bnd:l3packages}. It also uses \TikZ~\cite{pkg:pgf} and
the package \pkg{chemgreek}~\cite{pkg:chemgreek} bundle. Additionally the
\TikZ\ libraries \code{calc} and \code{arrows} are loaded. Knowledge of
@@ -133,14 +140,14 @@
Otherwise, I think I'll have a go at it in \TikZ.
\end{cnltxquote}
The problem was solved using \TikZ, since no package existed for that purpose.
-For one thing \modiagram\ is intended to fill this gap. I also found it very
+For one thing \modiag\ is intended to fill this gap. I also found it very
tedious, to make all this copying and pasting when I needed a second, third,
-\ldots\ diagram. \modiagram\ took care of that.
+\ldots\ diagram. \modiag\ took care of that.
\section{Main Commands}
All molecular orbital (MO) diagrams are created using the environment
-\env{MOdiagram}{}.
+\env{modiagram}{}.
\subsection{The \cs*{atom} Command}
\begin{commands}
@@ -152,13 +159,13 @@
Let's take a look at an example:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{right}{
1s = { 0; pair} ,
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
As you can see, the argument \meta{AO-spec} is essential to create the actual
@@ -180,20 +187,20 @@
The argument \meta{left}/\meta{right} is important, when p~orbitals are used.
For instance compare the following example to the one before:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s = { 0; pair} ,
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
When both variants are used one can also see, that the right atom is shifted to
the right (hence the naming). The right atom is shifted by \SI{4}{\centi\metre}
per default and can be adjusted individually, see page~\pageref{option:distance}.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s = { 0; pair} ,
2s = { 1; pair} ,
@@ -204,7 +211,7 @@
2s = { 1; pair} ,
2p = {1.5; up, down }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
With the command \cs{molecule} (section~\ref{ssec:molecule}) the reason for the
shift becomes clear.
@@ -212,23 +219,23 @@
Any of the arguments for the \ac{AO} can be left empty or be omitted.
\begin{example}[side-by-side]
Without argument: default height, full:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s, 2s, 2p}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
empty argument: default height, empty:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s=, 2s=, 2p=}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
using some values:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{1s, 2s=1, 2p={;,up} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{The \cs*{molecule} Command}\label{ssec:molecule}
@@ -240,11 +247,11 @@
An example first:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The command \cs{molecule} connects the \acp{AO} with the bonding and
anti-bondung \acp{MO}. \cs{molecule} can only be used \emph{after} one has
@@ -269,11 +276,11 @@
Obviously the regarding \acp{AO} must have been set in order to connect them.
This for example won't work:
\begin{sourcecode}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 2sMO = .75 }
- \end{MOdiagram}
+ \end{modiagram}
\end{sourcecode}
The value used in \meta{energy gain} determines how many \si{\centi\metre} the
bonding \ac{MO} lies below the lower \ac{AO} or how many \si{\centi\metre} the
@@ -281,52 +288,52 @@
\begin{example}[side-by-side]
same level:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
different levels:\par
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 1; up } }
\molecule { 1sMO = {.25; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If you specify \meta{energy loss} you can create non-symmetrical splittings.
Then, the first value (\meta{energy gain}) is used for the bonding \ac{MO} and
the second value (\meta{energy loss}) is used for the anti-bonding \ac{MO}.
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 0; up } }
\molecule { 1sMO = {.75/.25; pair } }
- \end{MOdiagram}
+ \end{modiagram}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = { 0; up } }
\atom{right}{ 1s = { 1; up } }
\molecule { 1sMO = {.25/.75; pair } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Please be aware, that you have to specify \emph{two} such values or pairs with
\option{2pMO}: the splitting of the \chemsigma\ orbitals and the splitting of
the \chempi\ orbitals.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 2p = { 0; up, up } }
\atom{right}{ 2p = { 1; up, up } }
\molecule { 2pMO = { 1.5, .75; pair, up, up } }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The complete \ac{MO} diagram for triplett dioxygen now could look something
like that:
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{
1s, 2s, 2p = {;pair,up,up}
}
@@ -336,7 +343,7 @@
\molecule{
1sMO, 2sMO, 2pMO = {;pair,pair,pair,up,up}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{The Naming Scheme}\label{Namensgebung}
@@ -344,7 +351,7 @@
nodes in a \env*{tikzpicture}, the internal naming scheme is important. It
closely follows the function:
\begin{center}
- \begin{MOdiagram}[
+ \begin{modiagram}[
distance = 6cm,
AO-width = 20pt,
labels-fs = \ttfamily\footnotesize,
@@ -391,13 +398,13 @@
2piz* = {2piz*}
}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
With these names it is possible to reference the orbitals with the known \TikZ
commands:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 1sMO = .75 }
@@ -405,11 +412,11 @@
(1sigma.center) -- (1sigma*.center) ;
\draw[red]
(1sigma*) ++ (2cm,.5cm) node {splitting} ;
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = 0 }
\atom{right}{ 1s = 0 }
\molecule { 1sMO = .75 }
@@ -417,7 +424,7 @@
(1sigma*) circle (8pt);
\draw[<-,shorten <=8pt,shorten >=15pt,blue]
(1sigma*) --++(2,1) node {anti-bonding MO};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{Placing AOs and MOs Arbitrarily}\label{ssec:AO_MO_irgendwo}
@@ -428,7 +435,7 @@
Xenon:
\begin{center}
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[\chlewis{0.}{F}\hspace*{5mm}\chlewis{180.}{F}]{left}{
1s=.2;up,up-el-pos={1sleft=.5}
}
@@ -440,7 +447,7 @@
\node[right,xshift=4mm] at (1sigma) {\footnotesize bonding};
\node[above] at (AO2.90) {\footnotesize non-bonding};
\node[above] at (1sigma*.90) {\footnotesize anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
To create diagrams like this there is the following command, which draws a single
@@ -459,10 +466,10 @@
Depending on the \meta{type} one s or three p orbitals are drawn.
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0;}
\AO(-20pt){p}{1;pair,up,down}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If one wants to place such an \ac{AO} at the position of an atom, one has to
@@ -475,21 +482,21 @@
\end{itemize}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} {1s=0}
\atom{right}{1s=0}
\molecule {1sMO=1}
\AO(1cm){s}{2}
\AO(3cm){s}{2}
\AO(5cm){s}{2}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Within the p orbitals there is an additional shift by \SI{20}{pt} per orbital.
This is equivalent to a double shift by the length \code{AO-width} (see
section~\ref{option:AO-width}):
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} {2p=0}
\atom{right}{2p=0}
% above the left atom:
@@ -500,26 +507,26 @@
\AO(1cm) {s}{ .5}
\AO(5cm+20pt){s}{ 1;up}
\AO(5cm+40pt){s}{1.5;down}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The \acp{AO} created with \cs{AO} also can be connected. For this you can use
the \TikZ\ command \cs*{draw}, of course. You can use the predefined node
names\ldots
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0} \AO(2cm){s}{1}
\AO{s}{2} \AO(2cm){s}{1.5}
\draw[red] (AO1.0) -- (AO2.180) (AO3.0) -- (AO4.180);
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots\ or use own node names
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO[a]{s}{0} \AO[b](2cm){s}{1}
\AO[c]{s}{2} \AO[d](2cm){s}{1.5}
\draw[red] (a.0) -- (b.180) (c.0) -- (d.180);
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The predefined names are \code{AO1}, \code{AO2} \etc for the type \code{s} and
@@ -527,15 +534,15 @@
\code{p}. Nodes of the type \code{p} get an \code{x}, \code{y} or \code{z} if
you specify your own name, too.
\begin{example}
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{p}{0}
\draw[<-,shorten >=5pt] (AO1y.-90) -- ++ (.5,-1) node {y};
- \end{MOdiagram}
+ \end{modiagram}
and
- \begin{MOdiagram}
+ \begin{modiagram}
\AO[A]{p}{0}
\draw[<-,shorten >=5pt] (Ay.-90) -- ++ (.5,-1) node {y};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
However, if you want the lines to be drawn in the same style as the ones
@@ -549,11 +556,11 @@
This command expects a comma separated list of node name pairs that are to be
connected. The names have to be connected with a \code{\&}:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\AO{s}{0;} \AO(2cm){s}{1;}
\AO{s}{2;} \AO(2cm){s}{1.5;}
\connect{ AO1 & AO2, AO3 & AO4 }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
Some things still need to be said: \cs{connect} adds the anchor \code{east} to
@@ -574,7 +581,7 @@
(\meta{AO}). In sections~\ref{option:distance} and \ref{option:AO-width} these
lengths and how they can be changed are discussed.
\begin{center}
- \begin{MOdiagram}[
+ \begin{modiagram}[
AO-width = 22pt ,
labels-fs = \ttfamily\tiny ,
labels-style = {text width=40pt,align=center,yshift=11pt}]
@@ -617,7 +624,7 @@
2piz* = {.5*\meta{dist} + 1cm + \meta{AO}}
}
}
- \end{MOdiagram}
+ \end{modiagram}
\end{center}
\subsection{Default Values}
@@ -663,23 +670,23 @@
Compare these examples:
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s={0;pair} }
\atom{right}{ 1s }
- \end{MOdiagram}
+ \end{modiagram}
\hrulefill
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left}{ 1s=1 }
\atom{right}{ 1s= }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\section{Customization}
The options of the section~\ref{ssec:umgebungs_optionen} can be set global as
package option, \ie, with \cs*{usepackage}\oarg{options}\Marg{modiagram}, or
-via the setup command \cs{MOsetup}\marg{options}.
+via the setup command \cs{setmodiagram}\marg{options}.
\subsection{Environment Options}\label{ssec:umgebungs_optionen}
There are some options with which the layout of the \ac{MO} diagrams can be
@@ -728,9 +735,9 @@
They all are discussed in the following sections. If they're used as options
for the environment, they're set locally and only change that environment.
\begin{sourcecode}
- \begin{MOdiagram}[options]
+ \begin{modiagram}[options]
...
- \end{MOdiagram}
+ \end{modiagram}
\end{sourcecode}
\subsubsection{Option \option*{style}}\label{option:style}
@@ -746,47 +753,47 @@
Let's take the \ac{MO} diagram of \ch{H2} to illustrate the different styles:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=plain]% default
+ \begin{modiagram}[style=plain]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=circle]
+ \begin{modiagram}[style=circle]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=round]
+ \begin{modiagram}[style=round]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=fancy]
+ \begin{modiagram}[style=fancy]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{distance}}\label{option:distance}
@@ -798,11 +805,11 @@
section~\ref{orbital-positionen}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[distance=6cm]
+ \begin{modiagram}[distance=6cm]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{AO-width}}\label{option:AO-width}
@@ -811,20 +818,20 @@
\SI{10}{pt}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[AO-width=15pt]
+ \begin{modiagram}[AO-width=15pt]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[style=fancy,AO-width=15pt]
+ \begin{modiagram}[style=fancy,AO-width=15pt]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
By changing the value of \option{AO-width} the positions of the p and the
\chempi\ orbitals also change, see section~\ref{orbital-positionen}.
@@ -841,29 +848,29 @@
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=.2]% default
+ \begin{modiagram}[el-sep=.2]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=0]
+ \begin{modiagram}[el-sep=0]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[el-sep=1]
+ \begin{modiagram}[el-sep=1]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
The options \key{up-el-pos}{<num>} and \key{down-el-pos}{<num>} can be used
@@ -873,29 +880,29 @@
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.4,down-el-pos=.6]% default
+ \begin{modiagram}[up-el-pos=.4,down-el-pos=.6]% default
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.333,down-el-pos=.667]
+ \begin{modiagram}[up-el-pos=.333,down-el-pos=.667]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[up-el-pos=.7,down-el-pos=.3]
+ \begin{modiagram}[up-el-pos=.7,down-el-pos=.3]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{lines}}\label{option:lines}
@@ -903,11 +910,11 @@
connecting lines:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[lines={gray,thin}]
+ \begin{modiagram}[lines={gray,thin}]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{names}}\label{option:names}
@@ -916,11 +923,11 @@
\cs{molecule}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Options \option*{names-style} and \option*{names-style-add}}\label{option:names_style}
@@ -930,11 +937,11 @@
for Version 2.10'' p.\,183 section 16.4.4 (pgfmanual.pdf) for the meaning}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={draw=blue}]
+ \begin{modiagram}[names,names-style={draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
With this the default setting is overwritten. As you can see it destroys the
@@ -942,37 +949,37 @@
specify \code{text height} and \code{text depth} yourself \ldots
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={text height=1.5ex, text depth=.25ex, draw=blue}]
+ \begin{modiagram}[names,names-style={text height=1.5ex, text depth=.25ex, draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots, add the \code{anchor} again \ldots
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style={anchor=base, draw=blue}]
+ \begin{modiagram}[names,names-style={anchor=base, draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\ldots\ or use the option \key{names-style-add}. It doesn't overwrite the
current setting but appends the new declaration:
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names,names-style-add={draw=blue}]
+ \begin{modiagram}[names,names-style-add={draw=blue}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}
% use package `chemmacros'
- \MOsetup{
+ \setmodiagram{
names,
names-style = {
text height = 2.5ex,
@@ -981,16 +988,16 @@
rounded corners
}
}
- \begin{MOdiagram}
+ \begin{modiagram}
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
- \begin{MOdiagram}[names-style-add={fill=blue!20}]
+ \end{modiagram}
+ \begin{modiagram}[names-style-add={fill=blue!20}]
\atom[p]{left} { 1s = {;up} }
\atom[b]{right}{ 1s = {;up} }
\molecule[\ch{X2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels}}\label{option:labels}
@@ -998,11 +1005,11 @@
orbitals. These labels can be changed, see section~\ref{sec:key:label}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels]
+ \begin{modiagram}[labels]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels-fs}}\label{option:labels-fs}
@@ -1010,21 +1017,21 @@
can use the option \option{labels-fs}.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-fs=\footnotesize]
+ \begin{modiagram}[labels,labels-fs=\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
This also allows you to change the font style or font shape of the labels.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-fs=\sffamily\footnotesize]
+ \begin{modiagram}[labels,labels-fs=\sffamily\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{Option \option*{labels-style}}\label{option:labels-style}
@@ -1032,11 +1039,11 @@
which the labels are written.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[labels,labels-style={blue,yshift=4pt}]
+ \begin{modiagram}[labels,labels-style={blue,yshift=4pt}]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{ 1sMO = {.75;pair} }
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{\cs*{atom} and \cs*{molecule} Specific Customizations}
@@ -1049,18 +1056,18 @@
keys to specify the \ac{AO} that you want to label.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels-fs=\footnotesize]
+ \begin{modiagram}[labels-fs=\footnotesize]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{
1sMO = {.75;pair},
label = { 1sigma = {bonding MO} }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square,distance=6cm]
+ \begin{modiagram}[style=square,distance=6cm]
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{
@@ -1072,21 +1079,21 @@
}
\node[right] at (1sigma.-45) {bonding};
\node[right] at (1sigma*.45) {anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
If the option is used together with the \option{labels} option
(page~\pageref{option:labels}) single labels are overwritten:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels]
+ \begin{modiagram}[labels]
\atom[H]{left} { 1s = {;up} }
\atom[H]{right}{ 1s = {;up} }
\molecule[\ch{H2}]{
1sMO = {.75;pair},
label = { 1sigma = \textcolor{red}{??} }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{color} Key}\label{sec:key:color}
@@ -1094,7 +1101,7 @@
display coloured electrons:
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}[labels-fs=\footnotesize]
+ \begin{modiagram}[labels-fs=\footnotesize]
\atom[H]{left}{
1s, color = { 1sleft = blue }
}
@@ -1106,7 +1113,7 @@
label = { 1sigma = {bonding MO} },
color = { 1sigma = green, 1sigma* = cyan }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{up-el-pos} and \option*{down-el-pos} keys}\label{sec:key:electrons}
@@ -1116,7 +1123,7 @@
section~\ref{option:electrons}.
\begin{example}[side-by-side]
% use package `chemmacros'
- \begin{MOdiagram}
+ \begin{modiagram}
\atom[H]{left}{
1s = {;up},
up-el-pos = { 1sleft=.5 }
@@ -1127,7 +1134,7 @@
up-el-pos = { 1sigma=.15 } ,
down-el-pos = { 1sigma=.85 }
}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{\cs*{AO} Specific Customizations}\label{ssec:AO_anpassen}
@@ -1138,10 +1145,10 @@
label to the \ac{AO}/\ac{MO}. If you use the type \code{p} you can specify
the orbital you want to label in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[label={s orbital}]{0}
\AO{p}[label[y]=py,label[z]=pz]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{color} Key}\label{key:AO_color}
@@ -1150,10 +1157,10 @@
color for the electrons. If you use the type \code{p} you can specify the
orbital in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[color=red]{0}
\AO{p}[color[y]=green,color[z]=cyan]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsubsection{The \option*{up-el-pos} and \option*{down-el-pos} Keys}\label{key:AO_electrons}
@@ -1163,10 +1170,10 @@
and \code{1}, also see section~\ref{option:electrons}. If you use the type
\code{p} you can specify the orbital in square brackets:
\begin{example}[side-by-side]
- \begin{MOdiagram}[style=square]
+ \begin{modiagram}[style=square]
\AO{s}[up-el-pos=.15]{0}
\AO{p}[up-el-pos[y]=.15,down-el-pos[z]=.15]{1.5}
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\subsection{Energy Axis}
@@ -1180,12 +1187,12 @@
\end{commands}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
For the time being there are two options to modify the axis.
@@ -1198,28 +1205,28 @@
\end{options}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis[title]
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[side-by-side]
- \begin{MOdiagram}
+ \begin{modiagram}
\atom{left} { 1s = {;up} }
\atom{right}{ 1s = {;up} }
\molecule{ 1sMO = {.75;pair} }
\EnergyAxis[title=E,head=stealth]
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\section{Examples}
The example from the beginning of section \ref{ssec:AO_MO_irgendwo}.
\begin{example}
% use package `chemmacros'
- \begin{MOdiagram}[names]
+ \begin{modiagram}[names]
\atom[\chlewis{0.}{F}\hspace*{5mm}\chlewis{180.}{F}]{left}{
1s=.2;up,up-el-pos={1sleft=.5}
}
@@ -1231,14 +1238,14 @@
\node[right,xshift=4mm] at (1sigma) {\footnotesize bonding};
\node[above] at (AO2.90) {\footnotesize non-bonding};
\node[above] at (1sigma*.90) {\footnotesize anti-bonding};
- \end{MOdiagram}
+ \end{modiagram}
\end{example}
\begin{example}[outside]
% use package `chemmacros'
\begin{figure}[p]
\centering
- \begin{MOdiagram}[style=square,labels,names,AO-width=8pt,labels-fs=\footnotesize]
+ \begin{modiagram}[style=square,labels,names,AO-width=8pt,labels-fs=\footnotesize]
\atom[\ch{O_a}]{left}{
1s, 2s, 2p = {;pair,up,up}
}
@@ -1250,7 +1257,7 @@
color = { 2piy*=red, 2piz*=red }
}
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\caption{MO diagram of \ch{^3 "\chemSigma-" O2}.}
\end{figure}
\end{example}
@@ -1259,8 +1266,8 @@
% use package `chemmacros'
\begin{figure}[p]
\centering
- \MOsetup{style = fancy, distance = 7cm, AO-width = 15pt, labels}
- \begin{MOdiagram}
+ \setmodiagram{style = fancy, distance = 7cm, AO-width = 15pt, labels}
+ \begin{modiagram}
\atom[N]{left}{
2p = {0;up,up,up}
}
@@ -1272,7 +1279,7 @@
color = { 2piy*=red }
}
\EnergyAxis
- \end{MOdiagram}
+ \end{modiagram}
\caption{Part of the MO diagram of \chlewis{180.}{NO}.}
\end{figure}
\end{example}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modiagram.doc.tlpobj new/tlpkg/tlpobj/modiagram.doc.tlpobj
--- old/tlpkg/tlpobj/modiagram.doc.tlpobj 2019-02-28 03:54:38.000000000 +0100
+++ new/tlpkg/tlpobj/modiagram.doc.tlpobj 2019-11-01 02:04:45.000000000 +0100
@@ -1,9 +1,9 @@
name modiagram.doc
category Package
-revision 38448
+revision 52589
shortdesc doc files of modiagram
relocated 1
-docfiles size=164
+docfiles size=141
RELOC/doc/latex/modiagram/README
RELOC/doc/latex/modiagram/modiagram_en.pdf
RELOC/doc/latex/modiagram/modiagram_en.tex
++++++ modiagram.tar.xz ++++++
++++ 3338 lines of diff (skipped)
++++++ montserrat.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/montserrat/README new/doc/fonts/montserrat/README
--- old/doc/fonts/montserrat/README 2017-02-27 23:34:30.000000000 +0100
+++ new/doc/fonts/montserrat/README 2019-11-08 22:40:13.000000000 +0100
@@ -13,13 +13,21 @@
part of all distributions of LaTeX version 2003/12/01 or later. Those files and
LaTeX support file montserrat.sty are
- Copyright (c) 2017 Michael Sharpe
+ Copyright (c) 2017--2019 Michael Sharpe
Files provided "as is", with no warranties.
The support files are provided in encodings OT1, T1, TS1 and LY1 for users of Western scripts.
-Current version: 1.01 2017-02-26
+Current version: 1.03 2019-11-07
+
+Changes in version 1.03
+1. Update the otf and pfb to the latest version of Montserrat (early 2019.)
+2. Added commands to remove all f-ligatures, which were not working as expected in small caps.
+3. Reverted the sty and fd files in accordance with recent changes in NFSS spec.
+
+Changes in version 1.02
+Changed the sty and fd files in line with the latest NFSS weight abbreviations, and chaged documentation accordingly.
Changes in version 1.01
Corrected a number of issues with montserat.sty.
Binary files old/doc/fonts/montserrat/montserrat-doc.pdf and new/doc/fonts/montserrat/montserrat-doc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/fonts/montserrat/montserrat-doc.tex new/doc/fonts/montserrat/montserrat-doc.tex
--- old/doc/fonts/montserrat/montserrat-doc.tex 2017-02-27 23:34:30.000000000 +0100
+++ new/doc/fonts/montserrat/montserrat-doc.tex 2019-11-08 22:40:13.000000000 +0100
@@ -5,18 +5,18 @@
\usepackage[parfill]{parskip}% Begin paragraphs with an empty line rather than an indent
\usepackage{graphicx}
%\usepackage{amssymb}% don't use with newtxmath
-%\pdfmapfile{+montserrat.map}
+\pdfmapfile{=montserrat.map}
%SetFonts
% libertine+newtxmath
-\usepackage{newtxtext} % use sb in place of bold
+%\usepackage{newtxtext} % use sb in place of bold
\usepackage[T1]{fontenc}
\usepackage{textcomp}
+\usepackage[scaled=.9,t,defaultfam]{montserrat}
\usepackage{nimbusmononarrow}% narrow
\usepackage{amsmath,amsthm}
-\usepackage[scaled=.9,defaultfam]{montserrat}
-\usepackage[libertine,bigdelims,vvarbb]{newtxmath}
+\usepackage[libertine,vvarbb]{newtxmath}
% option vvarbb gives you stix blackboard bold
-\useosf % use oldstyle figures except in math
+%\useosf % use oldstyle figures except in math
\usepackage[cal=boondoxo]{mathalfa}% less slanted than STIX cal
%SetFonts
\usepackage{booktabs}
@@ -24,11 +24,16 @@
\author{Michael Sharpe}
\date{\today} % Activate to display a given date or no date
\def\TeXShop{\TeX Shop}
+\usepackage{fonttable}
%\renewcommand*{\familydefault}{\sfdefault}
+\usepackage{trace}
\begin{document}
\maketitle
%\expandafter\show\csname lfstyle \endcsname
-Montserrat is a geometric sans-serif typeface designed by Julieta Ulanovsky, inspired by posters and signage from her historical Buenos Aires neighborhood of the same name. It is rather close in spirit to Gotham and Proxima Nova, but has its own individual appearance---more informal, less extended and more idiosyncratic. It is provided in a total of nine different weights, with upright and italic shapes, and every one of them has \textsc{Small Caps} and \textit{\textsc{Small Caps}}. There are two quite different versions that don't fit into the usual \LaTeX\ classifications. The version having the appellation Alternates has letter shapes that are much more rounded than the default version, reflecting the signage in the neighborhood of Montserrat. For example, here are the same four letters displayed in both the default and Alternates styles: ATWl, {\montserratalt ATWl}.
+%{\montserratalt fi fl ff ffi ffl}
+
+
+Montserrat is a geometric sans-serif typeface designed by Julieta Ulanovsky, inspired by posters and signage from her historic Buenos Aires neighborhood of the same name. It is rather close in spirit to Gotham and Proxima Nova, but has its own individual appearance---more informal, less extended and more idiosyncratic. It is provided in a total of nine different weights, with upright and italic shapes, and every one of them has \textsc{Small Caps} and \textit{\textsc{Small Caps}}. There are two quite different versions that don't fit into the usual \LaTeX\ classifications. The version having the appellation Alternates has letter shapes that are much more rounded than the default version, reflecting the signage in the neighborhood of Montserrat. For example, here are the same four letters displayed in both the default and Alternates styles: ATWl, {\montserratalt ATWl}.
As it currently set up, a preamble entry of the form
\begin{verbatim}
@@ -42,37 +47,49 @@
\item
{\tt defaultfam} will cause \verb|\familydefault| to be set to \verb|\sfdefault|, so that Montserrat becomes the default text font for the document.
\item {\tt alternates} will result in \verb|\sfdefault| being set to MontserratAlternates, with the rounder shapes.
-\item One of the options {\tt thin}, {\tt extralight}, {\tt light}, {\tt regular} may be specified to select the weight that should be used to render \LaTeX's {\tt regular}. (The default is {\tt regular}.)
-\item One of the options {\tt medium}, {\tt semibold}, {\tt bold}, {\tt extrabold}, {\tt black} may be specified to select the weight that should be used to render \LaTeX's {\tt bold}. (The default is {\tt bold}.)
-\item One of the options {\tt lining}, {\tt oldstyle} may be specified to select the figure style. (The default is {\tt lining}.)
-\item One of the options {\tt proportional}, {\tt tabular} may be specified to select the figure alignment. (The default is {\tt proportional}.)
+\item One of the options {\tt thin}, {\tt extralight}, {\tt light}, {\tt regular}, {\tt medium} may be specified to select the weight that should be used to render \LaTeX's {\tt regular}. (The default is {\tt regular}.)
+\item One of the options {\tt semibold}, {\tt bold}, {\tt extrabold}, {\tt black} may be specified to select the weight that should be used to render \LaTeX's {\tt bold}. (The default is {\tt bold}.)
+\item One of the options {\tt lining}, {\tt oldstyle} (or {\tt osf}) may be specified to select the figure style. (The default is {\tt lining}.)
+\item One of the options {\tt proportional} (or {\tt p}), {\tt tabular} (or {\tt t}) may be specified to select the figure alignment. (The default is {\tt proportional}.)
\end{itemize}
No matter which style you choose, you may specify the other using the construction \verb|{\montserratalt ...}|. (For example, this was used at the end of the first paragraph of this document to show the alternate version of ATWl.)
-The abbreviations for the weights in the {\tt fd} files are as follows.
+%The abbreviations for the weights in the {\tt fd} files are as follows.
+%
+%
+% \begin{tabular}{@{} ll @{}}
+% \toprule
+% Weight & abbrev \\
+% \midrule
+% thin & t \\
+% extralight & el \\
+% light & l \\
+% regular & m \\
+% medium & mb \\
+% semibold & sb \\
+% bold & b \\
+% extrabold & eb \\
+% black & k \\
+% \bottomrule
+% \end{tabular}
+
+As of version 1.02, it is easier to remember how to obtain weights other than LaTeX's {\tt regular} and {\tt bold}, however they may be have been selected. The available weights are named as follows:\par
+{\fontseries{thin}\selectfont thin}\\
+{\fontseries{extralight}\selectfont extralight}\\
+{\fontseries{light}\selectfont light}\\
+{\fontseries{regular}\selectfont regular}\\
+{\fontseries{medium}\selectfont medium}\\
+{\fontseries{semibold}\selectfont semibold}\\
+{\fontseries{bold}\selectfont bold}\\
+{\fontseries{extrabold}\selectfont extrabold}\\
+{\fontseries{black}\selectfont black}\\
- \begin{tabular}{@{} ll @{}}
- \toprule
- Weight & abbrev \\
- \midrule
- thin & t \\
- extralight & el \\
- light & l \\
- regular & m \\
- medium & mb \\
- semibold & sb \\
- bold & b \\
- extrabold & eb \\
- black & k \\
- \bottomrule
- \end{tabular}
-
-These may be used to render text in other weights. For example, while in a block of sans serif text,
+These names be used to render text any of these weights. For example, while in a block of sans serif text,
\begin{verbatim}
-{\fontseries{t}\selectfont x}
+{\fontseries{thin}\selectfont x}
\end{verbatim}
-will show as {\fontseries{t}\selectfont x} in thin weight.
+will render as {\fontseries{thin}\selectfont x} in thin weight.
Montserrat has four basic figure options, plus another four at smaller size. Other than the default figure style and alignment set in the package options, access to all other possible figure options is a little complicated, and you should devise macros for any you might use regularly.
@@ -84,10 +101,10 @@
Proportional lining & LF & {\fontfamily{Montserrat-LF}\selectfont 1} & \verb|{\fontfamily{Montserrat-LF}\selectfont 1}| \\
Tabular Oldstyle & TOsF & {\fontfamily{Montserrat-TOsF}\selectfont 1} & \verb|{\fontfamily{Montserrat-TOsF}\selectfont 1}| \\
Oldstyle & OsF & {\fontfamily{Montserrat-OsF}\selectfont 1} & \verb|{\fontfamily{Montserrat-OsF}\selectfont 1}| \\
- Superiors & Sup & {\sufigures 1} & \verb|{\sufigures 1}| or \textsu{1}\\
- Inferiors & Inf & {\infigures 1} & \verb|{\infigures 1}| or \textin{1}\\
- Numerators & Numr & {\nufigures 1} & \verb|{\nufigures 1}| or \textnu{1}\\
- Denominators & Dnom & {\defigures 1} & \verb|{\defigures 1}| or \textde{1}\\
+ Superiors & Sup & {\sufigures 1} & \verb|{\sufigures 1}| or \verb|\textsu{1}|\\
+ Inferiors & Inf & {\infigures 1} & \verb|{\infigures 1}| or \verb|\textin{1}|\\
+ Numerators & Numr & {\nufigures 1} & \verb|{\nufigures 1}| or \verb|\textnu{1}|\\
+ Denominators & Dnom & {\defigures 1} & \verb|{\defigures 1}| or \verb|\textde{1}|\\
\bottomrule
\end{tabular}
@@ -99,7 +116,7 @@
\textsc{Example macro definition:}\\
-Suppose you have set your default figure style in sans serif to proportional lining. (This is the default---you need not set any options to get this.) If you wish to have the option of proportional lining figures in sans serif made easier, you could modify the definitions in the {\tt.sty} file, as follows. Place the following in your preamble after loading Montserrat.
+Suppose you have set your default figure style in sans serif to proportional lining. (This is the default---you need not set any options to get this.) If you wish to have the option of proportional oldstyle figures in sans serif made easier, you could modify the definitions in the {\tt.sty} file, as follows. Place the following in your preamble after loading Montserrat.
\begin{verbatim}
\makeatletter
\DeclareRobustCommand{\sfosfstyle}{%
@@ -111,4 +128,11 @@
\makeatother
\end{verbatim}
+\section*{Usage with fontspec}
+Because the package supplies a file named {\tt montserrat.fontspec} whose contents list the {\tt otf} files that correspond to each of nine styles you may load {\tt montserrat} as the main text font with just
+\begin{verbatim}
+\usepackage{fontspec}
+\setmainfont{montserrat}
+\end{verbatim}
+This will use regular and bold weights for \LaTeX's regular and bold. If you wish other choices, you will have to suitably modify {\tt montserrat.fontspec}.
\end{document}
\ No newline at end of file
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/montserrat.doc.tlpobj new/tlpkg/tlpobj/montserrat.doc.tlpobj
--- old/tlpkg/tlpobj/montserrat.doc.tlpobj 2019-02-28 03:54:41.000000000 +0100
+++ new/tlpkg/tlpobj/montserrat.doc.tlpobj 2020-03-24 02:00:06.000000000 +0100
@@ -1,9 +1,9 @@
name montserrat.doc
category Package
-revision 43347
+revision 54512
shortdesc doc files of montserrat
relocated 1
-docfiles size=67
+docfiles size=132
RELOC/doc/fonts/montserrat/FONTLOG.txt
RELOC/doc/fonts/montserrat/OFL-FAQ.txt
RELOC/doc/fonts/montserrat/OFL.txt
++++++ montserrat.tar.xz ++++++
/work/SRC/openSUSE:Factory/texlive-specs-p/montserrat.tar.xz /work/SRC/openSUSE:Factory/.texlive-specs-p.new.3606/montserrat.tar.xz differ: char 25, line 1
++++++ mptopdf.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/context/scripts/mkii/mptopdf.man new/texmf-dist/doc/context/scripts/mkii/mptopdf.man
--- old/texmf-dist/doc/context/scripts/mkii/mptopdf.man 2019-02-24 16:12:57.000000000 +0100
+++ new/texmf-dist/doc/context/scripts/mkii/mptopdf.man 2020-02-05 22:46:49.000000000 +0100
@@ -1,6 +1,6 @@
-.TH "mptopdf" "1" "01-01-2018" "version 1.4.1" "convert MetaPost figures to PDF"
+.TH "mptopdf" "1" "01-01-2020" "version 1.4.1" "convert MetaPost figures to PDF"
.SH NAME
-.B mptopdf
+ mptopdf - convert MetaPost figures to PDF
.SH SYNOPSIS
.B mptopdf [
.I OPTIONS ...
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/mptopdf.1 new/texmf-dist/doc/man/man1/mptopdf.1
--- old/texmf-dist/doc/man/man1/mptopdf.1 2018-09-02 23:18:44.000000000 +0200
+++ new/texmf-dist/doc/man/man1/mptopdf.1 2020-02-05 22:49:44.000000000 +0100
@@ -1,6 +1,6 @@
-.TH "mptopdf" "1" "01-01-2018" "version 1.4.1" "convert MetaPost figures to PDF"
+.TH "mptopdf" "1" "01-01-2020" "version 1.4.1" "convert MetaPost figures to PDF"
.SH NAME
-.B mptopdf
+ mptopdf - convert MetaPost figures to PDF
.SH SYNOPSIS
.B mptopdf [
.I OPTIONS ...
Binary files old/texmf-dist/doc/man/man1/mptopdf.man1.pdf and new/texmf-dist/doc/man/man1/mptopdf.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mptopdf.doc.tlpobj new/tlpkg/tlpobj/mptopdf.doc.tlpobj
--- old/tlpkg/tlpobj/mptopdf.doc.tlpobj 2019-02-28 03:54:57.000000000 +0100
+++ new/tlpkg/tlpobj/mptopdf.doc.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,6 +1,6 @@
name mptopdf.doc
category Package
-revision 50112
+revision 54276
shortdesc doc files of mptopdf
docfiles size=6
texmf-dist/doc/context/scripts/mkii/mptopdf.man
++++++ mptopdf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/context/perl/mptopdf.pl new/texmf-dist/scripts/context/perl/mptopdf.pl
--- old/texmf-dist/scripts/context/perl/mptopdf.pl 2019-02-24 16:12:57.000000000 +0100
+++ new/texmf-dist/scripts/context/perl/mptopdf.pl 2020-02-05 22:46:49.000000000 +0100
@@ -3,6 +3,12 @@
# MikTeX users can set environment variable TEXSYSTEM to "miktex".
+# There have been suggestions to patch this script for dealing with different
+# output templates (a relative new metapost feature) but these have given
+# unwanted side effects. One can always wrap this script in another script
+# to deal with whatever patterns needed. We won't touch what has worked for
+# ages. (December 2019)
+
#D \module
#D [ file=mptopdf.pl,
#D version=2010.05.28, % 2000.05.29
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mptopdf.tlpobj new/tlpkg/tlpobj/mptopdf.tlpobj
--- old/tlpkg/tlpobj/mptopdf.tlpobj 2019-02-28 03:54:57.000000000 +0100
+++ new/tlpkg/tlpobj/mptopdf.tlpobj 2020-03-14 01:43:17.000000000 +0100
@@ -1,15 +1,15 @@
name mptopdf
category Package
-revision 50112
+revision 54276
shortdesc mpost to PDF, native MetaPost graphics inclusion
longdesc The mptopdf script does standalone conversion from mpost to
-longdesc PDF, using the supp-* and syst-* files. They also allow native
+longdesc PDF, using the supp-* and syst-* files. They also allow native
longdesc MetaPost graphics inclusion in LaTeX (via pdftex.def) and
-longdesc ConTeXt. They can be used independently of the rest of
-longdesc ConTeXt, yet are maintained as part of it. So in TeX Live we
-longdesc pull them out to this separate package for the benefit of LaTeX
-longdesc users who do not install the rest of ConTeXt. This can be
-longdesc found on CTAN in macros/pdftex/graphics.
+longdesc ConTeXt. They can be used independently of the rest of ConTeXt,
+longdesc yet are maintained as part of it. So in TeX Live we pull them
+longdesc out to this separate package for the benefit of LaTeX users who
+longdesc do not install the rest of ConTeXt. This can be found on CTAN
+longdesc in macros/pdftex/graphics.
depend plain
depend mptopdf.ARCH
execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" fmttriggers=plain
++++++ ms.doc.tar.xz ++++++
++++ 11842 lines of diff (skipped)
++++++ ms.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/ms/ragged2e.sty new/tex/latex/ms/ragged2e.sty
--- old/tex/latex/ms/ragged2e.sty 2009-06-13 02:24:58.000000000 +0200
+++ new/tex/latex/ms/ragged2e.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,314 +0,0 @@
-%%
-%% This is file `ragged2e.sty',
-%% generated with the docstrip utility.
-%%
-%% The original source files were:
-%%
-%% ragged2e.dtx (with options: `package')
-%%
-%% Copyright 1996..2009 Martin Schroeder.
-%%
-%% This file is part of the Ragged2e package
-%% -----------------------------------------
-%%
-%% This work may be distributed and/or modified under the
-%% conditions of the LaTeX Project Public License, either version 1.3
-%% of this license or (at your option) any later version.
-%% The latest version of this license is in
-%% http://www.latex-project.org/lppl.txt
-%% and version 1.3 or later is part of all distributions of LaTeX
-%% version 2005/12/01 or later.
-%%
-%% This work has the LPPL maintenance status `maintained'.
-%%
-%% The Current Maintainer of this work is Martin Schroeder.
-%%
-%% This work consists of the files ragged2e.dtx and ragged2e.ins
-%% and the derived file ragged2e.sty.
-%%
-\NeedsTeXFormat{LaTeX2e}[1996/10/24]
-\ProvidesPackage{ragged2e}
- [2009/05/21 v2.1 ragged2e Package (MS)]
-%% Copyright 1996..2009 by Martin Schr\"oder.
-%% \CharacterTable
-%% {Upper-case \A\B\C\D\E\F\G\H\I\J\K\L\M\N\O\P\Q\R\S\T\U\V\W\X\Y\Z
-%% Lower-case \a\b\c\d\e\f\g\h\i\j\k\l\m\n\o\p\q\r\s\t\u\v\w\x\y\z
-%% Digits \0\1\2\3\4\5\6\7\8\9
-%% Exclamation \! Double quote \" Hash (number) \#
-%% Dollar \$ Percent \% Ampersand \&
-%% Acute accent \' Left paren \( Right paren \)
-%% Asterisk \* Plus \+ Comma \,
-%% Minus \- Point \. Solidus \/
-%% Colon \: Semicolon \; Less than \<
-%% Equals \= Greater than \> Question mark \?
-%% Commercial at \@ Left bracket \[ Backslash \\
-%% Right bracket \] Circumflex \^ Underscore \_
-%% Grave accent \` Left brace \{ Vertical bar \|
-%% Right brace \} Tilde \~}
-%%
-%% \iffalse meta-comment
-%% ===================================================================
-%% @LaTeX-style-file{
-%% author = {Martin Schr\"oder},
-%% version = "2.1",
-%% date = "21 May 2009",
-%% filename = "ragged2e.sty",
-%% address = {Martin Schr\"oder
-%% Barmer Stra\"se 14
-%% 44137 Dortmund
-%% Germany}
-%% telephone = "+49-231-1206574",
-%% email = "martin@oneiros.de",
-%% docstring = "LaTeX package which defines new commands
-%% \Centering, \RaggedLeft, \RaggedRight and
-%% \justifying and new environments Center,
-%% FlushLeft, FlushRight and justify, which
-%% set ragged text and are easily configurable
-%% to allow hyphenation.
-%% Uses the everysel package.
-%% "
-%% }
-%% ===================================================================
-%% \fi
-\newif\if@raggedtwoe@originalcommands
-\newif\if@raggedtwoe@originalparameters
-\newif\if@raggedtwoe@footmisc
-\DeclareOption{OriginalCommands}{\@raggedtwoe@originalcommandstrue}
-\DeclareOption{originalcommands}{\@raggedtwoe@originalcommandstrue}
-\DeclareOption{NewCommands}{\@raggedtwoe@originalcommandsfalse}
-\DeclareOption{newcommands}{\@raggedtwoe@originalcommandsfalse}
-\DeclareOption{OriginalParameters}{\@raggedtwoe@originalparameterstrue}
-\DeclareOption{originalparameters}{\@raggedtwoe@originalparameterstrue}
-\DeclareOption{NewParameters}{\@raggedtwoe@originalparametersfalse}
-\DeclareOption{newparameters}{\@raggedtwoe@originalparametersfalse}
-\newcommand*{\@raggedtwoe@raggedrightboxes@opt}{
- \CheckCommand*{\@arrayparboxrestore}{%
- \let\if@nobreak\iffalse
- \let\if@noskipsec\iffalse
- \let\par\@@par
- \let\-\@dischyph
- \let\'\@acci\let\`\@accii\let\=\@acciii
- \parindent\z@ \parskip\z@skip
- \everypar{}%
- \linewidth\hsize
- \@totalleftmargin\z@
- \leftskip\z@skip \rightskip\z@skip \@rightskip\z@skip
- \parfillskip\@flushglue \lineskip\normallineskip
- \baselineskip\normalbaselineskip
- \sloppy}%
- \renewcommand{\@arrayparboxrestore}{%
- \let\if@nobreak\iffalse
- \let\if@noskipsec\iffalse
- \let\par\@@par
- \let\-\@dischyph
- \let\'\@acci\let\`\@accii\let\=\@acciii
- \parskip\z@skip
- \everypar{}%
- \linewidth\hsize
- \@totalleftmargin\z@
- \RaggedRight
- \lineskip\normallineskip
- \baselineskip\normalbaselineskip
- \sloppy}%
- \let\@raggedtwoe@raggedrightboxes@opt\relax
- }
-\DeclareOption{raggedrightboxes}{\@raggedtwoe@raggedrightboxes@opt}
-\DeclareOption{footnotes}{%
- \@raggedtwoe@footmisctrue
- \PassOptionsToPackage{ragged}{footmisc}%
- }
-\newcommand{\@raggedtwoe@abdhook}{%
- \PackageInfo{ragged2e}{ABD: executing \string\RaggedRight}%
- \RaggedRight
- \@ifundefined{@tocrmarg}{}{\edef\@tocrmarg{\@tocrmarg plus 2em}}%
- \let\@raggedtwoe@abdhook\relax
- }
-\newcommand{\@raggedtwoe@document@opt}{%
- \AtBeginDocument{\@raggedtwoe@abdhook}%
- \@raggedtwoe@raggedrightboxes@opt
- \@raggedtwoe@footmisctrue
- \let\@raggedtwoe@document@opt\relax
- }
-\DeclareOption{document}{\@raggedtwoe@document@opt}
-\DeclareOption*{%
- \if@raggedtwoe@footmisc
- \PassOptionsToPackage{\CurrentOption}{footmisc}%
- \else
- \OptionNotUsed
- \fi
- }
-%% ^^A -----------------------------
-\ExecuteOptions{originalcommands,newparameters}
-\ProcessOptions\relax
-\RequirePackage{everysel}
-\if@raggedtwoe@footmisc
- \RequirePackage{footmisc}[2002/08/28]
-\fi
-\newlength{\CenteringLeftskip}
-\newlength{\RaggedLeftLeftskip}
-\newlength{\RaggedRightLeftskip}
-\newlength{\CenteringRightskip}
-\newlength{\RaggedLeftRightskip}
-\newlength{\RaggedRightRightskip}
-\newlength{\CenteringParfillskip}
-\newlength{\RaggedLeftParfillskip}
-\newlength{\RaggedRightParfillskip}
-\newlength{\JustifyingParfillskip}
-\newlength{\CenteringParindent}
-\newlength{\RaggedLeftParindent}
-\newlength{\RaggedRightParindent}
-\newlength{\JustifyingParindent}
-\if@raggedtwoe@originalparameters
- \CenteringLeftskip\@flushglue
- \RaggedLeftLeftskip\@flushglue
- \RaggedRightLeftskip\z@skip
- \CenteringRightskip\@flushglue
- \RaggedLeftRightskip\z@skip
- \RaggedRightRightskip\@flushglue
- \CenteringParfillskip\z@skip
- \RaggedLeftParfillskip\z@skip
- \RaggedRightParfillskip\@flushglue
- \CenteringParindent\z@
- \RaggedLeftParindent\z@
- \RaggedRightParindent\z@
-\else
- \CenteringLeftskip\z@\@plus\tw@ em
- \RaggedLeftLeftskip\z@\@plus\tw@ em
- \RaggedRightLeftskip\z@skip
- \CenteringRightskip\z@\@plus\tw@ em
- \RaggedLeftRightskip\z@skip
- \RaggedRightRightskip\z@\@plus\tw@ em
- \CenteringParfillskip\z@skip
- \RaggedLeftParfillskip\z@skip
- \RaggedRightParfillskip\@flushglue
- \CenteringParindent\z@
- \RaggedLeftParindent\z@
- \RaggedRightParindent\z@
-\fi
-\JustifyingParfillskip\@flushglue
-\JustifyingParindent\parindent
-\newif\if@raggedtwoe@spaceskip
-\newcommand{\@raggedtwoe@everyselectfont}{%
- \if@raggedtwoe@spaceskip
- \ifdim\fontdimen\thr@@\font=\z@\relax
- \spaceskip\z@
- \else
- \spaceskip\fontdimen\tw@\font
- \fi
- \else
- \spaceskip\z@
- \fi
- }
-\EverySelectfont{\@raggedtwoe@everyselectfont}
-\let\@raggedtwoe@savedcr\\
-\let\@raggedtwoe@saved@gnewline\@gnewline
-\newcommand*{\@raggedtwoe@gnewline}[1]{%
- \ifvmode
- \@nolnerr
- \else
- \unskip
- \ifmmode
- \reserved@e {\reserved@f #1}\nobreak \hfil \break
- \else
- \reserved@e {\reserved@f #1}{\parskip\z@\par}%
- \fi
- \fi
- }
-\newcommand{\Centering}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\CenteringLeftskip
- \@rightskip\CenteringRightskip
- \rightskip\@rightskip
- \parfillskip\CenteringParfillskip
- \parindent\CenteringParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\RaggedLeft}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\RaggedLeftLeftskip
- \@rightskip\RaggedLeftRightskip
- \rightskip\@rightskip
- \parfillskip\RaggedLeftParfillskip
- \parindent\RaggedLeftParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\RaggedRight}{%
- \ifx\\\@raggedtwoe@savedcr
- \let\\\@centercr
- \fi
- \let\@gnewline\@raggedtwoe@gnewline
- \leftskip\RaggedRightLeftskip
- \@rightskip\RaggedRightRightskip
- \rightskip\@rightskip
- \parfillskip\RaggedRightParfillskip
- \parindent\RaggedRightParindent
- \@raggedtwoe@spaceskiptrue
- \@raggedtwoe@everyselectfont
- }
-\newcommand{\justifying}{%
- \let\\\@raggedtwoe@savedcr
- \let\@gnewline\@raggedtwoe@saved@gnewline
- \leftskip\z@
- \@rightskip\z@
- \rightskip\@rightskip
- \parfillskip\JustifyingParfillskip
- \parindent\JustifyingParindent
- \@raggedtwoe@spaceskipfalse
- \@raggedtwoe@everyselectfont
- }
-\newenvironment{Center}{%
- \trivlist
- \Centering\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{FlushLeft}{%
- \trivlist
- \RaggedRight\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{FlushRight}{%
- \trivlist
- \RaggedLeft\item\relax
- }{%
- \endtrivlist
- }
-\newenvironment{justify}{%
- \trivlist
- \justifying\item\relax
- }{%
- \endtrivlist
- }
-\if@raggedtwoe@originalcommands
-\else
- \let\LaTeXcentering\centering
- \let\LaTeXraggedleft\raggedleft
- \let\LaTeXraggedright\raggedright
- \let\centering\Centering
- \let\raggedleft\RaggedLeft
- \let\raggedright\RaggedRight
- \let\LaTeXcenter\center
- \let\endLaTeXcenter\endcenter
- \let\LaTeXflushleft\flushleft
- \let\endLaTeXflushleft\endflushleft
- \let\LaTeXflushright\flushright
- \let\endLaTeXflushright\endflushright
- \let\center\Center
- \let\endcenter\endCenter
- \let\flushleft\FlushLeft
- \let\endflushleft\endFlushLeft
- \let\flushright\FlushRight
- \let\endflushright\endFlushRight
-\fi
-\endinput
-%%
-%% End of file `ragged2e.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ms.tlpobj new/tlpkg/tlpobj/ms.tlpobj
--- old/tlpkg/tlpobj/ms.tlpobj 2019-02-28 03:54:58.000000000 +0100
+++ new/tlpkg/tlpobj/ms.tlpobj 2019-07-31 01:54:23.000000000 +0200
@@ -1,23 +1,23 @@
name ms
category Package
-revision 42428
+revision 51784
shortdesc Various LaTeX packages by Martin Schroder
relocated 1
longdesc A bundle of LaTeX packages by Martin Schroder; the collection
-longdesc comprises: count1to, make use of fixed TeX counters; everysel,
-longdesc set commands to execute every time a font is selected;
-longdesc everyshi, set commands to execute whenever a page is shipped
-longdesc out; multitoc, typeset the table of contents in multiple
-longdesc columns; prelim2e, mark typeset pages as preliminary; and
-longdesc ragged2e, typeset ragged text and allow hyphenation.
-runfiles size=12
+longdesc comprises: count1to, make use of TeX counters; everysel, set
+longdesc commands to execute every time a font is selected; everyshi,
+longdesc set commands to execute whenever a page is shipped out;
+longdesc multitoc, typeset the table of contents in multiple columns;
+longdesc and prelim2e, mark typeset pages as preliminary. ragged2e,
+longdesc which used to be part of this bundle, has become an independent
+longdesc package.
+runfiles size=9
RELOC/tex/latex/ms/count1to.sty
RELOC/tex/latex/ms/everysel.sty
RELOC/tex/latex/ms/everyshi.sty
RELOC/tex/latex/ms/multitoc.sty
RELOC/tex/latex/ms/prelim2e.sty
- RELOC/tex/latex/ms/ragged2e.sty
catalogue-ctan /macros/latex/contrib/ms
-catalogue-date 2016-06-24 19:18:15 +0200
+catalogue-date 2019-07-30 20:37:59 +0200
catalogue-license lppl
catalogue-topics collection
++++++ mslapa.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mslapa.doc.tlpobj new/tlpkg/tlpobj/mslapa.doc.tlpobj
--- old/tlpkg/tlpobj/mslapa.doc.tlpobj 2019-02-28 03:54:59.000000000 +0100
+++ new/tlpkg/tlpobj/mslapa.doc.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,6 +1,6 @@
name mslapa.doc
category Package
-revision 17514
+revision 54080
shortdesc doc files of mslapa
relocated 1
docfiles size=75
++++++ mslapa.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mslapa.tlpobj new/tlpkg/tlpobj/mslapa.tlpobj
--- old/tlpkg/tlpobj/mslapa.tlpobj 2019-02-28 03:54:59.000000000 +0100
+++ new/tlpkg/tlpobj/mslapa.tlpobj 2020-03-04 23:52:58.000000000 +0100
@@ -1,6 +1,6 @@
name mslapa
category Package
-revision 17514
+revision 54080
shortdesc Michael Landy's APA citation style
relocated 1
longdesc LaTeX and BibTeX style files for a respectably close
@@ -11,6 +11,5 @@
RELOC/tex/latex/mslapa/mslapa.sty
catalogue-also apacite apa
catalogue-ctan /macros/latex/contrib/mslapa
-catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
-catalogue-topics psychology journalpub bibtex-sty
+catalogue-topics psychology journalpub bibtex-sty apa
++++++ multicolrule.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multicolrule/README.md new/doc/latex/multicolrule/README.md
--- old/doc/latex/multicolrule/README.md 2019-01-02 23:38:45.000000000 +0100
+++ new/doc/latex/multicolrule/README.md 2019-10-04 22:48:54.000000000 +0200
@@ -26,6 +26,3 @@
`makeindex -s gglo.ist -o multicolrule.gls multicolrule.glo`.
This package requires expl3 and xparse.
- % |\DeclareMCRulePattern| \marg{name} \marg{key-value list}
- % \end{syntax}
-
Binary files old/doc/latex/multicolrule/mcrule-examples.pdf and new/doc/latex/multicolrule/mcrule-examples.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multicolrule/mcrule-examples.tex new/doc/latex/multicolrule/mcrule-examples.tex
--- old/doc/latex/multicolrule/mcrule-examples.tex 2019-01-02 23:38:45.000000000 +0100
+++ new/doc/latex/multicolrule/mcrule-examples.tex 2019-10-04 22:48:54.000000000 +0200
@@ -2,17 +2,19 @@
\documentclass{article}
\usepackage[left=1in,right=1in,top=1in,bottom=1in]{geometry}
\usepackage{fontspec}
-\usepackage[tikz]{multicolrule}[2018/12/31]
+\usepackage[tikz]{multicolrule}[2019/10/01]
\usepackage{lipsum}
+\usepackage{fancyvrb}
\usepackage{bbding}
\usepackage{pgfornament}
\usepackage{bidi}
+\usetikzlibrary{calc}
\setlength{\columnsep}{24pt}
\setlength{\columnseprule}{.5pt}
\begin{document}
\section*{Style Gallery}
-This file gives brief examples covering all the defined line styles and
+This file gives brief examples covering all defined line styles and
other functions available in \texttt{multicolrule}. See the documentation
for instructions on how to set them in your own documents.
@@ -157,13 +159,22 @@
\lipsum[1-2]
\end{multicols}
-\setlength{\columnsep}{50pt}
-\begin{multicols}{2}[Custom Line (color gray, 4 repeats), just because we can]
+\begin{multicols}{2}[Custom line that is too wide for the separator]
\SetMCRule{color=gray,repeat=4,repeat-distance=4pt,width=1pt,custom-line={\path (TOP) to [ornament=88] (BOT);}}
\lipsum[1-2]
\end{multicols}
-\newpage
+\begin{multicols}{2}[Custom line with horizontal lines flush with vertical rule]
+ \SetMCRule{color=gray,width=0.4pt, expand=2pt, custom-line={
+ \coordinate (TOPLEFT) at ($(TOP)-(\columnwidth+.5\columnsep,\columnseprule)$);
+ \coordinate (TOPRIGHT) at ($(TOP)+(\columnwidth+.5\columnsep,-\columnseprule)$);
+ \coordinate (BOTLEFT) at ($(BOT)-(\columnwidth+.5\columnsep,-\columnseprule)$);
+ \coordinate (BOTRIGHT) at ($(BOT)+(\columnwidth+.5\columnsep,\columnseprule)$);
+ \draw[line width=\columnseprule] (TOPLEFT) -- (TOPRIGHT)
+ (TOP) -- (BOT) (BOTLEFT) -- (BOTRIGHT);}}
+ \lipsum[1-2]
+\end{multicols}
+
\subsection*{Extended Rules}
\setlength{\columnsep}{24pt}
@@ -177,16 +188,32 @@
\lipsum[1]
\end{multicols}
-\begin{multicols}{2}[Dashed -- shrink both 16pt]
- \SetMCRule{line-style=dashed,extend-top=-16pt,extend-bot=-16pt}
+\begin{multicols}{2}[Dashed -- expand -8pt]
+ \SetMCRule{line-style=dashed,expand=-8pt}
+ \lipsum[1]
+\end{multicols}
+
+\begin{multicols}{2}[Dots -- expand 8pt]
+ \SetMCRule{line-style=dots,expand=8pt}
\lipsum[1]
\end{multicols}
-\begin{multicols}{2}[Extend-Fill with extend-reserve]
+\begin{multicols}{2}[Dots -- shift 16pt]
+ \SetMCRule{line-style=dots,shift=16pt}
+ \lipsum[1-2]
+\end{multicols}
+
+\begin{multicols}{2}[Extend-fill with extend-reserve]
\SetMCRule{line-style=solid,extend-fill,extend-reserve=\baselineskip}
- \lipsum[1-5]
+ \lipsum[1-2]
+\end{multicols}
+And something at the end to show the reserved space.
+
+\begin{multicols}{2}[Strut with extend-fill + extend-reserve]
+ \SetMCRule{line-style=strut,extend-fill,extend-reserve=\baselineskip}
+ \lipsum[1-3]
\end{multicols}
-And something at the end to show the reserved space
+This text is here to show the effect of the strut used as a separator above.
\subsection*{Patterns}
@@ -194,7 +221,7 @@
\DeclareMCRulePattern{right-hand}{custom-tile={\HandRight}{8pt}{8pt}}
\DeclareMCRulePattern{shrinking}{line-style=solid,color=blue,extend-top=-16pt}
\begin{multicols}{3}[Alternating Patterns]
- \SetMCRule{patterns={right-hand,left-hand}}
+ \SetMCRule{patterns={left-hand,right-hand}}
\lipsum[1-3]
\end{multicols}
@@ -225,6 +252,12 @@
\lipsum[1-2]
\end{multicols}
+\DeclareMCRulePattern{invisible}{width=thin,line-style=strut}
+\SetMCRule{patterns={left-hand,invisible,right-hand}}
+\begin{multicols}{4}[Invisible middle divider with strut]
+ \raggedcolumns
+ \lipsum[1-2]
+\end{multicols}
\DeclareMCRulePattern{blue-double}{width=thick,line-style=solid,color=blue,double=3pt}
\DeclareMCRulePattern{orange-triple}{width=thick,line-style=solid,color=orange,triple=3pt}
Binary files old/doc/latex/multicolrule/multicolrule.pdf and new/doc/latex/multicolrule/multicolrule.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicolrule.doc.tlpobj new/tlpkg/tlpobj/multicolrule.doc.tlpobj
--- old/tlpkg/tlpobj/multicolrule.doc.tlpobj 2019-02-28 03:55:02.000000000 +0100
+++ new/tlpkg/tlpobj/multicolrule.doc.tlpobj 2019-10-05 01:54:43.000000000 +0200
@@ -1,9 +1,9 @@
name multicolrule.doc
category Package
-revision 49579
+revision 52283
shortdesc doc files of multicolrule
relocated 1
-docfiles size=150
+docfiles size=155
RELOC/doc/latex/multicolrule/README.md
RELOC/doc/latex/multicolrule/mcrule-examples.pdf
RELOC/doc/latex/multicolrule/mcrule-examples.tex
++++++ multicolrule.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multicolrule/multicolrule.sty new/tex/latex/multicolrule/multicolrule.sty
--- old/tex/latex/multicolrule/multicolrule.sty 2019-01-02 23:38:45.000000000 +0100
+++ new/tex/latex/multicolrule/multicolrule.sty 2019-10-04 22:48:54.000000000 +0200
@@ -15,10 +15,7 @@
%%
\RequirePackage{expl3}
\RequirePackage{xparse}
- % |\DeclareMCRulePattern| \marg{name} \marg{key-value list}
- % \end{syntax}
-
-\ProvidesExplPackage {multicolrule} {2019/01/01} {1.2}
+\ProvidesExplPackage {multicolrule} {2019/10/01} {1.3}
{Decorative vertical rules between columns}
\RequirePackage{l3keys2e}
\RequirePackage{xpatch}
@@ -63,6 +60,7 @@
\ProcessKeysOptions{mcrule-opts}
\cs_new:Npn \__mcrule_column_height: {}
\cs_new:Npn \__mcrule_column_depth: {}
+\cs_new:Npn \__mcrule_column_overflow: {0pt}
\cs_new_protected:Npn \__mcrule_patch_mcol_output:N #1
{
\xpatchcmd{#1} {\columnseprulecolor\vrule\@width\columnseprule}
@@ -85,7 +83,6 @@
\cs_gset:Npn \__mcrule_column_height: {\box_ht:N \@outputbox}
\cs_gset:Npn \__mcrule_column_depth: {\box_dp:N \@outputbox}
\__mcrule_patch_twocol_output:N \@outputdblcol
- \__mcrule_patch_twocol_output:N \@outputdblcol
\AfterPackage!{bidi}
{
\__mcrule_patch_twocol_output:N \RTL@outputdblcol
@@ -96,8 +93,18 @@
\RequirePackage{multicol}
\__mcrule_patch_mcol_output:N \LR@column@boxes
\__mcrule_patch_mcol_output:N \RL@column@boxes
- \cs_gset:Npn \__mcrule_column_height: {\box_ht:N \mult@rightbox}
- \cs_gset:Npn \__mcrule_column_depth: {\dimen\tw@}
+ \cs_gset:Npn \__mcrule_column_height:
+ {
+ \box_ht:N \mult@rightbox
+ }
+ \cs_gset:Npn \__mcrule_column_depth:
+ {
+ \dim_max:nn {\dimen\tw@}{\box_dp:N \mult@rightbox}
+ }
+\cs_gset:Npn \__mcrule_column_overflow:
+{
+ \dim_max:nn {\box_ht:N \mult@nat@firstbox - \box_ht:N \mult@rightbox}{0pt}
+}
\LRmulticolcolumns
\AfterPackage!{bidi}
{
@@ -124,7 +131,8 @@
{
\int_gset:Nn \g__mcrule_pattern_count_int {\c_one_int}
}
- \tl_set:Nx \l_tmpa_tl {\seq_item:Nn \l__mcrule_pattern_list_seq {\g__mcrule_pattern_count_int} }
+ \tl_set:Nx \l_tmpa_tl {\seq_item:Nn \l__mcrule_pattern_list_seq
+ {\g__mcrule_pattern_count_int} }
\tl_if_blank:VF \l_tmpa_tl
{
\__mcrule_set_pattern:V \l_tmpa_tl
@@ -151,11 +159,12 @@
\cs_new:Npn \__mcrule_column_total_height:
{
\dim_eval:n {\__mcrule_column_height: + \__mcrule_column_depth: +
- \__mcrule_extend_column_top: + \__mcrule_extend_column_bottom:}
+ \__mcrule_extend_column_top: + \__mcrule_column_overflow: + \__mcrule_extend_column_bottom:}
}
\cs_new:Npn \__mcrule_column_total_depth:
{
- \dim_eval:n {\__mcrule_column_depth: + \__mcrule_extend_column_bottom:}
+ \dim_eval:n {\__mcrule_column_depth: + \__mcrule_column_overflow: +
+ \__mcrule_extend_column_bottom:}
}
\cs_new:Npn \__mcrule_extend_column_top:
{
@@ -188,7 +197,9 @@
\vbox_to_ht:nn {\__mcrule_column_total_height:}
{
\tex_vfill:D
- \tex_kern:D #2 \hbox:n{#1} \tex_kern:D #3
+ \tex_kern:D \dim_eval:n {#2} \exp_stop_f:
+ \hbox:n{#1}
+ \tex_kern:D \dim_eval:n {#3} \exp_stop_f:
\tex_vfill:D
}
}
@@ -201,7 +212,9 @@
{
\tex_cleaders:D \vbox:n
{
- \tex_kern:D #2 \hbox:n{#1} \tex_kern:D #3
+ \tex_kern:D \dim_eval:n {#2} \exp_stop_f:
+ \hbox:n{#1}
+ \tex_kern:D \dim_eval:n {#3} \exp_stop_f:
}
\tex_vfill:D
}
@@ -221,6 +234,10 @@
{
\rule[-\__mcrule_column_total_depth:]{\columnseprule}{\__mcrule_column_total_height:}
}
+\cs_new:Npn \__mcrule_strut:
+{
+ \rule[-\__mcrule_column_total_depth:]{0pt}{\__mcrule_column_total_height:}
+}
\bool_if:NTF \g__mcrule_use_tikz_bool
{
\ExplSyntaxOff
@@ -306,11 +323,21 @@
extend-fill .bool_set:N = \l__mcrule_extend_fill_bool,
extend-fill .default:n = true,
extend-reserve .dim_set:N = \l__mcrule_extend_reserve_dim,
+ expand .code:n = {
+ \dim_set:Nn \l__mcrule_extend_bot_dim {#1}
+ \dim_set:Nn \l__mcrule_extend_top_dim {#1}
+ },
+ shift .code:n = {
+ \dim_set:Nn \l__mcrule_extend_bot_dim {#1}
+ \dim_set:Nn \l__mcrule_extend_top_dim {\fp_to_dim:n {-1 * \l__mcrule_extend_bot_dim}}
+ },
line-style .choice:,
line-style / default .code:n = \cs_set:Npn \mcrule_divider:
{\vrule\@width\columnseprule},
line-style / solid .code:n = \cs_set:Npn \mcrule_divider:
{\__mcrule_solid_line:},
+ line-style / strut .code:n = \cs_set:Npn \mcrule_divider:
+ {\__mcrule_strut:},
line-style / dots .code:n = \cs_set:Npn \mcrule_divider:
{\__mcrule_tile_pattern:nnn {.}{1pt}{1pt}},
line-style / dense-dots .code:n = \cs_set:Npn \mcrule_divider:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicolrule.tlpobj new/tlpkg/tlpobj/multicolrule.tlpobj
--- old/tlpkg/tlpobj/multicolrule.tlpobj 2019-02-28 03:55:02.000000000 +0100
+++ new/tlpkg/tlpobj/multicolrule.tlpobj 2019-10-05 01:54:44.000000000 +0200
@@ -1,6 +1,6 @@
name multicolrule
category Package
-revision 49579
+revision 52283
shortdesc Decorative rules between columns
relocated 1
longdesc This package lets you customize the appearance of the vertical
@@ -10,12 +10,12 @@
longdesc macro provided by the standard classes (and related classes
longdesc such as the KOMA-Script equivalents). The package depends on
longdesc expl3 and xparse.
-runfiles size=4
+runfiles size=5
RELOC/tex/latex/multicolrule/multicolrule.sty
catalogue-contact-bugs https://github.com/polysyllabic/multicolrule/issues
catalogue-contact-repository https://github.com/polysyllabic/multicolrule
catalogue-ctan /macros/latex/contrib/multicolrule
-catalogue-date 2019-01-01 23:43:18 +0100
+catalogue-date 2019-10-04 14:50:49 +0200
catalogue-license lppl1.3c
catalogue-topics decoration rule line-patt line-weight expl3
-catalogue-version 1.2
+catalogue-version 1.3
++++++ multirow.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/README new/doc/latex/multirow/README
--- old/doc/latex/multirow/README 2019-01-01 23:50:59.000000000 +0100
+++ new/doc/latex/multirow/README 2019-05-31 23:45:57.000000000 +0200
@@ -1,6 +1,6 @@
-multirow.sty 2019/01/01 v2.4
-bigstruts.sty 2019/01/01 v2.4
-bigdelim.sty 2019/01/01 v2.4
+multirow.sty 2019/05/31 v2.5
+bigstruts.sty 2019/05/31 v2.5
+bigdelim.sty 2019/05/31 v2.5
Original Author: Jerry Leichter
Current Author: Piet van Oostrum
Binary files old/doc/latex/multirow/multirow.pdf and new/doc/latex/multirow/multirow.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.doc.tlpobj new/tlpkg/tlpobj/multirow.doc.tlpobj
--- old/tlpkg/tlpobj/multirow.doc.tlpobj 2019-02-28 03:55:04.000000000 +0100
+++ new/tlpkg/tlpobj/multirow.doc.tlpobj 2019-06-01 01:38:46.000000000 +0200
@@ -1,6 +1,6 @@
name multirow.doc
category Package
-revision 49572
+revision 51278
shortdesc doc files of multirow
relocated 1
docfiles size=151
++++++ multirow.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigdelim.sty new/tex/latex/multirow/bigdelim.sty
--- old/tex/latex/multirow/bigdelim.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/bigdelim.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigdelim}
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Create big delimiters in tabular or array]
\RequirePackage{multirow}
\newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/bigstrut.sty new/tex/latex/multirow/bigstrut.sty
--- old/tex/latex/multirow/bigstrut.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/bigstrut.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,7 +23,7 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{bigstrut}
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Provide larger struts in tabulars]
\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt
\newcommand\bigstrut[1][x]{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/multirow/multirow.sty new/tex/latex/multirow/multirow.sty
--- old/tex/latex/multirow/multirow.sty 2019-01-01 23:50:59.000000000 +0100
+++ new/tex/latex/multirow/multirow.sty 2019-05-31 23:45:57.000000000 +0200
@@ -23,13 +23,14 @@
%%
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{multirow}%
- [2019/01/01 v2.4
+ [2019/05/31 v2.5
Span multiple rows of a table]%
\newif\ifmultirowdebug
\DeclareOption{debug}{\multirowdebugtrue}
\DeclareOption{longtable}{%
\AtBeginDocument{%
-\def\@cline#1-#2\@nil{%
+\@ifundefined{CT@arc}
+{\def\@cline#1-#2\@nil{%
\omit
\@multicnt#1%
\advance\@multispan\m@ne
@@ -39,7 +40,18 @@
\advance\@multispan\@ne
\leaders\hrule\@height\arrayrulewidth\hfill
\cr
- \noalign{\nobreak\vskip-\arrayrulewidth}}
+ \noalign{\nobreak\vskip-\arrayrulewidth}}}
+{\def\@cline#1-#2\@nil{%
+ \omit
+ \@multicnt#1%
+ \advance\@multispan\m@ne
+ \ifnum\@multicnt=\@ne\@firstofone{&\omit}\fi
+ \@multicnt#2%
+ \advance\@multicnt-#1%
+ \advance\@multispan\@ne
+ {\CT@arc@\leaders\hrule\@height\arrayrulewidth\hfill}%
+ \cr
+ \noalign{\nobreak\vskip-\arrayrulewidth}}}
}}
\DeclareOption{supertabular}{%
\AtBeginDocument{%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multirow.tlpobj new/tlpkg/tlpobj/multirow.tlpobj
--- old/tlpkg/tlpobj/multirow.tlpobj 2019-02-28 03:55:04.000000000 +0100
+++ new/tlpkg/tlpobj/multirow.tlpobj 2019-06-01 01:38:47.000000000 +0200
@@ -1,6 +1,6 @@
name multirow
category Package
-revision 49572
+revision 51278
shortdesc Create tabular cells spanning multiple rows
relocated 1
longdesc The package has a lot of flexibility, including an option for
@@ -13,7 +13,7 @@
RELOC/tex/latex/multirow/multirow.sty
catalogue-also bigstrut bigdelim
catalogue-ctan /macros/latex/contrib/multirow
-catalogue-date 2019-01-01 14:36:00 +0100
+catalogue-date 2019-05-31 16:05:47 +0200
catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 2.4
+catalogue-version 2.5
++++++ musicography.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/musicography/README.md new/doc/latex/musicography/README.md
--- old/doc/latex/musicography/README.md 2017-10-31 22:23:51.000000000 +0100
+++ new/doc/latex/musicography/README.md 2020-01-29 23:39:07.000000000 +0100
@@ -2,7 +2,7 @@
This package makes available the most commonly used symbols in writing about
music in a way that can be used with `pdflatex` and looks consistent and
-attractive.
+attractive. (It also works with `xelatex`.)
It includes accidentals, meters, and notes of different rhythmic values.
The package provides a flexible, user-friendly interface written using `xparse`.
Binary files old/doc/latex/musicography/musicography.pdf and new/doc/latex/musicography/musicography.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/musicography/musicography.tex new/doc/latex/musicography/musicography.tex
--- old/doc/latex/musicography/musicography.tex 2018-05-26 00:32:19.000000000 +0200
+++ new/doc/latex/musicography/musicography.tex 2020-01-29 23:39:07.000000000 +0100
@@ -14,8 +14,7 @@
{\end{tabular}\end{quote}}
\usepackage[
- pdftitle={The musicography Package: Symbols for Music Writing with
- pdflatex},
+ pdftitle={The musicography Package: Symbols for Music Writing},
pdfauthor={Andrew A. Cashner},
pdfsubject={LaTeX package}, pdfkeywords={LaTeX, symbols, music, musicology, humanities}
]{hyperref}
@@ -27,24 +26,29 @@
{\nolinkurl{andrewacashner@gmail.com}}%
}%
}
-\date{May 21, 2018}
+\date{January 29, 2020}
\begin{document}
\maketitle
-Font packages for \code{pdflatex} only provided a limited range of musical
-symbols.
+Most \LaTeX{} font packages and freely available fonts only provided a limited
+range of musical symbols.
The \code{lilyglyphs} package uses Lilypond's fonts, but requires
\code{lualatex}.
This package makes available the most commonly used symbols in writing about
-music in a way that can be used with \code{pdflatex} and looks consistent and
-attractive.
-It includes accidentals, meters, and notes of different rhythmic values.
+music in a way that looks consistent and attractive.
+It is especially useful for \code{pdflatex} but also works alongside Unicode
+fonts with \code{xelatex}.
+It includes accidentals, meters, notes of different rhythmic values, and
+automatic formatting of figured bass.
This package builds on the approach used in the \code{harmony} package, where
the symbols are taken from the MusiXTeX fonts.
But it provides a larger range of symbols and a more flexible, user-friendly
interface written using \code{xparse}.
+The package is meant to work hand-in-hand with my \code{semantic-markup}
+package, and overrides some of its music-symbol commands with better
+alternatives.
\tableofcontents
@@ -58,6 +62,9 @@
The \code{bigger} option provides larger font sizes that match better with
certain fonts.
+The package now (2019) provides full support for figured-bass notation using the
+\verb|\musFig| command.
+
The \verb|\musNumFont| command allows you to change the font of the numerals
used.
For example, if using the \code{ebgaramond} font package, it looks better if you
@@ -66,6 +73,7 @@
\verb|\renewcommand{\musNumFont}[1]{\liningnums{#1}}|.
\end{quote}
+
\section{Symbols and Commands}
\subsection{Accidentals}
@@ -92,6 +100,8 @@
Eighth note (corchea) & \verb|\musEighth| or \verb|\musCorchea| &
\musEighth\\
Sixteenth note & \verb|\musSixteenth| & \musSixteenth\\
+ Thirty-second note & \verb|\musThirtySecond| & \musThirtySecond\\
+ Sixty-fourth note & \verb|\musSixtyFourth| & \musSixtyFourth\\
\end{codetable}
A dot may be added to any of the above by adding \code{Dotted} to the end of the
@@ -100,6 +110,8 @@
\begin{codetable}
Dotted whole note & \verb|\musWholeDotted| & \musWholeDotted\\
Dotted quarter note & \verb|\musQuarterDotted| & \musQuarterDotted\\
+ Dotted thirty-second note & \verb|\musThirtySecondDotted| &
+ \musThirtySecondDotted\\
\end{codetable}
\subsection{Meter Signatures}
@@ -111,12 +123,66 @@
Ternary with $3:2$ proportion & \verb|\meterCThreeTwo| &
\meterCThreeTwo\\
Spanish 17th-cent. ternary & \verb|\meterCZ| & \meterCZ\\
+ Medieval \term{tempus perfectum} & \verb|\meterO| & \meterO\\
\end{codetable}
-For other time signatures, use \verb|\musMeter{}{}|.
-The command \verb|\musFigures| is an alias for \verb|\musMeter| that can be used
-for notating figured bass.
-Both commands take two arguments and stack the arguments vertically.
+For other time signatures, use \verb|\musMeter{}{}|; the two arguments are the
+numerator and denominator of the fraction, respectively.
+
+\subsection{Figured Bass}
+
+For figured-bass notation, use \verb|\musFig{}|.
+The command, as of May 2019 now re-implemented using the \code{stackengine}
+package, takes a single argument which may contain as many space-separated
+elements as you like.
+(The \verb|\musFig| command is implemented with \verb|\musStack{}|, which is
+also used to for \verb|\musMeter|.)
+
+The elements in the argument will be stacked vertically and left-aligned.
+Multiple figures in a row should be enclosed in brackets if there are spaces
+between them.
+
+To align figures when there are empty slots, as in \musFig{6--5
+\noFig[5--]\musSharp}, use \verb|\noFig[]|.
+It will insert horizontal space the
+same width as its optional argument when typeset; the default value is the
+width of the numeral 5.
+It does this using \verb|\hphantom|, so you should supply the same text in the
+argument as the figure with which you want to align.
+The code for the example at the beginning of this paragraph was
+\verb|\musFig{6--5 \noFig[5--]\musSharp}|.
+
+The font may be controlled by redefining \verb|\musFigFont{}|.
+Its default value is as follows:
+\begin{Verbatim}
+\NewDocumentCommand{\musFigFont}{}{%
+ \scriptsize
+ \let\musFontLarge\musFontBig
+}
+\end{Verbatim}
+This reduces the size of numbers and the music font so that they fit better with
+surrounding text and so that numerals and accidentals in the figures match.
+
+
+
+{\renewcommand{\arraystretch}{2.5}
+\small
+\begin{codetable}
+ Two figures & \verb|\musFig{7 5\musSharp}|
+ & \musFig{7 5\musSharp}\\
+ Three figures & \verb|\musFig{7\musFlat{} 5 3}|
+ & \musFig{7\musFlat{} 5 3}\\
+ Four figures & \verb|\musFig{7 5 4 2}| &
+ \musFig{9 7 5 3}\\
+ Voice leading & \verb|\musFig{7--6 5--4 3}|
+ & \musFig{7--6 5--4 3}\\
+ Voice leading & \verb|\musFig{6--7 4--5 \noFig[2--]3}|
+ & \musFig{7--6 5--4 \noFig[2--]3}\\
+ Multiple figures per row
+ & \verb|\musFig{{6\musFlat{} 5} {\noFig[6\musFlat] \musSharp}}|
+ & \musFig{{6\musFlat{} 5} {\noFig[6\musFlat] \musSharp}}\\
+\end{codetable}}
+
\subsection{Customization}
@@ -129,14 +195,36 @@
\section{Changes}
-\begin{tabular}{r p{0.75\textwidth}}
- 2018/05/21 & Override semantic-markup's \verb|\fl|, \verb|\sh|, \verb|\na|
- commands if it is loaded \\
- 2017/10/31 & Corrected glyph used for \verb|\musHalf| and documented
- \verb|\musMeter| and \verb|\musFigures|\\
- 2017/08/29 & First version on CTAN\\
- 2017/04/12 & Created\\
-\end{tabular}
+\begin{itemize}
+ \item[2020-01-29] Reduced stack gap for \verb|\musFig|
+ \item[2019/11/24] Fix \verb|\MeterCThreeTwo| so that numbers are stacked
+ and aligned correctly
+ \item[2019/05/28] Bux fixes and new features, especially figured bass
+ \begin{itemize}
+ \item Fix issue 1 on Bitbucket, thanks to Christian Mondrup
+ \begin{itemize}
+ \item Correct mistaken notehead symbol for values less than
+ quarter note (was hollow, now filled)
+ \item Add 32nd and 64th notes, regular and dotted varieties
+ \item \verb|\musSymbol| is now typeset inside an
+ \verb|\mbox| to fix alignment problems when used in
+ tables
+ \end{itemize}
+ \item New features (some requested in issue no. 1):
+ \begin{itemize}
+ \item Add medieval perfect meter
+ \item Add aliases for \term{fusa} ($=$ corchea $=$ eighth note)
+ \item Replace musStack implementation with \code{stackengine}
+ \item Add full figured-bass support
+ \end{itemize}
+ \end{itemize}
+ \item[2018/05/21] Override semantic-markup's \verb|\fl|, \verb|\sh|,
+ \verb|\na| commands if it is loaded
+ \item[2017/10/31] Corrected glyph used for \verb|\musHalf| and documented
+ \verb|\musMeter| and \verb|\musFigures|
+ \item[2017/08/29] First version on CTAN
+ \item[2017/04/12] Created
+\end{itemize}
\section{Code}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musicography.doc.tlpobj new/tlpkg/tlpobj/musicography.doc.tlpobj
--- old/tlpkg/tlpobj/musicography.doc.tlpobj 2019-02-28 03:55:05.000000000 +0100
+++ new/tlpkg/tlpobj/musicography.doc.tlpobj 2020-01-30 01:55:21.000000000 +0100
@@ -1,9 +1,9 @@
name musicography.doc
category Package
-revision 47838
+revision 53596
shortdesc doc files of musicography
relocated 1
-docfiles size=68
+docfiles size=90
RELOC/doc/latex/musicography/README.md
RELOC/doc/latex/musicography/musicography.pdf
RELOC/doc/latex/musicography/musicography.tex
++++++ musicography.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/musicography/musicography.sty new/tex/latex/musicography/musicography.sty
--- old/tex/latex/musicography/musicography.sty 2018-05-26 00:32:19.000000000 +0200
+++ new/tex/latex/musicography/musicography.sty 2020-01-29 23:39:07.000000000 +0100
@@ -1,8 +1,8 @@
\NeedsTeXFormat{LaTeX2e}
-\ProvidesClass{musicography}[2018/05/21
+\ProvidesPackage{musicography}[2020/01/29
Symbols for music writing with pdflatex]
-% Copyright 2017 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
@@ -19,6 +19,20 @@
% and the documentation file musicography.tex.
% CHANGE LOG
+% 2020-01-29 - Reduced stack gap for \musFig
+% 2019-11-24 - Fix problem with \MeterCThreeTwo where numerals were being
+% printed next to each other instead of stacked.
+% 2019-05-28 - Fix issue #1:
+% + Correct notehead symbol for values < quarter note
+% (was hollow, should be filled)
+% + Add 32nd and 64th notes regular and dotted
+% + \musSymbol now inside an \mbox to fix alignment problems
+% - New features (some requested in issue #1)
+% + Add medieval perfect meter
+% + Add aliases for fusa (= corchea = eighth note)
+% + Replace musStack implementation with stackengine:
+% Now takes any number of space-separated arguments to stack
+% numerals, allowing for full figured-bass notation
% 2018-05-21 Override semantic-markup's \fl, \sh, \na commands if it is loaded
% 2017-10-31 Corrected glyph for \musHalf and documented
% \musMeter and \musFigures
@@ -55,7 +69,7 @@
% #4 kern after
% #5 symbol code (e.g., \symbol{4})
\NewDocumentCommand{\musSymbol}{ O{\musFont} m m m m }{%
- {#1\kern#2\raisebox{#3}{#5}\kern#4}%
+ \mbox{#1\kern#2\raisebox{#3}{#5}\kern#4}%
}
% Accidentals
@@ -119,10 +133,16 @@
\musStemmedNote{\symbol{7}}%
}
\NewDocumentCommand{\musEighth}{}{%
- \musFlaggedNote{\symbol{8}}{\symbol{40}}%
+ \musFlaggedNote{\symbol{7}}{\symbol{40}}%
}
\NewDocumentCommand{\musSixteenth}{}{%
- \musFlaggedNote{\symbol{8}}{\symbol{41}}%
+ \musFlaggedNote{\symbol{7}}{\symbol{41}}%
+}
+\NewDocumentCommand{\musThirtySecond}{}{%
+ \musFlaggedNote{\symbol{7}}{\symbol{42}}%
+}
+\NewDocumentCommand{\musSixtyFourth}{}{%
+ \musFlaggedNote{\symbol{7}}{\symbol{43}}%
}
\NewDocumentCommand{\musWholeDotted}{}{%
@@ -140,43 +160,19 @@
\NewDocumentCommand{\musSixteenthDotted}{}{%
\musDottedNote{\musSixteenth}%
}
+\NewDocumentCommand{\musThirtySecondDotted}{}{%
+ \musDottedNote{\musThirtySecond}%
+}
+\NewDocumentCommand{\musSixtyFourthDotted}{}{%
+ \musDottedNote{\musSixtyFourth}%
+}
-% Command to stack numerals
-% Adapted from harmony.sty's \ueber command
-\newdimen\tmpdima
-\newdimen\tmpdimb
-\newdimen\tmpdimc
-\newdimen\tmpdimd
-\newdimen\tmpdime
-\newbox\nbxa
-\newbox\nbxb
-\newbox\nbxc
-\newbox\nbxd
-\newbox\nbxe
-\newbox\nbxf
-\newbox\nbxg
-\newbox\nbxh
-\newbox\nbxi
-
-\NewDocumentCommand{\musStack}{ m m }{%
- \setbox\nbxi=\hbox{%
- \setbox\nbxa=\hbox{\scriptsize{\musNumFont{#1}}}%
- \setbox\nbxb=\hbox{\scriptsize{\musNumFont{#2}}}%
- \ifdim\wd\nbxa>\wd\nbxb%
- \tmpdima=\wd\nbxa%
- \else%
- \tmpdima=\wd\nbxb%
- \fi%
- \setbox\nbxa=\hbox to \tmpdima{%
- \scriptsize\hss{\musNumFont{#1}}\hss}%
- \setbox\nbxb=\hbox to \tmpdima{\scriptsize\hss{%
- \musNumFont{#2}}\hss}%
- \lower0.3ex\copy\nbxb%
- \kern-\wd\nbxb%
- \raise0.8\ht\nbxb%
- \box\nbxa%
- }%
- \unhbox\nbxi%
+
+% Command to stack numerals for metrical symbols or figured bass
+% Takes any number of space-separated arguments and stacks them vertically
+\RequirePackage{stackengine}
+\NewDocumentCommand{\musStack}{ O{\musNumFont} m }{%
+ {#1\Shortstack[l]{#2}}%
}
% Meter symbols
@@ -193,10 +189,20 @@
% #1 number on top
% #2 number on bottom
\NewDocumentCommand{\musMeter}{ m m }{%
- \musStack{#1}{#2}\kern0.05em
+ \musStack{#1 #2}\kern0.05em
}
% Same command used for figured bass
-\NewDocumentCommand{\musFigures}{}{\musMeter}
+\NewDocumentCommand{\musFigFont}{}{%
+ \scriptsize
+ \let\musFontLarge\musFontBig
+}
+\NewDocumentCommand{\musFig}{ m }{%
+ \setstackgap{S}{1pt}%
+ \musStack[\musFigFont]{#1}%
+}
+\NewDocumentCommand{\noFig}{ O{5} }{%
+ \hphantom{#1}%
+}
\NewDocumentCommand{\meterC}{}{%
\musSymbolMeter{\symbol{83}}%
@@ -209,21 +215,28 @@
\meterCplus{\musNumFont{3}}%
}
\NewDocumentCommand{\meterCThreeTwo}{}{%
- \meterCplus{\musStack{3}{2}}%
+ \meterCplus{{\footnotesize\stackanchor[1pt]{3}{2}}}%
}
% Ternary meter used in 17th-century Spanish music
\NewDocumentCommand{\meterCZ}{}{%
\meterCplus{Z}%
}
+% Perfect meter in medieval music
+\NewDocumentCommand{\meterO}{}{%
+ $\bigcirc$
+}
+
% Aliases for older note names
\NewDocumentCommand{\musSemibreve} {}{\musWhole}
\NewDocumentCommand{\musMinim} {}{\musHalf}
\NewDocumentCommand{\musSemiminim} {}{\musQuarter}
\NewDocumentCommand{\musCorchea} {}{\musEighth}
+\NewDocumentCommand{\musFusa} {}{\musEighth}
\NewDocumentCommand{\musSemibreveDotted} {}{\musWholeDotted}
\NewDocumentCommand{\musMinimDotted} {}{\musHalfDotted}
\NewDocumentCommand{\musSeminiminimDotted} {}{\musQuarterDotted}
\NewDocumentCommand{\musCorcheaDotted} {}{\musEighthDotted}
+\NewDocumentCommand{\musFusaDotted} {}{\musEighthDotted}
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musicography.tlpobj new/tlpkg/tlpobj/musicography.tlpobj
--- old/tlpkg/tlpobj/musicography.tlpobj 2019-02-28 03:55:05.000000000 +0100
+++ new/tlpkg/tlpobj/musicography.tlpobj 2020-01-30 01:55:21.000000000 +0100
@@ -1,6 +1,6 @@
name musicography
category Package
-revision 47838
+revision 53596
shortdesc Accessing symbols for music writing with pdfLaTeX
relocated 1
longdesc This package makes available the most commonly used symbols in
@@ -10,11 +10,10 @@
longdesc builds on the approach used in the harmony package, where the
longdesc symbols are taken from the MusiXTeX fonts. But it provides a
longdesc larger range of symbols and a more flexible, user-friendly
-longdesc interface written using xparse.
+longdesc interface written using xparse and stackengine.
runfiles size=2
RELOC/tex/latex/musicography/musicography.sty
catalogue-contact-repository https://bitbucket.org/andrewacashner/musicography
catalogue-ctan /macros/latex/contrib/musicography
-catalogue-date 2018-05-24 21:54:18 +0200
catalogue-license lppl1.3
catalogue-topics music font-supp-symbol
++++++ musixtex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
--- old/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/ChangeLog-130.txt 2020-03-20 22:25:54.000000000 +0100
@@ -0,0 +1,5 @@
+
+Changes from MusiXTeX 129 to 130:
+
+ * defined \zdoublebar for use within a bar
+ * defined \hbp and \hbpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/README new/texmf-dist/doc/generic/musixtex/README
--- old/texmf-dist/doc/generic/musixtex/README 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/README 2020-03-20 22:25:54.000000000 +0100
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.29 (2018-08-04).
+This is MusiXTeX, version 1.30 (2020-03-20).
MusiXTeX is a TeX-based system for typesetting music.
The main author was Daniel Taupin, who died in a climbing
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex new/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/barlines.tex 2020-03-20 22:25:54.000000000 +0100
@@ -14,10 +14,10 @@
also issue \keyindex{setdoublebar} to cause the next \verb|\bar| (or
\keyindex{stoppiece}, \keyindex{alaligne}, or \keyindex{alapage}) to be replaced
by a double bar.
-
There is no specific command to print a thin-thick double bar line, but
\keyindex{setdoubleBAR} will cause one in the same cases where
\verb|\setdoublebar| would cause a thin-thin double bar line.
+To typeset a double-bar line in the middle of a bar, use \keyindex{zdoublebar}.
To make the next bar line invisible, use \keyindex{setemptybar} before
\verb|\bar|.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex new/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex 2017-12-26 23:07:24.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/beams.tex 2020-03-20 22:25:54.000000000 +0100
@@ -340,6 +340,10 @@
\Notes\ibbl0j0\hb0j\tbl0\hb0j\en
\Notes\ibbl0h4\hb0h\tbl0\hb0j\en
\end{verbatim}\end{quote}\noindent
+There are also dotted and double-dotted versions \keyindex{hbp} and
+\keyindex{hbpp}.
+
+
A different look could be obtained as follows:
\begin{music}\nostartrule
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2020-03-20 22:25:54.000000000 +0100
@@ -1,6 +1,6 @@
\title{\Huge\bfseries\musixtex\\[\bigskipamount]
\LARGE\bfseries Using \TeX{} to write polyphonic\\or
-instrumental music\\\Large\itshape Version 1.29}
+instrumental music\\\Large\itshape Version 1.30}
\author{}
@@ -68,7 +68,7 @@
takes advantage of the greater capacity of the e\TeX\ version of \TeX.
This manual
is the definitive reference to all features of
-\musixtex\ version~1.29.
+\musixtex\ version~1.30.
Novice users need not start here.
Most
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2020-03-20 22:25:54.000000000 +0100
@@ -16,9 +16,10 @@
The heavy final double bar of a piece is one of the consequences of
\keyindex{Endpiece} or \keyindex{Stoppiece}. If you just want to terminate
the text with a simple bar, say \keyindex{stoppiece} or \keyindex{endpiece}.
-If you want to suppress right-justification of the last line of a score,
-use \keyindex{raggedstoppiece}.
To terminate it with no bar line at all, code \keyindex{zstoppiece}.
+If you want to suppress right-justification of the last line of a score,
+use \keyindex{raggedstoppiece}; the bar line can be suppressed by
+using \keyindex{setemptybar}.
Once you have stopped the score by any of these means, you may want to restart
it, and there are several ways to do so. If you don't need to change the key
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2020-03-20 22:25:54.000000000 +0100
@@ -81,9 +81,14 @@
\end{itemize}
These marks are horizontally centered relative to solid note heads.
To
-compensate for the fact that whole notes are wider, you should use
-\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}| to center accents
-and other items (e.g.,~\verb|\Fermataup|) above a whole note.
+compensate for the fact that whole notes are wider, you may use
+\begin{quote}
+\keyindex{wholeshift}\verb|{|\ital{Any nonspacing macro}\verb|}|
+\end{quote}
+to center accents
+(and other items) above or below a whole note. For example,
+\keyindex{Fermataup}\pitchp~(described in Section~{\ref{ornaments}}) is
+\emph{defined} as \keyindex{wholeshift}\verb|{|\keyindex{fermataup}\pitchp\verb|}|.
There are also variants of the most common accents\footnote{Thanks to Klaus
{\sc Bechert}'s corrections.} which will be automatically positioned
@@ -139,6 +144,7 @@
\verb|\tuplettxt| serves the same role for the last two macros.
The font used is defined by
\verb|\txtfont| and is, by default, \verb|\eightit| (in normal music size) but may be re-defined.
+\zkeyindex{txtfont}
The first four commands in the table
are normally used with beamed xtuplets. As indicated in the
@@ -273,6 +279,7 @@
\end{verbatim}\end{quote}
\section{Ornaments}
+\label{ornaments}
\subsection{Simple ornaments}\index{ornaments}
@@ -302,7 +309,7 @@
\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}|
\end{quote}
to center any of these ornaments
-above a whole note.
+above (or below) a whole note.
In the following macros for fermatas, the argument $p$ is the pitch of the
@@ -951,6 +958,55 @@
\zendextract
\end{verbatim}\end{quote}
\end{footnotesize}
+
+\clearpage
+
+Here is the same example with \verb|\tabstylespacetrue|:
+\begin{music}
+\input musixps
+\def\psslurhgt{0.5}
+\instrumentnumber{2}
+\songbottom1\songtop2
+\generalmeter{\meterfrac34}
+\generalsignature{-1}
+\setlines16
+\setclefsymbol1\tabclef\setclefsymbol2\treblelowoct
+\tabstylespacetrue
+\setsize1\largevalue
+\setsign10
+\nobarnumbers
+\interinstrument=4\internote
+\parindent=2ex
+\setname1{\tabstringfnt\baselineskip=1.5\internote%
+ \vbox{\hbox to\parindent{\hss E \hss}%
+ \hbox to\parindent{\hss B \hss}%
+ \hbox to\parindent{\hss G \hss}%
+ \hbox to\parindent{\hss D \hss}%
+ \hbox to\parindent{\hss A \hss}%
+ \hbox to\parindent{\hss D \hss}%
+}}
+\startextract
+\NOtesp\zltab55\zltab43\ltab32&\zh{d}\zhl{f}\qu{.h}\en
+\Notes\ltab32&\cu{h}\en
+\bar%
+\NOtes\zltab55\zltab45\zltab33\ltab10&\zq d\zql g\zq i\qu l\en
+\NOtesp\zltab54\zltab45\zltab32\ltab10&\rhl{^c}\rhu{g}\zh{h}\qu{.l}\en
+\Notes\ltab10&\cu{l}\en
+\bar%
+\NOtes\zltab40\zltab32\zltab23\ltab11&\zq d\zq h\zq k\qu{m}\en
+\NOtes\zltab51\zltab43\zltab33\ltab23&\zhl b\zh f\zq{.i}\qu{.k}\en
+\Notes\ltab35&\cu j\en
+\bar%
+\NOtes\zltab65\zltab45\ltab33&\zql N\zq g\qu i\en
+\NOtes\zltab50\zltab43\ltab32&\zql a\zq f\qu h\en
+\notes\zltab54\ltab45\ilsluru05\ltab43\ltab42\tlslur05\ltab43%
+&\zql{^c}\ibbu0g{-1}\qb0{g}\slur eed2\qb0{fe}\tqu0f\en
+\bar%
+\notes\zltab60\zltab50\ltab45\ilsluru05\ltab42\ltab43\tlslur05\ltab40%
+&\zq K\zql a\ibbu0g{-1}\qb0g\slur edd2\qb0e\qb0f\tqu0d\en
+\znotes&\lcn{14}{J.S. Bach}\en
+\zendextract
+\end{music}
Tablature support in \musixtex\ has been adapted
from \verb|tabdefs.tex| by R.J.~Gelten, which is available
\href{http://icking-music-archive.org/software/musixtex/add-ons/tabdefs.tex}
Binary files old/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf and new/texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2020-03-20 22:25:54.000000000 +0100
@@ -138,3 +138,83 @@
number of lines per staff for all instruments ($5$); and will reset all clef
symbols to standard clef symbols.
+ \section{Split and Shortened Systems}
+It is sometimes desirable to typeset a ``shortened'' system or to split
+a system into left and right segments, as in the following (extracted from a
+Geminiani \emph{concerto grosso}):
+
+\begin{music}
+\smallmusicsize
+\setclef1\bass
+\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5
+\songbottom{1}\songtop{5}
+\setinterinstrument4{1\internote}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}&\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g&\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i&\sk\sk\qs\cca k&\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n&\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k&\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk&\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup
+\end{music}
+
+This was coded as follows:
+\begin{footnotesize}
+\begin{quote}\begin{verbatim}
+\setclef1\bass\setclef5\treble\settrebleclefsymbol5\trebleoct
+\generalsignature{-2}
+\instrumentnumber5\songbottom{1}\songtop{5}
+\nobarnumbers
+\generalmeter{\meterfrac38}
+\hbox to\hsize\bgroup\vbox\bgroup\hsize=1.7in % specify length of left segment
+\startpiece\addspace\afterruleskip
+\Notes\qa G\sk&\ibu1i{-1}\qb1i\qb1{.g}
+ &\ca d\qa g&\ca n\itieu3n\qa n&\ca g\ds\en
+\notes\ds\sk&\sk\tbbu1\tqu1g
+ &\sk\sk&\sk\sk\ttie3&\ds\sk\en
+\znotes&&&&\lcn{q}{\bf D.S. al\kern3ex}\coda p\en
+\setdoublebar\endpiece
+\egroup\hfill\vbox\bgroup\hsize=3.7in % specify length of right segment
+\generalmeter{\allabreve}
+\startpiece\addspace\afterruleskip
+\znotes&&&&\coda o\en
+\NOtes\qa{.G}&\qa{.k}&\qa{.d}&\qa n&\qa g\en
+\notes\sk\sk\qs\cca N&\sk\sk\qs\cca i
+ &\sk\sk\qs\cca k
+ &\qs\ibbl3p{-2}\qb3{p}\qb3{o}\tql3n
+ &\qp\sk\sk\sk\en
+\NOtes\qa{.M}&\qa{.h}&\qa{.k}&\qa o&\ha k\en
+\Notes\sk&\sk&\sk&\itieu3r\qa r&\sk\en
+\notes\qs\cca M&\qs\cca h&\qs\cca k
+ &\sk\sk&\sk\sk\en
+\bar
+\NOtes\wh L\sk&\qa{g}\qa{g}&\ha{l}\sk
+ &\ttie3\ha r\sk&\ha{g}\sk\en
+\NOTes\sk&\ha j&\ha{n}&\tr s\ha q&\ha{n}\en
+\bar
+\nspace
+\NOtesp\ha{.K}&\ha{.h}&\ha{.k}&\ha{.r}&\ha{.^m}\en
+\setdoublebar\endpiece
+\egroup\egroup % close open \bgroups
+\end{verbatim}\end{quote}
+\end{footnotesize}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2020-03-20 22:25:54.000000000 +0100
@@ -61,7 +61,11 @@
For shifts farther to the left, use
\keyindex{iLsluru},
\keyindex{iLslurd}
-or \keyindex{tLslur}.
+or \keyindex{tLslur};
+for shifts farther to the right, use
+\keyindex{iRsluru},
+\keyindex{iRslurd}
+or \keyindex{tRslur}.
You can control the shape of type~K slurs with variants of
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex new/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex 2017-12-26 23:07:24.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/writingnotes.tex 2020-03-20 22:25:54.000000000 +0100
@@ -44,7 +44,7 @@
\item[\keyindex{breve}{\tt\char123}$p${\tt\char125} :]breve (\hbox to 8pt{\zbreve1\hss}) .
\item[\keyindex{longa}{\tt\char123}$p${\tt\char125} :]longa (\hbox to8pt{\zlonga1\hss}) .
\item[\keyindex{longaa}{\tt\char123}$p${\tt\char125} :]longa with automatic stem direction\footnote{Editor's note: Evidently there is no explicit up-stemmed longa} .
- \item[\keyindex{zmaxima}{\tt\char123}$p${\tt\char125} :]maxima(\hbox to16pt{\zmaxima1\hss}) .
+ \item[\keyindex{maxima}{\tt\char123}$p${\tt\char125} :]maxima (\hbox to16pt{\zmaxima1\hss}) .
\item[\keyindex{wq}{\tt\char123}$p${\tt\char125} :]arbitrary duration note (\hbox to8pt{\zwq1\hss})
(also used as alternate representation of a \ital{breve}).
\item[\keyindex{wqq}{\tt\char123}$p${\tt\char125} :]long arbitrary duration note
@@ -214,7 +214,7 @@
By appending one or two \verb|p|'s (for ``pointed'') to the name, many of the
macros just introduced provide one or two dots after the notehead:
-\keyindex{whp}\pitchp, \keyindex{whpp},
+\keyindex{whp}, \keyindex{whpp},
\keyindex{zwp}, \keyindex{zwpp},
\keyindex{hup}, \keyindex{hupp},
\keyindex{hlp}, \keyindex{hlpp},
@@ -226,12 +226,14 @@
\keyindex{zqp}, \keyindex{zqpp},
\keyindex{cup}, \keyindex{cupp},
\keyindex{clp}, \keyindex{clpp},
-\keyindex{qbp} and \keyindex{qbpp}.
-Naturally, the ones that start with ``\verb|z|'' are used in chords.
+\keyindex{qbp} and \keyindex{qbpp}, all followed by a pitch argument.
+The ones that start with ``\verb|z|'' are used in chords.
The dot(s) will be raised if the note is on a line.
-A more explicit way uses one of the macros \keyindex{pt}{\tt\char123}$p${\tt\char125},
-\keyindex{ppt}, or \keyindex{pppt} right
+A more explicit way uses one of the macros
+\keyindex{pt}{\tt\char123}$p${\tt\char125},
+\keyindex{ppt}{\tt\char123}$p${\tt\char125}, or
+\keyindex{pppt}{\tt\char123}$p${\tt\char125} right
before any note macro to place one to three dots after the normal note
head at pitch $p$. Again they will be raised if on a line. In fact this is the only
way to get a triple-dotted note.
@@ -239,6 +241,10 @@
quarter note with one dot could be coded \verb|\pt h\qu h|, with two dots
as \keyindex{ppt}\verb| h\qu h| and with three as
\keyindex{pppt}\verb| h\qu h|.
+As a matter of style, if two voices share one staff, the dots in
+the lower voice should be \emph{lowered} if the note is on a line. For
+this you can use \keyindex{lpt},
+\keyindex{lppt} and \keyindex{lpppt}.
Yet another method for posting a dot is to insert a \ital{period} before
the letter representing the pitch. Thus \verb|\qu{.a}| is equivalent to
@@ -248,14 +254,17 @@
Non-spacing dotted notes can be produced using
\keyindex{zhup}, \keyindex{zhlp}, \keyindex{zqup}, \keyindex{zqlp},
-\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp},
+\keyindex{zcup}, \keyindex{zclp}, \keyindex{zqbp}, followed by a pitch,
+and similarly with two \verb|p|'s for
+double-dotted notes.
+The following provide dotted chord notes shifted left or right:
+\keyindex{lhp},
+\keyindex{rhp},
+\keyindex{lqp},
+\keyindex{rqp},
and similarly with two \verb|p|'s for
double-dotted notes.
-As a matter of style, if two voices share one staff, the dots in
-the lower voice should be lowered if the note is on a line. For
-this you can use \keyindex{lpt}{\tt\char123}$p${\tt\char125} and
-\keyindex{lppt}{\tt\char123}$p${\tt\char125}.
\section{Sequences of equally spaced notes; collective coding}
\label{CollectiveCoding}
Binary files old/texmf-dist/doc/generic/musixtex/musixdoc.pdf and new/texmf-dist/doc/generic/musixtex/musixdoc.pdf differ
Binary files old/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf and new/texmf-dist/doc/generic/musixtex/scripts/musixtex.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/man/man1/musixtex.1 new/texmf-dist/doc/man/man1/musixtex.1
--- old/texmf-dist/doc/man/man1/musixtex.1 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/doc/man/man1/musixtex.1 2020-03-20 22:25:54.000000000 +0100
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2018-07-27 "musixtex version 0.21" ""
+.TH MUSIXTEX 1 2020-03-20 "musixtex version 0.22" ""
.SH NAME
musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary,
@@ -67,10 +67,10 @@
in that order, and process it as above.
.SH OPTIONS
.TP 10
-.B -v
+.B -v, -version, --version
output program name and version number, and quit
.TP
-.B -h
+.B -h, -help, --help
output usage summary and quit
.TP
.B -l
@@ -118,12 +118,16 @@
.B mtxx
as the mtx preprocessor; e.g., -M "prepmx -i".
.TP
+.B -X pmxx
+use
+.B pmxx
+as the pmx preprocessor; e.g., -X "./pmxab",
+.TP
.B -A aspcx
use
.B aspcx
as the aspc preprocessor; e.g., -A "autosp -l".
.TP
-.TP
.B -t
stop processing at the tex/mid files
.TP
@@ -153,7 +157,6 @@
If an error occurs at the TeX stage, processing halts immediately and the tail of the log file is sent to stderr.
Version information is copied from the temporary file to the log file.
-
.TP 0
Options affect processing of all succeeding MusiXTeX files unless changed by another option. Option flags cannot be combined; e.g., use \fB -l -x \fP rather than \fB -lx\fP.
Binary files old/texmf-dist/doc/man/man1/musixtex.man1.pdf and new/texmf-dist/doc/man/man1/musixtex.man1.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.doc.tlpobj new/tlpkg/tlpobj/musixtex.doc.tlpobj
--- old/tlpkg/tlpobj/musixtex.doc.tlpobj 2019-02-28 03:55:06.000000000 +0100
+++ new/tlpkg/tlpobj/musixtex.doc.tlpobj 2020-03-20 23:58:35.000000000 +0100
@@ -1,8 +1,8 @@
name musixtex.doc
category Package
-revision 48353
+revision 54431
shortdesc doc files of musixtex
-docfiles size=1387
+docfiles size=1077
texmf-dist/doc/generic/musixtex/ChangeLog-114.txt
texmf-dist/doc/generic/musixtex/ChangeLog-115.txt
texmf-dist/doc/generic/musixtex/ChangeLog-116.txt
@@ -19,6 +19,7 @@
texmf-dist/doc/generic/musixtex/ChangeLog-127.txt
texmf-dist/doc/generic/musixtex/ChangeLog-128.txt
texmf-dist/doc/generic/musixtex/ChangeLog-129.txt
+ texmf-dist/doc/generic/musixtex/ChangeLog-130.txt
texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
texmf-dist/doc/generic/musixtex/README
texmf-dist/doc/generic/musixtex/examples/adagio.tex
@@ -118,7 +119,6 @@
texmf-dist/doc/generic/musixtex/musixdoc/lyrics.tex
texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex
texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.ltx
- texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.pdf
texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sty
texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex
texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
++++++ musixtex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/scripts/musixtex/musixtex.lua new/texmf-dist/scripts/musixtex/musixtex.lua
--- old/texmf-dist/scripts/musixtex/musixtex.lua 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/scripts/musixtex/musixtex.lua 2020-03-20 22:25:54.000000000 +0100
@@ -1,12 +1,12 @@
#!/usr/bin/env texlua
-VERSION = "0.21"
+VERSION = "0.22"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
autosp as pre-processors (and deletes intermediate files)
- (c) Copyright 2011-2018 Bob Tennent rdt@cs.queensu.ca
+ (c) Copyright 2011-2020 Bob Tennent rdt@cs.queensu.ca
and Dirk Laurie dirk.laurie@gmail.com
This program is free software; you can redistribute it and/or modify it
@@ -29,6 +29,10 @@
ChangeLog:
+ version 0.22 2020-03-20 RDT
+ add -X option
+ add -version, --version, -help, --help options
+
version 0.21 2018-07-27 RDT
add -P option.
@@ -134,8 +138,8 @@
The normal route after preprocessing goes tex-dvi-ps-pdf, but shorter
routes are also available, see the options. The default processing route
for .tex files is etex-musixflx-etex.
-Options: -v version
- -h help
+Options: -v, --version version
+ -h, --help help
-l latex source
-p direct tex-pdf (pdftex etc)
-F fmt use fmt as the TeX processor
@@ -146,6 +150,7 @@
-m stop at pmx
-M prepmxx use prepmxx as the mtx preprocessor
-A autospx use autospx as the aspc preprocessor
+ -X pmxabx use pmxabx as the pmx preprocessor
-t stop at tex/mid
-s stop at dvi
-g stop at ps
@@ -289,9 +294,9 @@
end
function process_option(this_arg)
- if this_arg == "-v" then
+ if this_arg == "-v" or this_arg == "-version" or this_arg == "--version" then
os.exit(0)
- elseif this_arg == "-h" then
+ elseif this_arg == "-h" or this_arg == "-help" or this_arg == "--help" then
usage()
os.exit(0)
elseif this_arg == "-l" then
@@ -345,6 +350,9 @@
elseif this_arg == "-P" then
narg = narg+1
ps2pdf = arg[narg]
+ elseif this_arg == "-X" then
+ narg = narg+1
+ pmx = arg[narg]
else
print("! Unknown option "..this_arg.." ignored")
end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixps.tex new/texmf-dist/tex/generic/musixtex/musixps.tex
--- old/texmf-dist/tex/generic/musixtex/musixps.tex 2017-03-01 23:32:52.000000000 +0100
+++ new/texmf-dist/tex/generic/musixtex/musixps.tex 2020-03-20 22:25:54.000000000 +0100
@@ -1,5 +1,6 @@
%% PostScript slurs, ties and crescendos
% Coded by Stanislav Kneifl
+% RDT added \psRslurskip \iRslur \tRslur \psRtieskip \tRtie \psLtieskip \tLtie 2019/06/17
\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
@@ -26,6 +27,7 @@
\def\psbslurraise{2} % vert. offset for slurs on beams
\def\psLslurskip{-0.2} % horiz. offset of slurs shifted more to the left
+\def\psRslurskip{4} % horiz. offset of slurs shifted more to the right
\def\pslslurskip{0.4} % horiz. offset of slurs shifted to the left
\def\psislurskip{1.4} % horiz. offset of the slur beginnings
\def\pstslurskip{1.2} % horiz. offset of the slur endings
@@ -48,6 +50,8 @@
\def\psttieskip{0.3} % horiz. offset of the tie endings
\def\psltieskip{-0.2} % horiz. offset of ties shifted to the left
\def\psrtieskip{3} % horiz. offset of ties shifted to the right
+\def\psLtieskip{-0.4} % horiz. offset of ties shifted more to the left
+\def\psRtieskip{4} % horiz. offset of ties shifted more to the right
\def\pstiehgt{0.7} % height coeficient of the ties
\def\pstiemaxhgt{30} % maximal height if the ties
@@ -554,7 +558,9 @@
\def\ilsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\pslslurskip}}
\def\ilslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\pslslurskip}}
\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
-\def\iLslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psLslurskip}}
+\def\iLsluru#1#2{\iSlur{#1}{#2}{\psslurraise}{\psLslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
+\def\iRslurd#1#2{\iSlur{#1}{#2}{-\psslurraise}{\psRslurskip}}
\def\tfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psfslurhgt}{\psslurangul}}
\def\tslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\pstslurskip}{\psslurhgt}{\psslurangul}}
@@ -576,6 +582,7 @@
\def\tLfslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psfslurhgt}{\psslurangul}}
\def\tLslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psslurhgt}{\psslurangul}}
+\def\tRslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psRslurskip}{\psslurhgt}{\psslurangul}}
\def\tLhslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\pshslurhgt}{\psslurangul}}
\def\tLHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHslurhgt}{\psHslurangul}}
\def\tLHHslur#1#2{\tSlur{#1}{#2}{\psslurraise}{\psLslurskip}{\psHHslurhgt}{\psHHslurangul}}
@@ -599,6 +606,8 @@
\def\ttie#1{\tTie{#1}{\psttieskip}}
\def\tltie#1{\tTie{#1}{\psltieskip}}
\def\trtie#1{\tTie{#1}{\psrtieskip}}
+\def\tLtie#1{\tTie{#1}{\psLtieskip}}
+\def\tRtie#1{\tTie{#1}{\psRtieskip}}
\def\icresc#1{\Icresc{#1}{\d@nh}{0}}
\def\idecresc#1{\Idecresc{#1}{\d@nh}{0}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixtex.tex new/texmf-dist/tex/generic/musixtex/musixtex.tex
--- old/texmf-dist/tex/generic/musixtex/musixtex.tex 2018-08-05 23:01:41.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixtex.tex 2020-03-20 22:25:54.000000000 +0100
@@ -25,16 +25,20 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{29}
+\def\mxminorvernumber{30}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
-\def\mxversuffix{}%
+\def\mxversuffix{beta}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2018-08-04}
+\def\mxdate{2018-08-09}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.30
+% defined \zdoublebar for use within a bar
+% defined \hbp and \hbpp
+
% version 1.29
% defined \tabfnt, \tabcleffnt, \tabstringfnt, \tab etc. to support tablature
@@ -2284,6 +2288,7 @@
% if you need a line which appears ragged
\def\raggedstoppiece{\ifx\ragg@d\empty \fil@{r}\fi % version 1.18 RDT (from musixext)
\check@nopen\n@wbar\hfill\z@suspend\@nds@ction}
+\def\zendpiece{\setemptybar\raggedstoppiece}
\def\Stoppiece{\setdoubleBAR\stoppiece}
\let\Endpiece\Stoppiece
@@ -2580,14 +2585,13 @@
\fi}
\def\zzleftrightrepeat{% % RDT 1.28
- \advance\barno\m@ne
- \setrightrepeat
- \stoppiece
- \let\z@sw\@ne
- \contpiece
- \addspace{\h@lf\afterruleskip}%
- \kernm\afterruleskip\l@eftrepeat\kern\afterruleskip
- \advance\lastbarpos\afterruleskip \b@rrul@
+\advance\barno\m@ne%
+\setrightrepeat%
+\stoppiece%
+\let\z@sw\@ne%
+\contpiece%
+\advance\barno\m@ne%
+\leftrepeat% % RDT revised 1.30
}
\def\zleftrightrepeat@II{% % RDT 1.28
@@ -2603,6 +2607,9 @@
\let\leftrightrepeat\leftrightrepeat@II
\let\zleftrightrepeat\zleftrightrepeat@II % RDT 1.28
+
+\def\zdoublebar{\advance\barno\m@ne\doublebar} % RDT 1.30
+
\def\alapage{\stoppiece\eject\contpiece}
\def\zalapage{\zstoppiece\eject\contpiece}
@@ -3657,6 +3664,8 @@
\def\hlpp{\h@symbol\@qlpp}
\def\hb{\h@symbol\@qb}
+\def\hbp{\h@symbol\@qbp}
+\def\hbpp{\h@symbol\@qbpp}
\def\zh{\h@symbol\@zq}
\def\zhp{\h@symbol\@zqp}
@@ -4156,6 +4165,18 @@
\def\lppt{\g@pt\m@ne\@ne}
\def\lpppt{\g@pt\m@ne\tw@}
+
+% Shifted, pointed chord notes
+%
+\def\lhp#1{\loff{\zhp{#1}}}
+\def\rhp#1{\roff{\zhp{#1}}}
+\def\lqp#1{\loff{\zqp{#1}}}
+\def\rqp#1{\roff{\zqp{#1}}}
+\def\rhpp#1{\roff{\zhpp{#1}}}
+\def\lhpp#1{\loff{\zhpp{#1}}}
+\def\rqpp#1{\roff{\zqpp{#1}}}
+\def\lqpp#1{\loff{\zqpp{#1}}}
+
\def\g@pt#1#2#3{\check@staff
\inhgetn@i#3\relax \relax % two \relax since the first one
\ifnum\n@i<\@c % in swallowed by \inhgetn@i
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex.tlpobj new/tlpkg/tlpobj/musixtex.tlpobj
--- old/tlpkg/tlpobj/musixtex.tlpobj 2019-02-28 03:55:09.000000000 +0100
+++ new/tlpkg/tlpobj/musixtex.tlpobj 2020-03-20 23:58:37.000000000 +0100
@@ -1,6 +1,6 @@
name musixtex
category Package
-revision 48353
+revision 54431
shortdesc Sophisticated music typesetting
longdesc MusiXTeX provides a set of macros, based on the earlier
longdesc MusicTeX, for typesetting music with TeX. To produce optimal
@@ -16,7 +16,7 @@
longdesc the pmx preprocessor compiles a simpler input language to
longdesc MusiXTeX macros..
depend musixtex.ARCH
-runfiles size=148
+runfiles size=149
texmf-dist/dvips/musixtex/psslurs.pro
texmf-dist/scripts/musixtex/musixflx.lua
texmf-dist/scripts/musixtex/musixtex.lua
@@ -71,7 +71,6 @@
catalogue-also pmx
catalogue-contact-home http://icking-music-archive.org/software/htdocs
catalogue-ctan /macros/musixtex
-catalogue-date 2018-08-05 08:12:10 +0200
catalogue-license gpl2+
catalogue-topics music
-catalogue-version 1.29
+catalogue-version 1.30
++++++ musixtex_various.dif ++++++
--- /var/tmp/diff_new_pack.csWE08/_old 2020-05-29 21:30:24.065403958 +0200
+++ /var/tmp/diff_new_pack.csWE08/_new 2020-05-29 21:30:24.065403958 +0200
@@ -314,7 +314,7 @@
+pdflatex musixdoc
--- texmf-dist/scripts/musixtex/musixtex.lua
+++ texmf-dist/scripts/musixtex/musixtex.lua 2018-05-03 10:08:07.363421541 +0000
-@@ -200,15 +200,24 @@ end
+@@ -205,15 +205,24 @@ end
-- possible by exploiting the the fact that Lua has two false values.
-- dvi == nil "do not produce a DVI file" (but maybe PDF)
-- dvi == false "do not process the DVI file" (but stop after TeX)
++++++ mweights.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/mweights/README new/doc/latex/mweights/README
--- old/doc/latex/mweights/README 2017-03-30 23:32:20.000000000 +0200
+++ new/doc/latex/mweights/README 2020-01-23 22:58:09.000000000 +0100
@@ -1,5 +1,5 @@
This is the README for the mweights package, version
-2017-03-30.
+2020-01-23.
Many font families available for use with LaTeX have multiple
weights, especially when originally aimed at use on the web. For
@@ -49,5 +49,11 @@
\ttfamily) to use the macros. It should be a RequiredPackage (for
type1 font use only) in any such font package.
-The package is licensed under the terms of the LaTeX Project Public
-License. The maintainer is Bob Tennent (rdt at cs.queensu.ca).
+This package need not be used with LaTeX releases after
+2020-02-02 which will incorporate mweights functionality
+into the LaTeX kernel; the mweights package itself will
+actually not be loaded by the kernel.
+
+The package is licensed under the terms of the LaTeX Project
+Public License. The maintainer is Bob Tennent (rdt at
+cs.queensu.ca).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mweights.doc.tlpobj new/tlpkg/tlpobj/mweights.doc.tlpobj
--- old/tlpkg/tlpobj/mweights.doc.tlpobj 2019-02-28 03:55:16.000000000 +0100
+++ new/tlpkg/tlpobj/mweights.doc.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,6 +1,6 @@
name mweights.doc
category Package
-revision 43647
+revision 53520
shortdesc doc files of mweights
relocated 1
docfiles size=1
++++++ mweights.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mweights.tlpobj new/tlpkg/tlpobj/mweights.tlpobj
--- old/tlpkg/tlpobj/mweights.tlpobj 2019-02-28 03:55:16.000000000 +0100
+++ new/tlpkg/tlpobj/mweights.tlpobj 2020-01-24 01:57:16.000000000 +0100
@@ -1,6 +1,6 @@
name mweights
category Package
-revision 43647
+revision 53520
shortdesc Support for multiple-weight font packages
relocated 1
longdesc Many font families available for use with LaTeX are available
@@ -13,6 +13,5 @@
runfiles size=2
RELOC/tex/latex/mweights/mweights.sty
catalogue-ctan /macros/latex/contrib/mweights
-catalogue-date 2017-03-30 19:47:45 +0200
catalogue-license lppl
catalogue-topics font-use font-supp