From f5276aa2aa56865ae009565fa3607f14531e1a91 Mon Sep 17 00:00:00 2001
From: hanwen <hanwen>
Date: Fri, 19 Aug 2005 10:34:27 +0000
Subject: [PATCH] * lily/ly-module.cc (make_stand_in_procs_weak): only kludge
 if scm_stand_in_procs is not weak_any.

* lily/volta-bracket.cc (print): don't use strcmp().

* lily/volta-engraver.cc (process_music): use
Text_interface::is_markup() for setting the 'text property of the
volta bracket.

* input/mutopia/claop.py (accents): update syntax to 2.6
---
 ChangeLog                                           |  5 +++++
 input/mutopia/claop.py                              |  7 ++++---
 input/regression/accidental-unbroken-tie-spacing.ly |  8 +++-----
 input/regression/number-staff-lines.ly              | 11 ++++-------
 lily/ly-module.cc                                   |  3 +++
 lily/volta-bracket.cc                               |  1 -
 lily/volta-engraver.cc                              |  1 +
 7 files changed, 20 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index d7748423d5..b5e17bbc69 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2005-08-19  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
+	* lily/ly-module.cc (make_stand_in_procs_weak): only kludge if
+	scm_stand_in_procs is not weak_any.
+
+	* lily/volta-bracket.cc (print): don't use strcmp().
+
 	* lily/volta-engraver.cc (process_music): use
 	Text_interface::is_markup() for setting the 'text property of the
 	volta bracket.
diff --git a/input/mutopia/claop.py b/input/mutopia/claop.py
index 49843c5f7e..3928d3d9f5 100644
--- a/input/mutopia/claop.py
+++ b/input/mutopia/claop.py
@@ -266,7 +266,7 @@ stemme%s =  {
     
     for i in range(start_measure-1, start_measure-1+no_measures):
       print16(str[i*16:i*16+16])
-      sys.stdout.write (" |\n")
+      sys.stdout.write (" \n")
     
     sys.stdout.write ("\\bar\"|.\" }\n")
     
@@ -298,12 +298,13 @@ sys.stdout.write (r""">>
 	%hsize = 30.0 \cm
 	%vsize = 42.0 \cm
 }
-\context
-{
+\layout {
+ \context {
   \translator {
     \StaffContext 
     \override StaffSymbol #'line-count  = #3
     minimumVerticalExtent = #'(-3 . 3)
   }
+ }
 }
 """)
diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 0a1628a962..f4ba16868f 100644
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -6,15 +6,13 @@ wreak havoc in the spacing when unbroken."
 
 \version "2.6.0"
 
-rechts =  \relative c' {
+\relative c' {
   \clef treble
   \time 3/4
-    c8 b2  <g b des f>8 ~ |
-    <g b des f>8
+  c8 b2  <g b des f>8 ~ |
+  <g b des f>8
 }
 
-  \rechts
-
 \layout {
   raggedright = ##t
 }
diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 01bb2d2970..6b1d9f1248 100644
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -8,13 +8,10 @@ adjusted accordingly.  "
 }
 
 
-\context Voice \relative c {
+\new Staff \with {
+  \override StaffSymbol #'line-count = #3
+}
+\relative c {
   c' c c c | g' g g g 	\bar ":|"
 }
-\layout {
-  \context {
-    \Staff
-    \override StaffSymbol #'line-count = #3
-  }
-
 
diff --git a/lily/ly-module.cc b/lily/ly-module.cc
index afa97ae663..9bc5f32986 100644
--- a/lily/ly-module.cc
+++ b/lily/ly-module.cc
@@ -152,6 +152,9 @@ redefine_keyval (void *closure, SCM key, SCM val, SCM result)
 void
 make_stand_in_procs_weak ()
 {
+  if (SCM_IS_WHVEC_ANY(scm_stand_in_procs))
+    return; 
+  
   SCM old_tab = scm_stand_in_procs;
   SCM new_tab = scm_make_weak_key_hash_table (scm_from_int (257));
 
diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 81bc5479ee..10e4a228b0 100644
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -53,7 +53,6 @@ Volta_bracket_interface::print (SCM smob)
   else
     str = "|";
 
-  char const *cs = str.to_str0 ();
   no_vertical_end
     |= (str != ":|"
 	&& str != "|:"
diff --git a/lily/volta-engraver.cc b/lily/volta-engraver.cc
index 25adb6f473..69250670e0 100644
--- a/lily/volta-engraver.cc
+++ b/lily/volta-engraver.cc
@@ -14,6 +14,7 @@
 #include "side-position-interface.hh"
 #include "warn.hh"
 #include "staff-symbol.hh"
+#include "text-interface.hh"
 
 #include "translator.icc"
 
-- 
2.39.5