lilypond-1.5.1

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index b564cf17909326ff82ea1184eb4e505485db374b..015f6b2e25f0cd847272b5e2d813075a2e0e367a 100644 (file)
--- a/lily/span-bar.cc
+++ b/lily/span-bar.cc
@@ -62,9 +62,16 @@ Span_bar::brew_molecule (SCM smobbed_me)
       refp = staff_bar->common_refpoint (refp, Y_AXIS);
     }
 
-  // evaluate glyph
   Span_bar::evaluate_glyph(me);
   SCM glyph = me->get_grob_property (ly_symbol2scm ("glyph"));
+
+  /*
+    glyph may not be a string, when ME is killed by Hara Kiri in
+    between.
+  */
+  if (!gh_string_p (glyph))
+    return SCM_EOL;
+  
   String glyph_str = ly_scm2string (glyph);
 
   // compose span_bar_mol

diff --git a/ly/paper11.ly b/ly/paper11.ly
new file mode 100644 (file)
index 0000000..313d25a
--- /dev/null
+++ b/ly/paper11.ly
@@ -0,0 +1,2 @@
+
+\include "paper11-init.ly"

diff --git a/ly/paper13-init.ly b/ly/paper13-init.ly
index cdccec434e455860b5b2a5181f46eeb3b0027dd3..d053f1e440e9978c3486570f4b0f2a764a220edf 100644 (file)
--- a/ly/paper13-init.ly
+++ b/ly/paper13-init.ly
@@ -1,5 +1,6 @@
 % paper13-init.ly
 
+
 \version "1.3.146"
 
 paperThirteen = \paper {

diff --git a/ly/paper13.ly b/ly/paper13.ly
new file mode 100644 (file)
index 0000000..7ecec51
--- /dev/null
+++ b/ly/paper13.ly
@@ -0,0 +1,2 @@
+
+\include "paper13-init.ly"

diff --git a/ly/paper20.ly b/ly/paper20.ly
new file mode 100644 (file)
index 0000000..4511cff
--- /dev/null
+++ b/ly/paper20.ly
@@ -0,0 +1,2 @@
+
+\include "paper20-init.ly"

diff --git a/ly/paper23.ly b/ly/paper23.ly
new file mode 100644 (file)
index 0000000..61dfc7f
--- /dev/null
+++ b/ly/paper23.ly
@@ -0,0 +1,2 @@
+
+\include "paper23-init.ly"

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 6209e86e8bb77c15fca7b4d658c853defb19010a..4a2236a7aa5bd53f792149c43945bee495122a2b 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -826,6 +826,7 @@ if 1:
        conversions.append (((1,3,148), conv, '"(align" -> "(axis", "(rows" -> "(columns"'))
 
 
+
 ################################
 #      END OF CONVERSIONS      
 ################################