summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKarl Berry <karl@freefriends.org>2013-12-14 22:55:31 +0000
committerKarl Berry <karl@freefriends.org>2013-12-14 22:55:31 +0000
commitcdffe6ab5d6e1b4d0a3c276c71b17d205df5148e (patch)
tree121ecf317bef15b40dcac60bd1f9faae749f7754
parent337db2c0e53e0a0b70dd3ba32e6e84cb3f19d904 (diff)
pmx (14dec13)
git-svn-id: svn://tug.org/texlive/trunk@32412 c570f23f-e606-0410-a88d-b1316a301751
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/m-tx/m-tx.lua11
-rwxr-xr-xBuild/source/texk/texlive/linked_scripts/pmx/pmx2pdf.lua15
-rw-r--r--Master/texmf-dist/doc/generic/pmx/README2
-rwxr-xr-xMaster/texmf-dist/scripts/pmx/pmx2pdf.lua15
4 files changed, 34 insertions, 9 deletions
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.")
diff --git a/Master/texmf-dist/doc/generic/pmx/README b/Master/texmf-dist/doc/generic/pmx/README
index 8c6a40b2b32..4fdae04a388 100644
--- a/Master/texmf-dist/doc/generic/pmx/README
+++ b/Master/texmf-dist/doc/generic/pmx/README
@@ -1,4 +1,4 @@
-This is PMX, version 2.7.0 (2013-12-12). PMX provides a preprocessor for MusiXTeX.
+This is PMX, version 2.7.0 (2013-12-14). PMX provides a preprocessor for MusiXTeX.
pmxab builds a TeX input file based on a .pmx input file in a much
simpler language, making most of the layout decisions by itself. It has
diff --git a/Master/texmf-dist/scripts/pmx/pmx2pdf.lua b/Master/texmf-dist/scripts/pmx/pmx2pdf.lua
index 23a14bcf100..4f441763844 100755
--- a/Master/texmf-dist/scripts/pmx/pmx2pdf.lua
+++ b/Master/texmf-dist/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.")