From dca00d46af7df3663f73a1668fe47cd924e96558 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:26:57 +0000
Subject: [PATCH] lilypond-1.0.12

---
 input/test/time.fly     | 23 +++++++++++++++++++++++
 make/mutopia-rules.make |  4 ++--
 scripts/ly2dvi32.py     |  6 ++++--
 3 files changed, 29 insertions(+), 4 deletions(-)
 create mode 100644 input/test/time.fly

diff --git a/input/test/time.fly b/input/test/time.fly
new file mode 100644
index 0000000000..0029b15414
--- /dev/null
+++ b/input/test/time.fly
@@ -0,0 +1,23 @@
+
+
+\property Staff.timeSignatureStyle = "C"
+\time 12/8;
+
+[c8 c c][c8 c c][c8 c c][c8 c c]
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old3_2"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "oldC"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old6_4"
+c2 c2
+
+\time 2/2;
+\property Staff.timeSignatureStyle = "old9_4"
+c2 c2
+
diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make
index 23887b901c..1905f1f4dd 100644
--- a/make/mutopia-rules.make
+++ b/make/mutopia-rules.make
@@ -23,9 +23,9 @@ $(outdir)/%.fly.txt: %.fly
 .PRECIOUS: $(outdir)/%.dvi
 
 $(outdir)/%.dvi: %.ly
-	sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+	$(PYTHON) $(depth)/scripts/ly2dvi32.py -o $(outdir)  $< 
 	-mv $(basename $<).midi $(outdir)
 
 $(outdir)/%.dvi: %.fly
-	sh $(depth)/scripts/ly2dvi.sh -S $(topdir) -o $(outdir)  $< 
+	$(PYTHON) $(depth)/scripts/ly2dvi32.py -o $(outdir)  $< 
 	-mv $(basename $<).midi $(outdir)
diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py
index 7f801b7a18..40f1e157db 100644
--- a/scripts/ly2dvi32.py
+++ b/scripts/ly2dvi32.py
@@ -15,6 +15,7 @@ Output: DVI file
 
 name = 'ly2dvi'
 version = '0.0.4'
+errorlog = ''
 
 import sys
 import os
@@ -504,10 +505,11 @@ class Properties:
         """
 
         path =''
-        cmd =('kpsewhich tex %s 2>&1' % var)
+        cmd =('kpsewhich tex %s %s' % (var,errorlog))
         pipe = os.popen (cmd, 'r')
         path = pipe.readline ()[:-1] # chop off \n
-        if pipe.close():
+	return_status =  pipe.close()
+	if return_status and not path:
             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)
 	fd = open(path, 'r')
-- 
2.39.5