musixtex 1.15 (22may11)

git-svn-id: svn://tug.org/texlive/trunk@22568 c570f23f-e606-0410-a88d-b1316a301751

8 files changed, 247 insertions, 169 deletions

diff --git a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
index c567af06950..6bac25e8d8a 100755
--- a/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
+++ b/Build/source/texk/texlive/linked_scripts/musixtex/musixtex.lua
@@ -1,9 +1,9 @@
 #!/usr/bin/env texlua  
 
-VERSION = "0.3"
+VERSION = "0.4"
 
 --[[
-     musixtex.lua: processes a MusiXTeX file and then deletes intermediate files
+     musixtex.lua: processes MusiXTeX files (and deletes intermediate files)
 
      (c) Copyright 2011 Bob Tennent rdt@cs.queensu.ca
 
@@ -27,6 +27,10 @@ VERSION = "0.3"
 
   ChangeLog:
 
+     version 0.4  2011-04-30 RDT
+       Allow multiple filenames (and options).
+       Add -f (default) and -l (latex) options.
+
      version 0.3  2011-04-25 RDT
        Add -d (dvipdfm)  and -s (stop at dvi) options.
 
@@ -38,30 +42,22 @@ VERSION = "0.3"
 --]]
 
 function usage()
-  print("Usage:  [texlua] musixtex.lua [option] [basename[.tex]]")
+  print("Usage:  [texlua] musixtex.lua { option | basename[.tex] } ... ")
   print("options: -v  version")
   print("         -h  help")
-  print("         -p  pdfetex")
+  print("         -l  latex (or pdflatex)")
+  print("         -p  pdfetex (or pdflatex)")
   print("         -d  dvipdfm")
   print("         -s  stop at dvi")
+  print("         -f  restore default processing")
 end
 
 function whoami ()
   print("This is musixtex.lua version ".. VERSION .. ".")
 end
 
+whoami()
 if #arg == 0 then
-  whoami()
-  usage()
-  os.exit(0)
-end
-
-narg = 1
-
-if arg[narg] == "-v" then
-  whoami()
-  os.exit(0)
-elseif arg[narg] == "-h" then
   usage()
   os.exit(0)
 end
@@ -69,70 +65,77 @@ end
 -- defaults:
 tex = "etex"  
 musixflx = "musixflx"
-dvi = "dvips -q"
+dvi = "dvips"
 ps2pdf = "ps2pdf"
 
-if narg < #arg then
-  if arg[narg] == "-p" then
-    tex = "pdfetex"; dvi = ""; ps2pdf = ""
-  elseif arg[narg] == "-d" then
-    tex = "etex"; dvi = "dvipdfm"; ps2pdf = ""
-  elseif arg[narg] == "-s" then
-    tex = "etex"; dvi = ""; ps2pdf = ""
+exit_code = 0
+narg = 1
+repeat
+  this_arg = arg[narg]
+  if this_arg == "-v" then
+    os.exit(0)
+  elseif this_arg == "-h" then
+    usage()
+    os.exit(0)
+  elseif this_arg == "-l" then
+    if tex == "pdfetex" then
+      tex = "pdflatex"
+    else
+      tex = "latex"
+    end
+  elseif this_arg == "-p" then
+    if tex == "latex" then
+      tex = "pdflatex"
+    else
+      tex = "pdfetex"
+    end
+    dvi = ""; ps2pdf = ""
+  elseif this_arg == "-d" then
+    dvi = "dvipdfm"; ps2pdf = ""
+  elseif this_arg == "-s" then
+    dvi = ""; ps2pdf = ""
+  elseif this_arg == "-f" then
+    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"
   else
