From 19f2192ffb13aba66e60c295791cdeaa554ff1c5 Mon Sep 17 00:00:00 2001 From: "Jeffrey B. Reed" Date: Wed, 7 Jul 1999 23:47:42 +0200 Subject: [PATCH] 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 --- NEWS | 13 ++++++++++++- VERSION | 2 +- aclocal.m4 | 2 ++ scripts/ly2dvi.py | 17 ++++++++++++++++- stepmake/aclocal.m4 | 2 ++ 5 files changed, 33 insertions(+), 3 deletions(-) diff --git a/NEWS b/NEWS index c805f1b72c..3749a6fd23 100644 --- 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 75b3a1cff1..c4311a5125 100644 --- 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 d579266f49..602d77213a 100644 --- 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 deb297b599..25da9f8fce 100644 --- 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 ///this/that/the/other to + :\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 c92667b586..d579266f49 100644 --- 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 -- 2.39.2