From: Jan Nieuwenhuizen <janneke@gnu.org>
Date: Sun, 17 Dec 2000 18:06:25 +0000 (+0100)
Subject: patch::: 1.3.117.jcn3
X-Git-Tag: release/1.3.118~1
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=90af24283c8c892760d635f286436d845e0f2795;p=lilypond.git

patch::: 1.3.117.jcn3
---

diff --git a/VERSION b/VERSION
index a2f11a7e8d..9eee9a0ec2 100644
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=117
-MY_PATCH_LEVEL=jcn2
+MY_PATCH_LEVEL=jcn3
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.
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..5b6091907f 100644
--- a/lily/property-engraver.cc
+++ b/lily/property-engraver.cc
@@ -148,7 +148,7 @@ Property_engraver::apply_properties (SCM p, Grob *e, Translator_group*origin)
 	    SCM type_name = gh_call1 (typefunc, type_p);
 	    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 ()));
 	    scm_puts ("\n", errport);
diff --git a/lily/translator-group.cc b/lily/translator-group.cc
index 82a25ae4b7..08b5033451 100644
--- a/lily/translator-group.cc
+++ b/lily/translator-group.cc
@@ -419,9 +419,8 @@ type_check_assignment (SCM val, SCM sym,  SCM type_symbol)
 	  /* warning () ? */
 	  scm_puts (_f ("Failed typecheck for `%s', value `%s' must be of type `%s'",
 			ly_symbol2string (sym).ch_C (),
-			ly_symbol2string (val).ch_C (),
-			ly_scm2string (ly_write2scm (val)).ch_C (),
-			ly_symbol2string (type_name).ch_C ()).ch_C (),
+			ly_scm2string (ly_write2scm( val)).ch_C (),
+			ly_scm2string (type_name).ch_C ()).ch_C (),
 		    errport);
 	  scm_puts ("\n", errport);		      
 	}