-    print("Argument \"".. arg[narg] .. "\" ignored.")
-  end
+    filename = this_arg 
+    if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then
+        filename = string.sub(filename, 1, -5)
+    end
+    if not io.open(filename .. ".tex", "r") then
+      print("Non-existent file: ", filename .. ".tex")
+    else
+      print("Processing ".. filename .. ".tex.")
+      os.remove( filename .. ".mx2" )
+      if (os.execute(tex .. " " .. filename) == 0) and
+         (os.execute(musixflx .. " " .. filename) == 0) and
+         (os.execute(tex .. " " .. filename) == 0) and
+         ((tex ~= "latex" and tex ~= "pdflatex") 
+           or (os.execute(tex .. " " .. filename) == 0)) and
+         (dvi == "" or  (os.execute(dvi .. " " .. filename) == 0)) and
+         (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
+      then -- clean-up:
+        os.remove( filename .. ".mx1" )
+        os.remove( filename .. ".mx2" )
+        if dvi ~= "" then
+          os.remove( filename .. ".dvi" )
+        end
+        if ps2pdf ~= "" then 
+          print(filename .. ".pdf generated by " .. ps2pdf .. ".")
+          os.remove( filename .. ".ps" )
+        end
+        print("")
+      else
+        print("Musixtex processing of " .. filename .. ".tex fails.\n")
+        exit_code = 2
+        --[[ uncomment for debugging
+        print("tex = ", tex)
+        print("dvi = ", dvi)
+        print("ps2pdf = ", ps2pdf)
+        --]]
+      end
+
+    end --if not io.open ...
+  end --if this_arg == ...
   narg = narg+1
-end 
-
-
-filename = arg[narg] 
-if not filename then
-  usage()
-  os.exit(1)
-end
-
-extension = string.sub(filename, -4, -1)
-if extension == ".tex" then
-  basename = string.sub(filename, 1, -5)
-else
-  basename = filename
-end
-
-if not io.open(basename .. ".tex", "r") then
-  print("Non-existent file: ", basename .. ".tex")
-  os.exit(2)
-end
-
-whoami()
-print("Processing ".. basename .. ".tex")
-os.remove( basename .. ".mx2" )
-if (os.execute(tex .. " " .. basename) == 0) and
-   (os.execute(musixflx .. " " .. basename) == 0) and
-   (os.execute(tex .. " " .. basename) == 0) and
-   (dvi == "" or  (os.execute(dvi .. " " .. basename) == 0)) and
-   (ps2pdf == "" or (os.execute(ps2pdf .. " " .. basename .. ".ps") == 0) )
-then
-  if dvi ~= "" then
-    print(basename .. ".pdf generated.")
-  end
-  exit_code = 0
-else
-  print("Musixtex processing fails.")
---[[ uncomment for debugging
-  print("tex = ", tex)
-  print("dvi = ", dvi)
-  print("ps2pdf = ", ps2pdf)
---]]
-  exit_code = 3
-end
-
--- clean-up:
-os.remove( basename .. ".mx1" )
-os.remove( basename .. ".mx2" )
-if dvi ~= "" then 
-  os.remove( basename .. ".dvi" )
-end
-os.remove( basename .. ".ps" )
-
+until narg > #arg 
 os.exit( exit_code )
diff --git a/Master/texmf-dist/doc/generic/musixtex/addons/curly.tex b/Master/texmf-dist/doc/generic/musixtex/addons/curly.tex
index e1999f1089b..902125486d0 100644
--- a/Master/texmf-dist/doc/generic/musixtex/addons/curly.tex
+++ b/Master/texmf-dist/doc/generic/musixtex/addons/curly.tex
@@ -3,8 +3,6 @@
 %                                                                      %
 %         submitted by Mthimkhulu Molekwa <eMKay.sa@gmail.com>         %
 %                   to the mutex list on 19 May 1999                   %
-%         allow for non-standard \interstaff; patch
-                    suggested by  Rainer Dunker (1977)
 %                                                                      %
 %                                                                      %
 % usage:                                                               %
@@ -14,6 +12,11 @@
 %                  <instrument_n_lower><instrument_n_upper>            %
 %                 }                                                    %
 %                                                                      %
+%                                                                      %
+%                                                                      %
+%  This version corrected 07/23/2007 by Rainer Dunker to make it       %
+%  insensitive to changes in \interstaff by PMX                        %
+%                                                                      %
 %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 \ifx\undefined\curlybrackets \else \endinput\fi
 \makeatletter
@@ -31,7 +34,6 @@
       \noinstrum@nt=#1\s@l@ctinstr\b@zi\altitude
       \noinstrum@nt=#2\s@l@ctinstr\b@zii\altitude
       \advance\b@zii-\b@zi
-      % correction here by Rainer Dunker
       \C@Inter  
       \advance\b@zii\nblines\internote
       \advance\b@zii\nblines\internote
