Update tex-musixtex{,-doc} to 1.15pl29752

Changes:
- Depend on newly-added tex-musixtex-fonts.
- Reorganize directory structure to be consistent with other TeX Live
  2013 packages.

4 files changed, 24 insertions, 260 deletions

diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index 601e8df05dd..73cccc16b7f 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,15 +1,15 @@
-# $NetBSD: Makefile,v 1.29 2013/04/24 10:11:41 sbd Exp $
+# $NetBSD: Makefile,v 1.30 2013/12/04 02:42:07 minskim Exp $
 
 DISTNAME=	musixtex
-PKGNAME=	tex-${DISTNAME}-1.15
-PKGREVISION=	3
-TEXLIVE_REV=	22568
+PKGNAME=	tex-${DISTNAME}-1.15pl29752
+TEXLIVE_REV=	29752
 
 MAINTAINER=	dgriffi@cs.csubak.edu
 COMMENT=	TeX macros for sophisticated music typesetting
 LICENSE=	gnu-gpl-v2
 
 DEPENDS+=	dvipsk-[0-9]*:../../print/dvipsk
+DEPENDS+=	tex-musixtex-fonts-[0-9]*:../../fonts/tex-musixtex-fonts
 DEPENDS+=	tex-pdftex-[0-9]*:../../print/tex-pdftex
 
 USE_TOOLS+=	gs:run
@@ -21,8 +21,6 @@ SUBST_FILES.paths=	bin/musixtex
 SUBST_SED.paths=	-e 's,@LOCALBASE@,${LOCALBASE},g'
 
 REPLACE_TEXLUA=		bin/musixflx bin/musixtex
-TEX_MIXEDMAP_FILES+=	musix.map
-TEX_TEXMF_DIRS=		${PREFIX}/share/texmf-dist
 
 .include "../../print/texlive/package.mk"
 
@@ -31,5 +29,6 @@ post-extract:
 .for f in musixflx musixtex
 	${MV} ${WRKSRC}/texmf-dist/scripts/musixtex/${f}.lua ${WRKSRC}/bin/${f}
 .endfor
+	cd ${WRKSRC}/texmf-dist && ${RMDIR} -p scripts/musixtex
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/print/tex-musixtex/PLIST b/print/tex-musixtex/PLIST
index b7cecc4d418..2c1dd21323a 100644
--- a/print/tex-musixtex/PLIST
+++ b/print/tex-musixtex/PLIST
@@ -1,246 +1,7 @@
-@comment $NetBSD: PLIST,v 1.8 2011/05/26 23:50:43 minskim Exp $
+@comment $NetBSD: PLIST,v 1.9 2013/12/04 02:42:07 minskim Exp $
 bin/musixflx
 bin/musixtex
-share/texmf-dist/fonts/map/dvips/musixtex/musix.map
-share/texmf-dist/fonts/source/public/musixtex/musexgen.mf
-share/texmf-dist/fonts/source/public/musixtex/musix11.mf
-share/texmf-dist/fonts/source/public/musixtex/musix13.mf
-share/texmf-dist/fonts/source/public/musixtex/musix16.mf
-share/texmf-dist/fonts/source/public/musixtex/musix20.mf
-share/texmf-dist/fonts/source/public/musixtex/musix24.mf
-share/texmf-dist/fonts/source/public/musixtex/musix25.mf
-share/texmf-dist/fonts/source/public/musixtex/musix29.mf
-share/texmf-dist/fonts/source/public/musixtex/musixgen.mf
-share/texmf-dist/fonts/source/public/musixtex/musixsps.mf
-share/texmf-dist/fonts/source/public/musixtex/musixspx.mf
-share/texmf-dist/fonts/source/public/musixtex/mxsk.mf
-share/texmf-dist/fonts/source/public/musixtex/xdrawsl.mf
-share/texmf-dist/fonts/source/public/musixtex/xdrawzl.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg11.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg13.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg16.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg20.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg24.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg25.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreg29.mf
-share/texmf-dist/fonts/source/public/musixtex/xgreggen.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld11.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld11d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld13.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld13d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld16.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld16d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld20.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld24.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld24d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld29.mf
-share/texmf-dist/fonts/source/public/musixtex/xsld29d.mf
-share/texmf-dist/fonts/source/public/musixtex/xsldd20.mf
-share/texmf-dist/fonts/source/public/musixtex/xsldu20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslgen.mf
-share/texmf-dist/fonts/source/public/musixtex/xslgend.mf
-share/texmf-dist/fonts/source/public/musixtex/xslgenu.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd11.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd11d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd13.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd13d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd16.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd16d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd24.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd24d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd29.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhd29d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu11.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu11d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu13.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu13d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu16.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu16d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu24.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu24d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu29.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhu29d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhz-o.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhz.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhz20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslhz20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu11.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu11d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu13.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu13d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu16.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu16d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu24.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu24d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu29.mf
-share/texmf-dist/fonts/source/public/musixtex/xslu29d.mf
-share/texmf-dist/fonts/source/public/musixtex/xslud20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslup20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslz.mf
-share/texmf-dist/fonts/source/public/musixtex/xslz20.mf
-share/texmf-dist/fonts/source/public/musixtex/xslz20d.mf
-share/texmf-dist/fonts/source/public/musixtex/xtie20.mf
-share/texmf-dist/fonts/tfm/public/musixtex/musix11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix25.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musix29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musixsps.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/musixspx.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/mxsk.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xgreg29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld11d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld13d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld16d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld24d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsld29d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsldd20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xsldu20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd11d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd13d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd16d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd24d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhd29d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu11d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu13d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu16d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu20m.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu24d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhu29d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhz20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslhz20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu11.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu11d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu13.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu13d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu16.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu16d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu24.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu24d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu29.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslu29d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslud20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslup20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslz20.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xslz20d.tfm
-share/texmf-dist/fonts/tfm/public/musixtex/xtie20.tfm
-share/texmf-dist/fonts/type1/public/musixtex/musix11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musix13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musix16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musix20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musix24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musix29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musixsps.pfb
-share/texmf-dist/fonts/type1/public/musixtex/musixspx.pfb
-share/texmf-dist/fonts/type1/public/musixtex/mxsk.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xgreg29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld11d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld13d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld16d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld24d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsld29d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsldd20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xsldu20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd11d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd13d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd16d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd24d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhd29d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu11d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu13d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu16d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu24d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhu29d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhz20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslhz20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu11.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu11d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu13.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu13d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu16.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu16d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu24.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu24d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu29.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslu29d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslud20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslup20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslz20.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xslz20d.pfb
-share/texmf-dist/fonts/type1/public/musixtex/xtie20.pfb
-share/texmf-dist/scripts/musixtex/Windows/musixflx.bat
-share/texmf-dist/scripts/musixtex/Windows/musixtex.bat
-share/texmf-dist/scripts/musixtex/doc/musixflx.1
-share/texmf-dist/scripts/musixtex/doc/musixflx.pdf
-share/texmf-dist/scripts/musixtex/doc/musixtex.1
-share/texmf-dist/scripts/musixtex/doc/musixtex.pdf
+share/texmf-dist/dvips/musixtex/psslurs.pro
 share/texmf-dist/tex/generic/musixtex/musixadd.tex
 share/texmf-dist/tex/generic/musixtex/musixbar.tex
 share/texmf-dist/tex/generic/musixtex/musixbbm.tex
