summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/musixtex/musixtex.lua9
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/README2
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/examples/coulhack.tex70
-rw-r--r--Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html8
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.15
-rw-r--r--Master/texmf-dist/doc/man/man1/musixtex.man1.pdfbin4381 -> 4399 bytes
-rwxr-xr-xMaster/texmf-dist/scripts/musixtex/musixtex.lua9
7 files changed, 27 insertions, 76 deletions
diff --git a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
index c8901aa84d0..92cb3c3623e 100755
--- a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
-VERSION = "0.6"
+VERSION = "0.7"
--[[
musixtex.lua: processes MusiXTeX files (and deletes intermediate files)
@@ -27,6 +27,9 @@ VERSION = "0.6"
ChangeLog:
+ version 0.7 2013-12-11 RDT
+ Add -F fmt option
+
version 0.6 2012-09-14 RDT
Add -1 (one-pass [pdf][la]tex processing) option.
@@ -57,6 +60,7 @@ function usage()
print(" -s stop at dvi")
print(" -i retain intermediate files")
print(" -1 one-pass [pdf][la]tex processing")
+ print(" -F fmt use fmt as the TeX processor")
print(" -f restore default processing")
end
@@ -110,6 +114,9 @@ repeat
passes = 1
elseif this_arg == "-f" then
tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2
+ elseif this_arg == "-F" then
+ narg = narg+1
+ tex = arg[narg]
else
filename = this_arg
if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then
diff --git a/Master/texmf-dist/doc/generic/musixtex/README b/Master/texmf-dist/doc/generic/musixtex/README
index 7a04073480d..5aa2df6274f 100644
--- a/Master/texmf-dist/doc/generic/musixtex/README
+++ b/Master/texmf-dist/doc/generic/musixtex/README
@@ -1,4 +1,4 @@
-This is MusiXTeX, version 1.15 (packaged 2013-01-23). MusiXTeX is a
+This is MusiXTeX, version 1.15 (packaged 2013-12-12). MusiXTeX is a
TeX-based system for typesetting music.
The main author was Daniel Taupin, who died in a climbing accident in
diff --git a/Master/texmf-dist/doc/generic/musixtex/examples/coulhack.tex b/Master/texmf-dist/doc/generic/musixtex/examples/coulhack.tex
deleted file mode 100644
index 1f797876cd4..00000000000
--- a/Master/texmf-dist/doc/generic/musixtex/examples/coulhack.tex
+++ /dev/null
@@ -1,70 +0,0 @@
-% thicker ledger lines
-\def\myhlthick{1.5\lthick}
-\makeatletter
-\def\h@linei{%
- \y@ii\n@v\internote
- \y@iii\y@ii
- \advance\y@ii\myhlthick
- \advance\y@iii-\myhlthick
- \y@vi\noteskip % noteskip
-%-\ifnum\y@vi=\z@ \y@vi\maxdimen\fi % (or maxdimen if noteskip = 0)
- \advance\y@vi-\y@v % - notewidth
- \y@vi0.7\y@vi % this may be eaten =: additional length
- \y@iv\h@lf\qn@width\ifnum\y@vi>\y@iv \y@vi\y@iv\fi % not more than 0.5 qn@width
- \y@iv0.2\qn@width \ifnum\y@vi<\y@iv \y@vi\y@iv\fi % not less than 0.2 qn@width
- \y@iv\y@v % notewidth
- \advance\y@iv\y@vi % + additional length =: total length
- \kernm\h@lf\y@vi % center the ledger line
-%-\message{noteskip = \the\noteskip, length = \the\y@iv, notewidth = \the\y@v}%
- \vrule\@height\y@ii\@depth-\y@iii\@width\y@iv
- \kernm\y@iv\kern\h@lf\y@vi}
-
-% same adapted from MUSIXFLL.TEX
-
-\ifx\undefined\longledgerlines \else \endinput \fi
-
-\immediate\write10{MusiXFormerLedgerLines T.74\space<06 April 1997>}%
-
-%\edef\catcodeat{\the\catcode`\@}\catcode`\@=11
-
-\let\h@lineick\h@linei
-\def\h@lineidt{%
- \y@ii\n@v\internote
- \y@iii\y@ii
- \advance\y@ii\myhlthick
- \advance\y@iii-\myhlthick
- \y@iv\y@v
- \advance\y@iv\h@lf\qn@width
- \kernm.25\qn@width
- \vrule\@height\y@ii\@depth-\y@iii\@width\y@iv
- \kernm\y@iv\kern.25\qn@width}
-\def\longledgerlines{\global\let\h@linei\h@lineidt}
-\def\autoledgerlines{\global\let\h@linei\h@lineick}
-\longledgerlines
-%\catcode`\@=\catcodeat
-
-% space between signatures and first note at each system:
-
-\def\contpiece{\noindent \piece@conta \writ@staffs \piece@beginc
-% \Writ@meters \wbarno@x \hardspace{10pt}\addspace\afterruleskip
- \Writ@meters \wbarno@x \hardspace{.3\elemskip}\addspace\afterruleskip}
-% ^^^^^^^^^^^^^^^^^^^^^^^
-
-% missing pixels at some beam ends:
-\def\beamst@m{% queue de note vers une poutre
- \getcurpos \advance\y@v-\b@x
- \y@ii\b@p\y@v \divide\y@ii\tw@nty \advance\y@ii\b@z
- \ifdim\y@ii>\st@top % la poutre est au-dessus
- \stem@skip\qd@skip \comp@slope\stem@skip \advance\y@ii\s@lope
- \advance\y@ii .25\interbeam% hack
- \ifnum\b@n>\z@ \advance\y@ii\b@n\interbeam \advance\y@ii-\interbeam \fi
- \st@top\y@ii % a mettre a jour avec la pente ulterieurement
- \else
- \advance\y@ii-.25\interbeam% hack
- \stem@skip\z@
- \ifdim\y@ii<\st@bot
- \ifnum\b@n<\z@ \advance\y@ii\b@n\interbeam \advance\y@ii\interbeam \fi
- \st@bot\y@ii \fi \fi
- \C@stem}
-
-\makeatother
diff --git a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html
index fca335c0ee7..810cb76fb9a 100644
--- a/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html
+++ b/Master/texmf-dist/doc/generic/musixtex/scripts/musixtex.html
@@ -3,7 +3,7 @@ Content-type: text/html
<HTML><HEAD><TITLE>Manpage of MUSIXTEX</TITLE>
</HEAD><BODY>
<H1>MUSIXTEX</H1>
-Section: (1)<BR>Updated: 2012-09-14<BR><A HREF="#index">Index</A>
+Section: (1)<BR>Updated: 2013-12-11<BR><A HREF="#index">Index</A>
<A HREF="http://localhost/cgi-bin/man/man2html">Return to Main Contents</A><HR>
<P>
@@ -109,6 +109,10 @@ retain intermediate files
<DD>
one-pass [pdf][la]tex processing
+<DT><B>-F fmt</B>
+
+<DD>
+use fmt as the TeX processor
<DT><B>-f</B>
<DD>
@@ -158,6 +162,6 @@ This manual page was written by Bob Tennent &lt;<A HREF="mailto:rdt@cs.queensu.c
This document was created by
<A HREF="http://localhost/cgi-bin/man/man2html">man2html</A>,
using the manual pages.<BR>
-Time: 08:25:23 GMT, September 14, 2012
+Time: 22:15:29 GMT, December 11, 2013
</BODY>
</HTML>
diff --git a/Master/texmf-dist/doc/man/man1/musixtex.1 b/Master/texmf-dist/doc/man/man1/musixtex.1
index 669f8bd2ff5..04d963ba6a3 100644
--- a/Master/texmf-dist/doc/man/man1/musixtex.1
+++ b/Master/texmf-dist/doc/man/man1/musixtex.1
@@ -1,5 +1,5 @@
.\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2012-09-14 "musixtex version 0.6" ""
+.TH MUSIXTEX 1 2013-12-11 "musixtex version 0.7" ""
.SH NAME
musixtex \- processes MusiXTeX files, deleting intermediate files
@@ -73,6 +73,9 @@ retain intermediate files
.B -1
one-pass [pdf][la]tex processing
.TP
+.B -F fmt
+use fmt as the TeX processor
+.TP
.B -f
default processing
.TP 0
diff --git a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
index a1a8bf2d114..4f7dc4dead0 100644
--- a/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
+++ b/Master/texmf-dist/doc/man/man1/musixtex.man1.pdf
Binary files differ
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua
index c8901aa84d0..92cb3c3623e 100755
--- a/Master/texmf-dist/scripts/musixtex/musixtex.lua
+++ b/Master/texmf-dist/scripts/musixtex/musixtex.lua
@@ -1,6 +1,6 @@
#!/usr/bin/env texlua
-VERSION = "0.6"
+VERSION = "0.7"
--[[
musixtex.lua: processes MusiXTeX files (and deletes intermediate files)
@@ -27,6 +27,9 @@ VERSION = "0.6"
ChangeLog:
+ version 0.7 2013-12-11 RDT
+ Add -F fmt option
+
version 0.6 2012-09-14 RDT
Add -1 (one-pass [pdf][la]tex processing) option.
@@ -57,6 +60,7 @@ function usage()
print(" -s stop at dvi")
print(" -i retain intermediate files")
print(" -1 one-pass [pdf][la]tex processing")
+ print(" -F fmt use fmt as the TeX processor")
print(" -f restore default processing")
end
@@ -110,6 +114,9 @@ repeat
passes = 1
elseif this_arg == "-f" then
tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1; passes = 2
+ elseif this_arg == "-F" then
+ narg = narg+1
+ tex = arg[narg]
else
filename = this_arg
if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then