From cdffe6ab5d6e1b4d0a3c276c71b17d205df5148e Mon Sep 17 00:00:00 2001
From: Karl Berry <karl@freefriends.org>
Date: Sat, 14 Dec 2013 22:55:31 +0000
Subject: pmx (14dec13)

git-svn-id: svn://tug.org/texlive/trunk@32412 c570f23f-e606-0410-a88d-b1316a301751
---
 Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua   | 11 +++++++++++
 Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua | 15 +++++++++++----
 2 files changed, 22 insertions(+), 4 deletions(-)

(limited to 'Build')

diff --git a/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua b/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua
index 495777b6d57..be1a3b80d3e 100755
--- a/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua
+++ b/Build/source/texk/texlive/linked_scripts/m-tx/m-tx.lua
@@ -27,6 +27,10 @@ VERSION = "0.4"
 
   ChangeLog:
 
+     version 0.4   2013-12-11 RDT
+       Add -c option for pmxchords preprocessing of pmx file
+       Add -F fmt option to use fmt as TeX processor
+
      version 0.3   2012-04-09 RDT
        Change name to m-tx to avoid clash with another program.
 
@@ -48,6 +52,8 @@ function usage()
   print("         -l  latex (or pdflatex)")
   print("         -p  pdfetex (or pdflatex)")
   print("         -d  dvipdfm")
+  print("         -c  preprocess pmx file using pmxchords")
+  print("         -F fmt  use fmt as the TeX processor")
   print("         -s  stop at dvi")
   print("         -t  stop at tex/mid")
   print("         -m  stop at pmx")
@@ -98,6 +104,11 @@ repeat
     dvi = ""; ps2pdf = ""
   elseif this_arg == "-d" then
     dvi = "dvipdfm"; ps2pdf = ""
+  elseif this_arg == "-c"
+    pmx = "pmxchords"
+  elseif this_arg == "-F" then
+    narg = narg+1
+    tex = arg[narg]
   elseif this_arg == "-s" then
     dvi = ""; ps2pdf = ""
   elseif this_arg == "-i" then
diff --git a/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua b/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua
index 23a14bcf100..4f441763844 100755
--- a/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua
+++ b/Build/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua
@@ -1,6 +1,6 @@
 #!/usr/bin/env texlua  
 
-VERSION = "0.3.1"
+VERSION = "0.3.2"
 
 --[[
      pmx2pdf: processes MusiXTeX files using pmxab as a pre-processor 
@@ -27,6 +27,10 @@ VERSION = "0.3.1"
 --[[
 
   ChangeLog:
+
+     version 0.3.2 2013-12-14 RDT
+       restore the -c option that somehow got dropped
+
      version 0.3.1 2013-12-11 RDT
        added -F fmt option
 
@@ -69,6 +73,7 @@ if #arg == 0 then
 end
 
 -- defaults:
+pmxab = "pmxab"
 tex = "etex"  
 musixflx = "musixflx"
 dvi = "dvips"
@@ -102,11 +107,13 @@ repeat
   elseif this_arg == "-s" then
     dvi = ""; ps2pdf = ""
   elseif this_arg == "-f" then
-    tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
+    pmxab = "pmxab"; tex = "etex"; dvi = "dvips"; ps2pdf = "ps2pdf"; intermediate = 1
   elseif this_arg == "-t" then
     tex = ""; dvi = ""; ps2pdf = ""
   elseif this_arg == "-i" then
     intermediate = 0
+  elseif this_arg == "-c" then
+    pmxab = "pmxchords"
   elseif this_arg == "-F" then
     narg = narg+1
     tex = arg[narg]
@@ -118,9 +125,9 @@ repeat
     if not io.open(filename .. ".pmx", "r") then
       print("Non-existent file: ", filename .. ".pmx")
     else
-      print("Processing ".. filename .. ".pmx.")
+      print("Processing ".. filename .. ".pmx" .. " using " .. pmxab .. "." )
       os.remove( filename .. ".mx2" )
-      os.execute("pmxab" .. " " .. filename )
+      os.execute(pmxab .. " " .. filename )
       pmxaerr = io.open("pmxaerr.dat", "r")
       if (not pmxaerr) then
         print("No log file.")
-- 
cgit v1.2.3