Update tex-musictex{,-doc} to 1.18

Increased length of beam stems.

Revised musixtmr.tex et al to allow traditional accented characters
for etex processing.

\xppff now musicsize-dependent.

Moved definitions of \raggedstoppiece and \slide into musixtex.tex.

6 files changed, 28 insertions, 24 deletions

diff --git a/print/tex-musixtex-doc/Makefile b/print/tex-musixtex-doc/Makefile
index ec7df1e1154..43e79cdbfd4 100644
--- a/print/tex-musixtex-doc/Makefile
+++ b/print/tex-musixtex-doc/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.4 2015/06/14 12:50:04 markd Exp $
+# $NetBSD: Makefile,v 1.5 2015/08/02 11:49:59 markd Exp $
 
 DISTNAME=	musixtex.doc
-PKGNAME=	tex-${DISTNAME:S/./-/}-1.16.20150421
-TEXLIVE_REV=	37025
+PKGNAME=	tex-${DISTNAME:S/./-/}-1.18
+TEXLIVE_REV=	37959
 
 MAINTAINER=	dgriffi@cs.csubak.edu
+HOMEPAGE=	http://ctan.org/pkg/musixtex
 COMMENT=	Documentation for tex-musixtex
 LICENSE=	gnu-gpl-v2
 
diff --git a/print/tex-musixtex-doc/PLIST b/print/tex-musixtex-doc/PLIST
index 715a73f5457..ecb5c1332e1 100644
--- a/print/tex-musixtex-doc/PLIST
+++ b/print/tex-musixtex-doc/PLIST
@@ -1,9 +1,11 @@
-@comment $NetBSD: PLIST,v 1.4 2015/06/14 12:50:04 markd Exp $
+@comment $NetBSD: PLIST,v 1.5 2015/08/02 11:49:59 markd Exp $
 man/man1/musixflx.1
 man/man1/musixtex.1
 share/texmf-dist/doc/generic/musixtex/ChangeLog-114.txt
 share/texmf-dist/doc/generic/musixtex/ChangeLog-115.txt
 share/texmf-dist/doc/generic/musixtex/ChangeLog-116.txt
+share/texmf-dist/doc/generic/musixtex/ChangeLog-117.txt
+share/texmf-dist/doc/generic/musixtex/ChangeLog-118.txt
 share/texmf-dist/doc/generic/musixtex/ChangeLog-musixdoc.txt
 share/texmf-dist/doc/generic/musixtex/README
 share/texmf-dist/doc/generic/musixtex/examples/8bitchar.tex
diff --git a/print/tex-musixtex-doc/distinfo b/print/tex-musixtex-doc/distinfo
index 8eafa9f97b1..c13c578f59a 100644
--- a/print/tex-musixtex-doc/distinfo
+++ b/print/tex-musixtex-doc/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.4 2015/06/14 12:50:04 markd Exp $
+$NetBSD: distinfo,v 1.5 2015/08/02 11:49:59 markd Exp $
 
-SHA1 (tex-musixtex-37025/musixtex.doc.tar.xz) = 60ad2ad2686f5bab65abddc1d8466b2f3801bdb7
-RMD160 (tex-musixtex-37025/musixtex.doc.tar.xz) = 3eb9840d8520d4c79355dedc0f9213d3a6122db0
-Size (tex-musixtex-37025/musixtex.doc.tar.xz) = 1859660 bytes
+SHA1 (tex-musixtex-37959/musixtex.doc.tar.xz) = 3dd74d3ae33839d20f5d7407c9c5dacb2dfd0ee9
+RMD160 (tex-musixtex-37959/musixtex.doc.tar.xz) = 8309e7f0916237ba2cc90f81a405b3ff0066ab0b
+Size (tex-musixtex-37959/musixtex.doc.tar.xz) = 1908224 bytes
diff --git a/print/tex-musixtex/Makefile b/print/tex-musixtex/Makefile
index e71366e208d..08b137bcf8a 100644
--- a/print/tex-musixtex/Makefile
+++ b/print/tex-musixtex/Makefile
@@ -1,10 +1,11 @@
-# $NetBSD: Makefile,v 1.32 2015/06/14 12:50:04 markd Exp $
+# $NetBSD: Makefile,v 1.33 2015/08/02 11:49:59 markd Exp $
 
 DISTNAME=	musixtex
