Hello community,
here is the log from the commit of package texlive-specs-p for openSUSE:Factory checked in at 2017-06-25 19:23:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/texlive-specs-p (Old)
and /work/SRC/openSUSE:Factory/.texlive-specs-p.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "texlive-specs-p"
Sun Jun 25 19:23:27 2017 rev:27 rq:505688 version:unknown
Changes:
--------
--- /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.changes 2017-06-08 14:55:36.429651902 +0200
+++ /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.changes 2017-06-25 19:32:10.923091967 +0200
@@ -1,0 +2,58 @@
+Thu Jun 22 12:50:00 UTC 2017 - werner@suse.de
+
+- Avoid to depend on optional milog.cfg
+- texlive-milog does replace mathgl-tex
+
+-------------------------------------------------------------------
+Wed Jun 21 10:20:17 UTC 2017 - werner@suse.de
+
+- Do not require own provided perl modules for latexindent
+
+-------------------------------------------------------------------
+Tue Jun 20 06:39:06 UTC 2017 - werner@suse.de
+
+- Change left over texlive-pdftex-def for texlive-latex-bin
+
+-------------------------------------------------------------------
+Mon Jun 19 13:31:54 UTC 2017 - werner@suse.de
+
+- Fix texlive-pdftex-def dependency as now texlive-graphics-def does
+ provide pdftex.def
+- Fix texlive-rotating dependency as now texlive-graphics does
+ provide rotating.sty
+
+-------------------------------------------------------------------
+Fri Jun 16 12:14:49 UTC 2017 - werner@suse.de
+
+- Notive: Some patches have been moved
+ * bbold_bbold11.dif from texlive-specs-b to texlive-specs-c
+ * context_fourier-map.dif from texlive-specs-e to texlive-specs-f
+ * dvips_config.dif from texlive-specs-g to texlive-specs-h
+ * jadetex_ini.dif from texlive-specs-l to texlive-specs-m
+ * texdoc_cnf.dif from texlive-specs-v to texlive-specs-w
+ * texdraw_info.dif from texlive-specs-v to texlive-specs-w
+ this entry exists only to silent the auto factory bot
+
+-------------------------------------------------------------------
+Tue Jun 13 10:38:52 UTC 2017 - werner@suse.de
+
+- Final TeXLive 2017 20170520
+- Remove patch fontspec_emph.dif as now upstream
+- Update patches
+ * kpathsea_cnf.dif
+ * latex2man_tmphandling.dif
+ * latexdiff_perl.dif
+ * latexpand_perl.dif
+ * luaotfload_varfonts.dif
+ * luatex_cnf.dif
+ * musixtex_various.dif
+ * tetex_scripts.dif
+ * tex4ht_env.dif
+ * texconfig_scripts.dif
+
+-------------------------------------------------------------------
+Thu Jun 1 12:29:31 UTC 2017 - werner@suse.de
+
+- Update to TeXLive 2017 20170520 pretest
+
+-------------------------------------------------------------------
Old:
----
mwcls.doc.tar.xz
mwcls.tar.xz
mwe.doc.tar.xz
mwe.tar.xz
mweights.doc.tar.xz
mweights.tar.xz
mxedruli.doc.tar.xz
mxedruli.tar.xz
mychemistry.doc.tar.xz
mychemistry.tar.xz
mycv.doc.tar.xz
mycv.tar.xz
mylatexformat.doc.tar.xz
mylatexformat.tar.xz
mynsfc.doc.tar.xz
mynsfc.tar.xz
nag.doc.tar.xz
nag.tar.xz
nameauth.doc.tar.xz
nameauth.tar.xz
namespc.doc.tar.xz
namespc.tar.xz
nanumtype1.doc.tar.xz
nanumtype1.tar.xz
nar.tar.xz
natbib.doc.tar.xz
natbib.tar.xz
natded.doc.tar.xz
natded.tar.xz
nath.doc.tar.xz
nath.tar.xz
nature.doc.tar.xz
nature.tar.xz
navigator.doc.tar.xz
navigator.tar.xz
ncclatex.doc.tar.xz
ncclatex.tar.xz
ncctools.doc.tar.xz
ncctools.tar.xz
ncntrsbk.tar.xz
nddiss.doc.tar.xz
nddiss.tar.xz
ndsu-thesis.doc.tar.xz
ndsu-thesis.tar.xz
needspace.doc.tar.xz
needspace.tar.xz
nestquot.tar.xz
neuralnetwork.doc.tar.xz
neuralnetwork.tar.xz
nevelok.doc.tar.xz
nevelok.tar.xz
newcommand.doc.tar.xz
newenviron.doc.tar.xz
newenviron.tar.xz
newfile.doc.tar.xz
newfile.tar.xz
newlfm.doc.tar.xz
newlfm.tar.xz
newpx.doc.tar.xz
newpx.tar.xz
newsletr.doc.tar.xz
newsletr.tar.xz
newspaper.doc.tar.xz
newspaper.tar.xz
newtx.doc.tar.xz
newtx.tar.xz
newtxsf.doc.tar.xz
newtxsf.tar.xz
newtxtt.doc.tar.xz
newtxtt.tar.xz
newunicodechar.doc.tar.xz
newunicodechar.tar.xz
newvbtm.doc.tar.xz
newvbtm.tar.xz
newverbs.doc.tar.xz
newverbs.tar.xz
nextpage.tar.xz
nfssext-cfr.doc.tar.xz
nfssext-cfr.tar.xz
nicefilelist.doc.tar.xz
nicefilelist.tar.xz
niceframe.doc.tar.xz
niceframe.tar.xz
nicetext.doc.tar.xz
nicetext.tar.xz
nih.doc.tar.xz
nih.tar.xz
nihbiosketch.doc.tar.xz
nihbiosketch.tar.xz
nimbus15.doc.tar.xz
nimbus15.tar.xz
nkarta.doc.tar.xz
nkarta.tar.xz
nlctdoc.doc.tar.xz
nlctdoc.tar.xz
New:
----
medstarbeamer.doc.tar.xz
medstarbeamer.tar.xz
meetingmins.doc.tar.xz
meetingmins.tar.xz
memdesign.doc.tar.xz
memexsupp.doc.tar.xz
memexsupp.tar.xz
memoir.doc.tar.xz
memoir.tar.xz
memory.doc.tar.xz
memory.tar.xz
mendex-doc.doc.tar.xz
mentis.doc.tar.xz
mentis.tar.xz
menu.doc.tar.xz
menu.tar.xz
menukeys.doc.tar.xz
menukeys.tar.xz
merriweather.doc.tar.xz
merriweather.tar.xz
metafont-beginners.doc.tar.xz
metafont.doc.tar.xz
metafont.tar.xz
metago.doc.tar.xz
metago.tar.xz
metalogo.doc.tar.xz
metalogo.tar.xz
metaobj.doc.tar.xz
metaobj.tar.xz
metaplot.doc.tar.xz
metaplot.tar.xz
metapost-examples.doc.tar.xz
metapost.doc.tar.xz
metapost.tar.xz
metatex.doc.tar.xz
metatex.tar.xz
metatype1.source.tar.xz
metauml.doc.tar.xz
metauml.tar.xz
method.doc.tar.xz
method.tar.xz
metre.doc.tar.xz
metre.tar.xz
metrix.doc.tar.xz
metrix.tar.xz
mex.doc.tar.xz
mex.tar.xz
mf2pt1.doc.tar.xz
mf2pt1.tar.xz
mfirstuc.doc.tar.xz
mfirstuc.tar.xz
mflogo-font.doc.tar.xz
mflogo-font.tar.xz
mflogo.doc.tar.xz
mflogo.tar.xz
mflua.tar.xz
mfnfss.doc.tar.xz
mfnfss.tar.xz
mfpic.doc.tar.xz
mfpic.tar.xz
mfpic4ode.doc.tar.xz
mfpic4ode.tar.xz
mftinc.doc.tar.xz
mftinc.tar.xz
mfware.doc.tar.xz
mfware.tar.xz
mgltex.doc.tar.xz
mgltex.tar.xz
mhchem.doc.tar.xz
mhchem.tar.xz
mhequ.doc.tar.xz
mhequ.tar.xz
miama.doc.tar.xz
miama.tar.xz
microtype-de.doc.tar.xz
microtype.doc.tar.xz
microtype.tar.xz
midnight.doc.tar.xz
midnight.tar.xz
midpage.doc.tar.xz
midpage.tar.xz
miller.doc.tar.xz
miller.tar.xz
milog.doc.tar.xz
milog.tar.xz
minibox.doc.tar.xz
minibox.tar.xz
minidocument.doc.tar.xz
minidocument.tar.xz
missaali.doc.tar.xz
missaali.tar.xz
modular.doc.tar.xz
modular.tar.xz
montserrat.doc.tar.xz
montserrat.tar.xz
mpostinl.doc.tar.xz
mpostinl.tar.xz
mptrees.doc.tar.xz
mptrees.tar.xz
mucproc.doc.tar.xz
mucproc.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ texlive-specs-p.spec ++++++
++++ 40784 lines (skipped)
++++ between /work/SRC/openSUSE:Factory/texlive-specs-p/texlive-specs-p.spec
++++ and /work/SRC/openSUSE:Factory/.texlive-specs-p.new/texlive-specs-p.spec
++++++ mychemistry.doc.tar.xz -> metre.doc.tar.xz ++++++
++++ 3896 lines of diff (skipped)
++++++ mychemistry.doc.tar.xz -> metre.tar.xz ++++++
++++ 4864 lines of diff (skipped)
++++++ minifp.doc.tar.xz ++++++
++++++ minifp.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minifp.tlpobj new/tlpkg/tlpobj/minifp.tlpobj
--- old/tlpkg/tlpobj/minifp.tlpobj 2016-04-14 19:27:49.000000000 +0200
+++ new/tlpkg/tlpobj/minifp.tlpobj 2017-04-14 17:51:15.000000000 +0200
@@ -15,7 +15,7 @@
RELOC/tex/generic/minifp/mfpextra.tex
RELOC/tex/generic/minifp/minifp.sty
catalogue-ctan /macros/generic/minifp
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics arithmetic calculation random
catalogue-version 0.96
++++++ minipage-marginpar.doc.tar.xz ++++++
++++++ minipage-marginpar.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minipage-marginpar.tlpobj new/tlpkg/tlpobj/minipage-marginpar.tlpobj
--- old/tlpkg/tlpobj/minipage-marginpar.tlpobj 2016-04-14 19:27:50.000000000 +0200
+++ new/tlpkg/tlpobj/minipage-marginpar.tlpobj 2017-04-14 17:51:15.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/latex/minipage-marginpar/minipage-marginpar.sty
RELOC/tex/latex/minipage-marginpar/mpgmpar.sty
catalogue-ctan /macros/latex/contrib/minipage-marginpar
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics notes boxing
catalogue-version 0.2
++++++ miniplot.doc.tar.xz ++++++
++++++ miniplot.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/miniplot.tlpobj new/tlpkg/tlpobj/miniplot.tlpobj
--- old/tlpkg/tlpobj/miniplot.tlpobj 2016-04-14 19:27:50.000000000 +0200
+++ new/tlpkg/tlpobj/miniplot.tlpobj 2017-04-14 17:51:15.000000000 +0200
@@ -15,6 +15,6 @@
runfiles size=11
RELOC/tex/latex/miniplot/miniplot.sty
catalogue-ctan /macros/latex/contrib/miniplot
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics graphics-use
++++++ minitoc.doc.tar.xz ++++++
++++++ minitoc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minitoc.tlpobj new/tlpkg/tlpobj/minitoc.tlpobj
--- old/tlpkg/tlpobj/minitoc.tlpobj 2016-04-14 19:27:58.000000000 +0200
+++ new/tlpkg/tlpobj/minitoc.tlpobj 2017-04-14 17:51:18.000000000 +0200
@@ -236,7 +236,7 @@
RELOC/tex/latex/minitoc/xalx2.mld
RELOC/tex/latex/minitoc/xalx3.mld
catalogue-ctan /macros/latex/contrib/minitoc
-catalogue-date 2016-02-07 10:49:28 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics toc-etc
catalogue-version 61
++++++ minorrevision.doc.tar.xz ++++++
++++++ minorrevision.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minorrevision.tlpobj new/tlpkg/tlpobj/minorrevision.tlpobj
--- old/tlpkg/tlpobj/minorrevision.tlpobj 2016-04-14 19:27:59.000000000 +0200
+++ new/tlpkg/tlpobj/minorrevision.tlpobj 2017-04-14 17:51:18.000000000 +0200
@@ -14,7 +14,7 @@
runfiles size=1
RELOC/tex/latex/minorrevision/minorrevision.sty
catalogue-ctan /macros/latex/contrib/minorrevision
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics editorial
catalogue-version 1.1
++++++ minted.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minted/README new/doc/latex/minted/README
--- old/doc/latex/minted/README 2015-02-03 00:29:53.000000000 +0100
+++ new/doc/latex/minted/README 2016-11-25 19:29:31.000000000 +0100
@@ -1,4 +1,4 @@
-minted highlighted source code for LaTeX
+minted - highlighted source code for LaTeX
minted is a package that facilitates expressive syntax highlighting in LaTeX
using the Pygments library. The package also provides options to customize
Binary files old/doc/latex/minted/minted.pdf and new/doc/latex/minted/minted.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minted.doc.tlpobj new/tlpkg/tlpobj/minted.doc.tlpobj
--- old/tlpkg/tlpobj/minted.doc.tlpobj 2016-04-14 19:27:59.000000000 +0200
+++ new/tlpkg/tlpobj/minted.doc.tlpobj 2017-04-14 17:51:19.000000000 +0200
@@ -1,9 +1,9 @@
name minted.doc
category Package
-revision 38339
+revision 42418
shortdesc doc files of minted
relocated 1
-docfiles size=167
+docfiles size=198
RELOC/doc/latex/minted/Makefile
RELOC/doc/latex/minted/README
RELOC/doc/latex/minted/minted.pdf
++++++ minted.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minted/minted.sty new/tex/latex/minted/minted.sty
--- old/tex/latex/minted/minted.sty 2015-09-10 22:56:54.000000000 +0200
+++ new/tex/latex/minted/minted.sty 2016-11-25 19:33:55.000000000 +0100
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% minted.dtx (with options: `package')
-%% Copyright 2013--2015 Geoffrey M. Poore
+%% Copyright 2013--2016 Geoffrey M. Poore
%% Copyright 2010--2011 Konrad Rudolph
%%
%% This work may be distributed and/or modified under the
@@ -27,19 +27,26 @@
%% and the derived file minted.sty.
\NeedsTeXFormat{LaTeX2e}
\ProvidesPackage{minted}
- [2015/09/09 v2.1 Yet another Pygments shim for LaTeX]
+ [2016/10/31 v2.4.1 Yet another Pygments shim for LaTeX]
\RequirePackage{keyval}
\RequirePackage{kvoptions}
-\RequirePackage{fancyvrb}
+\RequirePackage{fvextra}
\RequirePackage{float}
\RequirePackage{ifthen}
\RequirePackage{calc}
+\IfFileExists{shellesc.sty}
+ {\RequirePackage{shellesc}
+ \@ifpackagelater{shellesc}{2016/04/29}
+ {}
+ {\protected\def\ShellEscape{\immediate\write18 }}}
+ {\protected\def\ShellEscape{\immediate\write18 }}
\RequirePackage{ifplatform}
\RequirePackage{pdftexcmds}
\RequirePackage{etoolbox}
\RequirePackage{xstring}
\RequirePackage{lineno}
-\AtBeginDocument{%
+\RequirePackage{framed}
+\AtEndPreamble{%
\@ifpackageloaded{color}{}{%
\@ifpackageloaded{xcolor}{}{\RequirePackage{xcolor}}}%
}
@@ -50,11 +57,14 @@
\StrSubstitute{\jobname}{ }{_}[\minted@jobname]
\StrSubstitute{\minted@jobname}{*}{_}[\minted@jobname]
\StrSubstitute{\minted@jobname}{"}{}[\minted@jobname]
+\StrSubstitute{\minted@jobname}{'}{_}[\minted@jobname]
\newcommand{\minted@cachedir}{\detokenize{_}minted-\minted@jobname}
\let\minted@cachedir@windows\minted@cachedir
\define@key{minted}{cachedir}{%
\@namedef{minted@cachedir}{#1}%
\StrSubstitute{\minted@cachedir}{/}{\@backslashchar}[\minted@cachedir@windows]}
+\DeclareBoolOption{finalizecache}
+\DeclareBoolOption{frozencache}
\let\minted@outputdir\@empty
\let\minted@outputdir@windows\@empty
\define@key{minted}{outputdir}{%
@@ -67,13 +77,27 @@
\DeclareComplementaryOption{final}{draft}
\ProcessKeyvalOptions*
\ifthenelse{\boolean{minted@newfloat}}{\RequirePackage{newfloat}}{}
-\ifcsname tikzexternalrealjob\endcsname
- \minted@drafttrue
- \minted@cachefalse
+\ifcsname tikzifexternalizing\endcsname
+ \tikzifexternalizing{\minted@drafttrue\minted@cachefalse}{}
\else
+ \ifcsname tikzexternalrealjob\endcsname
+ \minted@drafttrue
+ \minted@cachefalse
+ \else
+ \fi
\fi
-\ifthenelse{\boolean{minted@cache}}{%
- \AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}{}
+\ifthenelse{\boolean{minted@finalizecache}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {\PackageError{minted}%
+ {Options "finalizecache" and "frozencache" are not compatible}%
+ {Options "finalizecache" and "frozencache" are not compatible}}%
+ {}}%
+ {}
+\ifthenelse{\boolean{minted@cache}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {}%
+ {\AtEndOfPackage{\ProvideDirectory{\minted@outputdir\minted@cachedir}}}}%
+ {}
\newcommand{\minted@input}[1]{%
\IfFileExists{#1}%
{\input{#1}}%
@@ -81,11 +105,12 @@
was^^Jprobably given a file that does not exist--otherwise, you may need
^^Jthe outputdir package option, or may be using an incompatible build
tool\ifwindows,^^Jor may be using the kpsewhich option without having
- PowerShell installed\fi}%
+ PowerShell installed\fi,^^Jor may be using frozencache with a missing file}%
{This could be caused by using -output-directory or -aux-directory
^^Jwithout setting minted's outputdir, or by using a build tool that
^^Jchanges paths in ways minted cannot detect\ifwindows, or by using the
- ^^Jkpsewhich option without PowerShell\fi.}}%
+ ^^Jkpsewhich option without PowerShell\fi,
+ ^^Jor using frozencache with a missing file.}}%
}
\newcommand{\minted@infile}{\minted@jobname.out.pyg}
\newcommand{\minted@cachelist}{}
@@ -116,43 +141,49 @@
\fi
}
\ifthenelse{\boolean{minted@draft}}%
- {\AtEndDocument{%
+ {\AtEndDocument{%
+ \ifcsname minted@oldcachelist\endcsname
+ \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
+ \minted@savecachelist
+ \fi}}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {\AtEndDocument{%
\ifcsname minted@oldcachelist\endcsname
- \let\minted@cachelist\minted@oldcachelist
+ \StrSubstitute{\minted@oldcachelist}{,}{,^^J }[\minted@cachelist]
\minted@savecachelist
\fi}}%
- {\AtEndDocument{%
- \minted@savecachelist
- \minted@cleancache}}%
+ {\AtEndDocument{%
+ \minted@savecachelist
+ \minted@cleancache}}}%
\ifwindows
\providecommand{\DeleteFile}[2][]{%
\ifthenelse{\equal{#1}{}}%
- {\IfFileExists{#2}{\immediate\write18{del "#2"}}{}}%
+ {\IfFileExists{#2}{\ShellEscape{del #2}}{}}%
{\IfFileExists{#1/#2}{%
\StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
- \immediate\write18{del "\minted@windir\@backslashchar #2"}}{}}}
+ \ShellEscape{del \minted@windir\@backslashchar #2}}{}}}
\else
\providecommand{\DeleteFile}[2][]{%
\ifthenelse{\equal{#1}{}}%
- {\IfFileExists{#2}{\immediate\write18{rm "#2"}}{}}%
- {\IfFileExists{#1/#2}{\immediate\write18{rm "#1/#2"}}{}}}
+ {\IfFileExists{#2}{\ShellEscape{rm #2}}{}}%
+ {\IfFileExists{#1/#2}{\ShellEscape{rm #1/#2}}{}}}
\fi
\ifwindows
\newcommand{\ProvideDirectory}[1]{%
\StrSubstitute{#1}{/}{\@backslashchar}[\minted@windir]
- \immediate\write18{if not exist "\minted@windir" mkdir "\minted@windir"}}
+ \ShellEscape{if not exist \minted@windir\space mkdir \minted@windir}}
\else
\newcommand{\ProvideDirectory}[1]{%
- \immediate\write18{mkdir -p "#1"}}
+ \ShellEscape{mkdir -p #1}}
\fi
\newboolean{AppExists}
\newread\minted@appexistsfile
\newcommand{\TestAppExists}[1]{
\ifwindows
\DeleteFile{\minted@jobname.aex}
- \immediate\write18{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd)
- do set >"\minted@jobname.aex" >"\minted@jobname.aex"}
+ \ShellEscape{for \string^\@percentchar i in (#1.exe #1.bat #1.cmd)
+ do set > \minted@jobname.aex > \minted@jobname.aex}
%$ <- balance syntax highlighting
\immediate\openin\minted@appexistsfile\minted@jobname.aex
\expandafter\def\expandafter\@tmp@cr\expandafter{\the\endlinechar}
@@ -165,7 +196,7 @@
\immediate\closein\minted@appexistsfile
\DeleteFile{\minted@jobname.aex}
\else
- \immediate\write18{which "#1" && touch "\minted@jobname.aex"}
+ \ShellEscape{which #1 && touch \minted@jobname.aex}
\IfFileExists{\minted@jobname.aex}
{\AppExiststrue
\DeleteFile{\minted@jobname.aex}}
@@ -345,17 +376,17 @@
\newcommand{\minted@def@optfv}[1]{%
\define@key{minted@opt@g}{#1}{%
\expandafter\def\expandafter\minted@optlistfv@g\expandafter{%
- \minted@optlistfv@g#1=##1,}%
+ \minted@optlistfv@g#1={##1},}%
\@namedef{minted@opt@g:#1}{##1}}
\define@key{minted@opt@g@i}{#1}{%
\expandafter\def\expandafter\minted@optlistfv@g@i\expandafter{%
- \minted@optlistfv@g@i#1=##1,}%
+ \minted@optlistfv@g@i#1={##1},}%
\@namedef{minted@opt@g@i:#1}{##1}}
\define@key{minted@opt@lang}{#1}{%
\expandafter\let\expandafter\minted@tmp%
\csname minted@optlistfv@lang\minted@lang\endcsname
\expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=##1,}%
+ \minted@tmp#1={##1},}%
\expandafter\let\csname minted@optlistfv@lang\minted@lang\endcsname%
\minted@tmp
\@namedef{minted@opt@lang\minted@lang:#1}{##1}}
@@ -363,13 +394,13 @@
\expandafter\let\expandafter\minted@tmp%
\csname minted@optlistfv@lang\minted@lang @i\endcsname
\expandafter\def\expandafter\minted@tmp\expandafter{%
- \minted@tmp#1=##1,}%
+ \minted@tmp#1={##1},}%
\expandafter\let\csname minted@optlistfv@lang\minted@lang @i\endcsname%
\minted@tmp
\@namedef{minted@opt@lang\minted@lang @i:#1}{##1}}
\define@key{minted@opt@cmd}{#1}{%
\expandafter\def\expandafter\minted@optlistfv@cmd\expandafter{%
- \minted@optlistfv@cmd#1=##1,}%
+ \minted@optlistfv@cmd#1={##1},}%
\@namedef{minted@opt@cmd:#1}{##1}}
}
\newcommand{\minted@def@optfv@switch}[1]{%
@@ -450,90 +481,77 @@
\@namedef{minted@opt@lang\minted@lang @i:#2}{##1}}
\define@key{minted@opt@cmd}{#2}{%
\@namedef{minted@opt@cmd:#2}{##1}}
-}
-\newcommand{\minted@def@opt@style}{%
- \define@key{minted@opt@g}{style}{%
- \minted@checkstyle{##1}%
- \@namedef{minted@opt@g:style}{##1}}%
- \define@key{minted@opt@g@i}{style}{%
- \minted@checkstyle{##1}%
- \@namedef{minted@opt@g@i:style}{##1}}%
- \define@key{minted@opt@lang}{style}{%
- \minted@checkstyle{##1}%
- \@namedef{minted@opt@lang\minted@lang:style}{##1}}%
- \define@key{minted@opt@lang@i}{style}{%
- \minted@checkstyle{##1}%
- \@namedef{minted@opt@lang\minted@lang @i:style}{##1}}%
- \define@key{minted@opt@cmd}{style}{%
- \minted@checkstyle{##1}%
- \@namedef{minted@opt@cmd:style}{##1}}%
+ \ifstrempty{#1}{}{\@namedef{minted@opt@g:#2}{#1}}%
}
\newcommand{\minted@checkstyle}[1]{%
\ifcsname minted@styleloaded@\ifstrempty{#1}{default-pyg-prefix}{#1}\endcsname\else
+ \ifstrempty{#1}{}{\ifcsname PYG\endcsname\else\minted@checkstyle{}\fi}%
\expandafter\gdef%
\csname minted@styleloaded@\ifstrempty{#1}{default-pyg-prefix}{#1}\endcsname{}%
\ifthenelse{\boolean{minted@cache}}%
- {\IfFileExists
+ {\IfFileExists
{\minted@outputdir\minted@cachedir/\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}%
{}%
{%
- \ifwindows
- \immediate\write18{%
- \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
- -P commandprefix=PYG#1
- > "\minted@outputdir@windows\minted@cachedir@windows\@backslashchar%
- \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle"}%
- \else
- \immediate\write18{%
- \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
- -P commandprefix=PYG#1
- > "\minted@outputdir\minted@cachedir/%
- \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle"}%
- \fi
+ \ifthenelse{\boolean{minted@frozencache}}%
+ {\PackageError{minted}%
+ {Missing style definition for #1 with frozencache}%
+ {Missing style definition for #1 with frozencache}}%
+ {\ifwindows
+ \ShellEscape{%
+ \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
+ -P commandprefix=PYG#1
+ > \minted@outputdir@windows\minted@cachedir@windows\@backslashchar%
+ \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}%
+ \else
+ \ShellEscape{%
+ \MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
+ -P commandprefix=PYG#1
+ > \minted@outputdir\minted@cachedir/%
+ \ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}%
+ \fi}%
}%
\begingroup
\let\def\gdef
+ \catcode`\_=11
+ \catcode`\-=11
\endlinechar=-1\relax
\minted@input{%
\minted@outputdir\minted@cachedir/\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}%
\endgroup
\minted@addcachefile{\ifstrempty{#1}{default-pyg-prefix}{#1}.pygstyle}}%
- {\ifwindows
- \immediate\write18{%
+ {%
+ \ifwindows
+ \ShellEscape{%
\MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
- -P commandprefix=PYG#1 > "\minted@outputdir@windows\minted@jobname.out.pyg"}%
+ -P commandprefix=PYG#1 > \minted@outputdir@windows\minted@jobname.out.pyg}%
\else
- \immediate\write18{%
+ \ShellEscape{%
\MintedPygmentize\space -S \ifstrempty{#1}{default}{#1} -f latex
- -P commandprefix=PYG#1 > "\minted@outputdir\minted@jobname.out.pyg"}%
+ -P commandprefix=PYG#1 > \minted@outputdir\minted@jobname.out.pyg}%
\fi
\begingroup
\let\def\gdef
+ \catcode`\_=11
+ \catcode`\-=11
\endlinechar=-1\relax
\minted@input{\minted@outputdir\minted@jobname.out.pyg}%
\endgroup}%
+ \ifstrempty{#1}{\minted@patch@PYGZsq}{}%
\fi
}
\ifthenelse{\boolean{minted@draft}}{\renewcommand{\minted@checkstyle}[1]{}}{}
-\AtBeginDocument{\minted@checkstyle{}}
\newcommand{\minted@patch@PYGZsq}{%
\ifcsname PYGZsq\endcsname
- \ifx\upquote@cmtt\minted@undefined\else
- \ifx\encodingdefault\upquote@OTone
- \ifx\ttdefault\upquote@cmtt
- \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
- {\expandafter\gdef\csname PYGZsq\endcsname{\char13 }}{}%
- \else
- \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
- {\expandafter\gdef\csname PYGZsq\endcsname{\textquotesingle}}{}%
- \fi
- \else
- \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
- {\expandafter\gdef\csname PYGZsq\endcsname{\textquotesingle}}{}%
- \fi
- \fi
+ \expandafter\ifdefstring\expandafter{\csname PYGZsq\endcsname}{\char`\'}%
+ {\minted@patch@PYGZsq@i}%
+ {}%
\fi
}
+\begingroup
+\catcode`\'=\active
+\gdef\minted@patch@PYGZsq@i{\gdef\PYGZsq{'}}
+\endgroup
\ifthenelse{\boolean{minted@draft}}{}{\AtBeginDocument{\minted@patch@PYGZsq}}
\newcommand{\minted@def@opt@switch}[2][false]{%
\define@booleankey{minted@opt@g}{#2}%
@@ -605,7 +623,7 @@
\minted@def@optcl@switch{texcomments}{-P texcomments}
\minted@def@optcl@switch{mathescape}{-P mathescape}
\minted@def@optfv@switch{linenos}
-\minted@def@opt@style
+\minted@def@opt{style}
\minted@def@optfv{frame}
\minted@def@optfv{framesep}
\minted@def@optfv{framerule}
@@ -627,13 +645,27 @@
\minted@def@optfv{fontseries}
\minted@def@optfv{formatcom}
\minted@def@optfv{label}
+\minted@def@optfv{labelposition}
+\minted@def@optfv{highlightlines}
+\minted@def@optfv{highlightcolor}
+\minted@def@optfv{space}
+\minted@def@optfv{spacecolor}
+\minted@def@optfv{tab}
+\minted@def@optfv{tabcolor}
+\minted@def@optfv{highlightcolor}
+\minted@def@optfv@switch{curlyquotes}
+\minted@def@optfv@switch{numberfirstline}
\minted@def@optfv@switch{numberblanklines}
+\minted@def@optfv@switch{stepnumberfromfirst}
+\minted@def@optfv@switch{stepnumberoffsetvalues}
\minted@def@optfv@switch{showspaces}
\minted@def@optfv@switch{resetmargins}
\minted@def@optfv@switch{samepage}
\minted@def@optfv@switch{showtabs}
\minted@def@optfv@switch{obeytabs}
\minted@def@optfv@switch{breaklines}
+\minted@def@optfv@switch{breakbytoken}
+\minted@def@optfv@switch{breakbytokenanywhere}
\minted@def@optfv{breakindent}
\minted@def@optfv@switch{breakautoindent}
\minted@def@optfv{breaksymbol}
@@ -645,6 +677,10 @@
\minted@def@optfv{breaksymbolright}
\minted@def@optfv{breaksymbolsepright}
\minted@def@optfv{breaksymbolindentright}
+\minted@def@optfv{breakbefore}
+\minted@def@optfv{breakbeforesymbolpre}
+\minted@def@optfv{breakbeforesymbolpost}
+\minted@def@optfv@switch{breakbeforegroup}
\minted@def@optfv{breakafter}
\minted@def@optfv@switch{breakaftergroup}
\minted@def@optfv{breakaftersymbolpre}
@@ -652,347 +688,20 @@
\minted@def@optfv@switch{breakanywhere}
\minted@def@optfv{breakanywheresymbolpre}
\minted@def@optfv{breakanywheresymbolpost}
-\minted@def@opt@switch{breakbytoken}
-\minted@def@opt@switch{breakbytokenanywhere}
\minted@def@opt{bgcolor}
\minted@def@opt@switch{autogobble}
\newcommand{\minted@encoding}{\minted@get@opt{encoding}{UTF8}}
-\ifcsname KV@FV@breaklines\endcsname\else
-\newboolean{FV@BreakLines}
-\let\FV@ListProcessLine@Orig\FV@ListProcessLine
-\define@booleankey{FV}{breaklines}%
- {\FV@BreakLinestrue
- \let\FV@ListProcessLine\FV@ListProcessLine@Break}%
- {\FV@BreakLinesfalse
- \let\FV@ListProcessLine\FV@ListProcessLine@Orig}
-\newdimen\FV@BreakIndent
-\define@key{FV}{breakindent}{\FV@BreakIndent=#1}
-\fvset{breakindent=0pt}
-\newboolean{FV@BreakAutoIndent}
-\define@booleankey{FV}{breakautoindent}%
- {\FV@BreakAutoIndenttrue}{\FV@BreakAutoIndentfalse}
-\fvset{breakautoindent=true}
-\define@key{FV}{breaksymbolleft}{\def\FancyVerbBreakSymbolLeft{#1}}
-\define@key{FV}{breaksymbol}{\fvset{breaksymbolleft=#1}}
-\fvset{breaksymbolleft=\tiny\ensuremath{\hookrightarrow}}
-\define@key{FV}{breaksymbolright}{\def\FancyVerbBreakSymbolRight{#1}}
-\fvset{breaksymbolright={}}
-\newdimen\FV@BreakSymbolSepLeft
-\define@key{FV}{breaksymbolsepleft}{\FV@BreakSymbolSepLeft=#1}
-\define@key{FV}{breaksymbolsep}{\fvset{breaksymbolsepleft=#1}}
-\fvset{breaksymbolsepleft=1em}
-\newdimen\FV@BreakSymbolSepRight
-\define@key{FV}{breaksymbolsepright}{\FV@BreakSymbolSepRight=#1}
-\fvset{breaksymbolsepright=1em}
-\newdimen\FV@BreakSymbolIndentLeft
-\settowidth{\FV@BreakSymbolIndentLeft}{\ttfamily xxxx}
-\define@key{FV}{breaksymbolindentleft}{\FV@BreakSymbolIndentLeft=#1}
-\define@key{FV}{breaksymbolindent}{\fvset{breaksymbolindentleft=#1}}
-\newdimen\FV@BreakSymbolIndentRight
-\settowidth{\FV@BreakSymbolIndentRight}{\ttfamily xxxx}
-\define@key{FV}{breaksymbolindentright}{\FV@BreakSymbolIndentRight=#1}
-\newcommand{\FancyVerbFormatBreakSymbolLeft}[1]{%
- \ifnum\value{linenumber}=1\relax\else{#1}\fi}
-\newcounter{FancyVerbLineBreakLast}
-\newcommand{\FV@SetLineBreakLast}{%
- \setcounter{FancyVerbLineBreakLast}{\value{linenumber}}}
-\newcommand{\FancyVerbFormatBreakSymbolRight}[1]{%
- \ifnum\value{linenumber}=\value{FancyVerbLineBreakLast}\relax\else{#1}\fi}
-\newboolean{FV@BreakAnywhere}
-\define@booleankey{FV}{breakanywhere}%
- {\FV@BreakAnywheretrue
- \let\FancyVerbBreakStart\FV@Break
- \let\FancyVerbBreakStop\FV@EndBreak
- \let\FV@Break@Token\FV@Break@AnyToken}%
- {\FV@BreakAnywherefalse
- \let\FancyVerbBreakStart\relax
- \let\FancyVerbBreakStop\relax}
-\fvset{breakanywhere=false}
-\let\FancyVerbBreakStart\relax
-\let\FancyVerbBreakStop\relax
-\edef\FV@hashchar{\string#}
-\edef\FV@dollarchar{\string$}
-\edef\FV@ampchar{\string&}
-\edef\FV@underscorechar{\string_}
-\edef\FV@tildechar{\string~}
-\edef\FV@leftsquarebracket{\string[}
-\edef\FV@rightsquarebracket{\string]}
-\newcommand{\FV@EscChars}{%
- \let\#\FV@hashchar
- \let\%\@percentchar
- \let\{\@charlb
- \let\}\@charrb
- \let\$\FV@dollarchar
- \let\&\FV@ampchar
- \let\_\FV@underscorechar
- \let\\\@backslashchar
- \let~\FV@tildechar
- \let\~\FV@tildechar
- \let\[\FV@leftsquarebracket
- \let\]\FV@rightsquarebracket
-} %$ <- highlighting
-\define@key{FV}{breakafter}{%
- \ifstrempty{#1}%
- {\let\FV@BreakAfter\@empty
- \let\FancyVerbBreakStart\relax
- \let\FancyVerbBreakStop\relax}%
- {\def\FV@BreakAfter{#1}%
- \let\FancyVerbBreakStart\FV@Break
- \let\FancyVerbBreakStop\FV@EndBreak
- \let\FV@Break@Token\FV@Break@AfterToken}%
-}
-\fvset{breakafter={}}
-\newboolean{FV@BreakAfterGroup}
-\define@booleankey{FV}{breakaftergroup}%
- {\FV@BreakAfterGrouptrue}%
- {\FV@BreakAfterGroupfalse}%
-\fvset{breakaftergroup=true}
-\def\FV@BreakAfterPrep{%
- \ifx\FV@BreakAfter\@empty\relax
- \else
- \gdef\FV@BreakAfter@Def{}%
- \begingroup
- \def\FV@BreakAfter@Process##1##2\FV@Undefined{%
- \expandafter\FV@BreakAfter@Process@i\expandafter{##1}%
- \expandafter\ifx\expandafter\relax\detokenize{##2}\relax
- \else
- \FV@BreakAfter@Process##2\FV@Undefined
- \fi
- }%
- \def\FV@BreakAfter@Process@i##1{%
- \g@addto@macro\FV@BreakAfter@Def{%
- \@namedef{FV@BreakAfter@Token\detokenize{##1}}{}}%
- }%
- \FV@EscChars
- \expandafter\FV@BreakAfter@Process\FV@BreakAfter\FV@Undefined
- \endgroup
- \FV@BreakAfter@Def
- \fi
-}
-\expandafter\def\expandafter\FV@FormattingPrep\expandafter{%
- \expandafter\FV@BreakAfterPrep\FV@FormattingPrep}
-\define@key{FV}{breakanywheresymbolpre}{%
- \ifstrempty{#1}%
- {\def\FancyVerbBreakAnywhereSymbolPre{}}%
- {\def\FancyVerbBreakAnywhereSymbolPre{\hbox{#1}}}}
-\fvset{breakanywheresymbolpre={\,\footnotesize\ensuremath{_\rfloor}}}
-\define@key{FV}{breakanywheresymbolpost}{%
- \ifstrempty{#1}%
- {\def\FancyVerbBreakAnywhereSymbolPost{}}%
- {\def\FancyVerbBreakAnywhereSymbolPost{\hbox{#1}}}}
-\fvset{breakanywheresymbolpost={}}
-\define@key{FV}{breakaftersymbolpre}{%
- \ifstrempty{#1}%
- {\def\FancyVerbBreakAfterSymbolPre{}}%
- {\def\FancyVerbBreakAfterSymbolPre{\hbox{#1}}}}
-\fvset{breakaftersymbolpre={\,\footnotesize\ensuremath{_\rfloor}}}
-\define@key{FV}{breakaftersymbolpost}{%
- \ifstrempty{#1}%
- {\def\FancyVerbBreakAfterSymbolPost{}}%
- {\def\FancyVerbBreakAfterSymbolPost{\hbox{#1}}}}
-\fvset{breakaftersymbolpost={}}
-\newcommand{\FancyVerbBreakAnywhereBreak}{%
- \discretionary{\FancyVerbBreakAnywhereSymbolPre}%
- {\FancyVerbBreakAnywhereSymbolPost}{}}
-\newcommand{\FancyVerbBreakAfterBreak}{%
- \discretionary{\FancyVerbBreakAfterSymbolPre}%
- {\FancyVerbBreakAfterSymbolPost}{}}
-\newsavebox{\FV@LineBox}
-\newsavebox{\FV@LineIndentBox}
-\let\FV@LineIndentChars\@empty
-\def\FV@GetNextChar{\let\FV@NextChar=}
-\def\FV@CleanRemainingChars#1\FV@Undefined{}
-\def\FV@GetLineIndent{\afterassignment\FV@CheckIndentChar\FV@GetNextChar}
-\def\FV@CheckIndentChar{%
- \ifx\FV@NextChar\FV@Undefined
- \let\FV@Next=\relax
- \else
- \expandafter\ifx\FV@NextChar\FV@Space
- \g@addto@macro{\FV@LineIndentChars}{\FV@Space}%
- \let\FV@Next=\FV@GetLineIndent
- \else
- \expandafter\ifx\FV@NextChar\FV@Tab
- \g@addto@macro{\FV@LineIndentChars}{\FV@Tab}%
- \let\FV@Next=\FV@GetLineIndent
- \else
- \let\FV@Next=\FV@CleanRemainingChars
- \fi
- \fi
- \fi
- \FV@Next
-}
-\def\FV@Break{%
- \def\FV@Tmp{}%
- \FV@Break@Scan
-}
-\def\FV@EndBreak{\FV@Tmp}
-\begingroup
-\catcode`\$=3%
-\gdef\FV@Break@Scan{%
- \@ifnextchar\FV@EndBreak%
- {}%
- {\ifx\@let@token$\relax
- \let\FV@Break@Next\FV@Break@Math
- \else
- \ifx\@let@token\bgroup\relax
- \let\FV@Break@Next\FV@Break@Group
- \else
- \let\FV@Break@Next\FV@Break@Token
- \fi
- \fi
- \FV@Break@Next}%
-}
-\endgroup
-\begingroup
-\catcode`\$=3%
-\gdef\FV@Break@Math$#1${%
- \g@addto@macro{\FV@Tmp}{$#1$}%
- \FV@Break@Scan}
-\endgroup
-\def\FV@Break@Group#1{%
- \g@addto@macro{\FV@Tmp}{{#1}}%
- \FV@Break@Scan}
-\def\FV@Break@AnyToken#1{%
- \g@addto@macro{\FV@Tmp}{\FancyVerbBreakAnywhereBreak#1}%
- \FV@Break@Scan}
-\def\FV@Break@AfterToken#1{%
- \ifcsname FV@BreakAfter@Token\detokenize{#1}\endcsname
- \let\FV@Break@Next\FV@Break@AfterTokenBreak
- \else
- \let\FV@Break@Next\FV@Break@AfterTokenNoBreak
- \fi
- \FV@Break@Next{#1}%
-}
-\def\FV@Break@AfterTokenNoBreak#1{%
- \g@addto@macro{\FV@Tmp}{#1}%
- \FV@Break@Scan}
-\def\FV@Break@AfterTokenBreak#1{%
- \@ifnextchar\FV@Space%
- {\g@addto@macro{\FV@Tmp}{#1}\FV@Break@Scan}%
- {\ifthenelse{\boolean{FV@BreakAfterGroup}}%
- {\ifx\@let@token#1\relax
- \g@addto@macro{\FV@Tmp}{#1}%
- \let\FV@Break@Next\FV@Break@Scan
- \else
- \ifx\@let@token\bgroup\relax
- \g@addto@macro{\FV@Tmp}{#1}%
- \let\FV@TmpToken#1%
- \let\FV@Break@Next\FV@Break@AfterTokenBreak@Group
- \else
- \g@addto@macro{\FV@Tmp}{#1\FancyVerbBreakAfterBreak}%
- \let\FV@Break@Next\FV@Break@Scan
- \fi
- \fi}%
- {\g@addto@macro{\FV@Tmp}{#1\FancyVerbBreakAfterBreak}%
- \let\FV@Break@Next\FV@Break@Scan}%
- \FV@Break@Next}%
-}
-\def\FV@Break@AfterTokenBreak@Group#1{%
- \g@addto@macro{\FV@Tmp}{{#1}}%
- \ifstrempty{#1}%
- {\let\FV@Break@Next\FV@Break@AfterTokenBreak@Group@i}%
- {\let\FV@Break@Next\FV@Break@Scan}%
- \FV@Break@Next}
-\def\FV@Break@AfterTokenBreak@Group@i{%
- \@ifnextchar\FV@TmpToken%
- {\FV@Break@Scan}%
- {\g@addto@macro{\FV@Tmp}{\FancyVerbBreakAfterBreak}%
- \FV@Break@Scan}}
-\def\FV@makeLineNumber{%
- \hss
- \FancyVerbFormatBreakSymbolLeft{\FancyVerbBreakSymbolLeft}%
- \hbox to \FV@BreakSymbolSepLeft{\hfill}%
- \rlap{\hskip\linewidth
- \hbox to \FV@BreakSymbolSepRight{\hfill}%
- \FancyVerbFormatBreakSymbolRight{\FancyVerbBreakSymbolRight}%
- \FV@SetLineBreakLast
- }%
-}
-\def\FV@SaveLineBox#1{%
- \savebox{\FV@LineBox}{%
- \advance\linewidth by -\FV@BreakIndent
- \hbox to \FV@BreakIndent{\hfill}%
- \ifthenelse{\boolean{FV@BreakAutoIndent}}%
- {\let\FV@LineIndentChars\@empty
- \FV@GetLineIndent#1\FV@Undefined
- \savebox{\FV@LineIndentBox}{\FV@LineIndentChars}%
- \hbox to \wd\FV@LineIndentBox{\hfill}%
- \advance\linewidth by -\wd\FV@LineIndentBox}%
- {}%
- \ifdefempty{\FancyVerbBreakSymbolLeft}{}%
- {\hbox to \FV@BreakSymbolIndentLeft{\hfill}%
- \advance\linewidth by -\FV@BreakSymbolIndentLeft}%
- \ifdefempty{\FancyVerbBreakSymbolRight}{}%
- {\advance\linewidth by -\FV@BreakSymbolIndentRight}%
- \parbox[t]{\linewidth}{%
- \raggedright
- \leftlinenumbers*
- \begin{internallinenumbers*}%
- \let\makeLineNumber\FV@makeLineNumber
- \noindent\hspace*{-\FV@BreakIndent}%
- \ifdefempty{\FancyVerbBreakSymbolLeft}{}{%
- \hspace*{-\FV@BreakSymbolIndentLeft}}%
- \ifthenelse{\boolean{FV@BreakAutoIndent}}%
- {\hspace*{-\wd\FV@LineIndentBox}}%
- {}%
- \strut#1\nobreak\strut
- \end{internallinenumbers*}
- }%
- \ifdefempty{\FancyVerbBreakSymbolRight}{}%
- {\hbox to \FV@BreakSymbolIndentRight{\hfill}}%
- }%
-}
-\def\FancyVerbFormatText#1{#1}
-\def\FV@ListProcessLine@Break#1{%
- \hbox to \hsize{%
- \kern\leftmargin
- \hbox to \linewidth{%
- \ifx\FV@RightListFrame\relax\else
- \advance\linewidth by -\FV@FrameSep
- \advance\linewidth by -\FV@FrameRule
- \fi
- \ifx\FV@LeftListFrame\relax\else
- \advance\linewidth by -\FV@FrameSep
- \advance\linewidth by -\FV@FrameRule
- \fi
- \sbox{\FV@LineBox}{\FancyVerbFormatLine{\FancyVerbFormatText{#1}}}%
- \ifdim\wd\FV@LineBox>\linewidth
- \setcounter{FancyVerbLineBreakLast}{0}%
- \FV@SaveLineBox{\FancyVerbFormatText{%
- \FancyVerbBreakStart#1\FancyVerbBreakStop}}%
- \ifdefempty{\FancyVerbBreakSymbolRight}{}{%
- \let\FV@SetLineBreakLast\relax
- \FV@SaveLineBox{\FancyVerbFormatText{%
- \FancyVerbBreakStart#1\FancyVerbBreakStop}}}%
- \FV@LeftListNumber
- \FV@LeftListFrame
- \FancyVerbFormatLine{\usebox{\FV@LineBox}}%
- \FV@RightListFrame
- \FV@RightListNumber
- \else
- \FV@LeftListNumber
- \FV@LeftListFrame
- \FancyVerbFormatLine{%
- \parbox[t]{\linewidth}{\noindent\strut\FancyVerbFormatText{#1}\strut}}%
- \FV@RightListFrame
- \FV@RightListNumber
- \fi}%
- \hss}\baselineskip\z@\lineskip\z@}
-\ifcsname KV@FV@linenos\endcsname\else
-\define@booleankey{FV}{linenos}%
- {\@nameuse{FV@Numbers@left}}{\@nameuse{FV@Numbers@none}}
-\fi
-\fi
\newsavebox{\minted@bgbox}
-\newenvironment{minted@colorbg}[1]{
- %\setlength{\fboxsep}{-\fboxrule}
- \def\minted@bgcol{#1}
- \noindent
- \begin{lrbox}{\minted@bgbox}
- \begin{minipage}{\linewidth-2\fboxsep}}
- {\end{minipage}
- \end{lrbox}%
- \colorbox{\minted@bgcol}{\usebox{\minted@bgbox}}}
+\newenvironment{minted@colorbg}[1]{%
+ \setlength{\OuterFrameSep}{0pt}%
+ \colorlet{shadecolor}{#1}%
+ \let\minted@tmp\FV@NumberSep
+ \edef\FV@NumberSep{%
+ \the\numexpr\dimexpr\minted@tmp+\number\fboxsep\relax sp\relax}%
+ \medskip
+ \begin{snugshade*}}
+ {\end{snugshade*}%
+ \medskip\noindent}
\newwrite\minted@code
\newcommand{\minted@savecode}[1]{
\immediate\openout\minted@code\minted@jobname.pyg\relax
@@ -1020,7 +729,10 @@
\ifcsname MintedPygmentize\endcsname\else
\newcommand{\MintedPygmentize}{pygmentize}
\fi
+\newcounter{minted@pygmentizecounter}
\newcommand{\minted@pygmentize}[2][\minted@outputdir\minted@jobname.pyg]{%
+ \minted@checkstyle{\minted@get@opt{style}{default}}%
+ \stepcounter{minted@pygmentizecounter}%
\ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
{\def\minted@codefile{\minted@outputdir\minted@jobname.pyg}}%
{\def\minted@codefile{#1}}%
@@ -1035,206 +747,166 @@
-f latex -P commandprefix=PYG -F tokenmerge
\minted@optlistcl@g \csname minted@optlistcl@lang\minted@lang\endcsname
\minted@optlistcl@inlines
- \minted@optlistcl@cmd -o "\minted@outputdir\minted@infile"
+ \minted@optlistcl@cmd -o \minted@outputdir\minted@infile\space
\ifminted@kpsewhich
\ifwindows
- \detokenize{$}(kpsewhich "\minted@codefile")%
+ \detokenize{$}(kpsewhich \minted@codefile)%
\else
- \detokenize{`}kpsewhich "\minted@codefile"
- \detokenize{||} "\minted@codefile"\detokenize{`}%
+ \detokenize{`}kpsewhich \minted@codefile\space
+ \detokenize{||} \minted@codefile\detokenize{`}%
\fi
\else
- "\minted@codefile"
+ \minted@codefile
\fi}%
% For debugging, uncomment: %%%%
% \immediate\typeout{\minted@cmd}%
% %%%%
\ifthenelse{\boolean{minted@cache}}%
{%
- \ifx\XeTeXinterchartoks\minted@undefined
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
- {\edef\minted@hash{\pdf@filemdfivesum{#1}%
- \pdf@mdfivesum{\minted@cmd autogobble}}}%
- {\edef\minted@hash{\pdf@filemdfivesum{#1}%
- \pdf@mdfivesum{\minted@cmd}}}%
+ \ifminted@frozencache
\else
- \immediate\openout\minted@code\minted@jobname.mintedcmd\relax
- \immediate\write\minted@code{\minted@cmd}%
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
- {\immediate\write\minted@code{autogobble}}{}%
- \immediate\closeout\minted@code
- %Cheating a little here by using ASCII codes to write `{` and `}`
- %in the Python code
- \def\minted@hashcmd{%
- \detokenize{python -c "import hashlib;
- hasher = hashlib.sha1();
- f = open(\"}\minted@outputdir\minted@jobname.mintedcmd\detokenize{\", \"rb\");
- hasher.update(f.read());
- f.close();
- f = open(\"}#1\detokenize{\", \"rb\");
- hasher.update(f.read());
- f.close();
- f = open(\"}\minted@outputdir\minted@jobname.mintedmd5\detokenize{\", \"w\");
- macro = \"\\edef\\minted@hash\" + chr(123) + hasher.hexdigest() + chr(125) + \"\";
- f.write(\"\\makeatletter\" + macro + \"\\makeatother\\endinput\n\");
- f.close();"}}%
- \immediate\write18{\minted@hashcmd}%
- \minted@input{\minted@outputdir\minted@jobname.mintedmd5}%
+ \ifx\XeTeXinterchartoks\minted@undefined
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
+ {\edef\minted@hash{\pdf@filemdfivesum{#1}%
+ \pdf@mdfivesum{\minted@cmd autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}}%
+ {\edef\minted@hash{\pdf@filemdfivesum{#1}%
+ \pdf@mdfivesum{\minted@cmd}}}%
+ \else
+ \ifx\mdfivesum\minted@undefined
+ \immediate\openout\minted@code\minted@jobname.mintedcmd\relax
+ \immediate\write\minted@code{\minted@cmd}%
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
+ {\immediate\write\minted@code{autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}{}%
+ \immediate\closeout\minted@code
+ \edef\minted@argone@esc{#1}%
+ \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]%
+ \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]%
+ \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}%
+ \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]%
+ \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]%
+ %Cheating a little here by using ASCII codes to write `{` and `}`
+ %in the Python code
+ \def\minted@hashcmd{%
+ \detokenize{python -c "import hashlib; import os;
+ hasher = hashlib.sha1();
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.mintedcmd\detokenize{\")), \"rb\");
+ hasher.update(f.read());
+ f.close();
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"rb\");
+ hasher.update(f.read());
+ f.close();
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.mintedmd5\detokenize{\")), \"w\");
+ macro = \"\\edef\\minted@hash\" + chr(123) + hasher.hexdigest() + chr(125) + \"\";
+ f.write(\"\\makeatletter\" + macro + \"\\makeatother\\endinput\n\");
+ f.close();"}}%
+ \ShellEscape{\minted@hashcmd}%
+ \minted@input{\minted@outputdir\minted@jobname.mintedmd5}%
+ \else
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}%
+ {\edef\minted@hash{\mdfivesum file {#1}%
+ \mdfivesum{\minted@cmd autogobble(\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi-\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi)}}}%
+ {\edef\minted@hash{\mdfivesum file {#1}%
+ \mdfivesum{\minted@cmd}}}%
+ \fi
+ \fi
+ \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}%
+ \IfFileExists{\minted@infile}{}{%
+ \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
+ \edef\minted@argone@esc{#1}%
+ \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]%
+ \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]%
+ \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}%
+ \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]%
+ \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]%
+ %Need a version of open() that supports encoding under Python 2
+ \edef\minted@autogobblecmd{%
+ \detokenize{python -c "import sys; import os;
+ import textwrap;
+ from io import open;
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"r\", encoding=\"}\minted@encoding\detokenize{\");
+ t = f.readlines();
+ f.close();
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\")), \"w\", encoding=\"}\minted@encoding\detokenize{\");
+ fvstartnum = }\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi\detokenize{;
+ fvstopnum = }\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi\detokenize{;
+ s = fvstartnum-1 if fvstartnum != 0 else 0;
+ e = fvstopnum if fvstopnum != 0 else len(t);
+ [f.write(textwrap.dedent(\"\".join(x))) for x in (t[0:s], t[s:e], t[e:]) if x];
+ f.close();"}%
+ }%
+ \ShellEscape{\minted@autogobblecmd}}{}%
+ \ShellEscape{\minted@cmd}}%
\fi
- \edef\minted@infile{\minted@cachedir/\minted@hash.pygtex}%
- \IfFileExists{\minted@infile}{}{%
- \ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
- %Need a version of open() that supports encoding under Python 2
- \edef\minted@autogobblecmd{%
- \detokenize{python -c "import sys;
- import textwrap;
- from io import open;
- f = open(\"}#1\detokenize{\", \"r\", encoding=\"}\minted@encoding\detokenize{\");
- t = f.read();
- f.close();
- f = open(\"}\minted@outputdir\minted@jobname.pyg\detokenize{\", \"w\", encoding=\"}\minted@encoding\detokenize{\");
- f.write(textwrap.dedent(t));
- f.close();"}%
- }%
- \immediate\write18{\minted@autogobblecmd}}{}%
- \immediate\write18{\minted@cmd}}%
- \expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}%
+ \ifthenelse{\boolean{minted@finalizecache}}%
+ {%
+ \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
+ \edef\minted@actualinfile{\minted@cachedir/\minted@cachefilename}%
+ \ifwindows
+ \StrSubstitute{\minted@infile}{/}{\@backslashchar}[\minted@infile@windows]
+ \StrSubstitute{\minted@actualinfile}{/}{\@backslashchar}[\minted@actualinfile@windows]
+ \ShellEscape{move /y \minted@infile@windows\space\minted@actualinfile@windows}%
+ \else
+ \ShellEscape{mv -f \minted@infile\space\minted@actualinfile}%
+ \fi
+ \let\minted@infile\minted@actualinfile
+ \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}%
+ }%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {%
+ \edef\minted@cachefilename{listing\arabic{minted@pygmentizecounter}.pygtex}%
+ \edef\minted@infile{\minted@cachedir/\minted@cachefilename}%
+ \expandafter\minted@addcachefile\expandafter{\minted@cachefilename}}%
+ {\expandafter\minted@addcachefile\expandafter{\minted@hash.pygtex}}%
+ }%
\minted@inputpyg}%
{%
\ifthenelse{\equal{\minted@get@opt{autogobble}{false}}{true}}{%
+ \edef\minted@argone@esc{#1}%
+ \StrSubstitute{\minted@argone@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@argone@esc]%
+ \StrSubstitute{\minted@argone@esc}{"}{\@backslashchar"}[\minted@argone@esc]%
+ \edef\minted@tmpfname@esc{\minted@outputdir\minted@jobname}%
+ \StrSubstitute{\minted@tmpfname@esc}{\@backslashchar}{\@backslashchar\@backslashchar}[\minted@tmpfname@esc]%
+ \StrSubstitute{\minted@tmpfname@esc}{"}{\@backslashchar"}[\minted@tmpfname@esc]%
%Need a version of open() that supports encoding under Python 2
\edef\minted@autogobblecmd{%
- \detokenize{python -c "import sys;
+ \detokenize{python -c "import sys; import os;
import textwrap;
from io import open;
- f = open(\"}#1\detokenize{\", \"r\", encoding=\"}\minted@encoding\detokenize{\");
- t = f.read();
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@argone@esc\detokenize{\")), \"r\", encoding=\"}\minted@encoding\detokenize{\");
+ t = f.readlines();
f.close();
- f = open(\"}\minted@outputdir\minted@jobname.pyg\detokenize{\", \"w\", encoding=\"}\minted@encoding\detokenize{\");
- f.write(textwrap.dedent(t));
+ f = open(os.path.expanduser(os.path.expandvars(\"}\minted@tmpfname@esc.pyg\detokenize{\")), \"w\", encoding=\"}\minted@encoding\detokenize{\");
+ fvstartnum = }\ifx\FancyVerbStartNum\z@ 0\else\FancyVerbStartNum\fi\detokenize{;
+ fvstopnum = }\ifx\FancyVerbStopNum\z@ 0\else\FancyVerbStopNum\fi\detokenize{;
+ s = fvstartnum-1 if fvstartnum != 0 else 0;
+ e = fvstopnum if fvstopnum != 0 else len(t);
+ [f.write(textwrap.dedent(\"\".join(x))) for x in (t[0:s], t[s:e], t[e:]) if x];
f.close();"}%
}%
- \immediate\write18{\minted@autogobblecmd}}{}%
- \immediate\write18{\minted@cmd}%
+ \ShellEscape{\minted@autogobblecmd}}{}%
+ \ShellEscape{\minted@cmd}%
\minted@inputpyg}%
}
-\def\FV@SpaceMMode{ }
-\def\minted@BreakAfterPrep@extension{%
- \ifcsname FV@BreakAfter@Token\@backslashchar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZbs}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\FV@underscorechar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZus}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\@charlb\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZob}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\@charrb\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZcb}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{^}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZca}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\FV@ampchar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZam}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{<}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZlt}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{>}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZgt}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\FV@hashchar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZsh}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\@percentchar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZpc}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\FV@dollarchar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZdl}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{-}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZhy}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{'}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZsq}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{"}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZdq}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\FV@tildechar\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZti}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{@}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZat}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{[}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZlb}}{}%
- \fi
- \ifcsname FV@BreakAfter@Token\detokenize{]}\endcsname
- \@namedef{FV@BreakAfter@Token\detokenize{\PYGZrb}}{}%
- \fi
-}
\newcommand{\minted@inputpyg}{%
- \let\FV@BreakAfterPrep@orig\FV@BreakAfterPrep
- \def\FV@BreakAfterPrep{%
- \FV@BreakAfterPrep@orig\minted@BreakAfterPrep@extension}%
- \everymath\expandafter{\the\everymath\let\FV@Space\FV@SpaceMMode}%
- \ifthenelse{\equal{\minted@get@opt{breakbytokenanywhere}{false}}{true}}%
- {\setkeys{minted@opt@cmd}{breakbytoken=true}}{}%
- \ifthenelse{\boolean{FV@BreakAnywhere}}%
- {\expandafter\let\expandafter\minted@orig@PYG@breakanywhere%
- \csname PYG\minted@get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{%
- \minted@orig@PYG@breakanywhere{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}}{}%
- \ifx\FV@BreakAfter\@empty
- \else
- \expandafter\let\expandafter\minted@orig@PYG@breakafter%
- \csname PYG\minted@get@opt{style}{default}\endcsname
- \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{%
- \minted@orig@PYG@breakafter{##1}%
- {\FancyVerbBreakStart##2\FancyVerbBreakStop}}%
- \fi
+ \expandafter\let\expandafter\minted@PYGstyle%
+ \csname PYG\minted@get@opt{style}{default}\endcsname
+ \VerbatimPygments{\PYG}{\minted@PYGstyle}%
\ifthenelse{\boolean{minted@isinline}}%
{\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}%
{\let\FV@BeginVBox\relax
\let\FV@EndVBox\relax
\def\FV@BProcessLine##1{\FancyVerbFormatLine{##1}}%
- \ifthenelse{\equal{\minted@get@opt{breakbytoken}{false}}{true}}%
- {\minted@inputpyg@breakbytoken
- \minted@inputpyg@inline}%
- {\minted@inputpyg@inline}}%
+ \minted@inputpyg@inline}%
{\minted@inputpyg@inline}}%
- {\ifthenelse{\equal{\minted@get@opt{breaklines}{false}}{true}}%
- {\ifthenelse{\equal{\minted@get@opt{breakbytoken}{false}}{true}}%
- {\minted@inputpyg@breakbytoken
- \minted@inputpyg@block}%
- {\minted@inputpyg@block}}%
- {\minted@inputpyg@block}}%
-}
-\def\minted@inputpyg@breakbytoken{%
- \expandafter\let\expandafter\minted@orig@PYG@breakbytoken%
- \csname PYG\minted@get@opt{style}{default}\endcsname
- \ifthenelse{\equal{\minted@get@opt{breakbytokenanywhere}{false}}{true}}%
- {\let\minted@orig@allowbreak\allowbreak
- \def\allowbreak{\let\allowbreak\minted@orig@allowbreak}%
- \expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{%
- \allowbreak{}\leavevmode\hbox{\minted@orig@PYG@breakbytoken{##1}{##2}}}}%
- {\expandafter\def\csname PYG\minted@get@opt{style}{default}\endcsname##1##2{%
- \leavevmode\hbox{\minted@orig@PYG@breakbytoken{##1}{##2}}}}%
+ {\minted@inputpyg@block}%
}
\def\minted@inputpyg@inline{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted@get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
{\minted@input{\minted@outputdir\minted@infile}}%
{\colorbox{\minted@get@opt{bgcolor}{}}{%
\minted@input{\minted@outputdir\minted@infile}}}%
}
\def\minted@inputpyg@block{%
- \expandafter\let\expandafter\PYG%
- \csname PYG\minted@get@opt{style}{default}\endcsname
\ifthenelse{\equal{\minted@get@opt{bgcolor}{}}{}}%
{\minted@input{\minted@outputdir\minted@infile}}%
{\begin{minted@colorbg}{\minted@get@opt{bgcolor}{}}%
@@ -1266,6 +938,7 @@
{\minted@configlang{#1}%
\setkeys{minted@opt@lang@i}{#2}}}
\setmintedinline[php]{startinline=true}
+\setminted{tabcolor=black}
\newcommand{\usemintedstyle}[2][]{\setminted[#1]{style=#2}}
\begingroup
\catcode`\ =\active
@@ -1469,37 +1142,48 @@
\providecommand{\listoflistings}{\listof{listing}{\listoflistingscaption}}
\fi
\AtEndOfPackage{%
- \ifthenelse{\boolean{minted@draft}}{}{%
- \ifnum\pdf@shellescape=1\relax\else
- \PackageError{minted}%
- {You must invoke LaTeX with the
- -shell-escape flag}%
- {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty
- documentation for more information.}%
- \fi
- \setminted{style=default}%
- }%
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {%
+ \ifthenelse{\boolean{minted@frozencache}}{}{%
+ \ifnum\pdf@shellescape=1\relax\else
+ \PackageError{minted}%
+ {You must invoke LaTeX with the
+ -shell-escape flag}%
+ {Pass the -shell-escape flag to LaTeX. Refer to the minted.sty
+ documentation for more information.}%
+ \fi}%
+ }%
}
\AtEndPreamble{%
- \ifthenelse{\boolean{minted@draft}}{}{%
- \TestAppExists{pygmentize}%
- \ifAppExists\else
- \PackageError{minted}%
- {You must have `pygmentize' installed
- to use this package}%
- {Refer to the installation instructions in the minted
- documentation for more information.}%
- \fi
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {%
+ \ifthenelse{\boolean{minted@frozencache}}{}{%
+ \TestAppExists{\MintedPygmentize}%
+ \ifAppExists\else
+ \PackageError{minted}%
+ {You must have `pygmentize' installed
+ to use this package}%
+ {Refer to the installation instructions in the minted
+ documentation for more information.}%
+ \fi}%
}%
}
-\AtEndDocument{
- \ifx\XeTeXinterchartoks\minted@undefined
- \else
- \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}%
- \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}%
- \fi
- \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}%
- \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}%
+\AfterEndDocument{%
+ \ifthenelse{\boolean{minted@draft}}%
+ {}%
+ {\ifthenelse{\boolean{minted@frozencache}}%
+ {}
+ {\ifx\XeTeXinterchartoks\minted@undefined
+ \else
+ \DeleteFile[\minted@outputdir]{\minted@jobname.mintedcmd}%
+ \DeleteFile[\minted@outputdir]{\minted@jobname.mintedmd5}%
+ \fi
+ \DeleteFile[\minted@outputdir]{\minted@jobname.pyg}%
+ \DeleteFile[\minted@outputdir]{\minted@jobname.out.pyg}%
+ }%
+ }%
}
\endinput
%%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minted/minted1.sty new/tex/latex/minted/minted1.sty
--- old/tex/latex/minted/minted1.sty 2015-02-03 00:29:53.000000000 +0100
+++ new/tex/latex/minted/minted1.sty 2016-11-25 19:33:55.000000000 +0100
@@ -5,7 +5,7 @@
%% The original source files were:
%%
%% minted.dtx (with options: `packageone')
-%% Copyright 2013--2015 Geoffrey M. Poore
+%% Copyright 2013--2016 Geoffrey M. Poore
%% Copyright 2010--2011 Konrad Rudolph
%%
%% This work may be distributed and/or modified under the
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minted.tlpobj new/tlpkg/tlpobj/minted.tlpobj
--- old/tlpkg/tlpobj/minted.tlpobj 2016-04-14 19:28:00.000000000 +0200
+++ new/tlpkg/tlpobj/minted.tlpobj 2017-04-14 17:51:19.000000000 +0200
@@ -1,18 +1,18 @@
name minted
category Package
-revision 38339
+revision 42418
shortdesc Highlighted source code for LaTeX
relocated 1
longdesc The package that facilitates expressive syntax highlighting in
longdesc LaTeX using the powerful Pygments library. The package also
longdesc provides options to customize the highlighted source code
longdesc output using fancyvrb.
-runfiles size=17
+runfiles size=15
RELOC/tex/latex/minted/minted.sty
RELOC/tex/latex/minted/minted1.sty
catalogue-also texments verbments
catalogue-ctan /macros/latex/contrib/minted
-catalogue-date 2015-09-09 23:19:24 +0200
+catalogue-date 2016-11-01 08:52:52 +0100
catalogue-license lppl1.3
catalogue-topics listing
-catalogue-version 2.1
+catalogue-version 2.4.1
++++++ mintspirit.doc.tar.xz ++++++
++++++ mintspirit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mintspirit.tlpobj new/tlpkg/tlpobj/mintspirit.tlpobj
--- old/tlpkg/tlpobj/mintspirit.tlpobj 2016-04-14 19:28:00.000000000 +0200
+++ new/tlpkg/tlpobj/mintspirit.tlpobj 2017-04-14 17:51:19.000000000 +0200
@@ -559,6 +559,6 @@
RELOC/tex/latex/mintspirit/mintspirit.sty
RELOC/tex/latex/mintspirit/mintspirit2.sty
catalogue-ctan /fonts/mintspirit
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license ofl
catalogue-topics font font-sans font-otf font-type1
++++++ minutes.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/MinStyGd.tex new/doc/latex/minutes/MinStyGd.tex
--- old/doc/latex/minutes/MinStyGd.tex 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/MinStyGd.tex 2016-11-25 19:29:32.000000000 +0100
@@ -1,5 +1,5 @@
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/README new/doc/latex/minutes/README
--- old/doc/latex/minutes/README 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,55 +0,0 @@
-Name of contribution: minutes
-Name and email: Knut Lickert
-Location on CTAN: tex-archive/macros/latex/contrib/minutes
- http://tex.lickert.net/packages/minutes/index.html
-Summary description: Package for writing (collection of) minutes
-German Information: Paket zum Erstellen von Protokollen
- to take minutes = Protokoll schreiben
- protocoll = diplomatische Protokoll
-License type: Free (LaTeX Project Public License)
-
-Announcement text:
-----------------------------------------------------------------------
-minutes.sty provides the creation of a collection of minutes.
-Special features:
-- Support of tasks (who, schedule, what, date of finishing),
- possibility of creating a list of open tasks
- inclusion of open tasks from other minutes ('open last year tasks')
- (also possible as task.sty)
-- Support of attachments
-- Support of schedule dates (support of calendar.sty)
-- Different versions (`secret parts')
-- Macros for votes and decisions (list of decisions)
-
-The minutes package contains:
-- minutes.dtx
-- minutes.ins
-- protokol.tex German description
-- Overview.tex Include for minutes.dtx and protokol.tex
- Also stand-alone document
-- Tagesordnung.tex
- A template for a "Mitgliederversammlung"
-To run the examples, you need blindtext.sty.
-
-After running minutes.ins this package include:
-- minutes.sty The style itself
-- minutes.cfg A configuration file
-- Sample.tex A file, including an English, Dutch and German minute
-- SampleEN.tex An English minutes (loaded by Sample.tex)
-- SampleDE.tex A German minutes (loaded by Sample.tex)
-- SampleNL.tex A Dutch minutes (loaded by Sample.tex)
-- MinStyGd.tex A file to check the behavior with other classes,
- test different layouts...
-
-====================================
-Version 2.8b.
-Solves some incompatibility with other packages.
-
-Version 2.8c:
-Minor changes.
-
-Version 2.8d:
-*Add Polish texts
-*Correction French texts
-*Correction in example file Protokol.tex (after error message in d.c.t.t.)
-*Extend samples with attachments with label.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/README.md new/doc/latex/minutes/README.md
--- old/doc/latex/minutes/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/minutes/README.md 2016-11-25 19:29:32.000000000 +0100
@@ -0,0 +1,64 @@
+Name of contribution: minutes
+Name and email: Knut Lickert
+Location on CTAN: tex-archive/macros/latex/contrib/minutes
+ http://tex.lickert.net/packages/minutes/index.html
+Summary description: Package for writing (collection of) minutes
+German Information: Paket zum Erstellen von Protokollen
+ to take minutes = Protokoll schreiben
+ protocoll = diplomatische Protokoll
+License type: Free (LaTeX Project Public License)
+
+Announcement text:
+----------------------------------------------------------------------
+minutes.sty provides the creation of a collection of minutes.
+Special features:
+- Support of tasks (who, schedule, what, date of finishing),
+ possibility of creating a list of open tasks
+ inclusion of open tasks from other minutes ('open last year tasks')
+ (also possible as task.sty)
+- Support of attachments
+- Support of schedule dates (support of calendar.sty)
+- Different versions (`secret parts')
+- Macros for votes and decisions (list of decisions)
+
+The minutes package contains:
+- minutes.dtx
+- minutes.ins
+- protokol.tex German description
+- Overview.tex Include for minutes.dtx and protokol.tex
+ Also stand-alone document
+- Tagesordnung.tex
+ A template for a "Mitgliederversammlung"
+To run the examples, you need blindtext.sty.
+
+After running minutes.ins this package include:
+- minutes.sty The style itself
+- minutes.cfg A configuration file
+- Sample.tex A file, including an English, Dutch and German minute
+- SampleEN.tex An English minutes (loaded by Sample.tex)
+- SampleDE.tex A German minutes (loaded by Sample.tex)
+- SampleNL.tex A Dutch minutes (loaded by Sample.tex)
+- MinStyGd.tex A file to check the behavior with other classes,
+ test different layouts...
+
+====================================
+Version 1.8b.
+Solves some incompatibility with other packages.
+
+Version 1.8c:
+*Minor corrections (space around -- at time)
+*Corrected documentation (previous pdf was uncomplete)
+
+Version 1.8d (2009-12-04)
+*Add Polish texts
+*Correction French texts
+*Correction in example file Protokol.tex (after error message in d.c.t.t.)
+*Extend samples with attachments with label.
+
+Version 1.8e:
+Minor corrections Polish
+
+Version 1.8f (2010-10-03/2016-10-01):
+*corrections for optional minutes-title
+*correction in texts (avoid unwanted spaces)
+*Adaption version numbering in this readme
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/Sample.tex new/doc/latex/minutes/Sample.tex
--- old/doc/latex/minutes/Sample.tex 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/Sample.tex 2016-11-25 19:29:32.000000000 +0100
@@ -1,5 +1,5 @@
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleDE.tex new/doc/latex/minutes/SampleDE.tex
--- old/doc/latex/minutes/SampleDE.tex 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/SampleDE.tex 2016-11-25 19:29:32.000000000 +0100
@@ -1,5 +1,5 @@
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleEN.tex new/doc/latex/minutes/SampleEN.tex
--- old/doc/latex/minutes/SampleEN.tex 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/SampleEN.tex 2016-11-25 19:29:32.000000000 +0100
@@ -1,5 +1,5 @@
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/minutes/SampleNL.tex new/doc/latex/minutes/SampleNL.tex
--- old/doc/latex/minutes/SampleNL.tex 2009-12-11 02:05:25.000000000 +0100
+++ new/doc/latex/minutes/SampleNL.tex 2016-11-25 19:29:32.000000000 +0100
@@ -1,5 +1,5 @@
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
Binary files old/doc/latex/minutes/minutes.pdf and new/doc/latex/minutes/minutes.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minutes.doc.tlpobj new/tlpkg/tlpobj/minutes.doc.tlpobj
--- old/tlpkg/tlpobj/minutes.doc.tlpobj 2016-04-14 19:28:03.000000000 +0200
+++ new/tlpkg/tlpobj/minutes.doc.tlpobj 2017-04-14 17:51:20.000000000 +0200
@@ -1,13 +1,13 @@
name minutes.doc
category Package
-revision 16350
+revision 42186
shortdesc doc files of minutes
relocated 1
-docfiles size=91
+docfiles size=110
RELOC/doc/latex/minutes/MinStyGd.tex
RELOC/doc/latex/minutes/Overview.tex
RELOC/doc/latex/minutes/Protokol.tex
- RELOC/doc/latex/minutes/README
+ RELOC/doc/latex/minutes/README.md
RELOC/doc/latex/minutes/Sample.tex
RELOC/doc/latex/minutes/SampleDE.tex
RELOC/doc/latex/minutes/SampleEN.tex
++++++ minutes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/minutes/minutes.sty new/tex/latex/minutes/minutes.sty
--- old/tex/latex/minutes/minutes.sty 2009-12-11 02:05:25.000000000 +0100
+++ new/tex/latex/minutes/minutes.sty 2016-11-25 19:33:55.000000000 +0100
@@ -52,8 +52,8 @@
%% - MinStyGd.tex A file to check the behavior with other classes,
%% test different layouts...
%% ----------------------------------------------------------------------
-\def\minfileversion{V1.8d} %^^Aof minutes.sty
-\def\minfiledate{2009/12/04} %^^Aof minutes.sty
+\def\minfileversion{V1.8f} %^^Aof minutes.sty
+\def\minfiledate{2010/03/11} %^^Aof minutes.sty
%%
%% \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
@@ -288,7 +288,7 @@
\let\protokollKopf\maketitle
\let\notulenkop\maketitle
\def\min@title{#2}
-\ifx#1\relax
+\ifx{#1}\relax
\def\min@titleshort{#2}
\else
\def\min@titleshort{#1}
@@ -879,194 +879,194 @@
\let\naschrift\postscript
\newenvironment{Naschrift}{\begin{Postscript}}{\end{Postscript}}
\@ifundefined{addto}{\newcommand{\addto}[2]{#2}}{\relax}
-\addto\extrasenglish{
-\def\min@textModerator{Moderation}
-\def\min@textMinutesTaker{Minutes taker}
-\def\min@textPresent{Those present} %Participiant:
-\def\min@textAbsent{Absent}
-\def\min@textAbsentExcused{\min@textAbsent\xspace (excused)}
-\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (not excused)}
-\def\min@textGuest{Guest}
-\def\min@textDate{Date}
-\def\min@textStarttime{Begin of the meeting}
-\def\min@textEndtime{End of the meeting}
-\def\min@textLocation{Location of the meeting}
-\def\min@textCc{Distribution}
-\def\min@textPostscript{Postscript}
-\def\min@textEnclosure{Enclosure}
-\def\min@textforeignMinutes{Foreign minutes}
-\def\min@textSecret{including non-public informations}
-\def\min@textPage{page}
+\addto\extrasenglish{%
+\def\min@textModerator{Moderation}%
+\def\min@textMinutesTaker{Minutes taker}%
+\def\min@textPresent{Those present}%Participiant:
+\def\min@textAbsent{Absent}%
+\def\min@textAbsentExcused{\min@textAbsent\xspace (excused)}%
+\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (not excused)}%
+\def\min@textGuest{Guest}%
+\def\min@textDate{Date}%
+\def\min@textStarttime{Begin of the meeting}%
+\def\min@textEndtime{End of the meeting}%
+\def\min@textLocation{Location of the meeting}%
+\def\min@textCc{Distribution}%
+\def\min@textPostscript{Postscript}%
+\def\min@textEnclosure{Enclosure}%
+\def\min@textforeignMinutes{Foreign minutes}%
+\def\min@textSecret{including non-public informations}%
+\def\min@textPage{page}%
\def\min@toptext{}%Text before Topic
-\def\min@textForeign{(no \LaTeXe -minute)}
-\def\min@textYes{Yes}
-\def\min@textNo{No}
-\def\min@textNoVote{no vote}
-\def\min@textDecision{Decision}
-\def\min@textTask{Task}
-\def\min@textResponsible{Responsible}
-\def\min@textAnybody{Anybody}
-\@ifundefined{chapter}{
- \renewcommand{\partname}{Minutes}
- \renewcommand{\ptctitle}{Overview of topics}
- }{
- \renewcommand{\chaptername}{Minutes}
- \def\mtctitle{List of topics}
- }
+\def\min@textForeign{(no \LaTeXe -minute)}%
+\def\min@textYes{Yes}%
+\def\min@textNo{No}%
+\def\min@textNoVote{no vote}%
+\def\min@textDecision{Decision}%
+\def\min@textTask{Task}%
+\def\min@textResponsible{Responsible}%
+\def\min@textAnybody{Anybody}%
+\@ifundefined{chapter}{%
+ \renewcommand{\partname}{Minutes}%
+ \renewcommand{\ptctitle}{Overview of topics}%
+ }{%
+ \renewcommand{\chaptername}{Minutes}%
+ \def\mtctitle{List of topics}%
+ }%
}
-\addto\extrasdutch{
-\def\min@textModerator{Voorzitter}
-\def\min@textMinutesTaker{Notulist}
-\def\min@textPresent{Aanwezig} %Participiant:
-\def\min@textAbsent{Afwezig}
-\def\min@textAbsentExcused{\min@textAbsent\xspace (met bericht)}
-\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (zonder bericht)}
-\def\min@textGuest{Gasten}
-\def\min@textDate{Datum}
-\def\min@textStarttime{Begin van de bijeenkomst}
-\def\min@textEndtime{Eind van de bijeenkomst}
-\def\min@textLocation{Locatie van de bijeenkomst}
-\def\min@textCc{Distributie}
-\def\min@textPostscript{Naschrift}
-\def\min@textEnclosure{Bijlagen}
-\def\min@textforeignMinutes{Externe notulen}
-\def\min@textSecret{inclusief niet openbare informatie}
-\def\min@textPage{pagina}
+\addto\extrasdutch{%
+\def\min@textModerator{Voorzitter}%
+\def\min@textMinutesTaker{Notulist}%
+\def\min@textPresent{Aanwezig}%Participiant:
+\def\min@textAbsent{Afwezig}%
+\def\min@textAbsentExcused{\min@textAbsent\xspace (met bericht)}%
+\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (zonder bericht)}%
+\def\min@textGuest{Gasten}%
+\def\min@textDate{Datum}%
+\def\min@textStarttime{Begin van de bijeenkomst}%
+\def\min@textEndtime{Eind van de bijeenkomst}%
+\def\min@textLocation{Locatie van de bijeenkomst}%
+\def\min@textCc{Distributie}%
+\def\min@textPostscript{Naschrift}%
+\def\min@textEnclosure{Bijlagen}%
+\def\min@textforeignMinutes{Externe notulen}%
+\def\min@textSecret{inclusief niet openbare informatie}%
+\def\min@textPage{pagina}%
\def\min@toptext{}%Text before Topic
-\def\min@textForeign{(no \LaTeXe -minute)}
-\def\min@textYes{Ja}
-\def\min@textNo{Nee}
-\def\min@textNoVote{Geen Mening}
-\def\min@textDecision{Besluit}
-\def\min@textTask{Aktie}
-\def\min@textResponsible{Verantwoordelijk}
-\def\min@textAnybody{Iedereen}
-\@ifundefined{chapter}{
- \renewcommand{\partname}{Notulen}
- \renewcommand{\ptctitle}{Onderwerpen}
- }{
- \renewcommand{\chaptername}{Notulen}
- \def\mtctitle{Onderwerpen}
- }
+\def\min@textForeign{(no \LaTeXe -minute)}%
+\def\min@textYes{Ja}%
+\def\min@textNo{Nee}%
+\def\min@textNoVote{Geen Mening}%
+\def\min@textDecision{Besluit}%
+\def\min@textTask{Aktie}%
+\def\min@textResponsible{Verantwoordelijk}%
+\def\min@textAnybody{Iedereen}%
+\@ifundefined{chapter}{%
+ \renewcommand{\partname}{Notulen}%
+ \renewcommand{\ptctitle}{Onderwerpen}%
+ }{%
+ \renewcommand{\chaptername}{Notulen}%
+ \def\mtctitle{Onderwerpen}%
+ }%
}
-\def\min@frenchText{
+\def\min@frenchText{%
\def\min@textModerator{Animateur}%ou (Animateuse)
-\def\min@textMinutesTaker{Secr\'{e}taire de s\'{e}ance}
-\def\min@textPresent{Participant}
-\def\min@textAbsent{Absent}
-\def\min@textAbsentExcused{\min@textAbsent\xspace (annonc\'{e})}
-\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (pas annonc\'{e})}
-\def\min@textGuest{Visiteur}
-\def\min@textDate{Date}
-\def\min@textStarttime{Commencement}
-\def\min@textEndtime{Fin}
-\def\min@textLocation{Lieu}
-\def\min@textCc{Distribution}
-\def\min@textPostscript{Suppl\'{e}ment}
-\def\min@textEnclosure{Appendice}
-\def\min@textforeignMinutes{proc\`{e}s--verbal \'{e}trang\`{e}re}
-\def\min@textSecret{avec des informations secret}
-\def\min@textPage{page}
+\def\min@textMinutesTaker{Secr\'{e}taire de s\'{e}ance}%
+\def\min@textPresent{Participant}%
+\def\min@textAbsent{Absent}%
+\def\min@textAbsentExcused{\min@textAbsent\xspace (annonc\'{e})}%
+\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (pas annonc\'{e})}%
+\def\min@textGuest{Visiteur}%
+\def\min@textDate{Date}%
+\def\min@textStarttime{Commencement}%
+\def\min@textEndtime{Fin}%
+\def\min@textLocation{Lieu}%
+\def\min@textCc{Distribution}%
+\def\min@textPostscript{Suppl\'{e}ment}%
+\def\min@textEnclosure{Appendice}%
+\def\min@textforeignMinutes{proc\`{e}s--verbal \'{e}trang\`{e}re}%
+\def\min@textSecret{avec des informations secret}%
+\def\min@textPage{page}%
\def\min@toptext{}%Text before Topic
-\def\min@textForeign{proc\`{e}s--verbal sans \LaTeX}
-\def\min@textYes{Oui}
-\def\min@textNo{Non}
-\def\min@textNoVote{Sans d\'{e}cision}
-\def\min@textDecision{D\'{e}cision}
-\def\min@textTask{Devoir}
-\def\min@textResponsible{R\'{e}sponsible}
-\def\min@textAnybody{Quelqu'un}
-\@ifundefined{chapter}{
- \renewcommand{\partname}{Proc\`{e}s--verbal}
- \renewcommand{\ptctitle}{Table des proc\`{e}s--verbal}
- }{
- \renewcommand{\chaptername}{Proc\`{e}s--verbal}
- \def\mtctitle{Table des proc\`{e}s--verbal}
- }
+\def\min@textForeign{proc\`{e}s--verbal sans \LaTeX}%
+\def\min@textYes{Oui}%
+\def\min@textNo{Non}%
+\def\min@textNoVote{Sans d\'{e}cision}%
+\def\min@textDecision{D\'{e}cision}%
+\def\min@textTask{Devoir}%
+\def\min@textResponsible{R\'{e}sponsible}%
+\def\min@textAnybody{Quelqu'un}%
+\@ifundefined{chapter}{%
+ \renewcommand{\partname}{Proc\`{e}s--verbal}%
+ \renewcommand{\ptctitle}{Table des proc\`{e}s--verbal}%
+ }{%
+ \renewcommand{\chaptername}{Proc\`{e}s--verbal}%
+ \def\mtctitle{Table des proc\`{e}s--verbal}%
+ }%
}
-\addto\extrasfrench{
- \min@frenchText
+\addto\extrasfrench{%
+ \min@frenchText%
}
-\addto\extrasfrenchb{
- \min@frenchText
+\addto\extrasfrenchb{%
+ \min@frenchText%
}
-\addto\extraspolish{
-\def\min@textModerator{Przewodnicz\k{a}cy}
-\def\min@textMinutesTaker{Sekretarz}
-\def\min@textPresent{Obecni} %Participiant:
-\def\min@textAbsent{Nieobecni}
-\def\min@textAbsentExcused{\min@textAbsent (nieusprawiedliwieni)}
-\def\min@textAbsentNoExcuse{\min@textAbsent (usprawiedliwieni)}
-\def\min@textGuest{Go\'{s}cie}
-\def\min@textDate{Data}
-\def\min@textStarttime{Pocz\k{a}tek zebrania}
-\def\min@textEndtime{Koniec zebrania}
-\def\min@textLocation{Miejsce:}
-\def\min@textCc{Do wiadomo\'{s}ci}
-\def\min@textPostscript{PS}
-\def\min@textEnclosure{Za{\l}\k{a}cznik}
-\def\min@textforeignMinutes{Foreign minutes}
-\def\min@textSecret{Poufne}
-\def\min@textPage{strona}
+\addto\extraspolish{%
+\def\min@textModerator{Przewodnicz\k{a}cy}%
+\def\min@textMinutesTaker{Sekretarz}%
+\def\min@textPresent{Obecni}%Participiant:
+\def\min@textAbsent{Nieobecni}%
+\def\min@textAbsentExcused{\min@textAbsent\xspace (nieusprawiedliwieni)}%
+\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (usprawiedliwieni)}%
+\def\min@textGuest{Go\'{s}cie}%
+\def\min@textDate{Data}%
+\def\min@textStarttime{Pocz\k{a}tek zebrania}%
+\def\min@textEndtime{Koniec zebrania}%
+\def\min@textLocation{Miejsce:}%
+\def\min@textCc{Do wiadomo\'{s}ci}%
+\def\min@textPostscript{PS}%
+\def\min@textEnclosure{Za{\l}\k{a}cznik}%
+\def\min@textforeignMinutes{Protoko{\l}y zewn\k{e}trzne}%
+\def\min@textSecret{Poufne}%
+\def\min@textPage{strona}%
\def\min@toptext{}%Text before Topic
-\def\min@textForeign{(no \LaTeXe -minute)}
-\def\min@textYes{Tak}
-\def\min@textNo{Nie}
-\def\min@textNoVote{Wstrzyma{\l}o si\k{e}}
-\def\min@textDecision{Decyzja}
-\def\min@textTask{Zadanie}
-\def\min@textResponsible{Osoba odpowiedzialna}
-\def\min@textAnybody{Ktokolwiek}
-\@ifundefined{chapter}{
- \renewcommand{\partname}{Protok\'{o}{\l}}
- \renewcommand{\ptctitle}{Lista spraw}
- }{
- \renewcommand{\chaptername}{Protok\'{o}{\l}}
- \def\mtctitle{Lista spraw}
- }
+\def\min@textForeign{(no \LaTeXe -minute)}%
+\def\min@textYes{Tak}%
+\def\min@textNo{Nie}%
+\def\min@textNoVote{Wstrzyma{\l}o si\k{e}}%
+\def\min@textDecision{Decyzja}%
+\def\min@textTask{Zadanie}%
+\def\min@textResponsible{Osoba odpowiedzialna}%
+\def\min@textAnybody{Ktokolwiek}%
+\@ifundefined{chapter}{%
+ \renewcommand{\partname}{Protok\'{o}{\l}}%
+ \renewcommand{\ptctitle}{Lista spraw}%
+ }{%
+ \renewcommand{\chaptername}{Protok\'{o}{\l}}%
+ \def\mtctitle{Lista spraw}%
+ }%
}
-\def\min@germanText{
-\def\min@textModerator{Moderation}
-\def\min@textMinutesTaker{Protokollant}
-\def\min@textPresent{Anwesend}
-\def\min@textAbsent{Abwesend}
-\def\min@textAbsentExcused{\min@textAbsent\xspace (entschuldigt)}
-\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (unentschuldigt)}
-\def\min@textGuest{G\"aste}
-\def\min@textDate{Datum}
-\def\min@textStarttime{Beginn der Sitzung}
-\def\min@textEndtime{Ende der Sitzung}
-\def\min@textLocation{Sitzungsort}
-\def\min@textCc{Verteiler}
-\def\min@textPostscript{Nachtrag}
-\def\min@textEnclosure{Anhang}
-\def\min@textforeignMinutes{Fremdes Protokoll}
-\def\min@textSecret{mit nicht\"offentlichen Informationen}
-\def\min@textPage{Seite}
-\def\min@textForeign{(kein \LaTeXe -Protokoll)}
-\def\min@textYes{Ja}
-\def\min@textNo{Nein}
-\def\min@textNoVote{Enthaltung}
+\def\min@germanText{%
+\def\min@textModerator{Moderation}%
+\def\min@textMinutesTaker{Protokollant}%
+\def\min@textPresent{Anwesend}%
+\def\min@textAbsent{Abwesend}%
+\def\min@textAbsentExcused{\min@textAbsent\xspace (entschuldigt)}%
+\def\min@textAbsentNoExcuse{\min@textAbsent\xspace (unentschuldigt)}%
+\def\min@textGuest{G\"aste}%
+\def\min@textDate{Datum}%
+\def\min@textStarttime{Beginn der Sitzung}%
+\def\min@textEndtime{Ende der Sitzung}%
+\def\min@textLocation{Sitzungsort}%
+\def\min@textCc{Verteiler}%
+\def\min@textPostscript{Nachtrag}%
+\def\min@textEnclosure{Anhang}%
+\def\min@textforeignMinutes{Fremdes Protokoll}%
+\def\min@textSecret{mit nicht\"offentlichen Informationen}%
+\def\min@textPage{Seite}%
+\def\min@textForeign{(kein \LaTeXe -Protokoll)}%
+\def\min@textYes{Ja}%
+\def\min@textNo{Nein}%
+\def\min@textNoVote{Enthaltung}%
%%\def\min@textDecision{Beschlu{\ss}}% diff new/old spelling
-\def\min@textTask{Aufgabe}
-\def\min@textResponsible{Verantwortlich}
-\def\min@textAnybody{Irgendwer}
+\def\min@textTask{Aufgabe}%
+\def\min@textResponsible{Verantwortlich}%
+\def\min@textAnybody{Irgendwer}%
\def\min@toptext{}%Top} %-> ugly table of contents
-\@ifundefined{chapter}{
- \renewcommand{\partname}{Protokoll}
- \renewcommand{\ptctitle}{Tagesordnung}
- }{
- \renewcommand{\chaptername}{Protokoll}
- \renewcommand{\mtctitle}{Tagesordnung}
- }
+\@ifundefined{chapter}{%
+ \renewcommand{\partname}{Protokoll}%
+ \renewcommand{\ptctitle}{Tagesordnung}%
+ }{%
+ \renewcommand{\chaptername}{Protokoll}%
+ \renewcommand{\mtctitle}{Tagesordnung}%
+ }%
}
-\addto\extrasgerman{
- \min@germanText
- \def\min@textDecision{Beschlu{\ss}}
- }
-\addto\extrasngerman{
- \min@germanText
- \def\min@textDecision{Beschluss}
+\addto\extrasgerman{%
+ \min@germanText%
+ \def\min@textDecision{Beschlu{\ss}}%
+ }
+\addto\extrasngerman{%
+ \min@germanText%
+ \def\min@textDecision{Beschluss}%
}
\ProcessOptions\relax
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/minutes.tlpobj new/tlpkg/tlpobj/minutes.tlpobj
--- old/tlpkg/tlpobj/minutes.tlpobj 2016-04-14 19:28:03.000000000 +0200
+++ new/tlpkg/tlpobj/minutes.tlpobj 2017-04-14 17:51:20.000000000 +0200
@@ -1,6 +1,6 @@
name minutes
category Package
-revision 16350
+revision 42186
shortdesc Typeset the minutes of meetings
relocated 1
longdesc Supports the creation of a collection of minutes. Features
@@ -14,7 +14,7 @@
runfiles size=9
RELOC/tex/latex/minutes/minutes.sty
catalogue-ctan /macros/latex/contrib/minutes
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-09-30 11:34:18 +0200
catalogue-license lppl
catalogue-topics meeting-admin
-catalogue-version 1.8d
+catalogue-version 1.8f
++++++ mkgrkindex.doc.tar.xz ++++++
++++++ mkgrkindex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkgrkindex.tlpobj new/tlpkg/tlpobj/mkgrkindex.tlpobj
--- old/tlpkg/tlpobj/mkgrkindex.tlpobj 2016-04-14 19:28:04.000000000 +0200
+++ new/tlpkg/tlpobj/mkgrkindex.tlpobj 2017-04-14 17:51:23.000000000 +0200
@@ -14,7 +14,7 @@
texmf-dist/makeindex/mkgrkindex/uppercase-headers.ist
texmf-dist/scripts/mkgrkindex/mkgrkindex
catalogue-ctan /language/greek/mkgrkindex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics index-proc greek
catalogue-version 2.0
++++++ mkjobtexmf.doc.tar.xz ++++++
++++++ mkjobtexmf.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkjobtexmf.tlpobj new/tlpkg/tlpobj/mkjobtexmf.tlpobj
--- old/tlpkg/tlpobj/mkjobtexmf.tlpobj 2016-04-14 19:28:04.000000000 +0200
+++ new/tlpkg/tlpobj/mkjobtexmf.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=6
texmf-dist/scripts/mkjobtexmf/mkjobtexmf.pl
catalogue-ctan /support/mkjobtexmf
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license artistic
catalogue-topics archival
catalogue-version 0.8
++++++ mkpattern.doc.tar.xz ++++++
++++++ mkpattern.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkpattern.tlpobj new/tlpkg/tlpobj/mkpattern.tlpobj
--- old/tlpkg/tlpobj/mkpattern.tlpobj 2016-04-14 19:28:04.000000000 +0200
+++ new/tlpkg/tlpobj/mkpattern.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=4
RELOC/tex/plain/mkpattern/mkpatter.tex
catalogue-ctan /language/hyphenation/utils/mkpattern
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics hyphenation
catalogue-version 1.2
++++++ mkpic.doc.tar.xz ++++++
++++++ mkpic.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mkpic.tlpobj new/tlpkg/tlpobj/mkpic.tlpobj
--- old/tlpkg/tlpobj/mkpic.tlpobj 2016-04-14 19:28:05.000000000 +0200
+++ new/tlpkg/tlpobj/mkpic.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=7
texmf-dist/scripts/mkpic/mkpic
catalogue-ctan /support/mkpic
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics graphics
catalogue-version 1.02
++++++ mla-paper.doc.tar.xz ++++++
++++++ 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 2016-04-14 19:28:05.000000000 +0200
+++ new/tlpkg/tlpobj/mla-paper.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -10,6 +10,6 @@
runfiles size=2
RELOC/tex/latex/mla-paper/mla.sty
catalogue-ctan /macros/latex/contrib/mla-paper
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics gen-paper
++++++ mlist.doc.tar.xz ++++++
++++++ mlist.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mlist.tlpobj new/tlpkg/tlpobj/mlist.tlpobj
--- old/tlpkg/tlpobj/mlist.tlpobj 2016-04-14 19:28:05.000000000 +0200
+++ new/tlpkg/tlpobj/mlist.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/latex/mlist/mlist.cfg
RELOC/tex/latex/mlist/mlist.sty
catalogue-ctan /macros/latex/contrib/mlist
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths
catalogue-version 0.6a
++++++ mltex.doc.tar.xz ++++++
++++++ 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 2016-04-14 19:28:05.000000000 +0200
+++ new/tlpkg/tlpobj/mltex.tlpobj 2017-04-14 17:51:24.000000000 +0200
@@ -7,6 +7,14 @@
longdesc Computer Modern (CM) fonts. The system is distributed as a TeX
longdesc change file.
depend latex
+depend cm
+depend hyphen-base
+depend babel
+depend latexconfig
+depend latex-fonts
+depend knuth-lib
+depend mltex
+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,latex,latexconfig,latex-fonts
execute AddFormat name=mltex engine=pdftex options="-translate-file=cp227.tcx -mltex mltex.ini" fmttriggers=cm,hyphen-base,knuth-lib,mltex,plain
@@ -16,7 +24,7 @@
texmf-dist/tex/latex/mltex/mltex.sty
texmf-dist/tex/mltex/config/mltex.ini
catalogue-ctan /systems/generic/mltex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license knuth
catalogue-topics engine multilingual
catalogue-version 2.2
++++++ mmap.doc.tar.xz ++++++
++++++ mmap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mmap.tlpobj new/tlpkg/tlpobj/mmap.tlpobj
--- old/tlpkg/tlpobj/mmap.tlpobj 2016-04-14 19:28:05.000000000 +0200
+++ new/tlpkg/tlpobj/mmap.tlpobj 2017-04-14 17:51:25.000000000 +0200
@@ -55,7 +55,7 @@
RELOC/tex/latex/mmap/upzd.cmap
catalogue-also cmap
catalogue-ctan /macros/latex/contrib/mmap
-catalogue-date 2015-08-03 08:55:55 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics pdf-feat
catalogue-version 1.03
++++++ mnotes.doc.tar.xz ++++++
++++++ mnotes.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnotes.tlpobj new/tlpkg/tlpobj/mnotes.tlpobj
--- old/tlpkg/tlpobj/mnotes.tlpobj 2016-04-14 19:28:06.000000000 +0200
+++ new/tlpkg/tlpobj/mnotes.tlpobj 2017-04-14 17:51:25.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/latex/mnotes/mnotes.sty
catalogue-ctan /macros/latex/contrib/mnotes
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics marginal
catalogue-version 0.8
++++++ mnras.doc.tar.xz ++++++
++++++ mnras.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnras.tlpobj new/tlpkg/tlpobj/mnras.tlpobj
--- old/tlpkg/tlpobj/mnras.tlpobj 2016-04-14 19:28:06.000000000 +0200
+++ new/tlpkg/tlpobj/mnras.tlpobj 2017-04-14 17:51:25.000000000 +0200
@@ -9,7 +9,7 @@
RELOC/bibtex/bst/mnras/mnras.bst
RELOC/tex/latex/mnras/mnras.cls
catalogue-ctan /macros/latex/contrib/mnras
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics journalpub
catalogue-version 3.0
++++++ mnsymbol.doc.tar.xz ++++++
++++++ mnsymbol.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mnsymbol.tlpobj new/tlpkg/tlpobj/mnsymbol.tlpobj
--- old/tlpkg/tlpobj/mnsymbol.tlpobj 2016-04-14 19:28:07.000000000 +0200
+++ new/tlpkg/tlpobj/mnsymbol.tlpobj 2017-04-14 17:51:25.000000000 +0200
@@ -277,7 +277,7 @@
RELOC/fonts/type1/public/mnsymbol/MnSymbol9.pfb
RELOC/tex/latex/mnsymbol/MnSymbol.sty
catalogue-ctan /fonts/mnsymbol
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics font font-mf font-type1 font-symbol-maths
catalogue-version 1.4
++++++ moderncv.doc.tar.xz ++++++
++++++ 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 2016-04-14 19:28:13.000000000 +0200
+++ new/tlpkg/tlpobj/moderncv.tlpobj 2017-04-14 17:51:27.000000000 +0200
@@ -44,7 +44,7 @@
RELOC/tex/latex/moderncv/moderncvstyleoldstyle.sty
RELOC/tex/latex/moderncv/tweaklist.sty
catalogue-ctan /macros/latex/contrib/moderncv
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cv class
catalogue-version 2.0.0
++++++ moderntimeline.doc.tar.xz ++++++
++++++ moderntimeline.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moderntimeline.tlpobj new/tlpkg/tlpobj/moderntimeline.tlpobj
--- old/tlpkg/tlpobj/moderntimeline.tlpobj 2016-04-14 19:28:13.000000000 +0200
+++ new/tlpkg/tlpobj/moderntimeline.tlpobj 2017-04-14 17:51:28.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=2
RELOC/tex/latex/moderntimeline/moderntimeline.sty
catalogue-ctan /macros/latex/contrib/moderntimeline
-catalogue-date 2015-08-31 18:43:19 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cv diagram
catalogue-version 0.9
++++++ modiagram.doc.tar.xz ++++++
++++++ modiagram.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modiagram.tlpobj new/tlpkg/tlpobj/modiagram.tlpobj
--- old/tlpkg/tlpobj/modiagram.tlpobj 2016-04-14 19:28:14.000000000 +0200
+++ new/tlpkg/tlpobj/modiagram.tlpobj 2017-04-14 17:51:28.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=20
RELOC/tex/latex/modiagram/modiagram.sty
catalogue-ctan /macros/latex/contrib/modiagram
-catalogue-date 2015-09-23 13:04:31 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics chemistry diagram expl3
catalogue-version 0.2g
++++++ modref.doc.tar.xz ++++++
++++++ modref.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modref.tlpobj new/tlpkg/tlpobj/modref.tlpobj
--- old/tlpkg/tlpobj/modref.tlpobj 2016-04-14 19:28:14.000000000 +0200
+++ new/tlpkg/tlpobj/modref.tlpobj 2017-04-14 17:51:28.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/latex/modref/modref.sty
catalogue-also refstyle
catalogue-ctan /macros/latex/contrib/modref
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics label-ref
catalogue-version 1.0
++++++ modroman.doc.tar.xz ++++++
++++++ modroman.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/modroman.tlpobj new/tlpkg/tlpobj/modroman.tlpobj
--- old/tlpkg/tlpobj/modroman.tlpobj 2016-04-14 19:28:15.000000000 +0200
+++ new/tlpkg/tlpobj/modroman.tlpobj 2017-04-14 17:51:28.000000000 +0200
@@ -15,7 +15,7 @@
runfiles size=2
RELOC/tex/latex/modroman/modroman.sty
catalogue-ctan /macros/latex/contrib/modroman
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics numbers
catalogue-version 1
++++++ mongolian-babel.doc.tar.xz ++++++
++++++ mongolian-babel.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mongolian-babel.tlpobj new/tlpkg/tlpobj/mongolian-babel.tlpobj
--- old/tlpkg/tlpobj/mongolian-babel.tlpobj 2016-04-14 19:28:16.000000000 +0200
+++ new/tlpkg/tlpobj/mongolian-babel.tlpobj 2017-04-14 17:51:28.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/latex/mongolian-babel/mongolian.ldf
RELOC/tex/latex/mongolian-babel/mongolian.sty
catalogue-ctan /language/mongolian/babel
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics mongolian multilingual-addon
catalogue-version 1.2
++++++ monofill.doc.tar.xz ++++++
++++++ monofill.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/monofill.tlpobj new/tlpkg/tlpobj/monofill.tlpobj
--- old/tlpkg/tlpobj/monofill.tlpobj 2016-04-14 19:28:16.000000000 +0200
+++ new/tlpkg/tlpobj/monofill.tlpobj 2017-04-14 17:51:29.000000000 +0200
@@ -10,7 +10,7 @@
RELOC/tex/latex/monofill/monofill.RLS
RELOC/tex/latex/monofill/monofill.sty
catalogue-ctan /macros/latex/contrib/monofill
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2017-02-01 05:25:39 +0100
catalogue-license lppl1.3
catalogue-topics alignment
catalogue-version 0.2
++++++ montex.doc.tar.xz ++++++
++++++ montex.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/montex.tlpobj new/tlpkg/tlpobj/montex.tlpobj
--- old/tlpkg/tlpobj/montex.tlpobj 2016-04-14 19:28:18.000000000 +0200
+++ new/tlpkg/tlpobj/montex.tlpobj 2017-04-14 17:51:29.000000000 +0200
@@ -326,7 +326,7 @@
RELOC/tex/latex/montex/russian.def
RELOC/tex/latex/montex/xalx.def
catalogue-ctan /language/mongolian/montex
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics mongolian
catalogue-version IVu.04.092
++++++ moodle.doc.tar.xz ++++++
++++++ moodle.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moodle.tlpobj new/tlpkg/tlpobj/moodle.tlpobj
--- old/tlpkg/tlpobj/moodle.tlpobj 2016-04-14 19:28:21.000000000 +0200
+++ new/tlpkg/tlpobj/moodle.tlpobj 2017-04-14 17:51:40.000000000 +0200
@@ -9,7 +9,7 @@
runfiles size=21
RELOC/tex/latex/moodle/moodle.sty
catalogue-ctan /macros/latex/contrib/moodle
-catalogue-date 2016-02-02 05:57:37 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics exam
catalogue-version 0.5
++++++ moreenum.doc.tar.xz ++++++
++++++ moreenum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moreenum.tlpobj new/tlpkg/tlpobj/moreenum.tlpobj
--- old/tlpkg/tlpobj/moreenum.tlpobj 2016-04-14 19:28:21.000000000 +0200
+++ new/tlpkg/tlpobj/moreenum.tlpobj 2017-04-14 17:51:40.000000000 +0200
@@ -24,7 +24,7 @@
runfiles size=2
RELOC/tex/latex/moreenum/moreenum.sty
catalogue-ctan /macros/latex/contrib/moreenum
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics list-enum numbers
catalogue-version 1.03
++++++ morefloats.doc.tar.xz ++++++
++++++ morefloats.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morefloats.tlpobj new/tlpkg/tlpobj/morefloats.tlpobj
--- old/tlpkg/tlpobj/morefloats.tlpobj 2016-04-14 19:28:22.000000000 +0200
+++ new/tlpkg/tlpobj/morefloats.tlpobj 2017-04-14 17:51:40.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=10
RELOC/tex/latex/morefloats/morefloats.sty
catalogue-ctan /macros/latex/contrib/morefloats
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics float
catalogue-version 1.0h
++++++ morehype.doc.tar.xz ++++++
++++++ morehype.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morehype.tlpobj new/tlpkg/tlpobj/morehype.tlpobj
--- old/tlpkg/tlpobj/morehype.tlpobj 2016-04-14 19:28:24.000000000 +0200
+++ new/tlpkg/tlpobj/morehype.tlpobj 2017-04-14 17:51:41.000000000 +0200
@@ -23,7 +23,7 @@
RELOC/tex/latex/morehype/texblog.fdf
RELOC/tex/latex/morehype/texlinks.sty
catalogue-ctan /macros/latex/contrib/morehype
-catalogue-date 2015-11-16 06:21:29 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics hyper
catalogue-version r0.83
++++++ moresize.doc.tar.xz ++++++
++++++ moresize.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moresize.tlpobj new/tlpkg/tlpobj/moresize.tlpobj
--- old/tlpkg/tlpobj/moresize.tlpobj 2016-04-14 19:28:24.000000000 +0200
+++ new/tlpkg/tlpobj/moresize.tlpobj 2017-04-14 17:51:41.000000000 +0200
@@ -13,7 +13,7 @@
runfiles size=1
RELOC/tex/latex/moresize/moresize.sty
catalogue-ctan /macros/latex/contrib/moresize
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp
catalogue-version 1.9
++++++ moreverb.doc.tar.xz ++++++
++++++ moreverb.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/moreverb.tlpobj new/tlpkg/tlpobj/moreverb.tlpobj
--- old/tlpkg/tlpobj/moreverb.tlpobj 2016-04-14 19:28:25.000000000 +0200
+++ new/tlpkg/tlpobj/moreverb.tlpobj 2017-04-14 17:51:42.000000000 +0200
@@ -14,7 +14,7 @@
RELOC/tex/latex/moreverb/moreverb.sty
catalogue-also vrb fancyvrb
catalogue-ctan /macros/latex/contrib/moreverb
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics verbatim
catalogue-version 2.3a
++++++ morewrites.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/morewrites/README new/doc/latex/morewrites/README
--- old/doc/latex/morewrites/README 2012-08-25 01:40:06.000000000 +0200
+++ new/doc/latex/morewrites/README 1970-01-01 01:00:00.000000000 +0100
@@ -1,15 +0,0 @@
-----------------------------------------------------------------
-morewrites --- Always room for a new write
-E-mail: blflatex@gmail.com
-Released under the LaTeX Project Public License v1.3c or later
-See http://www.latex-project.org/lppl.txt
-----------------------------------------------------------------
-
-The morewrites package silently hooks into the TeX primitives
-responsible for writing to files to lift the restriction on
-the number of files open at the same time (16). Load the package
-with "\usepackage{morewrites}" as early as possible.
-
-This package uses the l3kernel bundle.
-
-This is work in progress, all suggestions/comments/bug reports are welcome!
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/morewrites/README.md new/doc/latex/morewrites/README.md
--- old/doc/latex/morewrites/README.md 1970-01-01 01:00:00.000000000 +0100
+++ new/doc/latex/morewrites/README.md 2017-04-17 00:19:40.000000000 +0200
@@ -0,0 +1,16 @@
+Provide more writing streams in LaTeX
+=====================================
+* E-mail: blflatex@gmail.com
+* Released under the LaTeX Project Public License v1.3c or later
+ See http://www.latex-project.org/lppl.txt
+
+The morewrites LaTeX package should be used when encountering the
+`No room for a new \write ` error. This is done by redefining a
+few TeX primitives related to output.
+
+This package uses the `l3kernel` bundle.
+
+This is work in progress, all suggestions/comments/bug reports
+are welcome! See https://github.com/blefloch/latex-morewrites
+
+
Binary files old/doc/latex/morewrites/morewrites.pdf and new/doc/latex/morewrites/morewrites.pdf differ
Binary files old/doc/latex/morewrites/primargs.pdf and new/doc/latex/morewrites/primargs.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morewrites.doc.tlpobj new/tlpkg/tlpobj/morewrites.doc.tlpobj
--- old/tlpkg/tlpobj/morewrites.doc.tlpobj 2016-04-14 19:28:25.000000000 +0200
+++ new/tlpkg/tlpobj/morewrites.doc.tlpobj 2017-04-21 02:07:49.000000000 +0200
@@ -1,9 +1,9 @@
name morewrites.doc
category Package
-revision 28767
+revision 43945
shortdesc doc files of morewrites
relocated 1
-docfiles size=275
- RELOC/doc/latex/morewrites/README
+docfiles size=320
+ RELOC/doc/latex/morewrites/README.md
RELOC/doc/latex/morewrites/morewrites.pdf
RELOC/doc/latex/morewrites/primargs.pdf
++++++ morewrites.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/morewrites/morewrites.sty new/tex/latex/morewrites/morewrites.sty
--- old/tex/latex/morewrites/morewrites.sty 2013-01-09 01:39:48.000000000 +0100
+++ new/tex/latex/morewrites/morewrites.sty 2017-04-20 23:10:32.000000000 +0200
@@ -9,7 +9,7 @@
%% Communicate any suggestions for changing this package
%% to Bruno Le Floch (blflatex@gmail.com).
%%
-%% File: morewrites.dtx Copyright (C) 2011-2013 Bruno Le Floch
+%% File: morewrites.dtx Copyright (C) 2011-2017 Bruno Le Floch
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -19,225 +19,355 @@
%% http://www.latex-project.org/lppl.txt
%%
%% -----------------------------------------------------------------------
-\RequirePackage {expl3} [2012/08/14]
-\RequirePackage {primargs} [2013/01/08]
+\RequirePackage {expl3} [2017/03/18]
+\RequirePackage {primargs} [2017/04/10]
\ProvidesExplPackage
- {morewrites} {2013/01/08} {0.2e} {Always room for a new write}
-\cs_generate_variant:Nn \prop_gpop:NnNT { NV }
+ {morewrites} {2017/04/20} {} {Always room for a new write}
+\sys_if_engine_luatex:T
+ {
+ \cs_new_protected:Npn \morewritessetup #1 { }
+ \msg_new:nnn { morewrites } { luatex }
+ { The~morewrites~package~is~unnecessary~in~LuaTeX. }
+ \msg_warning:nn { morewrites } { luatex }
+ \tex_endinput:D
+ }%
\cs_new_eq:NN \__morewrites_tex_immediate:w \tex_immediate:D
\cs_new_eq:NN \__morewrites_tex_openout:w \tex_openout:D
\cs_new_eq:NN \__morewrites_tex_write:w \tex_write:D
\cs_new_eq:NN \__morewrites_tex_closeout:w \tex_closeout:D
-\cs_new_eq:NN \__morewrites_tex_shipout:w \tex_shipout:D
-\int_new:N \g__morewrites_late_write_int
-\prop_new:N \g__morewrites_iow_prop
+\exp_args:NNf \cs_new_protected:Npn \__morewrites_tex_newwrite:N
+ { \exp_args:NNc \exp_after:wN \exp_stop_f: { newwrite } }
+\cs_generate_variant:Nn \prop_gpop:NnNT { NV }
+\cs_generate_variant:Nn \prop_gput:Nnn { NVx }
+\cs_generate_variant:Nn \tl_gput_right:Nn { Nv }
+\tl_new:N \l__morewrites_internal_tl
+\cs_new_eq:NN \__morewrites_tmp:w ?
+\int_new:N \g__morewrites_later_int
+\seq_new:N \g__morewrites_write_seq
+\prop_new:N \g__morewrites_write_prop
+\prop_new:N \g__morewrites_write_file_prop
+\tl_new:N \l__morewrites_code_tl
+\int_new:N \l__morewrites_user_int
+\tl_new:N \l__morewrites_tstr_tl
+\cs_new_eq:NN \l__morewrites_tstr_token ?
+\cs_new_eq:NN \s__morewrites \scan_stop:
\newwrite \g__morewrites_iow
\newread \g__morewrites_ior
\tl_new:N \g__morewrites_tmp_file_tl
-\tl_gset:Nn \g__morewrites_tmp_file_tl { \jobname.mw }
-\clist_new:N \g__morewrites_reserved_iow_clist
-\int_step_inline:nnnn {0} {1} { \g__morewrites_iow - 1 }
- { \clist_gput_right:Nn \g__morewrites_reserved_iow_clist {#1} }
-\clist_gput_right:Nn \g__morewrites_reserved_iow_clist {18}
-\int_new:N \g__morewrites_stream_int
-\cs_new_eq:NN \s__morewrites \scan_stop:
-\tl_new:N \l__morewrites_internal_tl
-\cs_new_protected:Npn \__morewrites_equals_file_name:N #1
+\bool_new:N \g__morewrites_tmp_file_bool
+\bool_gset_false:N \g__morewrites_tmp_file_bool
+\int_new:N \g__morewrites_group_level_int
+\box_new:N \g__morewrites_shipout_box
+\cs_new_protected:Npn \__morewrites_set_file:n #1
+ {
+ \bool_gset_false:N \g__morewrites_tmp_file_bool
+ \tl_gset:Nn \g__morewrites_tmp_file_tl {#1}
+ }
+\cs_new_protected:Npn \__morewrites_empty_file:n #1
+ {
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w
+ \g__morewrites_iow = #1 \scan_stop:
+ \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w
+ \g__morewrites_iow
+ }
+\prg_new_conditional:Npnn \__morewrites_if_file_trivial:n #1 { TF }
+ {
+ \group_begin:
+ \tex_openin:D \g__morewrites_ior = #1 \scan_stop:
+ \if_eof:w \g__morewrites_ior
+ \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true:
+ \else:
+ \int_set:Nn \tex_endlinechar:D { -1 }
+ \etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
+ \if_eof:w \g__morewrites_ior
+ \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_true:
+ \else:
+ \cs_gset_eq:NN \__morewrites_tmp:w \prg_return_false:
+ \fi:
+ \fi:
+ \tex_closein:D \g__morewrites_ior
+ \group_end:
+ \__morewrites_tmp:w
+ }
+\cs_new_protected:Npn \__morewrites_chk_file:
+ {
+ \__morewrites_if_file_trivial:nTF { \g__morewrites_tmp_file_tl }
+ { \bool_gset_true:N \g__morewrites_tmp_file_bool }
+ {
+ \msg_warning:nnxx { morewrites } { file-exists }
+ { \g__morewrites_tmp_file_tl }
+ { \g__morewrites_tmp_file_tl .mw }
+ \tl_gput_right:Nn \g__morewrites_tmp_file_tl { .mw }
+ \__morewrites_chk_file:
+ }
+ }
+\msg_new:nnnn { morewrites } { file-exists }
+ { File~'#1'~exists,~using~'#2'~instead. }
+ {
+ The~file~`#1'~exists~and~was~not~created~by~this~version~of~the~
+ `morewrites'~package.~Please~move~or~delete~that~file,~or~provide~
+ another~file~name~by~adding
+ \\ \\
+ \iow_indent:n { \iow_char:N\\morewritessetup~{~file~=~other-name~} }
+ \\ \\
+ to~your~source~file.~In~the~meantime,~the~file~`#2'~will~be~used.
+ }
+\cs_new_protected:Npn \__morewrites_equals_file:N #1
{
\group_begin:
+ \tex_aftergroup:D \primargs_get_file_name:N
\tex_aftergroup:D #1
- \primargs_remove_equals:N \__morewrites_parse_file_name:
+ \primargs_remove_equals:N \group_end:
}
-\cs_new_protected_nopar:Npn \__morewrites_parse_file_name:
- { \primargs_get_file_name:N \group_end: }
-\cs_new_protected_nopar:Npn \__morewrites_immediate:w
- { \primargs_read_x_token:N \__morewrites_immediate_ii: }
-\cs_new_protected_nopar:Npn \__morewrites_immediate_ii:
+\cs_new_protected:Npn \__morewrites_get_user:n #1
{
- \token_if_eq_meaning:NNTF \g_primargs_token \s__morewrites
- { \__morewrites_immediate_iii:N }
- { \__morewrites_tex_immediate:w }
+ \tl_set:Nn \l__morewrites_code_tl {#1}
+ \tex_afterassignment:D \l__morewrites_code_tl
+ \l__morewrites_user_int =
+ }
+\cs_new_protected:Npn \__morewrites_user_to_tstr:NTF #1
+ {
+ \tl_set:NV \l__morewrites_tstr_tl \l__morewrites_user_int
+ \int_compare:nNnTF { \l__morewrites_user_int } < { 19 }
+ { \use_i:nn }
+ { \prop_get:NVNTF #1 \l__morewrites_user_int \l__morewrites_tstr_tl }
}
-\cs_new_protected:Npn \__morewrites_immediate_iii:N #1
+\int_new:N \l__morewrites_collect_next_int
+\cs_new_protected:Npn \__morewrites_collect:x #1
{
- \tl_if_eq:nnTF { #1 } { \s__morewrites }
- { \__morewrites_immediate_iv:NN }
- { #1 }
+ \tl_set:Nx \l__morewrites_internal_tl {#1}
+ \__morewrites_collect_aux:cf { l__morewrites_0_tl } { 1 }
}
-\cs_new_protected:Npn \__morewrites_immediate_iv:NN #1 #2
+\cs_new_protected:Npn \__morewrites_collect_aux:Nn #1#2
{
- \exp_args:Nc #1
+ \int_compare:nNnT {#2} > \l__morewrites_collect_next_int
+ {
+ \tl_clear_new:N #1
+ \int_set:Nn \l__morewrites_collect_next_int {#2}
+ }
+ \tl_if_empty:NTF #1
+ { \tl_set_eq:NN #1 \l__morewrites_internal_tl }
{
- \exp_after:wN \__morewrites_immediate_v:w
- \token_to_str:N #2
+ \tl_put_left:No \l__morewrites_internal_tl {#1}
+ \tl_clear:N #1
+ \__morewrites_collect_aux:cf { l__morewrites_#2_tl }
+ { \int_eval:n { #2 + 1 } }
+ }
+ }
+\cs_generate_variant:Nn \__morewrites_collect_aux:Nn { cf }
+\cs_new_protected:Npn \__morewrites_collect_gput_right:N #1
+ {
+ \int_compare:nNnF \l__morewrites_collect_next_int = 0
+ {
+ \int_decr:N \l__morewrites_collect_next_int
+ \tl_gput_right:Nv #1
+ {
+ l__morewrites_
+ \int_use:N \l__morewrites_collect_next_int
+ _tl
+ }
+ \__morewrites_collect_gput_right:N #1
}
}
-\use:x
+\cs_generate_variant:Nn \__morewrites_collect_gput_right:N { c }
+\cs_new:Npn \__morewrites_user_tl_name:n #1
+ { g__morewrites_iow_ \int_eval:n {#1} _tl }
+\cs_new_protected:Npn \__morewrites_immediate:w
+ { \primargs_read_x_token:N \__morewrites_immediate_auxii: }
+\cs_new_protected:Npn \__morewrites_immediate_auxii:
{
- \cs_new:Npn \exp_not:N \__morewrites_immediate_v:w
- ##1 \tl_to_str:n { __morewrites } { __morewrites_immediate }
+ \token_if_eq_meaning:NNTF \g_primargs_token \s__morewrites
+ { \__morewrites_immediate_auxiii:N }
+ { \__morewrites_tex_immediate:w }
}
-\cs_new_protected:Npn \__morewrites_immediate_closeout_test:n #1
+\cs_new_protected:Npn \__morewrites_immediate_auxiii:N #1
+ { \str_if_eq:nnTF { #1 } { \s__morewrites } { \use_iii:nnn } { #1 } }
+\cs_new_protected:Npn \__morewrites_closeout:w
{
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_stream_int }
- { \__morewrites_immediate_closeout_aux: }
+ \s__morewrites
+ \use_i:nn
+ { \__morewrites_get_user:n { \__morewrites_closeout_later: } }
+ { \__morewrites_get_user:n { \__morewrites_closeout_now: } }
}
-\cs_new_protected_nopar:Npn \__morewrites_immediate_closeout_aux:
+\cs_new_protected:Npn \__morewrites_closeout_now:
{
- \prop_gpop:NVNT \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl
+ \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop
{
- \__morewrites_immediate_write_and_close:nn
- { \g__morewrites_stream_int } { \l__morewrites_internal_tl }
+ \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \l__morewrites_tstr_tl \exp_stop_f:
+ \int_compare:nNnF { \l__morewrites_tstr_tl } = { \l__morewrites_user_int }
+ {
+ \prop_gremove:NV \g__morewrites_write_prop \l__morewrites_user_int
+ \seq_gput_left:NV \g__morewrites_write_seq \l__morewrites_tstr_tl
+ }
+ }
+ {
+ \prop_gpop:NVNT \g__morewrites_write_file_prop \l__morewrites_user_int \l__morewrites_internal_tl
+ { \__morewrites_closeout_now:nn { \l__morewrites_user_int } { \l__morewrites_internal_tl } }
}
}
-\cs_new_protected:Npn \__morewrites_immediate_write_and_close:nn #1#2
+\cs_new_protected:Npn \__morewrites_closeout_now:nn #1#2
{
- \__morewrites_tex_immediate:w \__morewrites_tex_openout:w
- \g__morewrites_iow #2 \scan_stop:
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow = #2 \scan_stop:
\group_begin:
- \int_set_eq:NN \tex_newlinechar:D \c_minus_one
- \tl_use:c { g__morewrites_iow_ \int_eval:n {#1} _tl }
- \tl_gclear:c { g__morewrites_iow_ \int_eval:n {#1} _tl }
+ \int_set:Nn \tex_newlinechar:D { -1 }
+ \tl_use:c { \__morewrites_user_tl_name:n {#1} }
+ \tl_gclear:c { \__morewrites_user_tl_name:n {#1} }
\group_end:
\__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow
}
-\cs_new_protected:Npn \__morewrites_immediate_openout_test:n #1
+\cs_new_protected:Npn \__morewrites_openout:w
{
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_stream_int }
- { \__morewrites_equals_file_name:N \__morewrites_immediate_openout_aux:n }
+ \s__morewrites
+ \use_i:nn
+ { \__morewrites_get_user:n { \__morewrites_openout_later:w } }
+ { \__morewrites_get_user:n { \__morewrites_equals_file:N \__morewrites_openout_now:n } }
}
-\cs_new_protected:Npn \__morewrites_immediate_openout_aux:n #1
+\cs_new_protected:Npn \__morewrites_openout_now:n #1
{
- \__morewrites_immediate_closeout_aux:
- \prop_gput:NVn \g__morewrites_iow_prop \g__morewrites_stream_int {#1}
- \tl_gclear_new:c { g__morewrites_iow_ \int_use:N \g__morewrites_stream_int _tl }
+ \__morewrites_closeout_now:
+ \int_compare:nNnTF { \l__morewrites_user_int } < { 19 }
+ {
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \l__morewrites_user_int
+ = \tl_to_str:n {#1} \scan_stop:
+ }
+ {
+ \seq_gpop:NNTF \g__morewrites_write_seq \l__morewrites_tstr_tl
+ {
+ \prop_gput:NVV \g__morewrites_write_prop \l__morewrites_user_int \l__morewrites_tstr_tl
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \l__morewrites_tstr_tl \exp_stop_f:
+ = \tl_to_str:n {#1} \scan_stop:
+ }
+ {
+ \__morewrites_empty_file:n {#1}
+ \prop_gput:NVx \g__morewrites_write_file_prop \l__morewrites_user_int
+ { \tl_to_str:n {#1} }
+ \tl_gclear_new:c { \__morewrites_user_tl_name:n { \l__morewrites_user_int } }
+ }
+ }
}
-\cs_new_protected:Npn \__morewrites_immediate_write_test:n #1
+\cs_new_protected:Npn \__morewrites_write:w
{
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_stream_int }
- { \primargs_get_general_text:N \__morewrites_immediate_write_aux:n }
+ \s__morewrites
+ \use_i:nn
+ { \__morewrites_get_user:n { \__morewrites_write_later:w } }
+ { \__morewrites_get_user:n { \__morewrites_write_now:w } }
}
-\cs_new_protected_nopar:Npn \__morewrites_immediate_write_aux:n
+\cs_new_protected:Npn \__morewrites_write_now:w
{
- \prop_get:NVNTF \g__morewrites_iow_prop \g__morewrites_stream_int \l__morewrites_internal_tl
- { \__morewrites_immediate_write_open:n }
- { \__morewrites_immediate_write_closed:n }
+ \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop
+ { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \l__morewrites_tstr_tl \exp_stop_f: }
+ { \primargs_get_general_text:N \__morewrites_write_now:n }
}
-\cs_new_protected:Npn \__morewrites_immediate_write_closed:n #1
+\cs_new_protected:Npn \__morewrites_write_now:n
{
- \__morewrites_tex_immediate:w \__morewrites_tex_write:w
- \if_int_compare:w \g__morewrites_stream_int < \c_zero
- -1
- \else:
- 16
- \fi:
- {#1}
+ \prop_get:NVNTF \g__morewrites_write_file_prop \l__morewrites_user_int \l__morewrites_internal_tl
+ { \__morewrites_write_now_open:n }
+ { \__morewrites_tex_immediate:w \__morewrites_tex_write:w 16 }
}
-\cs_new_protected:Npn \__morewrites_immediate_write_open:n #1
+\cs_new_protected:Npn \__morewrites_write_now_open:n #1
{
- \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow
- \g__morewrites_tmp_file_tl \scan_stop:
- \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_iow {#1}
- \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow
+ \bool_if:NF \g__morewrites_tmp_file_bool { \__morewrites_chk_file: }
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w
+ \g__morewrites_iow = \g__morewrites_tmp_file_tl \scan_stop:
+ \__morewrites_tex_immediate:w \__morewrites_tex_write:w
+ \g__morewrites_iow {#1}
+ \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w
+ \g__morewrites_iow
\group_begin:
- \int_set_eq:NN \tex_endlinechar:D \c_minus_one
- \tex_openin:D \g__morewrites_ior \g__morewrites_tmp_file_tl \scan_stop:
- \__morewrites_immediate_write_readlines_loop:
+ \int_set:Nn \tex_endlinechar:D { -1 }
+ \tex_openin:D \g__morewrites_ior = \g__morewrites_tmp_file_tl \scan_stop:
+ \__morewrites_write_now_loop:
\tex_closein:D \g__morewrites_ior
+ \__morewrites_collect_gput_right:c
+ { \__morewrites_user_tl_name:n { \l__morewrites_user_int } }
\group_end:
+ \__morewrites_empty_file:n { \g__morewrites_tmp_file_tl }
}
-\cs_new_protected_nopar:Npn \__morewrites_immediate_write_readlines_loop:
+\cs_new_protected:Npn \__morewrites_write_now_loop:
{
\etex_readline:D \g__morewrites_ior to \l__morewrites_internal_tl
\ior_if_eof:NF \g__morewrites_ior
{
- \tl_gput_right:cx
- { g__morewrites_iow_ \int_use:N \g__morewrites_stream_int _tl }
+ \__morewrites_collect:x
{
- \__morewrites_tex_immediate:w \__morewrites_tex_write:w \g__morewrites_iow
- { \l__morewrites_internal_tl }
+ \__morewrites_tex_immediate:w \__morewrites_tex_write:w
+ \g__morewrites_iow { \l__morewrites_internal_tl }
}
- \__morewrites_immediate_write_readlines_loop:
+ \__morewrites_write_now_loop:
}
}
-\cs_new_protected:Npn \__morewrites_late:n #1
+\cs_new_protected:Npn \__morewrites_later:n #1
{
- \int_gincr:N \g__morewrites_late_write_int
+ \int_gincr:N \g__morewrites_later_int
\tl_const:cx
{
- c__morewrites_late_write_
- \int_use:N \g__morewrites_late_write_int
+ c__morewrites_later_
+ \int_use:N \g__morewrites_later_int
_tl
}
{
- \int_gset:Nn \exp_not:N \g__morewrites_stream_int
- { \exp_not:V \g__morewrites_stream_int }
+ \int_set:Nn \exp_not:N \l__morewrites_user_int
+ { \exp_not:V \l__morewrites_user_int }
\exp_not:n {#1}
}
\exp_args:NNx \__morewrites_tex_write:w \g__morewrites_iow
- { `( \int_use:N \g__morewrites_late_write_int ) }
+ { `( \int_use:N \g__morewrites_later_int ) }
}
-\cs_new_protected_nopar:Npn \__morewrites_openout:w
- { \s__morewrites \primargs_get_number:N \__morewrites_openout_test:n }
-\cs_new_protected:Npn \__morewrites_openout_test:n #1
- {
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_openout:w \g__morewrites_stream_int }
- { \__morewrites_equals_file_name:N \__morewrites_openout_aux:n }
- }
-\cs_new_protected:Npn \__morewrites_openout_aux:n #1
- { \__morewrites_late:n { \__morewrites_immediate_openout_aux:n {#1} } }
-\cs_new_protected_nopar:Npn \__morewrites_write:w
- { \s__morewrites \primargs_get_number:N \__morewrites_write_test:n }
-\cs_new_protected:Npn \__morewrites_write_test:n #1
- {
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_write:w \g__morewrites_stream_int }
- { \primargs_get_general_text:N \__morewrites_write_aux:n }
- }
-\cs_new_protected:Npn \__morewrites_write_aux:n #1
- { \__morewrites_late:n { \__morewrites_immediate_write_aux:n {#1} } }
-\cs_new_protected_nopar:Npn \__morewrites_closeout:w
- { \s__morewrites \primargs_get_number:N \__morewrites_closeout_test:n }
-\cs_new_protected:Npn \__morewrites_closeout_test:n #1
- {
- \int_gset:Nn \g__morewrites_stream_int {#1}
- \clist_if_in:NnTF \g__morewrites_reserved_iow_clist {#1}
- { \__morewrites_tex_closeout:w \g__morewrites_stream_int }
- { \__morewrites_closeout_aux: }
- }
-\cs_new_protected_nopar:Npn \__morewrites_closeout_aux:
- { \__morewrites_late:n { \__morewrites_immediate_closeout_aux: } }
-\cs_new_protected_nopar:Npn \__morewrites_before_shipout:
+\cs_new_protected:Npn \__morewrites_later_do:n #1
+ { \tl_use:c { c__morewrites_later_ \int_eval:n {#1} _tl } }
+\cs_new_protected:Npn \__morewrites_closeout_later:
{
- \__morewrites_tex_immediate:w \__morewrites_tex_openout:w \g__morewrites_iow
- \g__morewrites_tmp_file_tl \scan_stop:
+ \int_compare:nNnTF \l__morewrites_user_int < { 19 }
+ { \__morewrites_tex_closeout:w \l__morewrites_user_int }
+ { \__morewrites_later:n { \__morewrites_closeout_now: } }
}
-\cs_new_protected_nopar:Npn \__morewrites_after_shipout:
+\cs_new_protected:Npn \__morewrites_openout_later:w
{
- \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w \g__morewrites_iow
+ \int_compare:nNnTF \l__morewrites_user_int < { 19 }
+ { \__morewrites_tex_openout:w \l__morewrites_user_int }
+ { \__morewrites_equals_file:N \__morewrites_openout_later:n }
+ }
+\cs_new_protected:Npn \__morewrites_openout_later:n #1
+ { \__morewrites_later:n { \__morewrites_openout_now:n {#1} } }
+\cs_new_protected:Npn \__morewrites_write_later:w
+ {
+ \int_compare:nNnTF \l__morewrites_user_int < { 19 }
+ { \__morewrites_tex_write:w \l__morewrites_user_int }
+ { \primargs_get_general_text:N \__morewrites_write_later:n }
+ }
+\cs_new_protected:Npn \__morewrites_write_later:n #1
+ { \__morewrites_later:n { \__morewrites_write_later_aux:n {#1} } }
+\cs_new_protected:Npn \__morewrites_write_later_aux:n
+ {
+ \__morewrites_user_to_tstr:NTF \g__morewrites_write_prop
+ { \__morewrites_tex_immediate:w \__morewrites_tex_write:w \l__morewrites_tstr_tl \exp_stop_f: }
+ { \__morewrites_write_now:n }
+ }
+\cs_new_protected:Npn \__morewrites_before_shipout:
+ {
+ \bool_if:NF \g__morewrites_tmp_file_bool { \__morewrites_chk_file: }
+ \__morewrites_tex_immediate:w \__morewrites_tex_openout:w
+ \g__morewrites_iow = \g__morewrites_tmp_file_tl \scan_stop:
+ }
+\cs_new_protected:Npn \__morewrites_after_shipout:
+ {
+ \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w
+ \g__morewrites_iow
\group_begin:
\int_set_eq:NN \tex_endlinechar:D \tex_newlinechar:D
\char_set_catcode_other:n { \tex_endlinechar:D }
\tl_map_inline:nn { `(0123456789) }
{ \char_set_catcode_other:n {`##1} }
\etex_everyeof:D { `() \exp_not:N }
- \tl_gset:Nx \g__morewrites_internal_tl
+ \tl_set:Nx \l__morewrites_internal_tl
{
\exp_after:wN \__morewrites_after_shipout_loop:ww
\tex_input:D \g__morewrites_tmp_file_tl \c_space_tl
}
+ \__morewrites_empty_file:n { \g__morewrites_tmp_file_tl }
+ \exp_args:NNo
\group_end:
- \tl_map_inline:Nn \g__morewrites_internal_tl
- { \tl_use:c { c__morewrites_late_write_ ##1 _tl } }
+ \tl_map_function:nN { \l__morewrites_internal_tl } \__morewrites_later_do:n
}
\cs_new:Npn \__morewrites_after_shipout_loop:ww #1 `( #2 )
{
@@ -247,89 +377,114 @@
\__morewrites_after_shipout_loop:ww
}
}
-\IfFileExists{atbegshi.sty}
+\cs_new_protected:Npn \__morewrites_shipout:w
{
- \RequirePackage{atbegshi}
- \tl_replace_once:Nnn \AtBegShi@Output
- { \AtBegShi@OrgShipout \box \AtBeginShipoutBox }
- {
- \__morewrites_before_shipout:
- \AtBegShi@OrgShipout \box \AtBeginShipoutBox
- \__morewrites_after_shipout:
- }
- \tl_replace_once:Nnn \AtBegShi@Output
- { \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox }
- {
- \__morewrites_before_shipout:
- \AtBeginShipoutOriginalShipout \box \AtBeginShipoutBox
- \__morewrites_after_shipout:
- }
- }
+ \int_gset_eq:NN \g__morewrites_group_level_int \etex_currentgrouplevel:D
+ \tex_afterassignment:D \__morewrites_shipout_i:
+ \tex_global:D \tex_setbox:D \g__morewrites_shipout_box
+ }
+\cs_new_protected:Npn \__morewrites_shipout_i:
+ {
+ \int_compare:nNnTF { \g__morewrites_group_level_int }
+ = { \etex_currentgrouplevel:D }
+ { \__morewrites_shipout_ii: }
+ { \tex_aftergroup:D \__morewrites_shipout_ii: }
+ }
+\cs_new_protected:Npn \__morewrites_shipout_ii:
+ {
+ \__morewrites_before_shipout:
+ \__morewrites_tex_shipout:w \tex_box:D \g__morewrites_shipout_box
+ \__morewrites_after_shipout:
+ }
+\cs_gset_protected:Npn \__morewrites_tmp:w #1
+ {
+ \cs_if_exist:NF \__morewrites_tex_shipout:w
+ { \cs_new_eq:NN \__morewrites_tex_shipout:w #1 }
+ \cs_gset_eq:NN #1 \__morewrites_shipout:w
+ }
+\tl_map_inline:nn
+ {
+ \xyrealshipout@
+ \org@shipout
+ \PDFSYNCship@ut@ld
+ \CROP@shipout
+ \@soORI
+ \tex_shipout:D
+ \zwpl@Hship
+ \o@shipout@TP
+ \LL@shipout
+ \Shipout
+ \GXTorg@shipout
+ \AtBegShi@OrgShipout
+ \AtBeginShipoutOriginalShipout
+ \minidocument@orig@shipout
+ \shipout
+ }
+ {
+ \str_if_eq_x:nnT
+ { \cs_meaning:N #1 }
+ { \token_to_str:N \shipout }
+ { \__morewrites_tmp:w #1 }
+ }
+\cs_if_exist:NF \__morewrites_tex_shipout:w
+ {
+ \cs_new_eq:NN \__morewrites_tex_shipout:w \shipout
+ \cs_gset_eq:NN \shipout \__morewrites_shipout:w
+ }
+\cs_new_protected:Npn \__morewrites_close_all:
+ {
+ \prop_map_inline:Nn \g__morewrites_write_prop
+ { \__morewrites_tex_immediate:w \__morewrites_tex_closeout:w ##2 \scan_stop: }
+ \prop_gclear:N \g__morewrites_write_prop
+ \prop_map_function:NN \g__morewrites_write_file_prop
+ \__morewrites_closeout_now:nn
+ \prop_gclear:N \g__morewrites_write_file_prop
+ }
+\cs_new_protected:Npn \__morewrites_close_all_at_end:nw #1#2 \@@end
+ {
+ \int_compare:nNnTF {#1} > \c_zero
+ { #2 \__morewrites_close_all_at_end:nw { #1 - 1 } }
+ { \__morewrites_close_all: #2 }
+ \@@end
+ }
+\AtEndDocument { \__morewrites_close_all_at_end:nw { 5 } }
+\int_new:N \g__morewrites_alloc_write_int
+\int_set:Nn \g__morewrites_alloc_write_int { 18 }
+\cs_new_protected:Npn \__morewrites_newwrite:N #1
{
- \int_new:N \g__morewrites_group_level_int
- \box_new:N \g__morewrites_shipout_box
- \cs_new_protected_nopar:Npn \__morewrites_shipout:w
- {
- \int_gset_eq:NN \g__morewrites_group_level_int \etex_currentgrouplevel:D
- \tex_afterassignment:D \__morewrites_shipout_i:
- \tex_global:D \tex_setbox:D \g__morewrites_shipout_box
- }
- \cs_new_protected_nopar:Npn \__morewrites_shipout_i:
- {
- \int_compare:nNnTF { \g__morewrites_group_level_int }
- = { \etex_currentgrouplevel:D }
- { \__morewrites_shipout_ii: }
- { \tex_aftergroup:D \__morewrites_shipout_ii: }
- }
- \cs_new_protected_nopar:Npn \__morewrites_shipout_ii:
+ \int_gincr:N \g__morewrites_alloc_write_int
+ \int_set_eq:NN \allocationnumber \g__morewrites_alloc_write_int
+ \cs_undefine:N #1
+ \int_const:Nn #1 { \allocationnumber }
+ \wlog
{
- \__morewrites_before_shipout:
- \__morewrites_tex_shipout:w \tex_box:D \g__morewrites_shipout_box
- \__morewrites_after_shipout:
+ \token_to_str:N #1
+ = \token_to_str:N \write \int_use:N \allocationnumber
}
- \AtBeginDocument { \cs_gset_eq:NN \shipout \__morewrites_shipout:w }
- }
-\int_new:N \g__morewrites_at_end_int
-\int_gset:Nn \g__morewrites_at_end_int { 10 }
-\cs_new_protected_nopar:Npn \__morewrites_close_all:
- {
- \prop_map_function:NN \g__morewrites_iow_prop
- \__morewrites_immediate_write_and_close:nn
- \prop_gclear:N \g__morewrites_iow_prop
}
-\cs_set:Npn \__morewrites_tmp:w #1
+\cs_new_protected:Npn \__morewrites_allocate:n #1
{
- \cs_new_protected:Npn \__morewrites_close_all_at_end:w ##1 #1
+ \prg_replicate:nn
{
- \int_gdecr:N \g__morewrites_at_end_int
- \int_compare:nNnTF \g__morewrites_at_end_int > \c_zero
+ \int_max:nn { 0 }
{
- \tl_if_empty:nTF {##1}
- { ##1 \__morewrites_close_all: }
- { ##1 \__morewrites_close_all_at_end:w }
+ (#1) - \seq_count:N \g__morewrites_write_seq
+ - \prop_count:N \g__morewrites_write_prop
}
- { \__morewrites_close_all: ##1 }
- #1
}
- }
-\exp_args:Nc \__morewrites_tmp:w { @ @ end }
-\AtEndDocument { \__morewrites_close_all_at_end:w }
-\tex_countdef:D \g__morewrites_alloc_int 17 \scan_stop:
-\cs_new:Npn \__morewrites_newwrite:N #1
- {
- \int_gincr:N \g__morewrites_alloc_int
- \if_int_compare:w \g__morewrites_alloc_int = \c_sixteen
- \int_gset:Nn \g__morewrites_alloc_int { 20 }
- \fi:
- \int_set_eq:NN \allocationnumber \g__morewrites_alloc_int
- \cs_undefine:N #1
- \int_const:Nn #1 { \allocationnumber }
- \wlog
{
- \token_to_str:N #1
- = \token_to_str:N \write \int_use:N \allocationnumber
+ \__morewrites_tex_newwrite:N \l__morewrites_tstr_token
+ \seq_put_right:NV \g__morewrites_write_seq \l__morewrites_tstr_token
}
}
+\cs_new_protected:Npn \morewritessetup #1
+ { \keys_set:nn { __morewrites } {#1} }
+\keys_define:nn { __morewrites }
+ {
+ allocate .code:n = \__morewrites_allocate:n {#1} ,
+ file .code:n = \__morewrites_set_file:n {#1} ,
+ file .initial:n = \c_sys_jobname_str .mw
+ }
\cs_gset_eq:NN \immediate \__morewrites_immediate:w
\cs_gset_eq:NN \openout \__morewrites_openout:w
\cs_gset_eq:NN \write \__morewrites_write:w
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/morewrites/primargs.sty new/tex/latex/morewrites/primargs.sty
--- old/tex/latex/morewrites/primargs.sty 2013-01-09 01:39:48.000000000 +0100
+++ new/tex/latex/morewrites/primargs.sty 2017-04-17 00:19:40.000000000 +0200
@@ -9,7 +9,7 @@
%% Communicate any suggestions for changing this package
%% to Bruno Le Floch (blflatex@gmail.com).
%%
-%% File: primargs.dtx Copyright (C) 2012-2013 Bruno Le Floch
+%% File: primargs.dtx Copyright (C) 2012-2017 Bruno Le Floch
%%
%% It may be distributed and/or modified under the conditions of the
%% LaTeX Project Public License (LPPL), either version 1.3c of this
@@ -19,49 +19,58 @@
%% http://www.latex-project.org/lppl.txt
%%
%% -----------------------------------------------------------------------
-\RequirePackage {expl3} [2012/08/14]
+\RequirePackage {expl3} [2017/03/18]
\ProvidesExplPackage
- {primargs} {2013/01/08} {0.2e} {Parsing arguments of primitives}
-\cs_new_protected_nopar:Npn \g__primargs_code_tl { }
-\cs_new_protected_nopar:Npn \__primargs_no_afterassignment:
- { \tex_afterassignment:D \tex_relax:D }
-\cs_new_protected_nopar:Npn \__primargs_no_localdefs:
+ {primargs} {2017/04/10} {} {Parsing arguments of primitives}
+\tl_new:N \g__primargs_code_tl
+\tl_new:N \g__primargs_file_name_tl
+\tl_new:N \g__primargs_file_name_level_tl
+\cs_new_protected:Npn \__primargs_safe:
{
- \__primargs_no_afterassignment:
- \int_compare:nNnF \tex_globaldefs:D > \c_zero
- { \tex_globaldefs:D = \c_zero }
+ \tex_afterassignment:D \tex_relax:D
+ \if_int_compare:w 0 > \tex_globaldefs:D
+ \int_zero:N \tex_globaldefs:D
+ \fi:
}
-\cs_new_protected_nopar:Npn \primargs_read_x_token:N
+\cs_new_protected:Npn \primargs_read_x_token:N
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\__primargs_read_x_token:N
}
-\cs_new_protected_nopar:Npn \__primargs_read_x_token:N
+\cs_new_protected:Npn \__primargs_read_x_token:N
{
- \tex_afterassignment:D \__primargs_read_x_token_ii:N
+ \tex_afterassignment:D \__primargs_read_x_token_aux:N
\tex_global:D \tex_futurelet:D \g_primargs_token
}
-\cs_new_protected_nopar:Npn \__primargs_read_x_token_ii:N
+\cs_new_protected:Npn \__primargs_read_x_token_std:N
{
\exp_after:wN
\if_meaning:w \exp_not:N \g_primargs_token \g_primargs_token
- \group_end:
- \exp_after:wN \use_none:nnn
+ \group_end: \use_i:nnnn
\fi:
\exp_after:wN \__primargs_read_x_token:N \exp_after:wN
}
-\cs_new_protected_nopar:Npn \primargs_read_token:N
+\cs_new_eq:NN \__primargs_read_x_token_aux:N
+ \__primargs_read_x_token_std:N
+\cs_new_protected:Npn \__primargs_read_x_token_file:N
+ {
+ \if_meaning:w \tex_input:D \g_primargs_token
+ \use_i_ii:nnn \group_end:
+ \fi:
+ \__primargs_read_x_token_std:N
+ }
+\cs_new_protected:Npn \primargs_read_token:N
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\tex_afterassignment:D \group_end:
\tex_global:D \tex_futurelet:D \g_primargs_token
}
\cs_new_protected:Npn \primargs_remove_token:N #1
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\tex_aftergroup:D #1
\tex_afterassignment:D \group_end:
\tex_global:D \tex_let:D \g_primargs_token = ~
@@ -69,13 +78,13 @@
\cs_new_protected:Npn \primargs_remove_one_optional_space:N #1
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\tex_aftergroup:D #1
\primargs_read_x_token:N \__primargs_remove_one_optional_space:
}
-\exp_args:NNo \cs_new_protected_nopar:Npn \__primargs_remove_one_optional_space:
+\cs_new_protected:Npn \__primargs_remove_one_optional_space:
{
- \use:n { \if_catcode:w } ~ \exp_not:N \g_primargs_token
+ \if_catcode:w \c_space_token \exp_not:N \g_primargs_token
\exp_after:wN \primargs_remove_token:N
\fi:
\group_end:
@@ -83,15 +92,15 @@
\cs_new_protected:Npn \primargs_remove_optional_spaces:N #1
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\tex_aftergroup:D #1
\__primargs_remove_optional_spaces:
}
-\cs_new_protected_nopar:Npn \__primargs_remove_optional_spaces:
- { \primargs_read_x_token:N \__primargs_remove_optional_spaces_ii: }
-\exp_args:NNo \cs_new_protected_nopar:Npn \__primargs_remove_optional_spaces_ii:
+\cs_new_protected:Npn \__primargs_remove_optional_spaces:
+ { \primargs_read_x_token:N \__primargs_remove_optional_spaces_aux: }
+\cs_new_protected:Npn \__primargs_remove_optional_spaces_aux:
{
- \use:n { \if_catcode:w } ~ \exp_not:N \g_primargs_token
+ \if_catcode:w \c_space_token \exp_not:N \g_primargs_token
\exp_after:wN \primargs_remove_token:N
\exp_after:wN \__primargs_remove_optional_spaces:
\else:
@@ -104,19 +113,45 @@
\tex_aftergroup:D #1
\primargs_remove_optional_spaces:N \__primargs_remove_equals:
}
-\cs_new_protected_nopar:Npn \__primargs_remove_equals:
+\cs_new_protected:Npn \__primargs_remove_equals:
{
\if_meaning:w = \g_primargs_token
- \exp_after:wN \__primargs_remove_equals_ii:NN
+ \exp_after:wN \__primargs_remove_equals_aux:NN
\fi:
\group_end:
}
-\cs_new_protected:Npn \__primargs_remove_equals_ii:NN #1#2
+\cs_new_protected:Npn \__primargs_remove_equals_aux:NN #1#2
{ \tl_if_eq:nnTF { #2 } { = } { #1 } { #1 #2 } }
+\cs_new_protected:Npn \primargs_remove_filler:N #1
+ {
+ \group_begin:
+ \__primargs_safe:
+ \tex_aftergroup:D #1
+ \__primargs_remove_filler:
+ }
+\cs_new_protected:Npn \__primargs_remove_filler:
+ { \primargs_read_x_token:N \__primargs_remove_filler_aux: }
+\cs_new_protected:Npn \__primargs_remove_filler_aux:
+ {
+ \if_catcode:w \c_space_token \exp_not:N \g_primargs_token
+ \else:
+ \if_meaning:w \tex_relax:D \g_primargs_token
+ \else:
+ \exp_after:wN
+ \if_meaning:w \exp_not:N \prg_do_nothing: \g_primargs_token
+ \else:
+ \__primargs_remove_filler_end:NNNNN
+ \fi:
+ \fi:
+ \fi:
+ \primargs_remove_token:N \__primargs_remove_filler:
+ }
+\cs_new_protected:Npn \__primargs_remove_filler_end:NNNNN #1#2#3#4#5
+ { #1 #2 #3 \group_end: }
\cs_new_protected:Npn \__primargs_get_rhs:NnN #1#2#3
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
\tex_aftergroup:D #3
\tl_gset:Nn \g__primargs_code_tl
{
@@ -130,58 +165,103 @@
#1 =
}
\cs_generate_variant:Nn \__primargs_get_rhs:NnN { No }
-\cs_new_protected_nopar:Npn \primargs_get_number:N
+\cs_new_protected:Npn \primargs_get_number:N
{
\__primargs_get_rhs:NoN \tex_deadcycles:D
{ \tex_the:D \tex_deadcycles:D }
}
-\cs_new_protected_nopar:Npn \primargs_get_dimen:N
+\cs_new_protected:Npn \primargs_get_dimen:N
{
\__primargs_get_rhs:NoN \tex_hoffset:D
{ \tex_the:D \tex_hoffset:D }
}
-\cs_new_protected_nopar:Npn \primargs_get_glue:N
+\cs_new_protected:Npn \primargs_get_glue:N
{
\__primargs_get_rhs:NoN \tex_topskip:D
{ \tex_the:D \tex_topskip:D }
}
-\cs_new_protected_nopar:Npn \primargs_get_mudimen:N
+\cs_new_protected:Npn \primargs_get_mudimen:N
{
\msg_warning:nn { primargs } { get-mudimen }
\primargs_get_muglue:N
}
\msg_new:nnn { primargs } { get-mudimen }
{ The~\iow_char:N\\primargs_get_mudimen:N~function~is~buggy. }
-\cs_new_protected_nopar:Npn \primargs_get_muglue:N
+\cs_new_protected:Npn \primargs_get_muglue:N
{
\__primargs_get_rhs:NoN \tex_thinmuskip:D
{ \tex_the:D \tex_thinmuskip:D }
}
-\cs_new_protected_nopar:Npn \primargs_get_general_text:N
- { \__primargs_get_rhs:NoN \tex_errhelp:D { { } } }
-\tl_new:N \g__primargs_file_name_tl
+\cs_new_protected:Npn \primargs_get_general_text:N #1
+ {
+ \group_begin:
+ \__primargs_safe:
+ \tex_aftergroup:D #1
+ \tex_aftergroup:D { \if_false: } \fi:
+ \primargs_remove_filler:N \__primargs_get_general_text:
+ }
+\cs_new_protected:Npn \__primargs_get_general_text:
+ {
+ \if_catcode:w \c_group_begin_token \g_primargs_token
+ \exp_after:wN \primargs_remove_token:N
+ \else:
+ \group_begin:
+ \tex_aftergroup:D \__primargs_get_general_text_error:n
+ \if_catcode:w \c_group_end_token \g_primargs_token
+ \tex_aftergroup:D {
+ \tex_aftergroup:D }
+ \fi:
+ \fi:
+ \group_end:
+ }
+\cs_new_protected:Npn \__primargs_get_general_text_error:n #1
+ {
+ \exp_after:wN \group_end:
+ \etex_unexpanded:D \if_int_compare:w `{ = \c_zero \fi: #1 }
+ }
\cs_new_protected:Npn \primargs_get_file_name:N #1
{
\group_begin:
- \__primargs_no_localdefs:
+ \__primargs_safe:
+ \cs_gset_eq:NN \__primargs_read_x_token_aux:N
+ \__primargs_read_x_token_file:N
\tex_aftergroup:D #1
\tl_gclear:N \g__primargs_file_name_tl
+ \tl_gset:Nn \g__primargs_file_name_level_tl { 0 }
\primargs_remove_optional_spaces:N \__primargs_get_file_name_test:
}
-\cs_new_protected_nopar:Npn \__primargs_get_file_name_test:
+\cs_new_protected:Npn \__primargs_get_file_name_test:
{
\token_if_cs:NTF \g_primargs_token
{ \__primargs_get_file_name_end: }
{
\token_if_eq_charcode:NNTF \c_space_token \g_primargs_token
- { \primargs_remove_token:N \__primargs_get_file_name_end: }
+ { \primargs_remove_token:N \__primargs_get_file_name_space: }
{ \primargs_remove_token:N \__primargs_get_file_name_char: }
}
}
-\cs_new_protected_nopar:Npn \__primargs_get_file_name_end:
- { \exp_args:No \group_end: \g__primargs_file_name_tl }
-\cs_new_protected_nopar:Npn \__primargs_get_file_name_char:
+\cs_new_protected:Npn \__primargs_get_file_name_end:
+ {
+ \cs_gset_eq:NN \__primargs_read_x_token_aux:N
+ \__primargs_read_x_token_std:N
+ \exp_args:No \group_end: \g__primargs_file_name_tl
+ }
+\cs_new_protected:Npn \__primargs_get_file_name_space:
+ {
+ \int_if_odd:nTF { \g__primargs_file_name_level_tl }
+ {
+ \tl_gput_right:Nn \g__primargs_file_name_tl { ~ }
+ \primargs_read_x_token:N \__primargs_get_file_name_test:
+ }
+ { \__primargs_get_file_name_end: }
+ }
+\cs_new_protected:Npn \__primargs_get_file_name_char:
{
+ \token_if_eq_charcode:NNT " \g_primargs_token
+ {
+ \tl_set:Nx \g__primargs_file_name_level_tl
+ { \int_eval:n { 1 - \g__primargs_file_name_level_tl } }
+ }
\tl_gput_right:Nx \g__primargs_file_name_tl
{
\exp_after:wN \__primargs_get_file_name_char_ii:w
@@ -193,6 +273,76 @@
\cs_new:Npn \__primargs_get_file_name_char_ii:w #1 ~ #2 ~ #3 \q_stop
{ \__primargs_get_file_name_char_iii:w #3 ~ #3 ~ \q_stop }
\cs_new:Npn \__primargs_get_file_name_char_iii:w #1 ~ #2 ~ #3 \q_stop {#2}
+\sys_if_engine_luatex:TF
+ {
+ \cs_new_protected:Npn \primargs_get_input_file_name:N #1
+ {
+ \group_begin:
+ \__primargs_safe:
+ \tex_aftergroup:D #1
+ \tl_gclear:N \g__primargs_file_name_tl
+ \tl_gset:Nn \g__primargs_file_name_level_tl { 1 }
+ \primargs_remove_filler:N \__primargs_get_input_file_name_first:
+ }
+ \cs_new_protected:Npn \__primargs_get_input_file_name_first:
+ {
+ \token_if_eq_catcode:NNTF \g_primargs_token \c_group_begin_token
+ { \primargs_remove_token:N \__primargs_get_input_file_name_loop: }
+ { \primargs_get_file_name:N \group_end: }
+ }
+ \cs_new_protected:Npn \__primargs_get_input_file_name_loop:
+ { \primargs_read_x_token:N \__primargs_get_input_file_name_test: }
+ \cs_new_protected:Npn \__primargs_get_input_file_name_test:
+ {
+ \token_if_eq_catcode:NNTF \g_primargs_token \c_group_begin_token
+ {
+ \tl_gset:Nx \g__primargs_file_name_level_tl
+ { \int_eval:n { \g__primargs_file_name_level_tl + 1 } }
+ \primargs_remove_token:N \__primargs_get_input_file_name_brace:
+ }
+ {
+ \token_if_eq_catcode:NNTF \g_primargs_token \c_group_end_token
+ {
+ \tl_gset:Nx \g__primargs_file_name_level_tl
+ { \int_eval:n { \g__primargs_file_name_level_tl - 1 } }
+ \int_compare:nNnTF { \g__primargs_file_name_level_tl } > 0
+ { \primargs_remove_token:N \__primargs_get_input_file_name_brace: }
+ { \primargs_remove_token:N \__primargs_get_file_name_end: }
+ }
+ {
+ \token_if_eq_meaning:NNTF \g_primargs_token \c_space_token
+ {
+ \tl_gput_right:Nn \g__primargs_file_name_tl { ~ }
+ \primargs_remove_token:N \__primargs_get_input_file_name_loop:
+ }
+ { \exp_after:wN \__primargs_get_input_file_name_aux:N \exp_not:N }
+ }
+ }
+ }
+ \cs_new_protected:Npn \__primargs_get_input_file_name_brace:
+ {
+ \tl_gput_right:Nx \g__primargs_file_name_tl
+ {
+ \exp_after:wN \__primargs_get_file_name_char_ii:w
+ \token_to_meaning:N \g_primargs_token
+ \q_stop
+ }
+ \__primargs_get_input_file_name_loop:
+ }
+ \cs_new_protected:Npn \__primargs_get_input_file_name_aux:N #1
+ {
+ \exp_after:wN \str_if_eq_x:nnT
+ \exp_after:wN { \token_to_str:N #1 } { \token_to_str:N \par }
+ { \use_none:nnn }
+ \tex_xdef:D \g__primargs_file_name_tl
+ {
+ \g__primargs_file_name_tl
+ \exp_after:wN \tl_to_str:n \exp_after:wN { \exp_not:N #1 }
+ }
+ \__primargs_get_input_file_name_loop:
+ }
+ }
+ { \cs_new_eq:NN \primargs_get_input_file_name:N \primargs_get_file_name:N }
%%
%%
%% End of file `primargs.sty'.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/morewrites.tlpobj new/tlpkg/tlpobj/morewrites.tlpobj
--- old/tlpkg/tlpobj/morewrites.tlpobj 2016-04-14 19:28:25.000000000 +0200
+++ new/tlpkg/tlpobj/morewrites.tlpobj 2017-04-21 02:07:49.000000000 +0200
@@ -1,22 +1,21 @@
name morewrites
category Package
-revision 28767
+revision 43945
shortdesc Always room for a new write stream
relocated 1
longdesc The package aims to solve the error "No room for a new \write",
longdesc which occurs when the user, or when the user's packages have
-longdesc 'allocated too many streams using \newwrite (TeX has a fixed
+longdesc 'allocated too many streams' using \newwrite (TeX has a fixed
longdesc maximum number - 16 - such streams built-in to its code). The
longdesc package hooks into TeX primitive commands associated with
longdesc writing to files; it should be loaded near the beginning of the
longdesc sequence of loading packages for a document. The package uses
longdesc the l3kernel bundle.
-runfiles size=6
+runfiles size=8
RELOC/tex/latex/morewrites/morewrites.sty
RELOC/tex/latex/morewrites/primargs.sty
catalogue-also rvwrite
catalogue-ctan /macros/latex/contrib/morewrites
-catalogue-date 2015-08-03 05:43:12 +0200
-catalogue-license lppl1.3
+catalogue-date 2017-04-20 21:01:46 +0200
+catalogue-license lppl1.3c
catalogue-topics io-mgmt
-catalogue-version 0.2e
++++++ movie15.doc.tar.xz ++++++
++++++ movie15.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/movie15.tlpobj new/tlpkg/tlpobj/movie15.tlpobj
--- old/tlpkg/tlpobj/movie15.tlpobj 2016-04-14 19:28:26.000000000 +0200
+++ new/tlpkg/tlpobj/movie15.tlpobj 2017-04-14 17:51:42.000000000 +0200
@@ -14,6 +14,6 @@
RELOC/tex/latex/movie15/movie15.sty
catalogue-also flashmovie
catalogue-ctan /macros/latex/contrib/movie15
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics multimedia obsolete
++++++ mp3d.doc.tar.xz ++++++
++++++ mp3d.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mp3d.tlpobj new/tlpkg/tlpobj/mp3d.tlpobj
--- old/tlpkg/tlpobj/mp3d.tlpobj 2016-04-14 19:28:27.000000000 +0200
+++ new/tlpkg/tlpobj/mp3d.tlpobj 2017-04-14 17:51:42.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/metapost/mp3d/3dutil.mp
RELOC/metapost/mp3d/animpoly.mp
catalogue-ctan /graphics/metapost/contrib/macros/mp3d
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics mp-use graphics-3d
catalogue-version 1.34
++++++ mparhack.doc.tar.xz ++++++
++++++ mparhack.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mparhack.tlpobj new/tlpkg/tlpobj/mparhack.tlpobj
--- old/tlpkg/tlpobj/mparhack.tlpobj 2016-04-14 19:28:27.000000000 +0200
+++ new/tlpkg/tlpobj/mparhack.tlpobj 2017-04-14 17:51:43.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/latex/mparhack/mparhack.sty
catalogue-ctan /macros/latex/contrib/mparhack
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics marginal
catalogue-version 1.4
++++++ mparrows.doc.tar.xz ++++++
++++++ mparrows.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mparrows.tlpobj new/tlpkg/tlpobj/mparrows.tlpobj
--- old/tlpkg/tlpobj/mparrows.tlpobj 2016-04-14 19:28:28.000000000 +0200
+++ new/tlpkg/tlpobj/mparrows.tlpobj 2017-04-14 17:51:43.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/metapost/mparrows/mparrows.mp
catalogue-ctan /graphics/metapost/contrib/macros/mparrows
-catalogue-date 2016-02-21 05:08:42 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics mp-supp
catalogue-version 0.1
++++++ mpattern.doc.tar.xz ++++++
++++++ mpattern.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpattern.tlpobj new/tlpkg/tlpobj/mpattern.tlpobj
--- old/tlpkg/tlpobj/mpattern.tlpobj 2016-04-14 19:28:28.000000000 +0200
+++ new/tlpkg/tlpobj/mpattern.tlpobj 2017-04-14 17:51:43.000000000 +0200
@@ -8,6 +8,6 @@
runfiles size=2
RELOC/metapost/mpattern/mpattern.mp
catalogue-ctan /graphics/metapost/contrib/macros/mpattern
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license pd
catalogue-topics graphics-use
++++++ mpcolornames.doc.tar.xz ++++++
++++++ mpcolornames.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpcolornames.tlpobj new/tlpkg/tlpobj/mpcolornames.tlpobj
--- old/tlpkg/tlpobj/mpcolornames.tlpobj 2016-04-14 19:28:28.000000000 +0200
+++ new/tlpkg/tlpobj/mpcolornames.tlpobj 2017-04-14 17:51:43.000000000 +0200
@@ -18,7 +18,7 @@
RELOC/metapost/mpcolornames/mpcolornames-spec-xcolor-sty.mp
RELOC/metapost/mpcolornames/mpcolornames.mp
catalogue-ctan /graphics/metapost/contrib/macros/mpcolornames
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics colour
catalogue-version 0.20
++++++ mpgraphics.doc.tar.xz ++++++
++++++ mpgraphics.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mpgraphics.tlpobj new/tlpkg/tlpobj/mpgraphics.tlpobj
--- old/tlpkg/tlpobj/mpgraphics.tlpobj 2016-04-14 19:28:28.000000000 +0200
+++ new/tlpkg/tlpobj/mpgraphics.tlpobj 2017-04-14 17:51:43.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/tex/latex/mpgraphics/mpgraphics.sty
catalogue-also emp
catalogue-ctan /macros/latex/contrib/mpgraphics
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics graphics-inline
catalogue-version 0.3
++++++ mpman-ru.doc.tar.xz ++++++
++++++ mptopdf.doc.tar.xz ++++++
++++++ mptopdf.tar.xz ++++++
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 2016-05-23 00:06:07.000000000 +0200
+++ new/tlpkg/tlpobj/mptopdf.tlpobj 2017-04-14 17:51:44.000000000 +0200
@@ -10,6 +10,8 @@
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.
+depend mptopdf
+depend plain
depend mptopdf.ARCH
execute AddFormat name=mptopdf engine=pdftex options="-translate-file=cp227.tcx mptopdf.tex" fmttriggers=mptopdf,plain
runfiles size=43
++++++ ms.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/ms.doc.tlpobj new/tlpkg/tlpobj/ms.doc.tlpobj
--- old/tlpkg/tlpobj/ms.doc.tlpobj 2016-04-14 19:28:30.000000000 +0200
+++ new/tlpkg/tlpobj/ms.doc.tlpobj 2017-04-14 17:51:44.000000000 +0200
@@ -1,6 +1,6 @@
name ms.doc
category Package
-revision 29849
+revision 42428
shortdesc doc files of ms
relocated 1
docfiles size=629
++++++ ms.tar.xz ++++++
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 2016-04-14 19:28:32.000000000 +0200
+++ new/tlpkg/tlpobj/ms.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -1,6 +1,6 @@
name ms
category Package
-revision 29849
+revision 42428
shortdesc Various LaTeX packages by Martin Schroder
relocated 1
longdesc A bundle of LaTeX packages by Martin Schroder; the collection
@@ -18,6 +18,6 @@
RELOC/tex/latex/ms/prelim2e.sty
RELOC/tex/latex/ms/ragged2e.sty
catalogue-ctan /macros/latex/contrib/ms
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics collection
++++++ msc.doc.tar.xz ++++++
++++++ msc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msc.tlpobj new/tlpkg/tlpobj/msc.tlpobj
--- old/tlpkg/tlpobj/msc.tlpobj 2016-04-14 19:28:33.000000000 +0200
+++ new/tlpkg/tlpobj/msc.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -13,7 +13,7 @@
RELOC/bibtex/bib/msc/biblio.bib
RELOC/tex/latex/msc/msc.sty
catalogue-ctan /macros/latex/contrib/msc
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics comp-net
catalogue-version 1.16
++++++ msg.doc.tar.xz ++++++
++++++ msg.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msg.tlpobj new/tlpkg/tlpobj/msg.tlpobj
--- old/tlpkg/tlpobj/msg.tlpobj 2016-04-14 19:28:34.000000000 +0200
+++ new/tlpkg/tlpobj/msg.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -17,7 +17,7 @@
RELOC/tex/latex/msg/msg.sty
RELOC/tex/latex/msg/norsk_msg-msg.tex
catalogue-ctan /macros/latex/contrib/msg
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics multilingual
catalogue-version 0.40
++++++ mslapa.doc.tar.xz ++++++
++++++ 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 2016-04-14 19:28:34.000000000 +0200
+++ new/tlpkg/tlpobj/mslapa.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -11,6 +11,6 @@
RELOC/tex/latex/mslapa/mslapa.sty
catalogue-also apacite apa
catalogue-ctan /macros/latex/contrib/mslapa
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license other-free
catalogue-topics psychology journalpub bibtex-sty
++++++ msu-thesis.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/README new/doc/latex/msu-thesis/README
--- old/doc/latex/msu-thesis/README 2016-05-10 23:31:55.000000000 +0200
+++ new/doc/latex/msu-thesis/README 2016-11-25 19:29:34.000000000 +0100
@@ -1,4 +1,4 @@
-MSU Thesis Class Version 2.6 2016/05/09
+MSU Thesis Class Version 2.6b 2016/06/08
Copyright 2011,2012,2013,2014,2015,2016 by Alan Munn
Binary files old/doc/latex/msu-thesis/msu-thesis.pdf and new/doc/latex/msu-thesis/msu-thesis.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/msu-thesis.tex new/doc/latex/msu-thesis/msu-thesis.tex
--- old/doc/latex/msu-thesis/msu-thesis.tex 2016-05-10 23:31:55.000000000 +0200
+++ new/doc/latex/msu-thesis/msu-thesis.tex 2016-11-25 19:29:34.000000000 +0100
@@ -2,8 +2,8 @@
\documentclass[11pt]{article}
-\def\msuversion{2.6}
-\def\msudate{2016/05/09}
+\def\msuversion{2.6b}
+\def\msudate{2016/06/08}
\title{\textbf{Using the MSU Thesis Class}}
\author{\textbf{Alan Munn}\\Department of Linguistics and Languages\\\texttt{\href{mailto:amunn@msu.edu}{amunn@msu.edu}}}
\date{Version \msuversion\\\msudate}
@@ -190,6 +190,17 @@
\end{lstlisting}
\end{quote}
+Another common kind of List is a List of Abbreviations. The thesis office seems to want to call this "Key to Abbreviations". To add such a list, you need to do the following:
+
+\begin{quote}
+\begin{lstlisting}
+\clearpage
+\chapter*{Key to Abbreviations}
+\addcontentsline{toc}{chapter}{Key to Abbreviations}
+Your list of abbreviations here.
+\end{lstlisting}
+\end{quote}
+
\subsection{Landscape figures and tables}
If you have large figures and tables that must be rotated, you should use the |[lscape]| class option. This enables a pagestyle |lscape| and places the page numbers correctly on the long edge of the page. The option loads the \pkg{pdflscape} package which provides a |landscape| environment to place the landscape figure in. Before the landscape environment, you need to issue a |\clearpage| command and change the pagestyle to |lscape|, and afterwards, change it back to |plain|. Schematically, then, any landscape pages should be created in the following way.
@@ -275,7 +286,7 @@
\subsection{Version history}
Previous versions of \pkg{msu-thesis} (versions 1.0--1.4b) were created for non-electronic submission and should not be used. Versions 1.5--1.6 (the first electronic submission versions) contained a |\makeabstract| command and a separate |msuabstract| environment. These have been removed as of version 1.7. Users who are upgrading from earlier versions to version 1.7 do not need to change these commands however but their use will trigger a warning.) Version 2.0 implemented landscape pages; version 2.1 added support for \pkg{hyperref}. Versions 2.2--2.5 mainly accommodated to the ever changing whims of the MSU Graduate School. Version 2.6 fixed some appendix bugs introduced by the previous whim accommodation.
\section{Acknowledgements}
-Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0-1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the hyperref code. Thanks also to the following students who have reported problems over the years: Matt Husband, Irina Agafonova, Dmitriy Bryndin, Greg Christian, Changkuk Jung, Yisu Zhou, Neil ver Planck, Michael Wojcik, Kyle Crayne, Adam Soliman and Adam Liter.
+Thanks to Lars Madsen, Ulrike Fischer and Peter Wilson for help with setting up parts of the memoir code for versions 1.0-1.4 (now eliminated due to changed requirements). Thanks to Wolfgang Sternefeld for supplying the \pkg{linguex} spacing fix code, Leo Liu for the landscape page numbering code, which greatly simplified my original version, and Florent Chervet for the hyperref code. Thanks also to the following students who have reported problems over the years: Matt Husband, Irina Agafonova, Dmitriy Bryndin, Greg Christian, Changkuk Jung, Yisu Zhou, Neil ver Planck, Michael Wojcik, Kyle Crayne, Adam Soliman, Adam Liter and Ali Al-jiboory.
\appendix
\renewcommand{\thesection}{Appendix \Alph{section}}
Binary files old/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf and new/doc/latex/msu-thesis/samples/MSU-thesis-template.pdf differ
Binary files old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf and new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.pdf differ
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex
--- old/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex 2016-05-10 23:31:55.000000000 +0200
+++ new/doc/latex/msu-thesis/samples/MSU-thesis-testfile.tex 2016-11-25 19:29:34.000000000 +0100
@@ -60,6 +60,13 @@
\listoffigures
\clearpage
\listoflistings
+\clearpage
+\chapter*{Key to Abbreviations}
+\addcontentsline{toc}{chapter}{Key to Abbreviations}
+\begin{description}
+\item[foo] This is a foo
+\item[bar] This is a bar
+\end{description}
\mainmatter
% The next command changes chapters in the TOC to have no dotted leader
%\addtocontents{toc}{\protect\renewcommand{\protect\cftchapterdotsep}{\cftnodots}}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msu-thesis.doc.tlpobj new/tlpkg/tlpobj/msu-thesis.doc.tlpobj
--- old/tlpkg/tlpobj/msu-thesis.doc.tlpobj 2016-05-10 23:46:04.000000000 +0200
+++ new/tlpkg/tlpobj/msu-thesis.doc.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -1,6 +1,6 @@
name msu-thesis.doc
category Package
-revision 41013
+revision 41345
shortdesc doc files of msu-thesis
relocated 1
docfiles size=102
++++++ msu-thesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tex/latex/msu-thesis/msu-thesis.cls new/tex/latex/msu-thesis/msu-thesis.cls
--- old/tex/latex/msu-thesis/msu-thesis.cls 2016-05-10 23:31:55.000000000 +0200
+++ new/tex/latex/msu-thesis/msu-thesis.cls 2016-11-25 19:33:55.000000000 +0100
@@ -117,12 +117,15 @@
% also fix bookmarks in the PDF when hyperref is loaded.
% Made default caption delimiter a space so that captions in LOT/LOF look better
% Removed old commented out code and older backwards compatibility code.
-%
+% Version 2.6b 2016/06/08 Reworked some vertical spacing after complaints from the thesis office
+% despite the fact that people successfully submitted theses in May with
+% the previous spacing. This is getting ridiculous.
+% Also updated documentation to show how to add list of abbreviations
% Use at your own risk!
% Report bugs/problems/questions to
%
-\def\msu@version{2.6}
-\def\msu@date{2016/05/09}
+\def\msu@version{2.6b}
+\def\msu@date{2016/06/08}
\NeedsTeXFormat{LaTeX2e}
\ProvidesClass{msu-thesis}[\msu@date\space Michigan State University Thesis Class version \msu@version]
\newif\ifmsu@lscape\msu@lscapefalse
@@ -207,7 +210,7 @@
% set up the chapter titles
\chapterstyle{thatcher}
\setlength{\beforechapskip}{0pt}
-%\setlength{\afterchapskip}{28pt} % Thesis office didn't like this
+\setlength{\afterchapskip}{18pt} % 2016/06/08 because of thesis office complaints
\renewcommand*{\chapnamefont}{\centering\bfseries}
\renewcommand*{\chapnumfont}{\bfseries}
\renewcommand*{\chaptitlefont}{\SingleSpacing\bfseries}
@@ -321,11 +324,12 @@
\renewenvironment{abstract}{%
\chapter*{\abstractname}
\thispagestyle{empty}
- \plainbreak{-1.5}
+ \plainbreak{-.5} % changed 2016/06/08 after complaints
\begin{center}
\MakeUppercase{\thetitle}\plainbreak{1}By\plainbreak{1}\theauthor
\end{center}
- \DoubleSpacing
+ \plainbreak{-.5} % changed 2016/06/08 after complaints
+ \DoubleSpacing
}{\par}
@@ -356,17 +360,20 @@
\clearpage}
% make the dedication page
+% changed 2016/06/08 for vertical centering
\newcommand*{\makededicationpage}{%
\clearpage
\pagestyle{plain}
- \chapter*{\ }
- \vspace{.35\textheight}\begin{center}
- \msu@dedication
- \end{center}}
+ {\centering
+ \null\vfill
+ \msu@dedication\par
+ \vfill}}
\renewcommand{\mainmatter}{%
\DoubleSpacing\pagestyle{plain}\@ifstar{\@smemmain}{\@memmain}}
+% This should probably be changed to {\null\vfill} + \afterpartskip
+% But we'll worry about this later.
\renewcommand{\beforepartskip}{\vspace*{.35\textheight}}
% This code patches the memoir appendix code to automatically add
@@ -374,19 +381,34 @@
% TOC format that the Grad School requires correct.
% Also, since the Grad School doesn't allow a single appendix to have a letter name
% we remove it for the title, but not for the section headings.
+% Redefining \@apppage as well to get the spacing right 2016/06/08
%
+\def\msu@apppage{%
+ \@setuppart
+ \mempreaddapppagetotochook
+ \addappheadtotoc
+ \mempostaddapppagetotochook
+ \partmark{\appendixpagename}%
+ \memapppageinfo{\appendixpagename}%
+ {\centering
+ \interlinepenalty \@M
+ \normalfont
+ \vfil
+ \printparttitle{\appendixpagename}\par\vfil}%
+ \@endpart}
+
\let\orig@appendix\appendix
\let\orig@appendices\appendices
\renewcommand*{\appendix}{
\renewcommand\appendixpagename{Appendix}
\renewcommand\appendixtocname{Appendix}
- \appendixpage
+ \msu@apppage
\settocdepth{part}
\orig@appendix
\renewcommand\thechapter{}
\renewcommand\thesection{A.\arabic{section}}}
\renewcommand*{\appendices}{
- \appendixpage
+ \msu@apppage
\cftinserthook{toc}{APP}
\settocdepth{chapter}
\orig@appendices}
@@ -405,7 +427,8 @@
{\centering
\interlinepenalty \@M
\normalfont
- \printparttitle{\bibpagename}\par}%
+ \vfil
+ \printparttitle{\bibpagename}\par\vfil}%
\@endpart}
\newcommand\msu@preaddbibpagetotochook{}
\newcommand\msu@postaddbibpagetotochook{}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/msu-thesis.tlpobj new/tlpkg/tlpobj/msu-thesis.tlpobj
--- old/tlpkg/tlpobj/msu-thesis.tlpobj 2016-05-10 23:46:04.000000000 +0200
+++ new/tlpkg/tlpobj/msu-thesis.tlpobj 2017-04-14 17:51:45.000000000 +0200
@@ -1,6 +1,6 @@
name msu-thesis
category Package
-revision 41013
+revision 41345
shortdesc Class for Michigan State University Master's and PhD theses
relocated 1
longdesc This is a class file for producing dissertations and theses
@@ -14,7 +14,7 @@
RELOC/tex/latex/msu-thesis/gb4e-compat.tex
RELOC/tex/latex/msu-thesis/msu-thesis.cls
catalogue-ctan /macros/latex/contrib/msu-thesis
-catalogue-date 2016-05-10 18:02:59 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics dissertation
-catalogue-version 2.6
+catalogue-version 2.6b
++++++ mtgreek.doc.tar.xz ++++++
++++++ mtgreek.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mtgreek.tlpobj new/tlpkg/tlpobj/mtgreek.tlpobj
--- old/tlpkg/tlpobj/mtgreek.tlpobj 2016-04-14 19:28:35.000000000 +0200
+++ new/tlpkg/tlpobj/mtgreek.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=1
RELOC/tex/latex/mtgreek/mtgreek.sty
catalogue-ctan /macros/latex/contrib/mtgreek
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics font-supp greek
catalogue-version 1.1+
++++++ mugsthesis.doc.tar.xz ++++++
++++++ mugsthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mugsthesis.tlpobj new/tlpkg/tlpobj/mugsthesis.tlpobj
--- old/tlpkg/tlpobj/mugsthesis.tlpobj 2016-04-14 19:28:35.000000000 +0200
+++ new/tlpkg/tlpobj/mugsthesis.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -9,6 +9,6 @@
runfiles size=2
RELOC/tex/latex/mugsthesis/mugsthesis.cls
catalogue-ctan /macros/latex/contrib/mugsthesis
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics dissertation
++++++ multenum.doc.tar.xz ++++++
++++++ multenum.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multenum.tlpobj new/tlpkg/tlpobj/multenum.tlpobj
--- old/tlpkg/tlpobj/multenum.tlpobj 2016-04-14 19:28:36.000000000 +0200
+++ new/tlpkg/tlpobj/multenum.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -12,6 +12,6 @@
RELOC/tex/latex/multenum/multienum.sty
catalogue-also shortlst paralist
catalogue-ctan /macros/latex/contrib/multenum
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1
catalogue-topics list list-enum
++++++ multiaudience.doc.tar.xz ++++++
++++++ multiaudience.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiaudience.tlpobj new/tlpkg/tlpobj/multiaudience.tlpobj
--- old/tlpkg/tlpobj/multiaudience.tlpobj 2016-04-14 19:28:36.000000000 +0200
+++ new/tlpkg/tlpobj/multiaudience.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=1
RELOC/tex/latex/multiaudience/multiaudience.sty
catalogue-ctan /macros/latex/contrib/multiaudience
-catalogue-date 2015-08-05 05:51:16 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics cond-comp
catalogue-version 1.03
++++++ multibbl.doc.tar.xz ++++++
++++++ multibbl.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibbl.tlpobj new/tlpkg/tlpobj/multibbl.tlpobj
--- old/tlpkg/tlpobj/multibbl.tlpobj 2016-04-14 19:28:36.000000000 +0200
+++ new/tlpkg/tlpobj/multibbl.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=1
RELOC/tex/latex/multibbl/multibbl.sty
catalogue-ctan /macros/latex/contrib/multibbl
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-multi bibtex-supp
catalogue-version 1.1
++++++ multibib.doc.tar.xz ++++++
++++++ multibib.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibib.tlpobj new/tlpkg/tlpobj/multibib.tlpobj
--- old/tlpkg/tlpobj/multibib.tlpobj 2016-04-14 19:28:37.000000000 +0200
+++ new/tlpkg/tlpobj/multibib.tlpobj 2017-04-14 17:51:46.000000000 +0200
@@ -16,7 +16,7 @@
RELOC/makeindex/multibib/mbgind.ist
RELOC/tex/latex/multibib/multibib.sty
catalogue-ctan /macros/latex/contrib/multibib
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-multi bibtex-supp
catalogue-version 1.4
++++++ multibibliography.doc.tar.xz ++++++
++++++ multibibliography.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multibibliography.tlpobj new/tlpkg/tlpobj/multibibliography.tlpobj
--- old/tlpkg/tlpobj/multibibliography.tlpobj 2016-04-14 19:28:37.000000000 +0200
+++ new/tlpkg/tlpobj/multibibliography.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -16,7 +16,7 @@
texmf-dist/tex/latex/multibibliography/multibibliography.sty
catalogue-also nmbib
catalogue-ctan /macros/latex/contrib/multibibliography
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics bibtex-supp
catalogue-version 1.03
++++++ multicap.doc.tar.xz ++++++
++++++ multicap.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multicap.tlpobj new/tlpkg/tlpobj/multicap.tlpobj
--- old/tlpkg/tlpobj/multicap.tlpobj 2016-04-14 19:28:38.000000000 +0200
+++ new/tlpkg/tlpobj/multicap.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -12,6 +12,6 @@
RELOC/tex/latex/multicap/multicap.sty
catalogue-also caption
catalogue-ctan /macros/latex/contrib/multicap
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics caption
++++++ multidef.doc.tar.xz ++++++
++++++ multidef.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multidef.tlpobj new/tlpkg/tlpobj/multidef.tlpobj
--- old/tlpkg/tlpobj/multidef.tlpobj 2016-04-21 03:14:38.000000000 +0200
+++ new/tlpkg/tlpobj/multidef.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=2
RELOC/tex/latex/multidef/multidef.sty
catalogue-ctan /macros/latex/contrib/multidef
-catalogue-date 2016-04-20 06:02:38 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version 1.10
++++++ multido.doc.tar.xz ++++++
++++++ multido.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multido.tlpobj new/tlpkg/tlpobj/multido.tlpobj
--- old/tlpkg/tlpobj/multido.tlpobj 2016-04-14 19:28:39.000000000 +0200
+++ new/tlpkg/tlpobj/multido.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -12,7 +12,7 @@
RELOC/tex/generic/multido/multido.tex
RELOC/tex/latex/multido/multido.sty
catalogue-ctan /macros/generic/multido
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics macro-supp
catalogue-version 1.42
++++++ multienv.doc.tar.xz ++++++
++++++ multienv.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multienv.tlpobj new/tlpkg/tlpobj/multienv.tlpobj
--- old/tlpkg/tlpobj/multienv.tlpobj 2016-04-14 19:28:39.000000000 +0200
+++ new/tlpkg/tlpobj/multienv.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=2
RELOC/tex/latex/multienv/multienv.sty
catalogue-ctan /macros/latex/contrib/multienv
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version 1.0
++++++ multiexpand.doc.tar.xz ++++++
++++++ multiexpand.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiexpand.tlpobj new/tlpkg/tlpobj/multiexpand.tlpobj
--- old/tlpkg/tlpobj/multiexpand.tlpobj 2016-04-14 19:28:40.000000000 +0200
+++ new/tlpkg/tlpobj/multiexpand.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=1
RELOC/tex/generic/multiexpand/multiexpand.sty
catalogue-ctan /macros/generic/multiexpand
-catalogue-date 2016-02-07 10:49:28 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics macro-supp
catalogue-version 1.4
++++++ multiobjective.doc.tar.xz ++++++
++++++ multiobjective.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/multiobjective.tlpobj new/tlpkg/tlpobj/multiobjective.tlpobj
--- old/tlpkg/tlpobj/multiobjective.tlpobj 2016-04-14 19:28:40.000000000 +0200
+++ new/tlpkg/tlpobj/multiobjective.tlpobj 2017-04-14 17:51:47.000000000 +0200
@@ -10,7 +10,7 @@
runfiles size=1
RELOC/tex/latex/multiobjective/multiobjective.sty
catalogue-ctan /macros/latex/contrib/multiobjective
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics maths-symbol
catalogue-version 1.0
++++++ 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 2006-01-09 01:44:40.000000000 +0100
+++ new/doc/latex/multirow/README 2016-11-27 00:09:03.000000000 +0100
@@ -1,15 +1,30 @@
- multirow.sty V1.6 version (5-May-2004)
+multirow.sty 2016/11/25 v2.2
+bigstruts.sty 2016/11/25 v2.2
+bigdelim.sty 2016/11/25 v2.2
- Author: Jerry Leichter
- Piet van Oostrum
+Original Author: Jerry Leichter
+Current Author: Piet van Oostrum
This file may be distributed under the terms of the LaTeX Project Public
License, as described in lppl.txt in the base LaTeX distribution.
- Either version 1 or, at your option, any later version.
+ Either version 1.3 or, at your option, any later version.
+
+Installation:
+
+To generate the .sty files, run the command
+ tex multirow.ins
+and move the resulting .sty files to a place where LaTeX can find them, preferably
+..../tex/latex/multirow
+
+Usage:
+
+multirow.sty:
Make an entry that will span multiple rows of a table.
-\multirow{nrows}[bigstruts]{width}[fixup]{text}
+\multirow[vpos]{nrows}[bigstruts]{width}[vmove]{text}
+
+vpos is the vertical positioning: t. c. or b.
nrows is the number of rows to span. It's up to you to leave the other
rows empty, or the stuff created by \multirow will over-write it.
@@ -24,18 +39,24 @@
width is the width to which the text is to be set, or * to indicate that
the text argument's natural width is to be used.
- text is the actual text. If the width was set explicitly, the text will
+text is the actual text. If the width was set explicitly, the text will
be set in a parbox of that width; you can use \\ to force linebreaks
where you like.
- If the width was given as * the text will be set in LR mode. If you
+ If the width was given as * the text will be set in LR mode. If you
want a multiline entry in this case you should use a tabular or array
in the text parameter.
- The text is centered vertically within the range spanned by nrows.
+ If the width is given as = the width will be taken from the
+ tabular column in which it appears. This only works for p{}
+ columns and similar, for example X columns in tabularx, and LCRJ
+ columns in tabulary.
-fixup is a length used for fine tuning: The text will be raised (or
- lowered, if fixup is negative) by that length above (below) wherever
+ The text is centered vertically within the range spanned by nrows,
+ unless a vpos argument is given.
+
+vmove is a length used for fine tuning: The text will be raised (or
+ lowered, if vmove is negative) by that length above (below) wherever
it would otherwise have gone.
For example (using both multirow and bigstrut)
@@ -67,47 +88,24 @@
If any of the spanned rows are unusually large, or if you're using
bigstrut.sty and \bigstrut's are used assymetrically about the centerline of
the spanned rows, the vertical centering may not come out right. Use the
-fixup argument in this case.
+vmove argument in this case.
Just before "text" is expanded, the \multirowsetup macro is expanded to
set up any special environment. Initially, \multirowsetup contains just
\raggedright. It can be redefined with \renewcommand.
+
+bigstrut.sty:
+
+\bigstrut[pos] where pos is t or b
+
+ Add a bit of space above, below, or both a tabular row. The amount
+ is determined by \bigstrutjot.
+
+bigdelim.sty:
+
+\ldelim({n}{width}[text]
+\rdelim){n}{width}[text]
-Bugs: It's just about impossible to deal correctly with descenders. The
-text will be set up centered, but it may then have a baseline that doesn't
-match the baseline of the stuff beside it, in particular if the stuff
-beside it has descenders and "text" does not. This may result in a small
-missalignment. About all that can be done is to do a final touchup on
-"text", using the fixup optional argument. (Hint: If you use a measure
-like .1ex, there's a reasonable chance that the fixup will still be correct
-if you change the point size.)
-
-\multirow is mainly designed for use with table, as opposed to array,
-environments. It will not work well in an array environment since the lines
-have an extra \jot of space between them which it won't account for. Fixing
-this is difficult in general, and doesn't seem worth it. The bigstruts
-argument can be used to provide a semi-automatic fix: First set
-\bigstrutjot to .5\jot. Then simply repeat nrows as the bigstruts argument.
-This will be close, but probably not exact; you can use the fixup argument
-to refine the result. (If you do this repeatedly, you'll probably want to
-wrap these steps up in a simple macro. Note that the modified \bigstrutjot
-value will not give reasonable results if you have bigstruts and use this
-argument for its intended purpose elsewhere. In that case, you might want
-to set it locally.)
-
-If you use \multirow with the colortbl package you have to take
-precautions if you want to color the column that has the \multirow in it.
-colortbl works by coloring each cell separately. So if you use \multirow
-with a positive nrows value, colortbl will first color the top cell, then
-\multirow will typeset nrows cells starting with this cell, and later
-colortbl will color the other cells, effectively hiding the text in that
-area. This can be solved by putting the \multirow is the last row with a
-negative nrows value.
-Example:
-
- \begin{tabular}{l>{\columncolor{yellow}}l}
- aaaa & \\
- cccc & \\
- dddd & \multirow{-3}*{bbbb}\\
- \end{tabular}
-
\ No newline at end of file
+Put a big delimiter over n rows in a tabular, optionally preceded
+(\ldelim) or followed (rdelim) by text.
+
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/doc/latex/multirow/miscdoc.sty new/doc/latex/multirow/miscdoc.sty
--- old/doc/latex/multirow/miscdoc.sty 2010-03-01 19:57:28.000000000 +0100
+++ new/doc/latex/multirow/miscdoc.sty 1970-01-01 01:00:00.000000000 +0100
@@ -1,108 +0,0 @@
-\ProvidesPackage{miscdoc}[2010/01/20 v1.2 documentation macros misc latex pkgs]
-
-% miscdoc.sty
-% Copyright 2010 Robin Fairbairns
-%
-% 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 Robin Fairbairns.
-%
-% This work consists of the file miscdoc.sty (only)
-
-\setcounter{errorcontextlines}{1274}
-
-% The package arose from a small exercise to document packages whose
-% previous documentation consisted solely of comments in the package files.
-% The macros here defined are lifted from the author's faq.sty
-% (written for the UK TeX FAQ, CTAN:help/uk-tex-faq) or are inspired
-% by others' work (credited where the author is known) ... except
-% where they came as a flash of inspiration while actually writing the
-% documentation.
-
-% this option suggested by Heiko Oberdiek, 2010-01-29
-\DeclareOption{hyper}{%
- \AtEndOfPackage{%
- \RequirePackage[pdfusetitle]{hyperref}
- \RequirePackage{bookmark}
- \bookmarksetup{numbered,open,openlevel=1}
- }
-}
-\ProcessOptions\relax
-
-% note: T1 encoding assumed
-\usepackage{lmodern}
-\usepackage[T1]{fontenc}
-\usepackage{booktabs}
-
-% from faq.sty
-\newcommand\cs[1]{\texttt{\char`\\#1}}
-\let\csx\cs
-\def\bsbs{\cs{\char`\\}}
-
-% \cmdinvoke\cs<argument sequence>
-% \cs typeset as above
-% <argument sequence> may consist of optional or mandatory arguments;
-%
-% the `arguments' are simply typesett \texttt, as yet -- if something
-% fancier is needed, there's a bunch of code needs rewriting here...
-\DeclareRobustCommand\cmdinvoke{\@ifstar
- {\let\@tempa\emph\@scmdinvoke}%
- {\let\@tempa\relax\@scmdinvoke}%
-}
-\def\@scmdinvoke#1{\texttt{\symbol{92}#1}%
- \futurelet\@let@token\@cmdinvoke
-}
-\def\@cmdinvoke{\ifx\@let@token\bgroup
- \let\@tempb\@cmdinvoke@lbrace
- \else
- \ifx\@let@token[% ]
- \let\@tempb\@cmdinvoke@lbrack
- \else
- \ifx\@let@token(% )
- \let\@tempb\@cmdinvoke@lparen
- \else
- \let\@tempb\@empty
- \fi
- \fi
- \fi
- \@tempb
-}
-\def\@cmdinvoke@lbrace#1{\penalty0\hskip0pt\relax
- \texttt{\symbol{123}\@tempa{#1}\symbol{125}}%
- \futurelet\@let@token\@cmdinvoke
-}
-\def\@cmdinvoke@lbrack[#1]{\penalty-150\hskip0pt\relax
- \texttt{[\@tempa{#1}]}%
- \futurelet\@let@token\@cmdinvoke
-}
-\def\@cmdinvoke@lparen(#1){\penalty-150\hskip0pt\relax
- \texttt{(\@tempa{#1})}%
- \futurelet\@let@token\@cmdinvoke
-}
-% and extension -- versions that take a single extra (delimiter)
-% argument, such as \delcmdinvoke{lscrunge}( ... awful syntax, but...
-\DeclareRobustCommand\delcmdinvoke{\@ifstar
- {\let\@tempa\emph\@sdelcmdinvoke}%
- {\let\@tempa\relax\@sdelcmdinvoke}%
-}
-\def\@sdelcmdinvoke#1#2{\texttt{\symbol{92}#1#2}%
- \futurelet\@let@token\@cmdinvoke
-}
-
-% sui generis
-\newcommand\newitem{\par\addvspace{1ex}\noindent}
-
-% inspired by doc.sty in latex distribution
-\newcommand\meta[1]{\ensuremath{\langle}\emph{#1}\ensuremath{\rangle}}
-
-% meaningful names, as in faq.sty
-\let\environment\texttt
-\let\Package\textsf
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/doc/latex/multirow/multirow.tex new/doc/latex/multirow/multirow.tex
--- old/doc/latex/multirow/multirow.tex 2010-03-01 19:57:28.000000000 +0100
+++ new/doc/latex/multirow/multirow.tex 1970-01-01 01:00:00.000000000 +0100
@@ -1,242 +0,0 @@
-\documentclass[a4paper]{article}
-\usepackage[a4paper]{geometry}
-\usepackage{miscdoc,multirow,bigstrut,bigdelim,colortbl}
-\newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}}
-
-\begin{document}
-\title{The \Package{multirow},
- \Package{bigstrut} and
- \Package{bigdelim} packages}
-\author{Piet van Oostrum\thanks{catalogued ``active author''}\\
- \O{}ystein Bache\\
- Jerry Leichter\thanks{Documentation put together by Robin
- Fairbairns}}
-\maketitle
-
-\section{Introduction}
-These packages offer a series of extensions to the standard \LaTeX{}
-\texttt{tabular} environment. Their respective functions are:
-\begin{description}
-\item[\Package{multirow}] which provides a construction for table cells
- that span more than one row of the table;
-\item[\Package{bigdelim}] which creates an appropriately-sized
- delimiter (for example, brace, parenthesis or bracket) to fit in a
- single multirow, to indicate a relationship between other rows; and
-\item[\Package{bigstrut}] which creates struts which (slightly) stretch
- the table row in which they sit.
-\end{description}
-
-\section{Using \Package{multirow}}\label{sec:multirow}
-
-The basic syntax is:
-\begin{quote}
- \cmdinvoke*{multirow}{nrows}[bigstruts]{width}[fixup]{text}
-\end{quote}
-where
-\begin{description}
-\item[\emph{nrows}] is the number of rows to span. It's up to you to
- leave the other rows empty, or the stuff created by \cs{multirow}
- will over-write it. With a positive value of \emph{nrows} the
- spanned columns are this row and (\emph{nrows}-1) rows below
- it. With a negative value of \emph{nrows} they are this row and
- (1-\emph{nrows}) above it.
-\item[\emph{bigstruts}] is mainly used if you've used the
- \Package{bigstrut}. In that case it is the total number of uses of
- \cs{bigstrut} within the rows being spanned. Count 2 uses for each
- \cs{bigstrut}, 1 for each \cmdinvoke*{bigstrut}[x] where \emph{x} is
- either \texttt{t} or \texttt{b}. The default is 0.
-\item[\emph{width}] is the width to which the text is to be set, or
- \texttt{*} to indicate that the text argument's natural width is to
- be used.
-\item[\emph{text}] is the actual text of the construct. If the width
- was set explicitly, the text will be set in a \cs{parbox} of that
- width; you can use \bsbs{} to force linebreaks where you like.
-
- If the width was given as \texttt{*} the text will be set in LR
- mode. If you want a multiline entry in this case you should use a
- \texttt{tabular} or \texttt{array} environment in the text
- parameter.
-\item[\emph{fixup}] is a length used for fine tuning: the text will be
- raised (or lowered, if \emph{fixup} is negative) by that length
- above (below) wherever it would otherwise have gone.
-\end{description}
-For example (using both multirow and bigstrut):
-\begin{quote}
-\begin{verbatim}
-\newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}}
-\begin{tabular}{|c|c|}
-\hline
-\multirow{4}{1in}{Common g text} & Column g2a\\
- & Column g2b \\
- & Column g2c \\
- & Column g2d \\
-\hline
-\multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2}
- & Column g2b \bigstrut\\\cline{2-2}
- & Column g2c \bigstrut\\
-\hline
-\multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2}
- & Column g2b \bigstrut\\\cline{2-2}
- & Column g2c \bigstrut\\\cline{2-2}
- & Column g2d \bigstrut\\
-\hline
-\multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\
- & Column g2b \\
- & Column g2c \\
- & Column g2d \\
-\hline
-\end{tabular}
-\end{verbatim}
-\end{quote}
-which will appear as:
-\begin{quote}
- \begin{tabular}{|c|c|}
- \hline
- \multirow{4}{1in}{Common g text} & Column g2a\\
- & Column g2b \\
- & Column g2c \\
- & Column g2d \\
- \hline
- \multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2}
- & Column g2b \bigstrut\\\cline{2-2}
- & Column g2c \bigstrut\\
- \hline
- \multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2}
- & Column g2b \bigstrut\\\cline{2-2}
- & Column g2c \bigstrut\\\cline{2-2}
- & Column g2d \bigstrut\\
- \hline
- \multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\
- & Column g2b \\
- & Column g2c \\
- & Column g2d \\
- \hline
- \end{tabular}
-\end{quote}
-
-If any of the spanned rows are unusually large, or if you're using the
-\Package{bigstrut} and \cs{bigstrut}s are used asymetrically about the
-centerline of the spanned rows, the vertical centering may not come
-out right. Use the fixup argument in this case.
-
-Just before \emph{text} is expanded, the \cs{multirowsetup} macro is
-expanded to set up any special environment. Initially,
-\cs{multirowsetup} contains just \cs{raggedright}. It may be
-redefined with \cs{renewcommand}.
-
-It's just about impossible to deal correctly with descenders. The
-text will be set up centred, but it may then have a baseline that
-doesn't match the baseline of the stuff beside it, in particular if
-the stuff beside it has descenders and \emph{text} does not. This may
-result in a small misalignment. About all that can be done is to do a
-final touchup on \emph{text}, using the fixup optional argument.
-(Hint: If you use a measure like \texttt{.1ex}, there's a reasonable
-chance that the fixup will still be correct if you change the point
-size.)
-
-\cs{multirow} is mainly designed for use with \environment{table}, as
-opposed to \environment{array}, environments. It will not work well in an
-array environment since the lines have an extra \texttt{jot} of space
-between them which it won't account for. Fixing this is difficult in
-general, and doesn't seem worth it. The \emph{bigstruts} argument may
-be used to provide a semi-automatic fix: First set \cs{bigstrutjot} to
-\texttt{.5}\cs{jot}. Then simply repeat \emph{nrows} as the bigstruts
-argument. This will be close, but probably not exact; you can use the
-fixup argument to refine the result. (If you do this repeatedly,
-you'll probably want to wrap these steps up in a simple macro. Note
-that the modified \cs{bigstrutjot} value will not give reasonable
-results if you have bigstruts and use this argument for its intended
-purpose elsewhere. In that case, you might want to set it locally.)
-
-If you use \cs{multirow} with the \Package{colortbl} package you have
-to take precautions if you want to colour the column that has the
-\cs{multirow} in it. \Package{colortbl} works by colouring each cell
-separately. So if you use \cs{multirow} with a positive \emph{nrows}
-value, \Package{colortbl} will first color the top cell, then
-\cs{multirow} will typeset \emph{nrows} cells starting with this cell,
-and later \Package{colortbl} will color the other cells, effectively
-hiding the text in that area. This can be solved by putting the
-\cs{multirow} in the last row with a negative \emph{nrows} value.
-See, for example:
-\begin{quote}
-\begin{verbatim}
-\begin{tabular}{l>{\columncolor{yellow}}l}
- aaaa & \\
- cccc & \\
- dddd & \multirow{-3}*{bbbb}\\
-\end{tabular}
-\end{verbatim}
-\end{quote}
-which will produce:
-\begin{quote}
- \begin{tabular}{l>{\columncolor{yellow}}l}
- aaaa & \\
- cccc & \\
- dddd & \multirow{-3}*{bbbb}\\
- \end{tabular}
-\end{quote}
-
-\section{Using \Package{bigstrut}}
-
-\cmdinvoke*{bigstrut}[x] produces a strut which is \cs{bigstrutjot}
-(\texttt{2pt} by default) higher, lower, or both than the standard
-array/table strut. Use it in table entries that are adjacent to
-\cs{hline}s to leave an extra bit of space\,---\,according to the
-TeXbook (page 246), ``This is a little touch that improves the
-appearance of boxed tables; look for it as a mark of quality.''
-
-Although you could use \cs{bigstrut} in an array, there isn't normally
-much point since arrays are `opened up' by \cs{jot} anyway.
-
-\cmdinvoke{bigstrut}[t] adds height; \cmdinvoke{bigstrut}[b] adds
-depth. Just \cs{bigstrut} adds both. So: Use
-\cmdinvoke{bigstrut}[t] in the row just \emph{after} an \cs{hline};
-\cmdinvoke{bigstrut}[b] in the row just \emph{before}; and
-\cs{bigstrut} if there are \cs{hline}s both before and after.
-
-Spaces after the \cs{bigstrut} are ignored, even if it has an optional
-argument. Spaces before the \cs{bigstrut} are generally ignored (by a
-single \unskip).
-
-Note: The \Package{multirow} package makes use of \cs{bigstrutjot}. If
-both styles are used, they can be used in either order, as each checks
-to see if the other has already defined \cs{bigstrutjot}. However,
-the default values they set are different: if only \Package{multirow}
-is used, \cs{bigstrutjot} will be set to \texttt{3pt}. If
-\Package{bigstrut} is used, with or without \Package{multirow},
-\cs{bigstrutjot} will be \texttt{2pt}.
-
-\section{Using \Package{bigdelim}}
-
-The package is for working in a \environment{table} or \environment{array}
-environment, in which the \Package{multirow} packages is also used.
-
-Syntax of use is
-\begin{quote}
- \delcmdinvoke*{ldelim}({n}{width}[text]\\
- \delcmdinvoke*{rdelim}){n}{width}[text]
-\end{quote}
-The commands are used in a column of a \environment{tabular} or
-\environment{array}; they create a big parenthesis, brace or whatever
-delimiter that extends over the \emph{n} rows starting at the one
-containing the command. Corresponding cells in the following rows
-must be explicitly given (as empty cells).
-
-The first parameter is a delimiter to be used, e.g., \cs{\char`\{}
-\cs{\char`\}} \texttt{[} \texttt{]} \texttt{(} \texttt{)}\,---\,in fact,
-anything that can be used with \cs{left} or \cs{right}, as appropriate.
-
-The optional \emph{text} is set centred to the left of \cs{ldelim} or
-to the right of \cs{rdelim}. The \emph{width} is that reserved for
-the delimiter and its text; with a current copy of the
-\Package{multirow} package, the \emph{width} may be given as
-\texttt{*}, but that may cause the delimiters to be too small.
-
-Also with a recent version of \Package{multirow} the commands may be
-used in the last row of the extension with a negative \emph{n}
-parameter. This is useful in combination with \Package{colortbl} (see
-the discussion in section \ref{sec:multirow} on \Package{multirow}).
-If there are unusually tall rows you may have to enlarge \emph{n} (you
-can use non-integral values).
-
-\end{document}
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 2016-04-14 19:28:40.000000000 +0200
+++ new/tlpkg/tlpobj/multirow.doc.tlpobj 2017-04-14 17:51:48.000000000 +0200
@@ -1,10 +1,8 @@
name multirow.doc
category Package
-revision 17256
+revision 42588
shortdesc doc files of multirow
relocated 1
-docfiles size=77
+docfiles size=150
RELOC/doc/latex/multirow/README
- RELOC/doc/latex/multirow/miscdoc.sty
RELOC/doc/latex/multirow/multirow.pdf
- RELOC/doc/latex/multirow/multirow.tex
++++++ 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 2006-01-13 01:00:01.000000000 +0100
+++ new/tex/latex/multirow/bigdelim.sty 2016-11-27 00:09:04.000000000 +0100
@@ -1,68 +1,43 @@
-% bigdelim.sty
-% version 1.0
-% Nov 5, 1999
-% Piet van Oostrum
-% From bigbrace.sty : Oct 2, 1994 \Oystein Bache
-% from: \dobrace by piet@cs.ruu.nl (Piet van Oostrum):
%%
-%% This file may be distributed under the terms of the LaTeX Project Public
-%% License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1 or, at your option, any later version.
+%% This is file `bigdelim.sty',
+%% generated with the docstrip utility.
%%
-%
-% Usage in a tabular or array:
-% \usepackage{multirow}
-% \usepackage{bigdelim}
-% \ldelim({n}{w}[text]
-% \rdelim){n}{w}[text]
-% Use these commands in a column of a tabular or array. They generate a big
-% parenthesis/brace extending over the next n rows (including this one).
-% The corresponding entries in the next rows must explicitely be given as
-% empty cells. The first parameter must be the delimiter to be used, e.g.
-% \{ \} [ ] ( ), in fact any parameter that can be used with \left and
-% \right. The text is optional and is set centered to the left of
-% \ldelim and to the right of \rdelim. w must be the width reserved for
-% the brace and text. If you have a recent version of multirow.sty {w} may
-% be given as {*}, but this may cause the braces to be too small. Also with
-% a recent version of multirow.sty the commands may be used in the last row
-% of the extension with a negative n parameter. This is useful in
-% combination with the colortbl package (see multirow.sty)
-% If there are unusually large rows you may have to enlarge n (you can use
-% non-integral values).
-% If you have horizontal lines that interact with the braces you are
-% advised to use the hhline package to make the lines.
-
-\def\ldelim#1#2#3{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}}
+%% The original source files were:
+%%
+%% multirow.dtx (with options: `bigdelim')
+%%
+%% This is a generated file.
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%%
+%% Copyright (C) 1994 by \O ystein Bache
+%% Copyright (C) 2016 by Piet van Oostrum
+%%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bigdelim}
+ [2016/11/25 v2.2
+ Create big delimiters in tabular or array]
+\RequirePackage{multirow}
+\newcommand\ldelim[3]{\@ifnextchar[{\@ldelim{#1}{#2}{#3}}{\@ldelim{#1}{#2}{#3}[\null]}}
\def\@ldelim#1#2#3[#4]%
{\multirow{#2}{#3}{%
\ensuremath
- {\left.\vcenter{\hsize=0pt\vrule height
- \ifnum #2<0 -\fi#2\baselineskip width 0pt}%
+ {\left.\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}%
\textrm{#4}\right#1}}}
-%
-\def\rdelim#1#2#3{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}}
+\newcommand\rdelim[3]{\@ifnextchar[{\@rdelim{#1}{#2}{#3}}{\@rdelim{#1}{#2}{#3}[\null]}}
\def\@rdelim#1#2#3[#4]%
{\multirow{#2}{#3}{%
\ensuremath
- {\left#1\vcenter{\hsize=0pt\vrule height
- \ifnum #2<0 -\fi#2\baselineskip width 0pt}%
+ {\left#1\vcenter{\hsize=0pt\vrule height \multirow@dima width 0pt}%
\textrm{#4}\right.}}}
-%
\endinput
-%
-% Example:
-\documentclass{article}
-\usepackage{multirow}
-\usepackage{bigdelim}
-\begin{document}
-
-\begin{equation}
- \begin{array}{ccccccc}
- \ldelim({4}{4mm}& x & x & x & x &\rdelim){4}{4mm} \\
- & x & x & x & x & & i\\
- & x & x & x & x & & j\\
- & x & x & x & x & \\
- & & u & v & &
- \end{array}
-\end{equation}
-\end{document}
+%%
+%% End of file `bigdelim.sty'.
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 2006-01-13 01:00:01.000000000 +0100
+++ new/tex/latex/multirow/bigstrut.sty 2016-11-27 00:09:04.000000000 +0100
@@ -1,41 +1,36 @@
%%
-%% bigstrut.sty V1.0 (31-May-94)
+%% This is file `bigstrut.sty',
+%% generated with the docstrip utility.
%%
-%% Author: Jerry Leichter
+%% The original source files were:
%%
-%% V1.0 Split out as a separate style file.
+%% multirow.dtx (with options: `bigstrut')
+%%
+%% This is a generated file.
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%%
+%% Copyright (C) 1994 by Jerry Leichter
+%% Copyright (C) 2016 by Piet van Oostrum
%%
-%% This file may be distributed under the terms of the LaTeX Project Public
-%% License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1 or, at your option, any later version.
-%%
-% \bigstrut[x] produces a strut which is \bigstrutjot (2pt by default) higher,
-% lower, or both than the standard array/table strut. Use it in table entries
-% that are adjacent to \hline's to leave an extra bit of space - according to
-% the TeXbook (page 246), "This is a little touch that improves the appearance
-% of boxed tables; look for it as a mark of quality."
-%
-% Although you could use \bigstrut in an array, there isn't normally much
-% point since arrays are "opened up" by \jot anyway.
-%
-% \bigstrut[t] adds height; \bigstrut[b] adds depth. Just \bigstrut adds
-% both. So: Use \bigstrut[t] in the row just *after* an \hline; \bigstrut[b]
-% in the row just *before*; and \bigstrut if there are \hline's both before
-% and after.
-%
-% Spaces after the \bigstrut are ignored, even if it has an optional argument.
-% Spaces before the \bigstrut are generally ignored (by a single \unskip).
-%
-% Note: The multirow style file makes use of \bigstrutjot. If both styles
-% are used, they can be used in either order, as each checks to see if the
-% other has already defined \bigstrutjot. However, the default values they
-% set are different: If only multirow is used, \bigstrutjot will be set to
-% 3pt. If bigstrut is used, with or without multirow, \bigstrutjot will be
-% 2pt.
-
-\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot2pt
-\def\bigstrut{\relax\@ifnextchar [{\@bigstrut}{\@bigstrut[x]}}
-\def\@bigstrut[#1]{\unskip\@tempdima\ht\@arstrutbox \@tempdimb\dp\@arstrutbox
- \ifx #1b\else \advance\@tempdima by \bigstrutjot\fi
- \ifx #1t\else \advance\@tempdimb by \bigstrutjot\fi
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{bigstrut}
+ [2016/11/25 v2.2
+ Provide larger struts in tabulars]
+\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot}{}\bigstrutjot=2pt
+\newcommand\bigstrut[1][x]{%
+ \unskip\@tempdima=\ht\@arstrutbox \@tempdimb=\dp\@arstrutbox
+ \ifx #1b\relax \else \advance\@tempdima by \bigstrutjot\fi
+ \ifx #1t\relax \else \advance\@tempdimb by \bigstrutjot\fi
\hbox{\vrule \@height\@tempdima \@depth\@tempdimb \@width\z@}\ignorespaces}
+\endinput
+%%
+%% End of file `bigstrut.sty'.
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 2006-01-13 01:00:01.000000000 +0100
+++ new/tex/latex/multirow/multirow.sty 2016-11-27 00:09:04.000000000 +0100
@@ -1,159 +1,154 @@
%%
-%% multirow.sty V1.6 version (5-May-2004)
+%% This is file `multirow.sty',
+%% generated with the docstrip utility.
%%
-%% Author: Jerry Leichter
-%% Piet van Oostrum
+%% The original source files were:
%%
-%% This file may be distributed under the terms of the LaTeX Project Public
-%% License, as described in lppl.txt in the base LaTeX distribution.
-%% Either version 1 or, at your option, any later version.
+%% multirow.dtx (with options: `multirow')
+%%
+%% This is a generated file.
+%%
+%% This file may be distributed and/or modified under the conditions of
+%% the LaTeX Project Public License, either version 1.3 of this license
+%% or (at your option) any later version. The latest version of this
+%% license is in:
+%%
+%% http://www.latex-project.org/lppl.txt
+%%
+%% and version 1.3 or later is part of all distributions of LaTeX version
+%% 2005/12/01 or later.
+%%
+%% Copyright (C) 1994 by Jerry Leichter
+%% Copyright (C) 2016 by Piet van Oostrum
%%
-%% V1.0 was distributed anonymously, based on a Usenet posting that was
-%% not intended for stand-alone use.
-%% V1.1 was modified by Piet van Oostrum to allow it to
-%% work without bigstrut.sty.
-%% V1.2 was modified by Jerry Leichter for the same goal, but using a
-%% different approach which will work properly in conjunction with
-%% bigstrut.sty.
-%% V1.2a was modified by Piet van Oostrum to use \vskip
-%% instead of \raise in positioning, avoiding making rows too high
-%% when the adjustment is large.
-%% V1.3 was modified by Piet van Oostrum to work properly in a p{} column
-%% (\leavevmode added)
-%% V1.4 was modified by Piet van Oostrum to check for the special case that
-%% the width is given as an *. In this case the natural
-%% width of the text argument will be used and the argument
-%% is processed in LR-mode.
-%% V1.5 was modified by Piet van Oostrum: Added a % after \hbox{#5}\vfill}.
-%% Added \struts around #5 for better vertical positioning.
-%% Additional coding for negative value of nrows.
-%% V1.6 was modified by Piet van Oostrum: Replace a space by \relax after
-%% \advance\@tempdima#4.
-%%
-% Make an entry that will span multiple rows of a table.
-%
-% \multirow{nrows}[bigstruts]{width}[fixup]{text}
-%
-% nrows is the number of rows to span. It's up to you to leave the other
-% rows empty, or the stuff created by \multirow will over-write it.
-% With a positive value of nrows the spanned colomns are this row and
-% (nrows-1) rows below it. With a negative value of nrows they are
-% this row and (1-nrows) above it.
-%
-% bigstruts is mainly used if you've used bigstrut.sty. In that case it
-% is the total number of uses of \bigstrut within the rows being
-% spanned. Count 2 uses for each \bigstrut, 1 for each \bigstrut[x]
-% where x is either t or b. The default is 0.
-% width is the width to which the text is to be set, or * to indicate that
-% the text argument's natural width is to be used.
-%
-% text is the actual text. If the width was set explicitly, the text will
-% be set in a parbox of that width; you can use \\ to force linebreaks
-% where you like.
-%
-% If the width was given as * the text will be set in LR mode. If you
-% want a multiline entry in this case you should use a tabular or array
-% in the text parameter.
-%
-% The text is centered vertically within the range spanned by nrows.
-%
-% fixup is a length used for fine tuning: The text will be raised (or
-% lowered, if fixup is negative) by that length above (below) wherever
-% it would otherwise have gone.
-%
-% For example (using both multirow and bigstrut)
-%
-% \newcommand{\minitab}[2][l]{\begin{tabular}{#1}#2\end{tabular}}
-% \begin{tabular}{|c|c|}
-% \hline
-% \multirow{4}{1in}{Common g text} & Column g2a\\
-% & Column g2b \\
-% & Column g2c \\
-% & Column g2d \\
-% \hline
-% \multirow{3}[6]*{Common g text} & Column g2a\bigstrut\\\cline{2-2}
-% & Column g2b \bigstrut\\\cline{2-2}
-% & Column g2c \bigstrut\\
-% \hline
-% \multirow{4}[8]{1in}{Common g text} & Column g2a\bigstrut\\\cline{2-2}
-% & Column g2b \bigstrut\\\cline{2-2}
-% & Column g2c \bigstrut\\\cline{2-2}
-% & Column g2d \bigstrut\\
-% \hline
-% \multirow{4}*{\minitab[c]{Common \\ g text}} & Column g2a\\
-% & Column g2b \\
-% & Column g2c \\
-% & Column g2d \\
-% \hline
-% \end{tabular}
-%
-% If any of the spanned rows are unusually large, or if you're using
-% bigstrut.sty and \bigstrut's are used assymetrically about the centerline of
-% the spanned rows, the vertical centering may not come out right. Use the
-% fixup argument in this case.
-%
-% Just before "text" is expanded, the \multirowsetup macro is expanded to
-% set up any special environment. Initially, \multirowsetup contains just
-% \raggedright. It can be redefined with \renewcommand.
-%
-% Bugs: It's just about impossible to deal correctly with descenders. The
-% text will be set up centered, but it may then have a baseline that doesn't
-% match the baseline of the stuff beside it, in particular if the stuff
-% beside it has descenders and "text" does not. This may result in a small
-% missalignment. About all that can be done is to do a final touchup on
-% "text", using the fixup optional argument. (Hint: If you use a measure
-% like .1ex, there's a reasonable chance that the fixup will still be correct
-% if you change the point size.)
-%
-% \multirow is mainly designed for use with table, as opposed to array,
-% environments. It will not work well in an array environment since the lines
-% have an extra \jot of space between them which it won't account for. Fixing
-% this is difficult in general, and doesn't seem worth it. The bigstruts
-% argument can be used to provide a semi-automatic fix: First set
-% \bigstrutjot to .5\jot. Then simply repeat nrows as the bigstruts argument.
-% This will be close, but probably not exact; you can use the fixup argument
-% to refine the result. (If you do this repeatedly, you'll probably want to
-% wrap these steps up in a simple macro. Note that the modified \bigstrutjot
-% value will not give reasonable results if you have bigstruts and use this
-% argument for its intended purpose elsewhere. In that case, you might want
-% to set it locally.)
-%
-% If you use \multirow with the colortbl package you have to take
-% precautions if you want to color the column that has the \multirow in it.
-% colortbl works by coloring each cell separately. So if you use \multirow
-% with a positive nrows value, colortbl will first color the top cell, then
-% \multirow will typeset nrows cells starting with this cell, and later
-% colortbl will color the other cells, effectively hiding the text in that
-% area. This can be solved by putting the \multirow is the last row with a
-% negative nrows value.
-% Example:
-%
-% \begin{tabular}{l>{\columncolor{yellow}}l}
-% aaaa & \\
-% cccc & \\
-% dddd & \multirow{-3}*{bbbb}\\
-% \end{tabular}
-%
-\def\multirowsetup{\raggedright}
-\def\multirow#1{\relax\@ifnextchar
- [{\@multirow{#1}}{\@multirow{#1}[0]}}
-\def\@multirow#1[#2]#3{\@ifnextchar [{\@xmultirow{#1}[#2]{#3}}%
- {\@xmultirow{#1}[#2]{#3}[0pt]}}
-\def\@xmultirow#1[#2]#3[#4]#5{\@tempcnta=#1%
- \@tempdima\@tempcnta\ht\@arstrutbox
- \advance\@tempdima\@tempcnta\dp\@arstrutbox
- \ifnum\@tempcnta<0\@tempdima=-\@tempdima\fi
- \advance\@tempdima#2\bigstrutjot
- \if*#3\setbox0\vtop to \@tempdima{\vfill\multirowsetup
- \hbox{\strut#5\strut}\vfill}%
+\NeedsTeXFormat{LaTeX2e}
+\ProvidesPackage{multirow}%
+ [2016/11/25 v2.2
+ Span multiple rows of a table]%
+\newif\ifmultirowdebug
+\DeclareOption{debug}{\multirowdebugtrue}
+\DeclareOption{longtable}{%
+\AtBeginDocument{%
+\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
+ \leaders\hrule\@height\arrayrulewidth\hfill
+ \cr
+ \noalign{\nobreak\vskip-\arrayrulewidth}}
+}}
+\DeclareOption{supertabular}{%
+\AtBeginDocument{%
+\def\ST@tabularcr{%
+ {\ifnum0=`}\fi
+ \@ifstar{\MRST@xtabularcr}{\ST@xtabularcr}}
+\def\MRST@xtabularcr{%
+ \@ifnextchar[%]
+ {\MRST@argtabularcr}%
+ {\ifnum0=`{\fi}\cr\MRST@cr}}
+\def\MRST@argtabularcr[#1]{%
+ \ifnum0=`{\fi}%
+ \ifdim #1>\z@
+ \unskip\MRST@xargarraycr{#1}
\else
- \setbox0\vtop to \@tempdima{\hsize#3\@parboxrestore
- \vfill \multirowsetup \strut#5\strut\par\vfill}%
- \fi
- \ht0\z@\dp0\z@
- \ifnum\@tempcnta<0\advance\@tempdima-\dp\@arstrutbox
- \else\@tempdima=\ht\@arstrutbox
- \ifnum#2>0 \advance\@tempdima\bigstrutjot \fi
+ \MRST@yargarraycr{#1}%
+ \fi}
+\def\MRST@xargarraycr#1{%
+ \@tempdima #1\advance\@tempdima \dp \@arstrutbox
+ \vrule \@height\z@ \@depth\@tempdima \@width\z@ \cr
+ \noalign{\global\ST@toadd=#1}\MRST@cr}
+\def\MRST@yargarraycr#1{%
+ \cr\noalign{\vskip #1\global\MRST@toadd=#1}\MRST@cr}
+\def\MRST@cr{%
+ \noalign{%
+ \ifnum\ST@pboxht<\ST@lineht
+ \global\advance\ST@pageleft -\ST@lineht
+ \global\ST@prevht\ST@lineht
+ \else
+ \global\advance\ST@pageleft -\ST@pboxht
+ \global\advance\ST@pageleft -0.1\ST@pboxht
+ \global\advance\ST@pageleft -\ST@stretchht
+ \global\ST@prevht\ST@pboxht
+ \global\ST@pboxht\z@
+ \fi
+ \global\advance\ST@pageleft -\ST@toadd
+ \global\ST@toadd=\z@}}
+}
+\def\STneed#1{\ifdim\ST@pageleft<#1\ST@newpage\ST@next\fi}
+}
+\ProcessOptions
+\newlength{\multirow@colwidth}
+\newcount\multirow@cntb
+\newlength\multirow@dima
+\def\multirow@setcolwidth#1{%
+ \ifx\TY@final\multirow@undefined \multirow@colwidth=\hsize
+ \else
+ \ifx\TY@box\TY@box@v\multirow@colwidth=\hsize
+ \else \setbox0\hbox
+ {\let\\\space\let\newline\space #1}\multirow@colwidth=\wd0
+ \fi
+ \fi}
+\newcommand\multirowsetup{\raggedright}
+\long\def\multirow@vbox#1#2#3{\setbox0\vtop to \multirow@dima{#2%
+ \if #1t\relax\else\vfill\fi
+ \multirowsetup #3\if #1b\relax\else\vfill\fi}}
+%% \multirow [vpos] {nrows} [bigstruts] {width} [vmove] {text}
+\newcommand\multirow[2][c]{\@multirow[#1]{#2}}
+\def\@multirow[#1]#2{\@ifnextchar[{\@@multirow[#1]#2}{\@@multirow[#1]#2[0]}}
+\def\@@multirow[#1]#2[#3]#4{\@ifnextchar[{\@xmultirow[#1]{#2}[#3]{#4}}%
+ {\@xmultirow[#1]{#2}[#3]{#4}[0pt]}}
+\newif\ifmultirow@prefixt
+\newif\ifmultirow@prefixb
+\def\multirow@piii#1#2#3\end{\multirow@prefixtfalse\multirow@prefixbfalse
+ \if t#1\multirow@prefixttrue
+ \if b#2\multirow@prefixbtrue \multirow@cntb=#3%
+ \else \multirow@cntb=#2#3%
+ \fi
+ \else
+ \if b#1\multirow@prefixbtrue \multirow@cntb=#2#3%
+ \else \multirow@cntb=#1#2#3%
+ \fi
+ \fi}
+\def\@xmultirow[#1]#2[#3]#4[#5]#6{%
+ \expandafter\multirow@piii#3\relax\end%
+ \multirow@dima=#2\ht\@arstrutbox
+ \advance\multirow@dima#2\dp\@arstrutbox
+ \ifdim#2pt<\z@\multirow@dima=-\multirow@dima\fi
+ \advance\multirow@dima \multirow@cntb\bigstrutjot
+ \if*#4\multirow@vbox{#1}{}{\hbox{\strut#6\strut}}%
+ \else \if=#4\multirow@setcolwidth{#6}%
+ \multirow@vbox{#1}{\hsize\multirow@colwidth\@parboxrestore}{\strut#6\strut\par}%
+ \else \multirow@vbox{#1}{\hsize#4\@parboxrestore}{\strut#6\strut\par}%
+ \fi \fi
+ \ifdim#2pt>\z@
+ \if#1t\relax\multirow@dima=\ht0\else
+ \multirow@dima=\ht\@arstrutbox
+ \ifmultirow@prefixt \advance\multirow@dima\bigstrutjot\fi
+ \if#1b\relax \advance\multirow@dima\dp\@arstrutbox
+ \ifmultirow@prefixb \advance\multirow@dima\bigstrutjot\fi
+ \fi
+ \fi
+ \else
+ \if#1b\relax\else
+ \advance\multirow@dima-\dp\@arstrutbox
+ \ifmultirow@prefixb \advance\multirow@dima-\bigstrutjot\fi
+ \if#1t\relax\advance\multirow@dima-\ht\@arstrutbox
+ \ifmultirow@prefixt \advance\multirow@dima-\bigstrutjot\fi
+ \advance\multirow@dima\ht0
+ \fi
+ \fi
\fi
- \advance\@tempdima#4\relax\leavevmode\vtop{\vskip-\@tempdima\box0\vss}}
-\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot \bigstrutjot\jot}{}
+ \advance\multirow@dima#5\relax
+ \leavevmode
+ \setbox0\vtop{\vskip-\multirow@dima\box0\vss}\dp0=\z@
+ \ifmultirowdebug{\showboxdepth=5 \showboxbreadth=10 \showbox0}\fi
+ \box0
+}
+\@ifundefined{bigstrutjot}{\newdimen\bigstrutjot \bigstrutjot=\jot}{}
+\endinput
+%%
+%% End of file `multirow.sty'.
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 2016-04-14 19:28:40.000000000 +0200
+++ new/tlpkg/tlpobj/multirow.tlpobj 2017-04-14 17:51:48.000000000 +0200
@@ -1,6 +1,6 @@
name multirow
category Package
-revision 17256
+revision 42588
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 2015-08-03 05:43:12 +0200
-catalogue-license lppl1
+catalogue-date 2016-11-25 20:42:27 +0100
+catalogue-license lppl1.3
catalogue-topics table
-catalogue-version 1.6
+catalogue-version 2.2
++++++ munich.doc.tar.xz ++++++
++++++ munich.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/munich.tlpobj new/tlpkg/tlpobj/munich.tlpobj
--- old/tlpkg/tlpobj/munich.tlpobj 2016-04-14 19:28:41.000000000 +0200
+++ new/tlpkg/tlpobj/munich.tlpobj 2017-04-14 17:51:48.000000000 +0200
@@ -9,6 +9,6 @@
runfiles size=8
RELOC/bibtex/bst/munich/munich.bst
catalogue-ctan /biblio/bibtex/contrib/munich
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics bibtex-sty
++++++ musixguit.doc.tar.xz ++++++
++++++ musixguit.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixguit.tlpobj new/tlpkg/tlpobj/musixguit.tlpobj
--- old/tlpkg/tlpobj/musixguit.tlpobj 2016-04-14 19:28:41.000000000 +0200
+++ new/tlpkg/tlpobj/musixguit.tlpobj 2017-04-14 17:51:48.000000000 +0200
@@ -8,7 +8,7 @@
runfiles size=3
RELOC/tex/latex/musixguit/musixguit.sty
catalogue-ctan /macros/latex/contrib/musixguit
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.3
catalogue-topics music
catalogue-version 1.2.2
++++++ musixtex-fonts.doc.tar.xz ++++++
++++++ musixtex-fonts.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtex-fonts.tlpobj new/tlpkg/tlpobj/musixtex-fonts.tlpobj
--- old/tlpkg/tlpobj/musixtex-fonts.tlpobj 2016-04-14 19:28:46.000000000 +0200
+++ new/tlpkg/tlpobj/musixtex-fonts.tlpobj 2017-04-14 17:51:50.000000000 +0200
@@ -267,6 +267,6 @@
RELOC/fonts/type1/public/musixtex-fonts/xslz20d.pfb
RELOC/fonts/type1/public/musixtex-fonts/xtie20.pfb
catalogue-ctan /fonts/musixtex-fonts
-catalogue-date 2015-12-30 19:19:47 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl
catalogue-topics font font-type1 font-music
++++++ musixtex.doc.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt
--- old/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/ChangeLog-123.txt 2016-11-25 19:27:45.000000000 +0100
@@ -0,0 +1,6 @@
+
+Changes from MusiXTeX 122 to 123:
+
+ + added \xtr and \ptr ornaments
+ + adjusted spacing of \tr
+ + corrected definition of \C@Inter for \nblines > 6
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt
--- old/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt 1970-01-01 01:00:00.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/ChangeLog-124.txt 2017-03-02 00:01:03.000000000 +0100
@@ -0,0 +1,10 @@
+
+Changes from MusiXTeX 123 to 124:
+
+ + preserve changes to \transpose in an hboxed tremolo command
+ + test that musixtex.tex has already been loaded in some extensions:
+ + musixps, musixec, musixhv, musixplt, musixtmr, musixppff
+ + changed from \it to \ppff in several places
+ + support new command \setinterstaff{n}{m}
+ + define \largenotesize, \Largenotesize
+ + corrected typos \twtybf[g] \svtbf[g]
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt new/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
--- old/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt 2017-03-02 00:01:03.000000000 +0100
@@ -1,3 +1,11 @@
+2016-11-12 RDT
+
+ Expanded treatment of big cautionary accidentals
+
+2016-06-06 RDT
+
+ Revised the material on page layout.
+
2015-02-20 RDT
Clean up title page and preface(s).
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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/README 2017-03-02 00:01:03.000000000 +0100
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.22 (2016-02-25).
+This is MusiXTeX, version 1.24 (2017-02-28).
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/accidentals.tex new/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/accidentals.tex 2017-03-02 00:01:03.000000000 +0100
@@ -49,10 +49,9 @@
\vspace*{-2ex}
It also possible to introduce \ital{\ixem{cautionary accidental}s},
-i.e.,~small accidentals enclosed in parentheses. This done by preceding
-the name of the accidental keyword with ``\verb|c|'',\label{cautionary}
-e.g.,~\keyindex{cfl}\pitchp~for a cautionary flat.
- Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl},
+i.e.,~small accidentals enclosed in parentheses. This is done by preceding
+the name of the accidental keyword with ``\verb|c|''\label{cautionary}.
+Available cautionary accidentals are \keyindex{csh}, \keyindex{cfl},
\keyindex{cna},
\keyindex{cdfl} and \keyindex{cdsh}, which give
@@ -71,3 +70,5 @@
\keyindex{accshift}\verb|=|\ital{any \TeX\ dimension}, where
positive values shift to the left and negative to right, with a
default of~\verb|0pt|.
+For ``big'' cautionary accidentals, use, for example,
+\verb|{|\keyindex{largenotesize}\verb|\csh|\pitchp\verb|}| or see Section~\ref{brapar}.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex new/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/extensions.tex 2017-03-02 00:01:03.000000000 +0100
@@ -1,7 +1,10 @@
\chapter{Extension Library}
-All of the following files are invoked by saying \keyindex{input} \ital{filename}\ .
-Most of them are fully compatible with \musixtex\ in that they do not redefine
-any existing macros but rather provide additional functionality. In future
+All of the following files are invoked by saying \keyindex{input} \ital{filename}.
+In some cases,
+\verb\musixtex\ must be input \emph{before} the extension,
+but most of them are fully compatible with \verb\musixtex.tex\ in that they do not redefine
+any existing macros and just provide additional functionality.
+In future
versions of \musixtex\ we may very well incorporate many of them directly into
\verb|musixtex.tex|, but for now we leave them separate.
@@ -1466,18 +1469,22 @@
using (for instrument 2 as an example):
\verb|\settrebleclefsymbol2\oldGclef|
- \item\keyindex{cqu} $p$ provides a square headed quarter note with stem up at
+ \item\keyindex{cqu} $p$ provides a square-headed quarter note with stem up at
pitch $p$.
- \item\keyindex{cql} $p$ provides a square headed quarter note with stem down at
+ \item\keyindex{cql} $p$ provides a square-headed quarter note with stem down at
pitch $p$.
- \item\keyindex{chu} $p$ provides a square headed half note with stem up at
+ \item\keyindex{chu} $p$ provides a square-headed half note with stem up at
pitch $p$.
- \item\keyindex{chl} $p$ provides a square headed half note with stem down at
+ \item\keyindex{chl} $p$ provides a square-headed half note with stem down at
pitch $p$.
+ \item\keyindex{cqb} $n$ $p$ provides a square-headed beam note for beam $n$ at pitch $p$.
+
+ \item\keyindex{zcqb} $n$ $p$ provides a non-spacing square-headed beam note for beam $n$ at pitch $p$.
+
\item\keyindex{cnqu} $p$ and \keyindex{cnql} $p$ provide a stemless square
headed
quarter note at pitch $p$.
@@ -1873,6 +1880,12 @@
\section{musixps}\label{musixps}\index{musixps@{\tt musixps.tex}}
Activates type K Postscript slurs, ties, and hairpins; see Chapter~\ref{PostscriptSlurs}.
+Use as follows:
+\begin{quote}\begin{verbatim}
+\input musixtex
+\input musixps
+...
+\end{verbatim}\end{quote}
\section{musixstr}\label{musixstr}\index{musixstr@{\tt musixstr.tex}}
Provides bowing and other symbols for \itxem{string instruments}\footnote{provided
@@ -1910,7 +1923,7 @@
%\check
- \section{musixsty}\index{musixsty@{\tt musixsty.tex}}
+ \section{musixsty}\index{musixsty@{\tt musixsty.tex}}\label{musixsty}
Provides certain text-handling facilities for titles, footnotes, and other
items not related to lyrics. It should not be used with \LaTeX. It includes
@@ -1918,6 +1931,8 @@
\item definitions of \keyindex{hsize}, \keyindex{vsize},
\keyindex{hoffset}, \keyindex{voffset} suitable for A$4$ paper; those using
other sizes may wish to modify it once and for all;
+ \item a \keyindex{rectoverso}\verb|{|\emph{dimension}\verb|}| command to set up even/odd-page
+ asymmetric margins;
\item a set of text size commands:
\begin{description}\setlength{\itemsep}{0ex}
@@ -1931,7 +1946,7 @@
\item[\keyindex{twtypoint}] to get $20.74$ point font size;
\item[\keyindex{twfvpoint}] to get $24.88$ point font size;
\end{description}
- \item commands for creating titles:
+ \item commands for creating title-page headings:
\begin{itemize}\setlength{\itemsep}{0ex} \item \keyindex{author} or
\keyindex{fullauthor} to be put at the right of the first page, below the
title of the piece; the calling sequence is, for example
@@ -1949,6 +1964,9 @@
\item \keyindex{othermention} which is displayed on the left of the page,
vertically aligned with author's name. It may contain \verb|\\| to display it on
several lines;
+ \item \keyindex{headline} which displays the argument at the top of the title page (use
+ \verb|\hss| after or before the argument text or both to left-align or
+ right-align or center the text);
\item \keyindex{maketitle} which displays all the previous stuff;
\end{itemize}
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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/frontmatter.tex 2017-03-02 00:01:03.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.22}
+instrumental music\\\Large\itshape Version 1.24}
%\author{\Large\rm Daniel \sc Taupin\\\large\sl
@@ -67,7 +67,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.22.
+\musixtex\ version~1.24.
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 2015-07-27 00:48:40.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/layout.tex 2017-03-02 00:01:03.000000000 +0100
@@ -48,26 +48,81 @@
so that the first staff
on the page is all the way at the top and the last staff all the way at
the bottom.
-
The macro \keyindex{musicparskip} will allow the existing space between
systems to increase by up to \verb|5\Interligne|.
-The following values of page layout parameters will allow the maximum material
-to fit on each page, provided the printer allows the margins that are implied.
+The following values of page-layout parameters will allow as much material
+as possible
+on a page, provided the printer supports these dimensions which
+imply approximately half-inch margins:
\begin{center}
-\begin{tabular}{|l|l|l|}\hline
-\multicolumn{1}{|c|}{A4}&\multicolumn{1}{|c|}{letter}&\multicolumn{1}{|c|}{A4 or letter}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash parindent= 0pt}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash hoffset= -15.4mm}\\\hline
-\multicolumn{3}{|c|}{\tt\Bslash voffset= -10mm}\\\hline
-\verb+\hsize= 190mm+&\verb+\hsize= 196mm+&\verb+\hsize= 190mm+\\\hline
-\verb+\vsize= 260mm+&\verb+\vsize= 247mm+&\verb+\vsize= 247mm+\\\hline
+\begin{tabular}{|l|l|}\hline
+\multicolumn{1}{|c|}{A$4$}&\multicolumn{1}{|c|}{letter}\\\hline
+\verb+\hsize=190mm+&\verb+\hsize=7.5in+\\\hline
+\verb+\vsize=270mm+&\verb+\vsize=10in+\\\hline
\end{tabular}
\end{center}
-%avre
\zkeyindex{parindent}\zkeyindex{hoffset}\zkeyindex{voffset}
\zkeyindex{hsize}\zkeyindex{vsize}
+You may have to be more conservative if you have headlines or footlines
+or want
+even/odd-page asymmetry, such as with the \keyindex{rectoverso}
+command in \verb|musixsty.tex| (Section~\ref{musixsty}).
+If a score is going to be ``published'' at a public repository (such as
+\mbox{\textsc{imslp}}), you may want to allow for \emph{either}
+A$4$ \emph{or} letter paper, for example by setting the \verb|\hsize| to~190~mm
+and the \verb|\vsize| to~10~in.
+
+To generate a score in ``landscape''\index{landscape mode} mode, adjust the
+text-size parameters above accordingly (e.g., \verb+\hsize=10in+ and \verb+\vsize=7.5in+)
+and add a suitable \verb\papersize\ ``special'' to the \TeX\ output, as in
+\verb+\special{papersize=11in,8.5in}+.
+
+
+For \emph{any} values of
+\verb|\hsize| and \verb|\vsize|,
+material will normally be centered on the page by using
+command sequences such as the following, which simply split the difference between the page size and the text size,
+and then subtract one inch because of \TeX\ conventions:
+\begin{enumerate}
+\item[For A$4$ paper, portrait mode (210~mm $\times$ 297~mm):]\quad\\[-2ex]
+\begin{verbatim}
+\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in
+\voffset=297mm\advance\voffset-\vsize\divide\voffset2
+\advance\voffset-1.0in
+\end{verbatim}
+\item[For letter-size paper, portrait mode (8.5~in $\times$ 11~in):] \quad\\[-2ex]
+\begin{verbatim}
+\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in
+\voffset=11in\advance\voffset-\vsize\divide\voffset2
+\advance\voffset-1.0in
+\end{verbatim}
+\end{enumerate}
+
+To determine the maximal dimensions that \emph{your} printer is capable of,
+process the standard file \verb|testpage.tex| with \LaTeX\ and
+print the result. The ``rulers'' on four sides will indicate
+how much of the one-inch ``margin'' material outside the frame can actually be printed.
+Your \verb|\hsize| and \verb|\vsize| parameters can be increased, or, if necessary, decreased
+accordingly. If your score is going to be printed by a publisher or a colleague, you can send
+\verb|testpage.pdf| to them to determine what margins are necessary for their
+printer.
+
+However, if the margins on the \verb|testpage| output are \emph{not}
+symmetric,
+the printer is mis-aligned.
+If this can't be corrected, the margin offsets will
+have to be adjusted. Ideally, this should be done in the \TeX\ configuration
+so all \TeX\ output will be corrected, but offsets can be adjusted
+for just \verb|musixtex| output using
+\verb|\advance\hoffset ...| and/or
+\verb|\advance\voffset ...|
+after the ``normal'' settings given above.
+
+
\section{Page numbering, headers and footers}\index{page
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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/miscellaneous.tex 2017-03-02 00:01:03.000000000 +0100
@@ -79,7 +79,8 @@
\item \keyindex{flageolett}\pitchp~to put a
small circle above a note head at pitch $p$.
\end{itemize}
-These marks are horizontally centered relative to solid note heads. To
+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.
@@ -272,7 +273,17 @@
\item \keyindex{backturn}\pitchp\ for \hbox to 1.5em{\kern 0.6em\backturn 0\hss}
\item \keyindex{tr}\pitchp\ for \hbox to 1.5em{\kern 0.6em\tr 0\hss}
\item \keyindex{trt}\pitchp\ for \hbox to 1.5em{\kern 0.6em\trt 0\hss}\quad (J. S.~Bach's \textit{trillo und mordant})
+ \item \keyindex{xtr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\xtr 0\hss}
+ \item \keyindex{ptr}\pitchp\ for \hbox to 1.5em{\kern 0.5em\ptr 0\hss}
\end{itemize}
+To
+compensate for the fact that whole notes are wider, you may use
+\begin{quote}
+\keyindex{wholeshift}\verb|{|\mbox{\ital{Any nonspacing macro}}\verb|}|
+\end{quote}
+to center any of these ornaments
+above a whole note.
+
In the following macros for fermatas, the argument $p$ is the pitch of the
notehead on which the fermata rests, assuming no additional vertical
@@ -508,7 +519,6 @@
in combination with \keyindex{zchar} or \keyindex{zcharnote}.
Since the \hbox to .7cm{ \Ped\hss} symbol is rather wide, it might collide
with adjacent bass notes. To shift it horizontally, you could use \verb|\loff{\PED}|.
-\vfill
The following excerpt from \textit{Liebestr\"aume} by Franz Liszt illustrates
a more modern approach to specifying piano-pedal usage:
@@ -546,13 +556,13 @@
\bar%
\Notes\pdlud\ql B\sk\qpl\sk\qpl|%
\zhl{.c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
-\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|%
\ds\ibu1i0\qb1{dhjh}\tqu1d\en
\bar%
\Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
\endpiece%
\end{music}
-\pagebreak
+\vspace*{2ex}\par\noindent
This has been coded using the following commands:
\begin{quote}
\begin{tabular}{lll}
@@ -596,7 +606,7 @@
\bar%
\Notes\pdlud\ql B\sk\qpl\sk\qpl|%
\zhl{c}\ds\ibu1i0\qb1{^d^hjh}\tqu1d\en
-\Notes\zqu{M}\hppl\sk\qpu\sk\qu M|%
+\Notes\zqu{M}\hppl\sk\sk\qpu\sk\qu M|%
\ds\ibu1i0\qb1{dhjh}\tqu1d\en
\bar%
\Notes\zmidstaff{$\cdots$}\sk\pdlu\sk|\en
@@ -605,6 +615,7 @@
\end{footnotesize}
\end{quote}
+\pagebreak
\noindent
The following ``mixed'' patterns are also supported:
\begin{quote}
@@ -665,29 +676,31 @@
\section{Brackets, parentheses, oblique lines and slides}\label{brapar}
-Several varieties of brackets, parentheses and oblique lines are provided for
+Several varieties of brackets\index{brackets}, parentheses\index{parentheses} and oblique lines\index{oblique lines} are provided for
use within a score.
\begin{itemize}\setlength{\itemsep}{0ex}
\item \keyindex{lpar}\verb|{|$p$\verb|}| and
\keyindex{rpar}\verb|{|$p$\verb|}| yield left and right
-parentheses at pitch $p$. They could be used to enclose notes or to build
-\ital{cautionary} accidentals, although the latter are more easily
-obtained with predefined macros (see Chapter~\ref{cautionary}).
-
-%avrb
-For example,
-
+parentheses at pitch $p$. They can be used to enclose notes or to build
+``big'' cautionary\index{cautionary accidental} accidentals. For example,
+\\
+\begin{center}
\begin{tabular}{ll}
-\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\notes\bsk\lpar{g}\rpar{g}\hu{g}\sk%
-\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}\loffset{.4}{\sh g}\hu{g}\en}}
-&\begin{tabular}{ll}
-&\verb+\notes\lpar{g}\rpar{g}\hu{g}\sk%+\\
-is coded as&\verb+\loffset{1.5}{\lpar{g}}\loffset{1.5}{\rpar{g}}%+\\
-&\verb+\loffset{.4}{\sh g}\hu{g}\en}+
+\raisebox{-1.5ex}[0ex][0ex]{\musicintextnoclefn{\NOtes\qsk\lpar g\rpar g\hu g\sk%
+\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk%
+\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en}}
\end{tabular}
+\end{center}
+is coded as
+\end{itemize}
+\begin{center}\small
+\begin{tabular}{l}
+\verb+\NOtes\lpar g\rpar g\hu g\sk%+\\
+\verb+\loffset{1.5}{\lpar g\rpar g}\loffset{.4}{\sh g}\hu g\sk%+\\
+\verb+\loffset{2.1}{\lpar g}\loffset{1.5}{\rpar g}\loffset{.4}{\dfl g}\hu g\en+
\end{tabular}
-%avre
-
+\end{center}
+\begin{itemize}
\item \keyindex{bracket}\verb|{|$p$\verb|}{|$n$\verb|}| posts a
square bracket to the left of a chord, vertically spanning $n$
\verb|internote|s.
@@ -731,7 +744,7 @@
\endextract
\end{music}
\noindent is coded as
-\begin{quote}\begin{verbatim}
+\begin{quote}\small\begin{verbatim}
\begin{music}
\setstaffs1{2}
\setclef1{\bass}
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 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/parameters.tex 2017-03-02 00:01:03.000000000 +0100
@@ -19,6 +19,8 @@
\item[\keyindex{internote} :]vertical spacing between notes one scale
step apart in the current instrument, taking account of a possible alteration
by \keyindex{setsize}; \nochange.
+Note that each distinct instrument may have a different
+\verb|\internote| (see Chapter~\ref{staffspacing}).
\item[\keyindex{Internote} :]vertical spacing between notes one scale
step apart in any instrument whose \keyindex{setsize} has the default
value \keyindex{normalvalue} ($1.0$), equal to \verb|0.5\Interligne|; \nochange.
@@ -32,15 +34,22 @@
\item[\keyindex{interstaff} :]a very important macro with a single numerical
argument representing the factor that multiplies \verb|2\internote| to give the
distance between the bottom of one staff and the bottom of the next one. In
-fact the macro redefines the parameter \verb|\interfacteur|.
+fact the macro redefines the parameter \verb|\interfacteur|. Default is 9.
+\verb|\interstaff| applies to all the
+instruments; to set the inter-staff spacing for a single instrument,
+use \keyindex{setinterstaff}\itbrace{n}\itbrace{m},
+$n$ is the instrument and $m$ is the replacement factor for that instrument.
+Note that
+after you have used \keyindex{setinterstaff},
+you cannot reset the distances for that instrument with
+\keyindex{interstaff}; you must subsequently use
+\keyindex{setinterstaff} for that purpose.
\item[\keyindex{interportee} :]distance between the bottom of one staff and
the bottom of the next one. It is always reset to
-\verb|2|\keyindex{interfacteur}\verb|\internote| at the next system.
+2 times \keyindex{internote} times the \keyindex{interfacteur} for the current
+instrument at the next system.
Therefore, trying to change \verb|\interportee| will have no effect. Change
-\verb|\interstaff| instead. Further, note that \verb|\interstaff| applies to all the
-instruments, but each distinct instrument may have a different
-\verb|\internote| (see Chapter~\ref{staffspacing}).
-
+\verb|\interstaff| or use \keyindex{setinterstaff} instead.
\item[\keyindex{interinstrument} :]additional vertical distance between
two consecutive instruments. This means that the distance between the lowest
line of the previous instrument and the lowest line of the top staff of the current
@@ -53,7 +62,8 @@
with the macro \keyindex{setinterinstrument}\itbrace{n}\itbrace{s}, where
$n$ is the instrument and $s$ is the replacement value of the space to
be added. The \verb|\setinterinstrument| macro may be useful in some vocal
-scores to provide vertical space for lyrics. Note that
+scores to provide vertical space for lyrics.
+Note that
after you have used \keyindex{setinterinstrument},
you cannot reset the distances for that instrument with
\keyindex{interinstrument}; you must subsequently use
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex new/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/preparing.tex 2017-03-02 00:01:03.000000000 +0100
@@ -269,7 +269,9 @@
the spacing in single-instrument parts extracted from a multi-instrument score;
see Section~\ref{musixtnt}.
-The \texttt{autosp} package can be found at
+The \texttt{autosp} package is available in
+\href{https://www.tug.org/texlive/}{\underline{TeXLive}} (from 2016) and
+can also be found at
the \href{http://icking-music-archive.org/software/autosp/autosp.zip}
{\underline{Werner Icking Music Archive}}
or at
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex new/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/settingup.tex 2017-03-02 00:01:03.000000000 +0100
@@ -219,6 +219,13 @@
This will place the name in the space to the left of the
first staff or group of staves for instrument $n$. To specify the amount of space
available, use \verb|\parindent|$d$ where $d$ is any hard \TeX\ dimension.
+For multi-line instrument names, use \TeX\ commands as in the following:
+\begin{verbatim}
+ \setname1{\vbox{%
+ \hbox to\parindent{\hss Bass\hss}%
+ \hbox to\parindent{\hss Recorder\hss}}}
+\end{verbatim}
+
\section{Groupings of instruments}\label{curlybrackets}
By default, all staves in a system will be joined
at the left by a thin, vertical rule. In addition, if an instrument has more than
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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/slurstiesTypeK.tex 2017-03-02 00:01:03.000000000 +0100
@@ -24,7 +24,7 @@
Once the software mentioned in the prior two paragraphs is installed and the
\TeX\ filename database is refreshed, the type~K package can be
invoked by including the command \verb|\input musixps|
-near the beginning of your source file.
+near the beginning of your source file (but after loading \verb\musixtex.tex\).
The resulting dvi file should then be converted into Postscript using \textbf{dvips}.
If desired, a PDF file can then be generated with \textbf{ps2pdf}, \textbf{ghostscript},
or \textbf{Adobe Acrobat} (see Section~\ref{using} for more information on this).
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex new/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/smaller.tex 2017-03-02 00:01:03.000000000 +0100
@@ -1,5 +1,5 @@
-\chapter{Smaller Notes in Normal-Sized Staves}
-Here we describe how to reduce the size of note symbols without changing the
+\chapter{Smaller (or Larger) Notes in Normal-Sized Staves}
+Here we describe how to change the size of note symbols without changing the
size of the staff itself. Changing overall staff size will be treated in
Chapter~\ref{staffspacing}.
@@ -69,6 +69,8 @@
\notes&\sk\tbbl0\tbl0\qb0J|\tbl1\zq c\qb1e\en
\endextract
\end{verbatim}\end{quote}
+Similarly, you may use
+\keyindex{largenotesize} or \keyindex{Largenotesize} to get \emph{larger} notes.
\section{Grace notes}
Grace notes are a special case of small and tiny notes, namely single-stemmed
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex new/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex
--- old/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/doc/generic/musixtex/musixdoc/transposition.tex 2017-03-02 00:01:03.000000000 +0100
@@ -9,43 +9,39 @@
\section{Logical transposition and octaviation}
Logical transposition is controlled by an integer-valued \TeX\ register
-\keyindex{transpose}. Its default value is 0. If you enter
-\verb|\transpose=|$n$, then all subsequent pitches specified by
+\keyindex{transpose}. Its default value is $0$. If you enter
+\verb|\transpose=|$n$ outside of notes commands, then all subsequent pitches specified by
letters will be transposed by $n$ positions. Normally this method would be
used to transpose an entire piece. Pitches specified with
numbers will not be affected, so if you think you will ever want to
transpose a piece, you should enter all note pitches with letters.
-One way to transpose up or down by one octave would be to set
-\keyindex{transpose} to $7$ or $-7$. For example, to make a quarter note
-octave as a chord, you could define a macro as
-\verb|\def\soqu#1{\zq{#1}{\transpose=7 \qu{#1}}}|.
-Note that because \verb|\transpose| is altered inside a pair of braces, the
-effect of the alteration is only local and does not reach outside the braces.
-
- Another more convenient way to transpose locally up or down by one octave
+One way to transpose up or down by one octave would be to increase or decrease
+\keyindex{transpose} by $7$.
+A more convenient way to transpose locally up or down by one octave
makes use respectively of the characters
\verb|'| (close-quote, interpreted as an \itxem{acute accent}) and \verb|`| (open-quote, interpreted as
a \itxem{grave accent}),
placed immediately before the letter specifying the pitch. So
for example \verb|\qu{'ab}| is equivalent to \verb|\qu{hi}| and
\verb|\qu{`kl}| is equivalent to \verb|\qu{de}|. These characters have
-cumulative effects but in a somewhat restricted sense. They will alter the value of
-\verb|\transpose|, but only until changing to a different staff or
-instrument or encountering \verb|\en|, at which time it will be reset to the
+cumulative effects; thus,
+for example, \verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}| are both equivalent to \verb|\qu{ah}|.
+Alterations to the value of
+\verb|\transpose| in notes commands are \emph{local}: when changing to a different staff or
+instrument or encountering \verb|\en|, \verb|\transpose| will be reset to the
value it had before the accents were used. (That value is stored in
-another register called \keyindex{normaltranspose}). Thus for example
-\verb|\qu{''A'A}| and \verb|\qu{''A}\qu{'A}|
-are both equivalent to \verb|\qu{ah}|.
+another register called \keyindex{normaltranspose}). Another way to localize
+changes to \verb|\transpose| is to create an explicit \TeX\ ''group'' by enclosing commands in \verb|{...}| braces.
At any point it is possible to reset the \verb|\transpose| register
-explicitly to the value it had
-when entering \verb|\notes|, by prefacing a pitch indication with
+explicitly to the \verb|\normaltranspose| value
+by prefacing a pitch indication with
``\verb|!|''. Thus \verb|\qu{!a'a}| always
gives the note \verb|a| and its upper octave \verb|h|, shifted by the
-value of {\Bslash transpose} at the beginning of the current
-\verb|\notes...\en| group, regardless of the number of grave and
-acute accents occurring previously within that group.
+value of {\Bslash normaltranspose},
+regardless of the number of grave and
+acute accents earlier in that group.
\section{Behavior of accidentals under logical transposition}\label{transposeaccids}
The above processes indeed change the vertical position of the note heads
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/musixtex-install.pdf and new/texmf-dist/doc/generic/musixtex/musixtex-install.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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/doc/man/man1/musixtex.1 2017-03-02 00:01:04.000000000 +0100
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2016-02-20 "musixtex version 0.16" ""
+.TH MUSIXTEX 1 2017-01-08 "musixtex version 0.17" ""
.SH NAME
musixtex \- processes MusiXTeX files, using pre-processors prepmx, pmxab and autosp as necessary,
@@ -71,46 +71,48 @@
output usage summary and quit
.TP
.B -l
-assumes LaTeX source;
+assume LaTeX source;
implied if the file has .ltx extension
.TP
.B -p
-changes the TeX processor to
+change the TeX processor to
.BR pdfetex (1)
or
.BR pdflatex (1)
-(and doesn't run
-.BR dvips (1)
-and
-.BR ps2pdf (1)
-or
-.BR dvipdfm (1)
-)
+(and doesn't run a dvi processor)
.TP
.B -c
preprocess pmx file using
.BR pmxchords (1)
.TP
.B -d
-changes the dvi processor to
+don't generate a .ps file and change the dvi processor to
.BR dvipdfm (1)
+.TP
+.B -D dvix
+use
+.B dvix
+as the dvi processor; e.g., -D "dvipdfm -m 0.9".
+Use -d
+.I before
+-D to suppress .ps generation.
.TP
.B -F fmt
-uses
+use
.B fmt
as the TeX processor; e.g., -F "luatex --output-format=dvi"
.TP
.B -m
-stops processing at the pmx file
+stop processing at the pmx file
.TP
.B -t
-stops processing at the tex/mid files
+stop processing at the tex/mid files
.TP
.B -s
-stops processing at the dvi file
+stop processing at the dvi file
.TP
.B -g
-stops processing at the ps file
+stop processing at the ps file
.TP
.B -i
retain intermediate and log files
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 2016-04-19 17:46:11.000000000 +0200
+++ new/tlpkg/tlpobj/musixtex.doc.tlpobj 2017-04-14 17:51:48.000000000 +0200
@@ -1,8 +1,8 @@
name musixtex.doc
category Package
-revision 40612
+revision 43375
shortdesc doc files of musixtex
-docfiles size=1017
+docfiles size=1036
texmf-dist/doc/generic/musixtex/ChangeLog-114.txt
texmf-dist/doc/generic/musixtex/ChangeLog-115.txt
texmf-dist/doc/generic/musixtex/ChangeLog-116.txt
@@ -12,6 +12,8 @@
texmf-dist/doc/generic/musixtex/ChangeLog-120.txt
texmf-dist/doc/generic/musixtex/ChangeLog-121.txt
texmf-dist/doc/generic/musixtex/ChangeLog-122.txt
+ texmf-dist/doc/generic/musixtex/ChangeLog-123.txt
+ texmf-dist/doc/generic/musixtex/ChangeLog-124.txt
texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
texmf-dist/doc/generic/musixtex/README
texmf-dist/doc/generic/musixtex/examples/8bitchar.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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/scripts/musixtex/musixtex.lua 2017-03-02 00:01:04.000000000 +0100
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
-VERSION = "0.16c"
+VERSION = "0.17a"
--[[
musixtex.lua: processes MusiXTeX files using prepmx and/or pmxab and/or
@@ -29,6 +29,16 @@
ChangeLog:
+ version 0.17a 2017-01-08 RDT
+ Added -D option.
+ Avoid writing or concatenating a nil value.
+
+ version 0.16e 2016-03-02 DL
+ missing version information (caused by batchmode in 0.16c) fixed
+
+ version 0.16d 2016-03-02 RDT
+ filename argument in autosp failure message fixed
+
version 0.16c 2016-02-24 RDT
-interaction batchmode for -q
report_error reports only the first error
@@ -115,7 +125,8 @@
-l latex source
-p direct tex-pdf (pdftex etc)
-F fmt use fmt as the TeX processor
- -d tex-dvi-pdf (dvipdfm)
+ -d tex-dvi-pdf (using dvipdfm if -D not used)
+ -D dvixx use dvixx as the dvi processor
-c preprocess pmx file using pmxchords
-m stop at pmx
-t stop at tex/mid
@@ -156,9 +167,9 @@
end
end
--- The global variables below may be changed by set_options(). System
--- commands for the various programs are mostly set to nil if the step
--- is to be omitted, which can be tested by a simple "if" statement.
+-- System commands for the various programs are mostly
+-- set to nil if the step is to be omitted, which can be
+-- tested by a simple "if" statement.
-- Exceptions:
-- 'tex' is the command for processing a TeX file, but it is important
-- to know whether the user has explicitly specified an option that
@@ -176,7 +187,7 @@
function defaults()
prepmx = "prepmx"
pmx = "pmxab"
- tex = "etex"
+ tex = "etex"
musixflx = "musixflx"
dvi = dvips
ps2pdf = "ps2pdf"
@@ -273,6 +284,9 @@
override = override .. 'p'
elseif this_arg == "-d" then
dvi = "dvipdfm"; ps2pdf = nil
+ elseif this_arg == "-D" then
+ narg = narg+1
+ dvi = arg[narg]
elseif this_arg == "-c" then
pmx = "pmxchords"
elseif this_arg == "-F" then
@@ -311,7 +325,14 @@
function find_file(this_arg)
basename, extension = this_arg:match"(.*)%.(.*)"
- if not extension then
+ if extension then
+ extensions = {["mtx"] = true, ["pmx"] = true, ["aspc"] = true, ["tex"] = true, ["ltx"] = true}
+ if not extensions[extension] then
+ print("!! extension " .. extension .. " unrecognized; valid extensions are mtx|pmx|aspc|tex|ltx.")
+ exit_code = exit_code+1
+ return
+ end
+ else
basename = this_arg
for ext in ("mtx,pmx,aspc,tex,ltx"):gmatch"[^,]+" do
if exists (basename .. "." .. ext) then
@@ -320,7 +341,7 @@
end
end
if not extension then
- print("!! No file " .. basename .. "[.mtx|.pmx|.aspc|.tex|.ltx]")
+ print("!! No file " .. basename .. ".[mtx|pmx|aspc|tex|ltx]")
exit_code = exit_code+1
return
end
@@ -385,7 +406,7 @@
if execute ("autosp " .. basename .. ".aspc" ) == 0 then
extension = "tex"
else
- print ("!! autosp preprocessing of " .. filename .. " fails.")
+ print ("!! autosp preprocessing of " .. basename .. ".aspc fails.")
exit_code = exit_code+1
return
end
@@ -447,59 +468,80 @@
end
end
--- Extracting version and path information from tempname.
--- The targets below rely on the exact output format used by various
--- programs and TeX files.
-targets = {
-mtxtex = "%(([^(]+mtx%.tex)%s*$",
-mtxlatex = "%(([^(]+mtxlatex%.sty)",
-mtxLaTeX = ".*mtxLaTeX.*",
-pmxtex = "%(([^(]+pmx%.tex)",
-musixtex = "%(([^(]+musixtex%.tex)",
-musixltx = "%(([^(]+musixltx%.tex)",
-musixlyr = "%(([^(]+musixlyr%.tex)",
+---- Report version information on musixtex.log
+
+-- File names and message signatures to be looked for in a TeX log file.
+logtargets = {
+mtxtex = {"mtx%.tex","mtxTeX"},
+mtxlatex = {"mtxlatex%.sty","mtxLaTeX"},
+pmxtex = {"pmx%.tex","PMX"},
+musixtex = {"musixtex%.tex","MusiXTeX"},
+musixltx = {"musixltx%.tex","MusiXLaTeX"},
+musixlyr = {"musixlyr%.tex","MusiXLYR"}
+}
+
+-- Signatures of messages displayed on standard output by programs
+capturetargets = {
MTx = "This is (M%-Tx.->)",
PMX = "This is (PMX[^\n]+)",
pdftex = "This is (pdfTeX[^\n]+)",
musixflx = "Musixflx%S+",
autosp = "This is autosp.*$",
-index = "autosp,MTx,mtxtex,mtxlatex,mtxLaTeX,PMX,pmxtex,"..
- "musixtex,musixltx,musixlyr,musixflx,pdftex"
+index = "autosp,MTx,PMX,musixflx,pdftex"
}
-extra_line = { mtxtex=true, musixtex=true, musixltx=true, pmxtex=true,
- musixlyr=true }
+function report_texfiles(logname)
+ local log = logname and io.open(logname)
+ if not log then return end
+ local lines =
+ {"--- TeX files actually included according to "..logname.." ---"}
+ log = log:read"*a"
+-- The following pattern matches filenames input by TeX, even if
+-- interrupted by a line break. It may include the first word of
+-- an \immediate\write10 message emitted by the file.
+ for pos,filename in log:gmatch"%(()(%.?[/]%a[%-/%.%w\n]+)" do
+ local hit
+ repeat
+ local oldfilename = filename
+ filename = oldfilename:match"[^\n]+" -- up to next line break
+ hit = io.open(filename) -- success if the file exists
+ if hit then break end
+ filename = oldfilename:gsub("\n","",1) -- remove line break
+ until filename==oldfilename
+ if hit then
+ for target,sig in pairs(logtargets) do
+ if filename:match(sig[1]) then
+ local i,j = log:find(sig[2].."[^\n]+",pos)
+ if j then lines[#lines+1] = filename.."\n "..log:sub(i,j) end
+ end
+ end
+ end
+ end
+ return table.concat(lines,'\n').."\n"
+end
function report_versions(tempname)
if not tempname then return end -- only available with -q
local logs = io.open(tempname)
if not logs then
- print ("No version information: could not open "..tempname)
+ musixlog:write ("No version information: could not open "..tempname)
return
end
local versions = {}
- local extra
- musixlog:write("--- Packages actually used according to "..
- tempname.." ---\n")
+ musixlog:write("--- Programs actually executed according to "..tempname.." ---\n")
for line in logs:lines() do
- if extra then
- versions[extra] = versions[extra] .. "\n " ..line
- extra = false
- else for target, pattern in pairs(targets) do
+ for target in capturetargets.index:gmatch"[^,]+" do
if not versions[target] then
- local found = line:match(pattern)
+ local found = line:match(capturetargets[target])
if found then
- extra = extra_line[target] and target
versions[target] = found
+ musixlog:write(found,"\n")
end
end
- end end
+ end
end
logs:close()
- for target in targets.index:gmatch"[^,]+" do if versions[target] then
- if target=="mtxLaTeX" then musixlog:write" " end
- musixlog:write(versions[target],"\n")
- end end
+ return
end
------------------------------------------------------------------------
@@ -517,8 +559,11 @@
if this_arg:match"^%-" then process_option(this_arg)
else
basename, extension = find_file(this_arg) -- nil,nil if not found
- extension = preprocess(basename,extension)
+ extension = preprocess(basename, extension)
tex_process(tex,basename,extension)
+ if basename and io.open(basename..".log") then -- to be printed later
+ versions = report_texfiles(basename..".log")
+ end
if basename and cleanup then
remove("pmxaerr.dat")
for ext in ("mx1,mx2,dvi,ps,idx,log,ilg,pml"):gmatch"[^,]+" do
@@ -531,6 +576,7 @@
narg = narg+1
until narg > #arg
+if versions then musixlog:write(versions) end
report_versions(tempname)
musixlog:close()
os.exit( exit_code )
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixec.tex new/texmf-dist/tex/generic/musixtex/musixec.tex
--- old/texmf-dist/tex/generic/musixtex/musixec.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixec.tex 2017-03-02 00:01:05.000000000 +0100
@@ -21,9 +21,10 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXec\space<2016/02/22>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixec.tex}\fi
+\immediate\write16{MusiXec\space<2017/02/10>}
%
\longECfontnamestrue
@@ -131,11 +132,11 @@
\font\twfvsl=ecsl2488
%
-% Redefine accented characters for etex
+% Redefine accented characters for 8-bit font
%
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\ifx\documentclass\undefined
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\def\ProvidesFile#1[#2]{}
\def\DeclareFontEncoding#1#2#3{}
\def\DeclareTextAccent#1#2#3{%
@@ -160,9 +161,9 @@
\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
\else{\ooalign{\unhbox\z@\crcr
\hidewidth\char11\hidewidth}}\fi\fi}
+\catcode`\@=\catcodeat
\fi
-\catcode`\@=\catcodeat
\normtype
\endinput
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixhv.tex new/texmf-dist/tex/generic/musixtex/musixhv.tex
--- old/texmf-dist/tex/generic/musixtex/musixhv.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixhv.tex 2017-03-02 00:01:05.000000000 +0100
@@ -21,9 +21,10 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXhv\space<2016/02/22>}
+\immediate\write16{MusiXhv\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixhv.tex}\fi
%
% 7pt "Roman" (sans serif), bold, "italic" (oblique), "bold-italic" (bold-oblique), and small-cap
\font\sevenrm=phvr8t at 7pt
@@ -133,7 +134,8 @@
\font\twfvsl=phvro8t scaled \magstep5
%
%
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
+\edef\catcodeat{\the\catcode`\@}
+\catcode`\@=11
%
\def\sF{{\ppff s\p@kern f}}
\def\sfz{{\ppff s\p@kern f\f@kern z}}
@@ -147,6 +149,7 @@
% Redefine accented characters for etex, suggested by David Carlisle:
%
\ifx\documentclass\undefined
+\catcode`\@=11
\def\ProvidesFile#1[#2]{}
\def\DeclareFontEncoding#1#2#3{}
\def\DeclareTextAccent#1#2#3{%
@@ -167,7 +170,6 @@
\input t1enc.def
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
\else{\ooalign{\unhbox\z@\crcr
\hidewidth\char11\hidewidth}}\fi\fi}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixlit.tex new/texmf-dist/tex/generic/musixtex/musixlit.tex
--- old/texmf-dist/tex/generic/musixtex/musixlit.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixlit.tex 2017-03-02 00:01:05.000000000 +0100
@@ -17,7 +17,7 @@
% Boston, MA 02111-1307, USA.
%
-\immediate\write16{MusiXLITurgical 0.37\space<23 Dec 2015>}%
+\immediate\write16{MusiXLITurgical 0.38\space<17 Dec 2016>}%
\ifx\undefined\oldGclef \else \endinput \fi
@@ -34,6 +34,8 @@
\def\cnql{\def\q@u{\musixfont\@c}\@nq}
\def\cnhu{\def\q@u{\musixchar101}\@nq}
\def\cnhl{\def\q@u{\musixchar102}\@nq}
+\def\cqb{\def\q@u{\musixchar99}\@qb} % RDT 2016-12-17
+\def\zcqb{\advancefalse\cqb} % RDT 2016-12-17
% Moved to musixtex.tex. RDT 2015-12-23
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixplt.tex new/texmf-dist/tex/generic/musixtex/musixplt.tex
--- old/texmf-dist/tex/generic/musixtex/musixplt.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixplt.tex 2017-03-02 00:01:05.000000000 +0100
@@ -21,9 +21,10 @@
% the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
% Boston, MA 02111-1307, USA.
%
-% Copyright 2015-2016 Bob Tennent rdt@cs.queensu.ca
+% Copyright 2015-2017 Bob Tennent rdt@cs.queensu.ca
%
-\immediate\write16{MusiXplt\space<2016/02/22>}
+\immediate\write16{MusiXplt\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixplt.tex}\fi
%
% 7pt roman, bold, italic, bold italic, slanted and small-cap
\font\sevenrm=pplr8t at 7pt
@@ -147,9 +148,11 @@
\catcode`\@=\catcodeat
%
-% Redefine accented characters for etex, suggested by David Carlisle:
+% Redefine accented characters for 8-bit font, suggested by David Carlisle:
%
+
\ifx\documentclass\undefined
+\catcode`\@=11
\def\ProvidesFile#1[#2]{}
\def\DeclareFontEncoding#1#2#3{}
\def\DeclareTextAccent#1#2#3{%
@@ -170,7 +173,6 @@
\input t1enc.def
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
% \c needs special treatment
\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
\else{\ooalign{\unhbox\z@\crcr
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixppff.tex new/texmf-dist/tex/generic/musixtex/musixppff.tex
--- old/texmf-dist/tex/generic/musixtex/musixppff.tex 2015-07-27 00:48:40.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixppff.tex 2017-03-02 00:01:05.000000000 +0100
@@ -12,7 +12,8 @@
%% ...
%%
%%
-\immediate\write16{MusiXppff \noexpand\ppff font replacement <2015/07/25>}%
+\immediate\write16{MusiXppff \noexpand\ppff font replacement <2017/02/10>}%
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixppff.tex}\fi
\font\xppfftwelve=xppff10 at 8pt
\font\xppffsixteen=xppff10
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 2015-02-28 23:49:36.000000000 +0100
+++ new/texmf-dist/tex/generic/musixtex/musixps.tex 2017-03-02 00:01:05.000000000 +0100
@@ -1,6 +1,7 @@
%% PostScript slurs, ties and crescendos
% Coded by Stanislav Kneifl
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixps.tex}\fi
\ifx\undefined\liftcresc\else\endinput\fi
\immediate\write16{MusiXPS PostScript slurs, ties and crescendos 0.93 (17.2.2015)}%
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixsty.tex new/texmf-dist/tex/generic/musixtex/musixsty.tex
--- old/texmf-dist/tex/generic/musixtex/musixsty.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixsty.tex 2016-11-25 19:33:35.000000000 +0100
@@ -18,9 +18,10 @@
%
\ifx\undefined\Tenpoint \else \endinput\fi
-\immediate\write16{MusiXtextSTYle T.116\space<27 February 2015>}%
+\immediate\write16{MusiXtextSTYle T.123\space<04 March 2016>}%
% modified by RDT to be independent of Computer Modern (other than Math fonts)
+% RDT: added \headline{..} in \maketitle
\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\edef\catcode@gt{\the\catcode`\>}\catcode`\>=12
@@ -292,6 +293,9 @@
\let\othert@itremorceau\empty
\def\othermention#1{\def\othert@itremorceau{#1}}
+\let\headl@ne\undefined
+\def\headline#1{\def\headl@ne{#1}}
+
\let\s@hortauthor\empty
\def\shortauthor#1{\def\s@hortauthor{(#1)}}
@@ -310,7 +314,9 @@
\output{\outmorceau}
-\def\maketitle{\centerline{\BIGfont \ifx\headt@itremorceau\undefined
+\def\maketitle{%
+\ifx\headl@ne\undefined\else\line{\headl@ne}\bigskip\fi% for version 123 RDT
+\centerline{\BIGfont \ifx\headt@itremorceau\undefined
\titremorceau\else\headt@itremorceau\fi}
\medskip
\ifx\subt@itremorceau\undefined\else
@@ -353,16 +359,30 @@
\catcode`\<=\catcode@lt
\catcode`\@=\catcodeat
-\hsize=185mm
-\vsize=275mm
-\hoffset=210mm
-\advance\hoffset -\hsize
-\divide\hoffset 2\relax
-\advance\hoffset -2.54cm
+%%% A4 (210mm x 297mm):
+\hsize=190mm %%% adjust to increase/decrease printer margins
+\vsize=270mm %%% adjust to increase/decrease printer margins
+\hoffset=210mm\advance\hoffset-\hsize\divide\hoffset2
+\advance\hoffset-1.0in % TeX convention
+\voffset=297mm\advance\voffset-\vsize\divide\voffset2
+\advance\voffset-1.0in % TeX convention
+
+%%% letter-size (8.5in x 11.0in):
+%\hsize=7.5in %%% adjust to increase/decrease printer margins
+%\vsize=10.0in %%% adjust to increase/decrease printer margins
+%\hoffset=8.5in\advance\hoffset-\hsize\divide\hoffset2
+%\advance\hoffset-1.0in % TeX convention
+%\voffset=11.0in\advance\voffset-\vsize\divide\voffset2
+%\advance\voffset-1.0in % TeX convention
+
+%%% To determine the *minimal* margins supported by your
+%%% printer and check for printer mis-alignment, process
+%%% testpage.tex with LaTeX and print the result.
+
\tenpoint
-%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%%
-\advance\hoffset -5mm
-\voffset=-1.54cm
-%%%%%%%%%%%%%%%%%%%%%%%%% local adjust to be tuned %%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%%%% adjust here for a non-centering printer %%%%%%%%
+%\advance\hoffset 0mm
+%\advance\voffset 0mm
\endinput
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 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixtex.tex 2017-03-02 00:01:05.000000000 +0100
@@ -25,15 +25,31 @@
\def\mufl@x{0.83}%
\def\mxmajorvernumber{1}
-\def\mxminorvernumber{22}
+\def\mxminorvernumber{24}
\def\mxvernumber{\mxmajorvernumber\mxminorvernumber}% make it possible to compare with \ifnum
\def\mxversuffix{}%
\edef\mxversion{\mxmajorvernumber.\mxminorvernumber\mxversuffix}
-\def\mxdate{2016-02-24}
+\def\mxdate{2017-02-28}
\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}%
\everyjob{\immediate\write16{MusiXTeX(c) \mxversion\space<\mxdate>}}%
+% version 1.24
+
+% preserve changes to \transpose in an hboxed tremolo command
+% test that musixtex.tex has already been loaded in some extensions:
+% musixps, musixec, musixhv, musixplt, musixtmr, musixppff
+% changed from \it to \ppff in several places
+% support new command \setinterstaff{n}{m}
+% define \largenotesize, \Largenotesize
+% correct typos \twtybf[g] \svtbf[g]
+
+% version 1.23
+
+% added \xtr and \ptr ornaments
+% adjusted spacing of \tr
+% corrected definition of \C@Inter for \nblines > 6
+
% version 1.22
% bi and sc font definitions added; sl and tt definitions for musixsty moved
@@ -241,7 +257,7 @@
\newcount\n@vi
\newcount\n@vii
\newcount\n@viii
-%\newcount\count@ %=\count255 def'd in plain
+\newcount\count@
\newbox\toks@box
\newbox\w@rkbox
@@ -336,6 +352,7 @@
\advance\count@ by\@ne
%
\expandafter \let \csname interinstrument\roman@c@\endcsname \interinstrument
+ \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24
%
% altitude
\expandafter \noexpand@newskip \csname k@i\roman@c@\endcsname
@@ -1562,6 +1579,10 @@
\let\curr@ntsiz@\smallnotesize}
\def\tinynotesize{\set@tinynotesize\comput@specifics
\let\curr@ntsiz@\tinynotesize}
+\def\largenotesize{\set@largenotesize\comput@specifics % v.124 RDT
+ \let\curr@ntsiz@\largenotesize}
+\def\Largenotesize{\set@Largenotesize\comput@specifics % v.124 RDT
+ \let\curr@ntsiz@\Largenotesize}
\def\musickeyfont{%
\ifdim\internote<\p@seven6\Internote \musictinyfont
@@ -1680,8 +1701,8 @@
\let\hsluru\hslurutwenty \let\hslurd\hslurdtwenty
\let\slurud\slurutwentyd \let\slurdd\slurdtwentyd % +ickd
\let\hslurud\hslurutwentyd \let\hslurdd\hslurdtwentyd %+ickd
- \let\meternorfont\svtbfg \let\metersmallfont\frtbf % version 1.18 RDT
- \let\meterbigfont\twtybfg \let\meterlargefont\twfvbf
+ \let\meternorfont\svtbf \let\metersmallfont\frtbf % version 1.18 RDT
+ \let\meterbigfont\twtybf \let\meterlargefont\twfvbf % version 1.24 typos corrected
\let\meterLargefont\twfvbf
\let\tinyppff\ppfftwenty
\let\smallppff\ppfftwentyfour
@@ -1782,11 +1803,18 @@
\edef\st@ffs{\csname n@p\romannumeral\noinstrum@nt\endcsname}%
\edef\nblines{\csname n@l\romannumeral\noinstrum@nt\endcsname}%
\edef\internote{\csname i@n\romannumeral\noinstrum@nt\endcsname}%
- \interportee\interfacteur\internote \interportee\tw@\interportee}
+ \edef\int@rf{\csname interfacteur\romannumeral\noinstrum@nt\endcsname}% RDT 1.24
+ \interportee\int@rf\internote \interportee\tw@\interportee} % RDT 1.24
-\def\C@Inter{\stem@skip\interportee \advance\stem@skip-\@ight\internote
- \ifnum\nblines=\f@ur \advance\stem@skip\tw@\internote \fi
- \ifnum\nblines>\fiv@ \advance\stem@skip-\tw@\internote \fi}
+\def\C@Inter{% RDT: corrected to work if \nblines > 6 (version 1.23)
+ \stem@skip\interportee
+ \ifnum\nblines=\thr@@
+ \advance\stem@skip-\@ight\internote
+ \else
+ \advance\stem@skip-\nblines\internote
+ \advance\stem@skip-\nblines\internote
+ \advance\stem@skip\tw@\internote
+ \fi}
%%% loop over instruments and staffs
@@ -1887,6 +1915,9 @@
\def\setinterinstrument#1#2{\n@v#1\relax % select instrument
\expandafter\def\csname interinstrument\romannumeral\n@v\endcsname{#2}}
+\def\setinterstaff#1#2{\n@v#1\relax % select instrument % RDT 1.24
+ \expandafter\def\csname interfacteur\romannumeral\n@v\endcsname{#2}}
+
%%% portees
\newdimen\systemheight
@@ -2965,7 +2996,7 @@
\let\rq\rq@ \let\lq\lq@ \let\ds\ds@oup \let\mp\mp@
\locx@skip\x@skip}
-\def\@ndstaff{\egroup
+\def\@ndstaff{\egroup % this where \transpose gets reset
\ifdim\n@skip<\wd\n@otebox \n@skip\wd\n@otebox \fi
\raise\altportee\rlap{\unhbox\n@otebox}}
@@ -3018,8 +3049,8 @@
\if .\t@ruc \let\@TI\pt \C@GET \fi
\if >\t@ruc \let\@TI\dsh \C@GET \fi
\if <\t@ruc \let\@TI\dfl \C@GET \fi
- \if !\t@ruc \transpose\normaltranspose \C@Get \fi
- \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi
+ \if !\t@ruc \transpose\normaltranspose \C@Get \fi
+ \if '\t@ruc \advance\transpose\s@v@n \C@Get \fi
\if `\t@ruc \advance\transpose-\s@v@n \C@Get \fi
\ifnum\n@viii<\maxdimen \n@i#1\fi
\else
@@ -4090,9 +4121,14 @@
\def\mordent{\n@iv89\@Char}
\def\Mordent{\n@iv119\@Char}
\def\doublethumb{\n@iv121\@Char}
-\def\tr#1{\zcn{#1}{\ppff tr}}
\def\trt#1{\loffset{0.65}{\shake{#1}}\roffset{0.65}{\mordent{#1}}}
+
+\def\tr#1{\loffset{0.15}{\zcn{#1}{\ppff tr}}} % \loffset added version 1.23 RDT
+\def\xtr#1{\raise1.25\internote\hbox{\n@iv111\zcn{#1}\C@ChaR}} % added version 1.23 RDT
+\def\ptr#1{\raise1.25\internote\hbox{\n@iv117\zcn{#1}\C@ChaR}} % added version 1.23 RDT
+%\def\Xtr#1{\wholeshift{\xtr{#1}}} % unnecessary?
+
%%% accents
\def\upbow{{\musixfont\@xxiii}}
@@ -4281,7 +4317,7 @@
\def\trilleX{\let\T@i\empty \C@trille}
\let\trille\trilleX
-\def\TrilleX{\def\T@i{\it tr }\C@trille}
+\def\TrilleX{\def\T@i{\ppff tr }\C@trille} % 1.24 changed from \it RDT
\let\Trille\TrilleX
\def\C@trille#1#2{\zcharnote{#1}{\y@v#2\noteskip \trill@}}
@@ -4320,7 +4356,7 @@
\def\tTrill@old#1{\s@l@cttrill#1\relax
\message{\noexpand\tr@x=\the\tr@x, No. #1}%
\ifdim\tr@x < \maxdimen\else\errmessage{\@mis \noexpand\Itrille \number #1}\fi
- \def\T@i{\it tr }\C@tri}
+ \def\T@i{\ppff tr }\C@tri} % 1.24 changed from \it RDT
\def\C@tri#1{\getcurpos\advance\y@v-\tr@y \kernm\y@v
\zcharnote{#1}\trill@\kern\y@v\let\T@i\empty\let\@itrille\undefined}
@@ -4362,7 +4398,7 @@
\C@T}
\def\ITrille#1{\s@l@cttrill#1\relax
\ifdim\tr@x < \maxdimen\errmessage{\@mis \noexpand\Ttrille \number #1}\fi
- \global\tr@sw={{\it tr }}%
+ \global\tr@sw={{\ppff tr }}% 1.24 changed from \it RDT
\C@T}
\def\C@T#1{%
@@ -4388,23 +4424,26 @@
%%% version 1.21
%%% RDT changed beam numbers to 5, suggested by JPC
%%% RDT adjusted the vertical positions for 16th and 32nd tremolos
+%%% version 1.24
+%%% RDT use new counter \tr@nspose to preserve changes to \transpose in an \hbox
-\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}}}%
-\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}}}%
-\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}}}%
-\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}}}%
+\newcount\tr@nspose % used to restore value of \transpose after closing an \hbox
+\def\trml#1{\raise2\internote\hbox{\loffset{0.5}{\ibl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\trmu#1{\raise-3\internote\hbox{\loffset{0.5}{\ibu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\trrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\trrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\trrrml#1{\raise3\internote\hbox{\loffset{0.5}{\ibbbl5{#1}9}\roffset{0.5}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\trrrmu#1{\raise-4\internote\hbox{\loffset{0.5}{\ibbbu5{#1}9}\roffset{0.5}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
% whole notes are wider than quarter/half notes:
% version 1.21 RDT adjusted the offsets and vertical positions
-\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}}}%
-\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}}}%
-\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}}}%
-\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}}}%
+\def\Trml#1{\raise3\internote\hbox{\ibl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\Trmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\Trrml#1{\raise3\internote\hbox{\ibbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\Trrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\Trrrml#1{\raise3\internote\hbox{\ibbbl5{#1}9\roffset{1.25}{\tbl5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
+\def\Trrrmu#1{\raise-4\internote\hbox{\loffset{1.1}{\ibbbu5{#1}9}\roffset{0.15}{\tbu5}\global\tr@nspose\transpose}\transpose\tr@nspose}%
%%% octave lines
@@ -4683,7 +4722,7 @@
\def\f{{\ppff f}}
\def\ff{{\ppff f\f@kern f}}
\def\fp{{\ppff f\f@kern p}}
-\def\sF{{\it s\ppff \p@kern f}}
+\def\sF{{\ppff s\ppff \p@kern f}} % changed \it to \ppff 1.24 RDT
\def\fff{{\ppff f\f@kern f\f@kern f}}
\def\ffff{{\ppff f\f@kern f\f@kern f\f@kern f}}
\def\mf{{\ppff m\p@kern\f@kern f}}
@@ -4949,11 +4988,12 @@
%%% standard settings
% [115] make them compatible to >12 instruments
-\def\resetlayout{\let\interfacteur\nin@
+\def\resetlayout{\def\interfacteur{9}%
\stafftopmarg\thr@@\Interligne \staffbotmarg\thr@@\Interligne
\count@\z@ \loop
\advance\count@ by\@ne
\expandafter \let\csname n@l\roman@c@\endcsname \fiv@
+ \expandafter\def\csname interfacteur\roman@c@\endcsname{\interfacteur} % RDT 1.24
\ifnum\count@<\maxinstruments\repeat
\resetclefsymbols}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/texmf-dist/tex/generic/musixtex/musixtmr.tex new/texmf-dist/tex/generic/musixtex/musixtmr.tex
--- old/texmf-dist/tex/generic/musixtex/musixtmr.tex 2016-04-07 19:14:54.000000000 +0200
+++ new/texmf-dist/tex/generic/musixtex/musixtmr.tex 2017-03-02 00:01:05.000000000 +0100
@@ -20,7 +20,8 @@
%%
%% History: see trailer.
%
-\immediate\write16{MusiXTimesFonts\space<2016/02/22>}
+\immediate\write16{MusiXTimesFonts\space<2017/02/10>}
+\ifx\undefined\startpiece\errmessage{Input musixtex.tex before musixtmr.tex}\fi
%
% 7pt roman, bold, italic, bold italic, slanted and small-cap
\font\sevenrm=ptmr8t at 7pt
@@ -146,7 +147,7 @@
\let\mezzopiano\mp@
%
-% Redefine accented characters for etex, suggested by David Carlisle:
+% Redefine accented characters for 8-bit font, suggested by David Carlisle:
%
\ifx\documentclass\undefined
\def\ProvidesFile#1[#2]{}
@@ -166,10 +167,10 @@
\def#1{\char#3\relax}}
\def\DeclareTextComposite#1#2#3#4{%
\expandafter\def\csname T1\string#1-\string#3\endcsname{\char#4\relax}}
+\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
\input t1enc.def
-\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
% \c needs special treatment
\def\c#1{\leavevmode\ifx c#1\char231 \else\setbox\z@\hbox{#1}\ifdim\ht\z@=1ex\accent11 #1%
\else{\ooalign{\unhbox\z@\crcr
@@ -196,4 +197,5 @@
%% 8-bit encoding and extensions, similar to musixplt.tex
%% 2015-07-25
%% change to ptmr8t fonts and use t1enc.def to re-defined accented characters
-
+%% 2016-07-11 RDT
+%% \catcode`\@=11 before inputting t1enc.def
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 2016-04-19 17:46:14.000000000 +0200
+++ new/tlpkg/tlpobj/musixtex.tlpobj 2017-04-14 17:51:49.000000000 +0200
@@ -1,6 +1,6 @@
name musixtex
category Package
-revision 40612
+revision 43375
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
@@ -69,7 +69,7 @@
texmf-dist/tex/latex/musixtex/musixtex.sty
catalogue-also pmx
catalogue-ctan /macros/musixtex
-catalogue-date 2016-02-25 15:24:43 +0100
+catalogue-date 2017-02-28 22:08:33 +0100
catalogue-license gpl2
catalogue-topics music
-catalogue-version 1.22
+catalogue-version 1.24
++++++ musixtex_various.dif ++++++
--- /var/tmp/diff_new_pack.bw8xia/_old 2017-06-25 19:32:32.140094440 +0200
+++ /var/tmp/diff_new_pack.bw8xia/_new 2017-06-25 19:32:32.140094440 +0200
@@ -13,10 +13,10 @@
texmf-dist/doc/generic/musixtex/examples/marcon3.tex | 8 ------
texmf-dist/doc/generic/musixtex/examples/recueil.tex | 5 ++--
texmf-dist/doc/generic/musixtex/musixdoc/musixdoc.sh | 10 ++++++++
- texmf-dist/scripts/musixtex/musixtex.lua | 17 +++++++++++--
+ texmf-dist/scripts/musixtex/musixtex.lua | 15 +++++++++---
texmf-dist/tex/generic/musixtex/musixtex.ins | 16 +++++++++++++
texmf-dist/tex/generic/musixtex/pdfmusixtex.ins | 16 +++++++++++++
- 17 files changed, 87 insertions(+), 45 deletions(-)
+ 17 files changed, 85 insertions(+), 45 deletions(-)
--- texmf-dist/doc/generic/musixtex/examples/albinoni.tex
+++ texmf-dist/doc/generic/musixtex/examples/albinoni.tex 2001-02-28 12:02:52.000000000 +0000
@@ -313,8 +313,8 @@
+makeindx musixdoc.idx
+pdflatex musixdoc
--- texmf-dist/scripts/musixtex/musixtex.lua
-+++ texmf-dist/scripts/musixtex/musixtex.lua 2016-06-08 12:49:39.297232299 +0000
-@@ -172,14 +172,25 @@ end
++++ texmf-dist/scripts/musixtex/musixtex.lua 2017-06-13 16:08:36.651332556 +0000
+@@ -183,14 +183,23 @@ 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)
@@ -325,15 +325,13 @@
function defaults()
prepmx = "prepmx"
pmx = "pmxab"
-- tex = "etex"
+- tex = "etex"
+ if base == "pdfmusixtex" then
-+ tex = "pdfetex"
-+ dvips = ""
++ tex = "pdfetex"
+ dvi = ""
+ ps2pdf = ""
+ else
-+ tex = "etex"
-+ dvips = "dvips -e0"
++ tex = "etex"
+ dvi = dvips
+ ps2pdf = "ps2pdf"
+ end
++++++ musixtnt.doc.tar.xz ++++++
++++++ musixtnt.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musixtnt.tlpobj new/tlpkg/tlpobj/musixtnt.tlpobj
--- old/tlpkg/tlpobj/musixtnt.tlpobj 2016-04-14 19:28:50.000000000 +0200
+++ new/tlpkg/tlpobj/musixtnt.tlpobj 2017-04-14 17:51:51.000000000 +0200
@@ -22,6 +22,6 @@
runfiles size=1
texmf-dist/tex/generic/musixtnt/musixtnt.tex
catalogue-ctan /macros/musixtnt
-catalogue-date 2016-02-09 07:19:18 +0100
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license gpl2
catalogue-topics music
++++++ musuos.doc.tar.xz ++++++
++++++ musuos.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/musuos.tlpobj new/tlpkg/tlpobj/musuos.tlpobj
--- old/tlpkg/tlpobj/musuos.tlpobj 2016-04-14 19:28:52.000000000 +0200
+++ new/tlpkg/tlpobj/musuos.tlpobj 2017-04-14 17:51:52.000000000 +0200
@@ -11,7 +11,7 @@
RELOC/tex/latex/musuos/musuos.cls
catalogue-also biblatex-musuos
catalogue-ctan /macros/latex/contrib/musuos
-catalogue-date 2015-08-08 19:53:23 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics dissertation music
catalogue-version 1.1d
++++++ muthesis.doc.tar.xz ++++++
++++++ muthesis.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/muthesis.tlpobj new/tlpkg/tlpobj/muthesis.tlpobj
--- old/tlpkg/tlpobj/muthesis.tlpobj 2016-04-14 19:28:52.000000000 +0200
+++ new/tlpkg/tlpobj/muthesis.tlpobj 2017-04-14 17:51:52.000000000 +0200
@@ -10,6 +10,6 @@
RELOC/tex/latex/muthesis/muthesis.cls
RELOC/tex/latex/muthesis/third-rep.cls
catalogue-ctan /macros/latex/contrib/muthesis
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl
catalogue-topics dissertation
++++++ mversion.doc.tar.xz ++++++
++++++ mversion.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/tlpkg/tlpobj/mversion.tlpobj new/tlpkg/tlpobj/mversion.tlpobj
--- old/tlpkg/tlpobj/mversion.tlpobj 2016-04-14 19:28:52.000000000 +0200
+++ new/tlpkg/tlpobj/mversion.tlpobj 2017-04-14 17:51:52.000000000 +0200
@@ -12,7 +12,7 @@
runfiles size=1
RELOC/tex/latex/mversion/mVersion.sty
catalogue-ctan /macros/latex/contrib/mversion
-catalogue-date 2015-08-03 05:43:12 +0200
+catalogue-date 2016-06-24 19:18:15 +0200
catalogue-license lppl1.2
catalogue-topics doc-mgmt doc-tool
catalogue-version 1.0.1