From e7b0597d595e3499b6bad53c204f2497fc814980 Mon Sep 17 00:00:00 2001 From: Jan Nieuwenhuizen Date: Tue, 24 Feb 2004 22:48:00 +0000 Subject: [PATCH] * ps/music-drawing-routines.ps: * ps/lilyponddefs.ps: Add end markers. --- ChangeLog | 7 +++++++ ps/lilyponddefs.ps | 4 +++- ps/music-drawing-routines.ps | 1 + scm/output-ps.scm | 4 ++-- scripts/lilypond.py | 8 +++++--- 5 files changed, 18 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6882c0fa33..9084a40d20 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2004-02-24 Jan Nieuwenhuizen + + * ps/music-drawing-routines.ps: + * ps/lilyponddefs.ps: Add end markers. + 2004-02-24 Han-Wen Nienhuys * lily/hyphen-engraver.cc (finalize): suicide unterminated hyphens. @@ -7,6 +12,8 @@ 2004-02-24 Jan Nieuwenhuizen + * scripts/lilypond.py (find_pfa_fonts): Bugfix and update. + * scm/output-ps.scm: Resurrect. * scm/output-tex.scm: Minimal cleanups. diff --git a/ps/lilyponddefs.ps b/ps/lilyponddefs.ps index 991dc58caa..cc4bf26f4e 100644 --- a/ps/lilyponddefs.ps +++ b/ps/lilyponddefs.ps @@ -1,4 +1,4 @@ -%!PS-Adobe-1.0: lilyponddefs +%!PS-Adobe-1.0: lilyponddefs.ps % % Functions for direct PostScript output @@ -221,3 +221,5 @@ make-lilypond-title % see if we're there... % 10 setlinewidth 0 0 moveto 400 800 lineto stroke + +% end lilyponddefs.ps diff --git a/ps/music-drawing-routines.ps b/ps/music-drawing-routines.ps index f3cae4c6a0..39374dae21 100644 --- a/ps/music-drawing-routines.ps +++ b/ps/music-drawing-routines.ps @@ -376,3 +376,4 @@ stroke } bind def +%end music-drawing-routines.ps diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 4bf3f57866..7c67171488 100644 --- a/scm/output-ps.scm +++ b/scm/output-ps.scm @@ -238,9 +238,9 @@ (string-append ;; URG: now we can't use scm output without Lily (ly:gulp-file "lilyponddefs.ps") - " {exch pop //systemdict /run get exec} " + "{exch pop //systemdict /run get exec}\n\n" (ly:gulp-file "music-drawing-routines.ps") - "{ exch pop //systemdict /run get exec } " + "{ exch pop //systemdict /run get exec }\n\n" ;; ps-testing wreaks havoc when used with lilypond-book. ;; -- is this still true with new modules system? ;; (if (defined? 'ps-testing) "\n /testing true def" "") diff --git a/scripts/lilypond.py b/scripts/lilypond.py index c5ea0ae984..9f2c148e82 100644 --- a/scripts/lilypond.py +++ b/scripts/lilypond.py @@ -620,6 +620,8 @@ def generate_dependency_file (depfile, outname): def find_file_in_path (path, name): for d in string.split (path, os.pathsep): + if not d: + d = original_dir if name in os.listdir (d): return os.path.join (d, name) @@ -633,12 +635,12 @@ def find_pfa_fonts (name): ly.error (_ ("not a PostScript file: `%s\'" % name)) ly.exit (1) here = 0 - m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL) + m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) pfa = [] while m: - here = m.end (1) + here = here + m.end (0) pfa.append (m.group (1)) - m = re.match ('.*?/(feta[-a-z0-9]+) +findfont', s[here:], re.DOTALL) + m = re.match ('.*?/([-a-zA-Z]*(feta|parmesan)[-a-z0-9]+) +findfont', s[here:], re.DOTALL) return pfa -- 2.39.2