diff --git a/print/tex-musixtex/distinfo b/print/tex-musixtex/distinfo
index b1fa0c8b2a0..15a2579083a 100644
--- a/print/tex-musixtex/distinfo
+++ b/print/tex-musixtex/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2011/05/26 23:50:43 minskim Exp $
+$NetBSD: distinfo,v 1.5 2013/12/04 02:42:07 minskim Exp $
 
-SHA1 (tex-musixtex-22568/musixtex.tar.xz) = ca64deee85df2a383a0e28726aac263f2b053a33
-RMD160 (tex-musixtex-22568/musixtex.tar.xz) = 4bbb836ed31df3957372714c7959499f43ca072e
-Size (tex-musixtex-22568/musixtex.tar.xz) = 4569560 bytes
-SHA1 (patch-bin_musixtex) = 2e1945bd850d01796e1e2f3da2f17626dce4bb91
+SHA1 (tex-musixtex-29752/musixtex.tar.xz) = 5dd79a96df7eb00d3d46b46fd2f894d74d038148
+RMD160 (tex-musixtex-29752/musixtex.tar.xz) = 8ed01497c7712b7581dbdfec8d9b5cf2df8144d0
+Size (tex-musixtex-29752/musixtex.tar.xz) = 87604 bytes
+SHA1 (patch-bin_musixtex) = df4cbb8c506d7636a50d1fcbde24c6c806727cc4
diff --git a/print/tex-musixtex/patches/patch-bin_musixtex b/print/tex-musixtex/patches/patch-bin_musixtex
index 2e724e079e5..d1fc06e3bf9 100644
--- a/print/tex-musixtex/patches/patch-bin_musixtex
+++ b/print/tex-musixtex/patches/patch-bin_musixtex
@@ -1,10 +1,10 @@
-$NetBSD: patch-bin_musixtex,v 1.1 2011/05/26 23:50:43 minskim Exp $
+$NetBSD: patch-bin_musixtex,v 1.2 2013/12/04 02:42:07 minskim Exp $
 
 Fix paths to commands.
 
---- bin/musixtex.orig	2011-05-22 22:09:37.000000000 +0000
+--- bin/musixtex.orig	2013-01-24 23:23:04.000000000 +0000
 +++ bin/musixtex
-@@ -63,10 +63,10 @@ if #arg == 0 then
+@@ -71,10 +71,10 @@ if #arg == 0 then
  end
  
  -- defaults:
@@ -16,10 +16,10 @@ Fix paths to commands.
 +musixflx = "@LOCALBASE@/bin/musixflx"
 +dvi = "@LOCALBASE@/bin/dvips"
 +ps2pdf = "@LOCALBASE@/bin/ps2pdf"
+ intermediate = 1
+ passes = 2
  
- exit_code = 0
- narg = 1
-@@ -79,23 +79,23 @@ repeat
+@@ -89,19 +89,19 @@ repeat
      os.exit(0)
    elseif this_arg == "-l" then
      if tex == "pdfetex" then
@@ -43,9 +43,13 @@ Fix paths to commands.
 +    dvi = "@LOCALBASE@/bin/dvipdfm"; ps2pdf = ""
    elseif this_arg == "-s" then
      dvi = ""; ps2pdf = ""
+   elseif this_arg == "-i" then
+@@ -109,7 +109,7 @@ repeat
+   elseif this_arg == "-1" then
+     passes = 1
    elseif this_arg == "-f" then
--    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"
-+    tex = "@LOCALBASE@/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"
+-    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2
++    tex = "@LOCALBASE@/bin/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"; intermediate = 1; passes = 2
    else
      filename = this_arg 
      if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then