patch::: 1.5.22.jcn4

1.5.22.jcn4

diff --git a/CHANGES b/CHANGES
index 78f455fb947edd4571446902938c761593479586..8b28b189f141a9d9d18251cf5eb6f4cbd645f2e5 100644 (file)
--- 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 cc6ea27a71ec817cb95496b6c00fe2c522ce0749..58cd2a286fc66c614bab2b11e5a981cd092a6d3a 100644 (file)
--- 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 ae47a7d189b24ae21fe46bb98a928805ced3d2f0..833241cb530df3cb45cb68f0412b32d87fd77452 100644 (file)
--- 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 97abc27d8d842975ef3b731bae4e07629e887a3d..bd7963dbb5deecebd7889186940e07e42a3c9391 100644 (file)
--- 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 22a9a2245b65a1ba14e94fd69198ba53f546423f..c8ac68ce3cd5fedc72f893cbac15729bbeafffe1 100644 (file)
--- 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')