* 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 97d613f3df4a8737036beb78e9977dc5b8c6c01f..c3a3dcd7cae17b1d81bc5b8b87fde38fa1ca1399 100644 (file)
--- 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 19b8c228e2e309723757a06d7f1e7fc5c7a9cc81..9b8cbbff15acb97754fcbf9548e26ab1051d82db 100644 (file)
--- 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 0c92e7a97711ab47a145aeb8d8005610b0c09755..ffbb9d01d20d579be7226d4ef3912fe288a2bf21 100644 (file)
--- 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));
+       }
        ;