diff --git a/Master/texmf-dist/scripts/musixtex/doc/musixflx.pdf b/Master/texmf-dist/scripts/musixtex/doc/musixflx.pdf
index 506805a49c0..1052dbf8342 100644
--- a/Master/texmf-dist/scripts/musixtex/doc/musixflx.pdf
+++ b/Master/texmf-dist/scripts/musixtex/doc/musixflx.pdf
diff --git a/Master/texmf-dist/scripts/musixtex/doc/musixtex.1 b/Master/texmf-dist/scripts/musixtex/doc/musixtex.1
index 1a233867a9f..c8460885b4a 100644
--- a/Master/texmf-dist/scripts/musixtex/doc/musixtex.1
+++ b/Master/texmf-dist/scripts/musixtex/doc/musixtex.1
@@ -1,19 +1,37 @@
 .\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2011-04-25  "musixtex version 0.3" ""
+.TH MUSIXTEX 1 2011-05-21  "musixtex version 0.4" ""
 
 .SH NAME
-musixtex \- processes a MusiXTeX file and then deletes intermediate files
+musixtex \- processes MusiXTeX files, deleting intermediate files
 
 .SH SYNOPSIS
 [ texlua ]
 .B musixtex[.lua]
-[
+{
 .IR option
-] 
-[
+|
 .IR jobname 
 [ .tex ] 
-]
+} ...
+.TP 
+The default effect is to process each file using 
+.TP 12
+.BR etex (1)
+(first pass)
+.TP
+.BR musixflx (1)
+(second pass)
+.TP
+.BR etex (1)
+(third pass)
+.TP
+.BR dvips (1)
+(dvi to Postscript)
+.TP
+.BR ps2pdf (1)
+(Postscript to Portable Document Format)
+.TP
+followed by removal of intermediate files.
 
 .SH OPTIONS
 .TP 8
@@ -23,13 +41,23 @@ output program name and version number, and quit
 .B -h
 output usage summary and quit
 .TP
+.B -l 
+changes the TeX processor to
+.BR latex (1)
+or
+.BR pdflatex (1)
+.TP
 .B -p 
 changes 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)
 )
 .TP
 .B -d 
@@ -38,10 +66,17 @@ changes the dvi processor to
 .TP
 .B -s 
 stops processing at the dvi file
+.TP
+.B -f
+default processing 
+.TP 0
+Options affect processing of all succeeding MusiXTeX files unless changed by another option.
 
 .SH SEE ALSO
 .BR etex (1),
+.BR latex (1),
 .BR pdfetex (1),
+.BR pdflatex (1),
 .BR musixflx (1),
 .BR dvipdfm (1),
 .BR dvips (1),
diff --git a/Master/texmf-dist/scripts/musixtex/doc/musixtex.pdf b/Master/texmf-dist/scripts/musixtex/doc/musixtex.pdf
index 8fe95568e7b..e3f9c8128d5 100644
--- a/Master/texmf-dist/scripts/musixtex/doc/musixtex.pdf
+++ b/Master/texmf-dist/scripts/musixtex/doc/musixtex.pdf
diff --git a/Master/texmf-dist/scripts/musixtex/musixtex.lua b/Master/texmf-dist/scripts/musixtex/musixtex.lua
index c567af06950..6bac25e8d8a 100755
--- a/Master/texmf-dist/scripts/musixtex/musixtex.lua
+++ b/Master/texmf-dist/scripts/musixtex/musixtex.lua
@@ -1,9 +1,9 @@
 #!/usr/bin/env texlua  
 
-VERSION = "0.3"
+VERSION = "0.4"
 
 --[[
-     musixtex.lua: processes a MusiXTeX file and then deletes intermediate files
+     musixtex.lua: processes MusiXTeX files (and deletes intermediate files)
 
      (c) Copyright 2011 Bob Tennent rdt@cs.queensu.ca
 
@@ -27,6 +27,10 @@ VERSION = "0.3"
 
   ChangeLog:
 
+     version 0.4  2011-04-30 RDT
+       Allow multiple filenames (and options).
+       Add -f (default) and -l (latex) options.
+
      version 0.3  2011-04-25 RDT
        Add -d (dvipdfm)  and -s (stop at dvi) options.
 
@@ -38,30 +42,22 @@ VERSION = "0.3"
 --]]
 
 function usage()
