* scm/define-music-properties.scm (figure): use string for 'figure

* lily/parser.yy (bass_number): allow strings for bassfigure too.

* scm/bass-figure.scm (make-bass-figure-markup): add
alignBassFigureAccidentals property.

diff --git a/ChangeLog b/ChangeLog
index eb2f04da457c95f495fc9c35096a006d6631be2a..57ae8216a07d526f76d1f72860647b4bcf723fcc 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2003-07-17  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scm/define-music-properties.scm (figure): use string for 'figure
+
+       * lily/parser.yy (bass_number): allow strings for bassfigure too. 
+
+       * input/regression/ : add raggedright = ##t where applicable. 
+       
        * scm/bass-figure.scm (make-bass-figure-markup): add
        alignBassFigureAccidentals property.
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index b84854339a3eb1227bbb686cdeef10d85560cfa4..eee67cf14e29b496b0036bc1e60d42872a0acc9e 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -645,7 +645,7 @@ a8-[ ais-] d-[ es r d-]
 @menu
 * Combining music into compound expressions::  
 * Adding articulation marks to notes ::  
-* More basic rhythms::          
+* Basic rhythmical commands::   
 * Commenting input files::      
 @end menu
 

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 4087dc57d9edcc0bb88cd1f833459597c6871146..c4dc84c7f1d2cb26411182159f4d58cf54a303c0 100644 (file)
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -23,7 +23,7 @@ texidoc = "New markup syntax."
                \musicglyph #"accidentals--1"
                \combine "X" "+"   
                \combine "o" "/"
-
+%              \char-number #"abc1234abc"
                \box \column << { "string 1" } { "string 2" } >>
                "$\\emptyset$"
                \italic Norsk

diff --git a/lily/parser.yy b/lily/parser.yy
index 3f740e4d6549c0bc6bc3a399a5436cf309b715f9..5cb1441daf5e186ea113bc730b58f2b4875eae92 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -49,6 +49,8 @@ TODO:
 #include <ctype.h>
 #include <stdlib.h>
 
+
+
 #include "translator-def.hh"
 #include "lily-guile.hh"
 #include "misc.hh"
@@ -285,8 +287,8 @@ yylex (YYSTYPE *s,  void * v)
 %token FIGURE_SPACE
 
 %type <i>      exclamations questions dots optional_rest
-%type <i>      bass_number bass_mod
-%type <scm>    br_bass_figure bass_figure figure_list figure_spec
+%type <i>       bass_mod
+%type <scm>    bass_number br_bass_figure bass_figure figure_list figure_spec
 %token <i>     DIGIT
 %token <scm>   NOTENAME_PITCH
 %token <scm>   TONICNAME_PITCH
@@ -1859,8 +1861,13 @@ tremolo_type:
                BASS FIGURES
 *****************************************************************/
 bass_number:
-       DIGIT
-       | UNSIGNED 
+       DIGIT   {
+               $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+       }
+       | UNSIGNED {
+               $$ = scm_number_to_string (gh_int2scm ($1), gh_int2scm (10));
+       }
+       | STRING { $$ =  $1 }
        ;
 
 bass_mod:
@@ -1879,7 +1886,7 @@ bass_figure:
                Music *bfr = MY_MAKE_MUSIC("BassFigureEvent");
                $$ = bfr->self_scm();
 
-               bfr->set_mus_property ("figure", gh_int2scm ($1));
+               bfr->set_mus_property ("figure", $1);
 
                scm_gc_unprotect_object ($$);
        }

diff --git a/scm/bass-figure.scm b/scm/bass-figure.scm
index b60a433eb4f2f05c08f412cae667a24ca5f960c4..136396187e34b9e858ee4c880e55e36377291523 100644 (file)
--- a/scm/bass-figure.scm
+++ b/scm/bass-figure.scm
@@ -31,11 +31,11 @@
         (acc  (ly:get-mus-property fig-music 'alteration))
         (acc-markup #f)
         (fig-markup
-         (if (number? fig)
-             (make-number-markup (number->string fig))
+         (if (string? fig)
+             (make-simple-markup fig)
              (make-simple-markup (if align-accs " " ""))
              )))
-      
+
       (if (number? acc)
          (make-line-markup (list fig-markup
                                  (alteration->text-accidental-markup acc)))

diff --git a/scm/define-music-properties.scm b/scm/define-music-properties.scm
index 83ff53bf4fea2a045e41d18c7e0c83b8472a40a2..5b146f580d8aa2047315065239d95cef13953ff2 100644 (file)
--- a/scm/define-music-properties.scm
+++ b/scm/define-music-properties.scm
@@ -85,7 +85,8 @@ starting grace notes.")
 translation property")
 (music-property-description 'what string? "What to change for auto-change. FIXME, naming")
 
-(music-property-description 'figure number? "number for figured bass")
+(music-property-description 'figure string? "a `figure' (which may be
+a string) for figured bass")
 (music-property-description 'alteration number? "alteration for figured bass")
 (music-property-description 'bracket-start boolean? "start a bracket
 here. TODO: use span requests?")

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index a90a48eb3043bf427895f747bed9c5dae47b00cb..f9587aa8a2adeabf74479484d708893216ef6fd6 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -326,7 +326,6 @@ for the reader.
     (bracketify-molecule m Y th (* 2.5 th) th)  
 ))
 
-
 ;; todo: fix negative space
 (define (hspace-markup grob props . rest)
   "Syntax: \\hspace NUMBER."
@@ -505,7 +504,8 @@ for the reader.
    ;; size
    (cons smaller-markup (list markup?))
    (cons bigger-markup (list markup?))
-
+;   (cons char-number-markup (list string?))
+   
    ;; 
    (cons sub-markup (list markup?))
    (cons normal-size-sub-markup (list markup?))