From 3e10d18916c94bb9db5014e451ee348273c1c89d Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:51:55 +0000
Subject: [PATCH] lilypond-1.5.1

---
 lily/span-bar.cc      | 9 ++++++++-
 ly/paper11.ly         | 2 ++
 ly/paper13-init.ly    | 1 +
 ly/paper13.ly         | 2 ++
 ly/paper20.ly         | 2 ++
 ly/paper23.ly         | 2 ++
 scripts/convert-ly.py | 1 +
 7 files changed, 18 insertions(+), 1 deletion(-)
 create mode 100644 ly/paper11.ly
 create mode 100644 ly/paper13.ly
 create mode 100644 ly/paper20.ly
 create mode 100644 ly/paper23.ly

diff --git a/lily/span-bar.cc b/lily/span-bar.cc
index b564cf1790..015f6b2e25 100644
--- 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
index 0000000000..313d25a0e4
--- /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 cdccec434e..d053f1e440 100644
--- 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
index 0000000000..7ecec51bbb
--- /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
index 0000000000..4511cff2ad
--- /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
index 0000000000..61dfc7fc1b
--- /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 6209e86e8b..4a2236a7aa 100644
--- 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	
 ################################
-- 
2.39.2