* ly/declarations-init.ly: use Scheme for dimension defs.

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

diff --git a/ChangeLog b/ChangeLog
index 06e65eb9033af0321d6717ce0d50fd8d030f9562..97d613f3df4a8737036beb78e9977dc5b8c6c01f 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-10-27  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * ly/declarations-init.ly: use Scheme for dimension defs.
+
+       * lily/parser.yy (TODO): remove hard coded dimensions, add
+       REAL NUMBER_IDENTIFIER production.
+
        * lily/rest-collision.cc (force_shift_callback): rewrite using
        -done property.
 
@@ -42,6 +47,8 @@
 
 2002-10-21  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * VERSION: 1.7.4 released.  
+       
        * scm/generate-documentation.scm (string-append): add macro
        definitions.
 

diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc
index c4d69313c72a73a8fe95356ddfe3c5505d60e5de..cc3e5df35148a2396d6a60f3b28208c06be9497d 100644 (file)
--- a/lily/my-lily-lexer.cc
+++ b/lily/my-lily-lexer.cc
@@ -35,11 +35,9 @@ static Keyword_ent the_key_tab[]={
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"breathe", BREATHE},
-  {"char", CHAR_T},
   {"chordmodifiers", CHORDMODIFIERS},
   {"chords", CHORDS},
   {"clef", CLEF},
-  {"cm", CM_T},
   {"consists", CONSISTS},
   {"consistsend", CONSISTSEND},
   {"context", CONTEXT},
@@ -50,7 +48,6 @@ static Keyword_ent the_key_tab[]={
   {"figures",FIGURES},
   {"grace", GRACE},
   {"header", HEADER},
-  {"in", IN_T},
   {"lyrics", LYRICS},
   {"key", KEY},
   {"mark", MARK},
@@ -59,7 +56,6 @@ static Keyword_ent the_key_tab[]={
   {"time", TIME_T},
   {"times", TIMES},
   {"midi", MIDI},
-  {"mm", MM_T},
   {"name", NAME},
   {"pitchnames", PITCHNAMES},
   {"notes", NOTES},
@@ -71,7 +67,6 @@ static Keyword_ent the_key_tab[]={
   {"partial", PARTIAL},
   {"paper", PAPER},
   {"property", PROPERTY},
-  {"pt", PT_T},
   {"relative", RELATIVE},
   {"remove", REMOVE},
   {"repeat", REPEAT},

diff --git a/lily/parser.yy b/lily/parser.yy
index 95a07efbacbf96a9b0ecac7b06f713b33c254287..0c92e7a97711ab47a145aeb8d8005610b0c09755 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -186,9 +186,7 @@ yylex (YYSTYPE *s,  void * v)
 %token BREATHE
 %token CHORDMODIFIERS
 %token CHORDS
-%token CHAR_T
 %token CLEF
-%token CM_T
 %token CONSISTS
 %token DURATION
 %token SEQUENTIAL
@@ -202,14 +200,12 @@ yylex (YYSTYPE *s,  void * v)
 %token GRACE 
 %token HEADER
 %token HYPHEN
-%token IN_T
 %token INVALID
 %token KEY
 %token LYRICS
 %token MARK
 %token MULTI_MEASURE_REST
 %token MIDI
-%token MM_T
 %token PITCH
 %token DEFAULT
 %token NAME
@@ -220,7 +216,6 @@ yylex (YYSTYPE *s,  void * v)
 %token PARTIAL
 %token PROPERTY
 %token OVERRIDE SET REVERT 
-%token PT_T
 %token RELATIVE
 %token REMOVE
 %token REPEAT
@@ -2090,20 +2085,8 @@ bare_number:
        | NUMBER_IDENTIFIER             {
                $$ = $1;
        }
-       | REAL CM_T     {
-               $$ = gh_double2scm (gh_scm2double ($1) CM );
-       }
-       | REAL PT_T     {
-               $$ = gh_double2scm (gh_scm2double ($1) PT);
-       }
-       | REAL IN_T     {
-               $$ = gh_double2scm (gh_scm2double ($1) INCH);
-       }
-       | REAL MM_T     {
-               $$ = gh_double2scm (gh_scm2double ($1) MM);
-       }
-       | REAL CHAR_T   {
-               $$ = gh_double2scm (gh_scm2double ($1) CHAR);
+       | REAL NUMBER_IDENTIFIER        {
+               $$ = gh_double2scm (gh_scm2double ($1) * gh_scm2double ($2));
        }
        ;
 

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index 1ae8561c1e79b5023894fc94d4bfa1509684d925..cec3097a7f7dc24eb1ff211ed1b1eeb430ad3096 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -34,6 +34,16 @@ melismaEnd = \property Staff.melismaBusy = ##f
 % ugh
 \include "midi-init.ly"
 
+
+% Do units first; must be done before any units are specified.
+\paper {
+       unit = "mm"
+       mm = 1.0
+       in = 25.4
+       pt = #(/  in 72.27)
+       cm = #(* 10 mm)
+}
+
 papersize = "a4"
 paperfile = \papersize + "-init.ly"
 

diff --git a/ly/params-init.ly b/ly/params-init.ly
index 8e144cc9a762f6ca62ebb3a95511c9ae7efd061b..c92c7c81c22c341f7caa60406acce89f32b97402 100644 (file)
--- a/ly/params-init.ly
+++ b/ly/params-init.ly
@@ -18,7 +18,6 @@ paperfile = \papersize + "-init.ly"
 \include \paperfile
 \include "paper-init.ly"
 
-unit = "mm"
 staffspace = #(/ staffheight 4.0)
 linethickness = #(/ staffspace  10.0)
 outputscale =  #(/ staffheight 4.0)