From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Wed, 14 Nov 2001 21:46:30 +0000 (+0100)
Subject: patch::: 1.5.22.jcn4
X-Git-Tag: release/1.5.23~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=46340a068e743b3b35175c80b811c0b3860512ea;p=lilypond.git

patch::: 1.5.22.jcn4

1.5.22.jcn4
---

diff --git a/CHANGES b/CHANGES
index 78f455fb94..8b28b189f1 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
-1.5.22.jcn3
+1.5.22.jcn4
 ===========
 
+* Stanza number: allow markup texts.
+
+* Partial bugfix: ly2dvi: handle spaces in .ly file names (except for
+latex calls).
+
 * Bugfix: prepend DATADIR to %loadpath too.
 
 * Resurrected experimental sketch output, now with dispatch.
diff --git a/VERSION b/VERSION
index cc6ea27a71..58cd2a286f 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=5
 PATCH_LEVEL=22
-MY_PATCH_LEVEL=jcn3
+MY_PATCH_LEVEL=jcn4
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
diff --git a/lily/stanza-number-engraver.cc b/lily/stanza-number-engraver.cc
index ae47a7d189..833241cb53 100644
--- a/lily/stanza-number-engraver.cc
+++ b/lily/stanza-number-engraver.cc
@@ -45,7 +45,7 @@ Stanza_number_engraver::process_music ()
 
 
       // TODO
-      if (gh_string_p (s))
+      if (gh_string_p (s) || gh_pair_p (s))
 
 	/*
 	  if (i.grob_l_->has_interface (symbol ("lyric-syllable-interface")))
diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm
index 97abc27d8d..bd7963dbb5 100644
--- a/scm/translator-property-description.scm
+++ b/scm/translator-property-description.scm
@@ -301,7 +301,7 @@ help with debugging large scores.")
 (translator-property-description 'squashedPosition integer? " Vertical position of
 squashing for Pitch_squash_engraver.")
 (translator-property-description 'stavesFound list? "list of all staff-symbols found.")
-(translator-property-description 'stanza string? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.")
+(translator-property-description 'stanza markup? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.")
 
 
 (translator-property-description 'stemLeftBeamCount integer? "
diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py
index 22a9a2245b..c8ac68ce3c 100644
--- a/scripts/ly2dvi.py
+++ b/scripts/ly2dvi.py
@@ -414,7 +414,7 @@ def run_lilypond (files, outbase, dep_prefix):
 		if dep_prefix:
 			opts = opts + ' --dep-prefix=%s' % dep_prefix
 
-	fs = string.join (files)
+	fs = '"' + string.join (files, '" "') + '"'
 
 	if not verbose_p:
 		# cmd = cmd + ' 1> /dev/null 2> /dev/null'
@@ -613,6 +613,7 @@ None
 	f.write (s)
 	f.close ()
 
+	# FIXME: howto escape spaces in file names?
 	cmd = 'latex \\\\nonstopmode \\\\input %s' % latex_fn
 
 	if not verbose_p:
@@ -638,7 +639,7 @@ None.
 	if extra['orientation'] and extra['orientation'][0] == 'landscape':
 		opts = opts + ' -tlandscape'
 
-	cmd = 'dvips %s -o%s %s' % (opts, outbase + '.ps', outbase + '.dvi')
+	cmd = 'dvips "%s" -o"%s" "%s"' % (opts, outbase + '.ps', outbase + '.dvi')
 	
 	if not verbose_p:
 		progress ( _("Running %s...") % 'dvips')