From a0cfef58635512a3fa29852a277ffbd7f819714a Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Tue, 26 Mar 2002 21:27:04 +0000
Subject: [PATCH] lilypond-1.0.13

---
 NEWS                        | 55 +++++++++++++++++++++++++++++++++++++
 VERSION                     |  2 +-
 buildscripts/mf-to-table.py |  4 +--
 scripts/ly2dvi32.py         | 18 +++++++-----
 4 files changed, 69 insertions(+), 10 deletions(-)

diff --git a/NEWS b/NEWS
index 855cc07ca3..13afbece63 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,58 @@
+pl 12.mb1
+	- bf: feta-timesig.mf Added horizontal space, minor corrections.
+	- Changed meaning of Staff.timeSignatureStyle:
+		C	Use C and stroked C for 4/4,2/2
+		old	Use old style mensuration marks
+		1	Use single number
+		Cn/m	Set symbol explicitly, n/m=2/2 or 4/4	
+		oldn/m	Set symbol explicitly, n/m=2/2,3/2,3/4,4/4,6/4 or 9/4.
+	  All other time signatures are typeset with the default two-digit
+	  layout.
+		
+
+pl 12.jcn2
+	- Lookup abstract base class
+	- Lookup/Symtable(s): separation of input/output
+
+pl 12.jcn1
+	- preparations for braindead PostScript output
+
+pl 12.hwn3
+	- praeludium-fuga-E to relative mode
+	- bf: mudela-mode.el
+	- bf: BIBINPUTS
+	- more dutch glossary + explanations
+	- table-to-html fixes
+pl 12.hwn2
+	- bf: mymycode in .yo
+	- VERSION to out/
+	- add VPATH to mutopia
+	- access_Identifier (bool): (non)copy arg now explicit.
+	- bf: lilypond-latex.tex
+  
+
+
+pl 12.hwn1
+	- \remove "Engraver_type";
+	- \output "bla" -> output = "bla" (mudela 0.1.6)
+	- \property defaultclef -> \property defaultClef
+	- naming of access_{Engraver,Performer,Translator_group} ()
+	- changed syntax for \translator in \paper{} (mudela 0.1.6)
+	- declared contexts:
+
+		StaffContext = \translator { .. }
+		\translator { \StaffContext }
+
+	- elt_b -> elem_b
+	- bf: add Separating_line_group_engraver to RhythmicStaff.
+
+
+pl 12.am1
+	- large doc patch, ChoireStaff -> ChoirStaff
+
+*******
+pl 12
+
 pl 11.uu2
 	- added Transposed_music for mixing transposition and relative 
 
diff --git a/VERSION b/VERSION
index 75df7b13ab..e7a8da66cd 100644
--- a/VERSION
+++ b/VERSION
@@ -1,7 +1,7 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=0
-PATCH_LEVEL=12
+PATCH_LEVEL=13
 MY_PATCH_LEVEL=
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 3f4d99006d..4d4b505197 100644
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -4,7 +4,7 @@
 # 
 # source file of the GNU LilyPond music typesetter
 # 
-# (c) 1997 Han-Wen Nienhuys <hanwen@stack.nl>
+# (c) 1997 Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 import os
 import sys
@@ -14,7 +14,6 @@ import regex
 import regsub
 import time
 
-sys.path.append ('@abs-step-bindir@')
 
 (options, files) = getopt.getopt(
     sys.argv[1:], 'a:d:hl:o:p:t:', 
@@ -60,6 +59,7 @@ class Feta_file(File):
 	    if begin_autometric_re.search(line) == -1:
 		line = ''
 	    line = line + regsub.sub('\n','', suf)
+            line = regsub.sub('\r','', line)
 
 	if self.eof():
 	   return ''
diff --git a/scripts/ly2dvi32.py b/scripts/ly2dvi32.py
index 40f1e157db..74c5495c08 100644
--- a/scripts/ly2dvi32.py
+++ b/scripts/ly2dvi32.py
@@ -14,7 +14,7 @@ Output: DVI file
 """
 
 name = 'ly2dvi'
-version = '0.0.4'
+version = '0.0.5'
 errorlog = ''
 
 import sys
@@ -504,14 +504,18 @@ class Properties:
         locate and open titledefs.tex file
         """
 
-        path =''
-        cmd =('kpsewhich tex %s %s' % (var,errorlog))
-        pipe = os.popen (cmd, 'r')
-        path = pipe.readline ()[:-1] # chop off \n
-	return_status =  pipe.close()
-	if return_status and not path:
+        if os.name == 'nt':
             path = os.path.join(this.get('root'), 'texmf', 'tex',
                                 'lilypond', var)
+        else:
+            path =''
+            cmd =('kpsewhich tex %s %s' % (var,errorlog))
+            pipe = os.popen (cmd, 'r')
+            path = pipe.readline ()[:-1] # chop off \n
+            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')
         return fd
 
-- 
2.39.5