From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sun, 27 Oct 2002 01:26:56 +0000 (+0000)
Subject: * lily/parser.yy (bare_number): allow 4 \cm (without
X-Git-Tag: release/1.7.5~4
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=d342461725b41f73f2d742addcf958bda9bc58fc;p=lilypond.git

* lily/parser.yy (bare_number): allow 4 \cm (without
decimal dot). (should backport to 1.6?)

* lily/parser.yy (TODO): remove hard coded dimensions, add
REAL NUMBER_IDENTIFIER production.
---

diff --git a/ChangeLog b/ChangeLog
index 97d613f3df..c3a3dcd7ca 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2002-10-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+	* lily/parser.yy (bare_number): allow 4 \cm (without
+	decimal dot). (should backport to 1.6?)
+
 	* ly/declarations-init.ly: use Scheme for dimension defs.
 
 	* lily/parser.yy (TODO): remove hard coded dimensions, add
@@ -8,8 +11,9 @@
 	* lily/rest-collision.cc (force_shift_callback): rewrite using
 	-done property.
 
-	* scm/grob-property-description.scm (rest-collision-done): add property.
-
+	* scm/grob-property-description.scm (rest-collision-done): add
+	property.
+	
 	* lilypond.vim: add file (<hjunes@cc.hut.fi>)
 
 2002-10-23  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 19b8c228e2..9b8cbbff15 100644
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -4925,10 +4925,10 @@ This makes the following 28 measures (assuming 4/4 time) be broken every
 @cindex @code{indent}
 @cindex @code{linewidth}
 
-The most basic settings influencing the spacing are @code{linewidth}
-and @code{indent}, both set in the @code{\paper} block.  They control
-the indentation of the first line of music, and the lengths of the
-lines.  If @code{linewidth} set to a negative value, a single
+The most basic settings influencing the spacing are @code{indent} and
+@code{linewidth}. They are set in the @code{\paper} block. They
+control the indentation of the first line of music, and the lengths of
+the lines.  If @code{linewidth} set to a negative value, a single
 unjustified line is produced.  A similar effect for scores that are
 longer than one line, can be produced by setting @code{raggedright} to
 true in the @code{\paper} block.
diff --git a/lily/parser.yy b/lily/parser.yy
index 0c92e7a977..ffbb9d01d2 100644
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -2088,6 +2088,9 @@ bare_number:
 	| REAL NUMBER_IDENTIFIER	{
 		$$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2));
 	}
+	| UNSIGNED NUMBER_IDENTIFIER	{
+		$$ = gh_double2scm ($1 * gh_scm2double ($2));
+	}
 	;