From 827787235b53cf0328c4ca1a29bbc3ecbc0a1639 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 00:34:52 +0000
Subject: [PATCH] lilypond-1.3.119

---
 input/bugs/guile-state.ly | 54 +++++++++++++++++++--------------------
 input/test/warnings.ly    | 15 +++++++++++
 lily/property-engraver.cc | 20 +++++++--------
 3 files changed, 51 insertions(+), 38 deletions(-)
 create mode 100644 input/test/warnings.ly

diff --git a/input/bugs/guile-state.ly b/input/bugs/guile-state.ly
index 5295650d3e..2ca522dd5a 100644
--- a/input/bugs/guile-state.ly
+++ b/input/bugs/guile-state.ly
@@ -1,11 +1,11 @@
 \header{
-texidoc=3D"Real header: the slurBeginAttachment setting still lives in the
+texidoc="Real header: the slurBeginAttachment setting still lives in the
 second example, breaking the cross staff broken slur.
 ";
 }
-=09
+	
 \header{
-texidoc=3D"
+texidoc="
 Slurs can be forced to always attach to note heads.
 ";
 }
@@ -13,19 +13,19 @@ Slurs can be forced to always attach to note heads.
 
 \score{
 	\notes \relative c''{
-		\property Voice.VerticalDirection =3D #1
-		\property Voice.slurBeginAttachment =3D #'head
-		\property Voice.slurEndAttachment =3D #'head
+		\property Voice.VerticalDirection = #1
+		\property Voice.slurBeginAttachment = #'head
+		\property Voice.slurEndAttachment = #'head
 		g16()g()g()g()d'()d()d()d
 	}
 	\paper{
-		indent =3D 0.0;
-		linewidth =3D 60.0\mm;
+		indent = 0.0;
+		linewidth = 60.0\mm;
 	}
 }
-=09
+	
 \header{
-texidoc=3D"
+texidoc="
 The same goes for slurs. They behave decently when broken across
 linebreak.
 ";
@@ -33,45 +33,45 @@ linebreak.
 
 \score{
 	\context PianoStaff <
-	\context Staff=3Done \notes\relative c'{
+	\context Staff=one \notes\relative c'{
 %{
 		\stemUp \slurUp
-		 c4( c \translator Staff=3Dtwo c )c |
-		\translator Staff=3Done
+		 c4( c \translator Staff=two c )c |
+		\translator Staff=one
 		\stemUp \slurUp
-		 c4( c \translator Staff=3Dtwo c )c |
+		 c4( c \translator Staff=two c )c |
 		\stemUp \slurUp
-		 c4( c \translator Staff=3Done c )c |
-		\translator Staff=3Dtwo
+		 c4( c \translator Staff=one c )c |
+		\translator Staff=two
 		\stemUp \slurUp
-		 c4( c \translator Staff=3Done c )c |
-		\translator Staff=3Dtwo
+		 c4( c \translator Staff=one c )c |
+		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=3Done c c )c |
+		 c4( \translator Staff=one c c )c |
 %}
 		r2
-		\translator Staff=3Dtwo
+		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=3Done c
+		 c4( \translator Staff=one c
 		   \break
 		c )c
 		r2
 
 %{
 		\stemDown \slurDown
-		 d4( \translator Staff=3Dtwo c c \translator Staff=3Done )d
-		\translator Staff=3Dtwo
+		 d4( \translator Staff=two c c \translator Staff=one )d
+		\translator Staff=two
 		\stemUp \slurUp
-		 c4( \translator Staff=3Done c c \translator Staff=3Dtwo )c
+		 c4( \translator Staff=one c c \translator Staff=two )c
 		r1
 %}
 	}
-	\context Staff=3Dtwo \notes\relative c'{
+	\context Staff=two \notes\relative c'{
 		\clef bass;
 		s1 s1 %s1 s1 s1 s1 s1 s1 s1 s1
 	}
 	>
-	\paper { indent =3D 0.; linewidth =3D 40.*\staffspace; }
+	\paper { indent = 0.; linewidth = 40.*\staffspace; }
 }
 
-\version "1.3.110";=20
+\version "1.3.110"; 
diff --git a/input/test/warnings.ly b/input/test/warnings.ly
new file mode 100644
index 0000000000..655d27c9a8
--- /dev/null
+++ b/input/test/warnings.ly
@@ -0,0 +1,15 @@
+\header {
+texidoc="Various warnings
+";
+}
+
+linebreak = \penalty -1000;
+
+\score {
+  \notes {
+    \property Voice.Stem \set #'length = #"foo"
+    \property Voice.Stem \set #'longth = #2
+    \property Staff.clefStyle = #"foo"
+    \property Staff.clefStyle = #2
+ }
+}
diff --git a/lily/property-engraver.cc b/lily/property-engraver.cc
index 79227b5590..8ba9d331be 100644
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -116,18 +116,14 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
 	{
 	  e->set_grob_property (elt_prop_sym, val);
 
-	  SCM errport = scm_current_error_port ();
 	  SCM meta = e->get_grob_property ("meta");
 	  SCM name = scm_assoc (ly_symbol2scm ("name"), meta);
-	  /* warning () ? */
-	  scm_puts (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
-			ly_symbol2string (prop_sym).ch_C (),
-			origin->type_str_.ch_C (),
-			ly_scm2string (gh_cdr (name)).ch_C (),
-			ly_symbol2string (elt_prop_sym).ch_C (),
-			ly_scm2string (ly_write2scm (val)).ch_C ()).ch_C (),
-		    errport);
-	  scm_puts ("\n", errport);
+	  warning (_f ("%s is deprecated.  Use\n \\property %s.%s \\override #'%s = #%s",
+		       ly_symbol2string (prop_sym).ch_C (),
+		       origin->type_str_.ch_C (),
+		       ly_scm2string (gh_cdr (name)).ch_C (),
+		       ly_symbol2string (elt_prop_sym).ch_C (),
+		       ly_scm2string (ly_write2scm (val)).ch_C ()));
 	}
       else
 
@@ -146,11 +142,13 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
 	    SCM errport = scm_current_error_port ();
 	    SCM typefunc = scm_eval2 (ly_symbol2scm ("type-name"), SCM_EOL);
 	    SCM type_name = gh_call1 (typefunc, type_p);
+#if 0 
 	    warning (_f ("Wrong type for property: %s, type: %s, value found: %s, type: %s",
 			 ly_symbol2string (prop_sym).ch_C (),
-			 ly_symbol2string (type_name).ch_C (),
+			 ly_scm2string (type_name).ch_C (),
 			 ly_scm2string (ly_write2scm (val)).ch_C (),
 			 ly_scm2string (ly_type (val)).ch_C ()));
+#endif
 	    scm_puts ("\n", errport);
 	  }
     }
-- 
2.39.5