patch::: 1.1.53.jbr1

pl 53.jbr1
	- scripts/ly2dvi.py: A fix for the multitude of file systems supported
          by windows.  As long as the paths that the cygwin apps use are
          UNC style and the paths that the native windows apps use are DOS
          style everybody is happy.  I add quick and dirty  unc2dos function
          to facilitate this approach.
---
Generated by daboys@austin.rr.com using package-diff 0.62,
From = lilypond-1.1.53, To = lilypond-1.1.53.jbr1

usage

    cd lilypond-source-dir; patch -E -p1 < lilypond-1.1.53.jbr1.diff

Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure --state
1.1.53
1.1.53.jbr1
++state

diff --git a/NEWS b/NEWS
index c805f1b72c84161db912fa664ee31337f3fafa51..3749a6fd23059313fb2dffe6eb6e53b6d079074e 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,15 @@
-pl 53.gp1
+--- ../lilypond-1.1.53/NEWS    Mon Jul 05 05:56:28 1999
+++ b/NEWS      Wed Jul 07 23:47:42 1999
+@@ -1,3 +1,9 @@
+pl 53.jbr1
+       - scripts/ly2dvi.py: A fix for the multitude of file systems supported
+          by windows.  As long as the paths that the cygwin apps use are
+          UNC style and the paths that the native windows apps use are DOS 
+          style everybody is happy.  I add quick and dirty  unc2dos function
+          to facilitate this approach.
+ 
+ pl 52.jcn3
+       - bf: mi2mu: midi without keypl 53.gp1
        - added Hyphen-engraver, Hyphen-spanner
 ************
 pl 52.jcn3

diff --git a/VERSION b/VERSION
index 75b3a1cff1ef22d3b0bd7b3dcba4392720b0bee0..c4311a51250b43ecf2ab970255c771a02a9a0661 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=1
 PATCH_LEVEL=53
-MY_PATCH_LEVEL=gp1
+MY_PATCH_LEVEL=jbr1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/aclocal.m4 b/aclocal.m4
index d579266f49ca40a49db06945fd12aab506a08eee..602d77213ae3deb0becaa0fd24480ff64026f68c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -1,5 +1,7 @@
 dnl WARNING WARNING WARNING WARNING
 dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in
 

diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index deb297b5992ae654b33950ab5d549e74ec093872..25da9f8fce53a942c5982d455ceb079546208335 100644 (file)
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -14,7 +14,7 @@ Output: DVI file
 """
 
 name = 'ly2dvi'
-version = '0.0.11'
+version = '0.0.12'
 errorlog = ''
 
 import sys
@@ -854,7 +854,11 @@ class Properties:
         """
 
         os.environ['LILYPONDPREFIX'] = path
+        if os.name == 'nt' or os.name == 'dos':
+            path = unc2dos(path);
+
        this.__set('root',path,requester)
+        
 
     #
     # printProps
@@ -912,6 +916,17 @@ def getTeXFile(contents):
     else:
         return texfiles
 
+def unc2dos(path):
+    """
+    Convert a path of format //<drive>/this/that/the/other to
+    <drive>:\this\that\the\other
+    """
+    m=re.match('^//([A-Za-z])(/.*)$',path)
+    if m:
+        return m.group(1) + ':' + os.path.normpath(m.group(2))
+    
+    
+
 def program_id ():
     return name + ' ' + version;
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index c92667b586c63f6d2765ca12bb64cda995bdf5ab..d579266f49ca40a49db06945fd12aab506a08eee 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -1,3 +1,5 @@
+dnl WARNING WARNING WARNING WARNING
+dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
 dnl aclocal.m4   -*-shell-script-*-
 dnl StepMake subroutines for configure.in