-  print("Usage:  [texlua] musixtex.lua [option] [basename[.tex]]")
+  print("Usage:  [texlua] musixtex.lua { option | basename[.tex] } ... ")
   print("options: -v  version")
   print("         -h  help")
-  print("         -p  pdfetex")
+  print("         -l  latex (or pdflatex)")
+  print("         -p  pdfetex (or pdflatex)")
   print("         -d  dvipdfm")
   print("         -s  stop at dvi")
+  print("         -f  restore default processing")
 end
 
 function whoami ()
   print("This is musixtex.lua version ".. VERSION .. ".")
 end
 
+whoami()
 if #arg == 0 then
-  whoami()
-  usage()
-  os.exit(0)
-end
-
-narg = 1
-
-if arg[narg] == "-v" then
-  whoami()
-  os.exit(0)
-elseif arg[narg] == "-h" then
   usage()
   os.exit(0)
 end
@@ -69,70 +65,77 @@ end
 -- defaults:
 tex = "etex"  
 musixflx = "musixflx"
-dvi = "dvips -q"
+dvi = "dvips"
 ps2pdf = "ps2pdf"
 
-if narg < #arg then
-  if arg[narg] == "-p" then
-    tex = "pdfetex"; dvi = ""; ps2pdf = ""
-  elseif arg[narg] == "-d" then
-    tex = "etex"; dvi = "dvipdfm"; ps2pdf = ""
-  elseif arg[narg] == "-s" then
-    tex = "etex"; dvi = ""; ps2pdf = ""
+exit_code = 0
+narg = 1
+repeat
+  this_arg = arg[narg]
+  if this_arg == "-v" then
+    os.exit(0)
+  elseif this_arg == "-h" then
+    usage()
+    os.exit(0)
+  elseif this_arg == "-l" then
+    if tex == "pdfetex" then
+      tex = "pdflatex"
+    else
+      tex = "latex"
+    end
+  elseif this_arg == "-p" then
+    if tex == "latex" then
+      tex = "pdflatex"
+    else
+      tex = "pdfetex"
+    end
+    dvi = ""; ps2pdf = ""
+  elseif this_arg == "-d" then
+    dvi = "dvipdfm"; ps2pdf = ""
+  elseif this_arg == "-s" then
+    dvi = ""; ps2pdf = ""
+  elseif this_arg == "-f" then
+    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"
   else
-    print("Argument \"".. arg[narg] .. "\" ignored.")
-  end
+    filename = this_arg 
+    if filename ~= "" and string.sub(filename, -4, -1) == ".tex" then
+        filename = string.sub(filename, 1, -5)
+    end
+    if not io.open(filename .. ".tex", "r") then
+      print("Non-existent file: ", filename .. ".tex")
+    else
+      print("Processing ".. filename .. ".tex.")
+      os.remove( filename .. ".mx2" )
+      if (os.execute(tex .. " " .. filename) == 0) and
+         (os.execute(musixflx .. " " .. filename) == 0) and
+         (os.execute(tex .. " " .. filename) == 0) and
+         ((tex ~= "latex" and tex ~= "pdflatex") 
+           or (os.execute(tex .. " " .. filename) == 0)) and
+         (dvi == "" or  (os.execute(dvi .. " " .. filename) == 0)) and
+         (ps2pdf == "" or (os.execute(ps2pdf .. " " .. filename .. ".ps") == 0) )
+      then -- clean-up:
+        os.remove( filename .. ".mx1" )
+        os.remove( filename .. ".mx2" )
+        if dvi ~= "" then
+          os.remove( filename .. ".dvi" )
+        end
+        if ps2pdf ~= "" then 
+          print(filename .. ".pdf generated by " .. ps2pdf .. ".")
+          os.remove( filename .. ".ps" )
+        end
+        print("")
+      else
+        print("Musixtex processing of " .. filename .. ".tex fails.\n")
+        exit_code = 2
+        --[[ uncomment for debugging
+        print("tex = ", tex)
+        print("dvi = ", dvi)
+        print("ps2pdf = ", ps2pdf)
+        --]]
+      end
+
+    end --if not io.open ...
+  end --if this_arg == ...
   narg = narg+1