-PKGNAME=	tex-${DISTNAME}-1.16.20150421
-TEXLIVE_REV=	37025
+PKGNAME=	tex-${DISTNAME}-1.18
+TEXLIVE_REV=	37959
 
 MAINTAINER=	dgriffi@cs.csubak.edu
+HOMEPAGE=	http://ctan.org/pkg/musixtex
 COMMENT=	TeX macros for sophisticated music typesetting
 LICENSE=	gnu-gpl-v2
 
diff --git a/print/tex-musixtex/distinfo b/print/tex-musixtex/distinfo
index 809a071fd45..848b781ad3b 100644
--- a/print/tex-musixtex/distinfo
+++ b/print/tex-musixtex/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.7 2015/06/14 12:50:04 markd Exp $
+$NetBSD: distinfo,v 1.8 2015/08/02 11:49:59 markd Exp $
 
-SHA1 (tex-musixtex-37025/musixtex.tar.xz) = e254374e61eaf163451a9187dbe24f72a8f86cf4
-RMD160 (tex-musixtex-37025/musixtex.tar.xz) = f754eaf77fa6e891bd1d9215fadd26b328c86a73
-Size (tex-musixtex-37025/musixtex.tar.xz) = 91608 bytes
-SHA1 (patch-bin_musixtex) = b899f4dc8ccfad3c1020b248a37fd62261a994bb
+SHA1 (tex-musixtex-37959/musixtex.tar.xz) = 581a4da7c8be97f35c4e671b651b2292335ed8d4
+RMD160 (tex-musixtex-37959/musixtex.tar.xz) = ad8f524998b3780c2c1082804d6e0546dec4b7c0
+Size (tex-musixtex-37959/musixtex.tar.xz) = 92684 bytes
+SHA1 (patch-bin_musixtex) = 105e777fe56fdfd2e97d87b8f7717aed9610e086
diff --git a/print/tex-musixtex/patches/patch-bin_musixtex b/print/tex-musixtex/patches/patch-bin_musixtex
index 2826dcf584d..04db19cf684 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.3 2015/04/23 12:33:29 markd Exp $
+$NetBSD: patch-bin_musixtex,v 1.4 2015/08/02 11:49:59 markd Exp $
 
 Fix paths to commands.
 
---- bin/musixtex.orig	2015-02-28 22:49:36.000000000 +0000
+--- bin/musixtex.orig	2015-07-26 22:48:40.000000000 +0000
 +++ bin/musixtex
-@@ -84,11 +84,11 @@ if #arg == 0 then
+@@ -91,11 +91,11 @@ if #arg == 0 then
  end
  
  -- defaults:
@@ -21,7 +21,7 @@ Fix paths to commands.
  intermediate = 1
  passes = 2
  index = 0
-@@ -104,19 +104,19 @@ repeat
+@@ -112,19 +112,19 @@ repeat
      os.exit(0)
    elseif this_arg == "-l" then
      if tex == "pdfetex" then
@@ -46,15 +46,15 @@ Fix paths to commands.
    elseif this_arg == "-s" then
      dvi = ""; ps2pdf = ""
    elseif this_arg == "-i" then
-@@ -124,9 +124,9 @@ repeat
+@@ -132,9 +132,9 @@ repeat
    elseif this_arg == "-1" then
      passes = 1
    elseif this_arg == "-f" then
--    tex = "etex"; dvi = dvips; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2; index = 0
-+    tex = "@LOCALBASE@/bin/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"; intermediate = 1; passes = 2; index = 0
+-    tex = "etex"; dvi = dvips; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2; index = 0; preprocess = 0
++    tex = "@LOCALBASE@/bin/etex"; dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = "@LOCALBASE@/bin/ps2pdf"; intermediate = 1; passes = 2; index = 0; preprocess = 0
    elseif this_arg == "-g" then
 -    dvi = dvips; ps2pdf = ""
 +    dvi = "@LOCALBASE@/bin/dvips"; ps2pdf = ""
    elseif this_arg == "-x" then
      index = 1
-   elseif this_arg == "-F" then
+   elseif this_arg == "-a" then