-end 
-
-
-filename = arg[narg] 
-if not filename then
-  usage()
-  os.exit(1)
-end
-
-extension = string.sub(filename, -4, -1)
-if extension == ".tex" then
-  basename = string.sub(filename, 1, -5)
-else
-  basename = filename
-end
-
-if not io.open(basename .. ".tex", "r") then
-  print("Non-existent file: ", basename .. ".tex")
-  os.exit(2)
-end
-
-whoami()
-print("Processing ".. basename .. ".tex")
-os.remove( basename .. ".mx2" )
-if (os.execute(tex .. " " .. basename) == 0) and
-   (os.execute(musixflx .. " " .. basename) == 0) and
-   (os.execute(tex .. " " .. basename) == 0) and
-   (dvi == "" or  (os.execute(dvi .. " " .. basename) == 0)) and
-   (ps2pdf == "" or (os.execute(ps2pdf .. " " .. basename .. ".ps") == 0) )
-then
-  if dvi ~= "" then
-    print(basename .. ".pdf generated.")
-  end
-  exit_code = 0
-else
-  print("Musixtex processing fails.")
---[[ uncomment for debugging
-  print("tex = ", tex)
-  print("dvi = ", dvi)
-  print("ps2pdf = ", ps2pdf)
---]]
-  exit_code = 3
-end
-
--- clean-up:
-os.remove( basename .. ".mx1" )
-os.remove( basename .. ".mx2" )
-if dvi ~= "" then 
-  os.remove( basename .. ".dvi" )
-end
-os.remove( basename .. ".ps" )
-
+until narg > #arg 
 os.exit( exit_code )
diff --git a/Master/texmf/doc/man/man1/musixtex.1 b/Master/texmf/doc/man/man1/musixtex.1
index 1a233867a9f..c8460885b4a 100644
--- a/Master/texmf/doc/man/man1/musixtex.1
+++ b/Master/texmf/doc/man/man1/musixtex.1
@@ -1,19 +1,37 @@
 .\" This manpage is licensed under the GNU Public License
-.TH MUSIXTEX 1 2011-04-25  "musixtex version 0.3" ""
+.TH MUSIXTEX 1 2011-05-21  "musixtex version 0.4" ""
 
 .SH NAME
-musixtex \- processes a MusiXTeX file and then deletes intermediate files
+musixtex \- processes MusiXTeX files, deleting intermediate files
 
 .SH SYNOPSIS
 [ texlua ]
 .B musixtex[.lua]
-[
+{
 .IR option
-] 
-[
+|
 .IR jobname 
 [ .tex ] 
-]
+} ...
+.TP 
+The default effect is to process each file using 
+.TP 12
+.BR etex (1)
+(first pass)
+.TP
+.BR musixflx (1)
+(second pass)
+.TP
+.BR etex (1)
+(third pass)
+.TP
+.BR dvips (1)
+(dvi to Postscript)
+.TP
+.BR ps2pdf (1)
+(Postscript to Portable Document Format)
+.TP
+followed by removal of intermediate files.
 
 .SH OPTIONS
 .TP 8
@@ -23,13 +41,23 @@ output program name and version number, and quit
 .B -h
 output usage summary and quit
 .TP
+.B -l 
+changes the TeX processor to
+.BR latex (1)
+or
+.BR pdflatex (1)
+.TP
 .B -p 
 changes 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)
 )
 .TP
 .B -d 
@@ -38,10 +66,17 @@ changes the dvi processor to
 .TP
 .B -s 
 stops processing at the dvi file
+.TP
+.B -f
+default processing 
+.TP 0
+Options affect processing of all succeeding MusiXTeX files unless changed by another option.
 
 .SH SEE ALSO
 .BR etex (1),
+.BR latex (1),
 .BR pdfetex (1),
+.BR pdflatex (1),
 .BR musixflx (1),
 .BR dvipdfm (1),
 .BR dvips (1),
diff --git a/Master/texmf/doc/man/man1/musixtex.man1.pdf b/Master/texmf/doc/man/man1/musixtex.man1.pdf
index ee5bb253c54..5588a85c6d6 100644
--- a/Master/texmf/doc/man/man1/musixtex.man1.pdf
+++ b/Master/texmf/doc/man/man1/musixtex.man1.pdf