*** empty log message ***

diff --git a/ChangeLog b/ChangeLog
index 0aa6b31aaea1b57a7c951a525839dfae871531bb..8e532663a06abb0c23c5c7f0cbd3d8c75683b534 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-03-05  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/mutopia/W.A.Mozart/*.ly (romanze): markup syntax updates. 
+
        * buildscripts/mf-to-table.py: add .pfa, .pfb target dependency.
 
        * stepmake/stepmake/metafont-rules.make ($(outdir)/%.pfb): remove

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
index 5b9117439ad3bf7a07b907e6a33d2272a3ffd8c2..f1e0f7985aff86a3991239b258b357d6032a4fd0 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ly
@@ -43,7 +43,7 @@ allegro =
        [ )fis8( e16 )d] d4-. r2 | 
        \mark "B"
        R1*3
-       r2 r4 [d8(_#`(,italic-bf "con espressione") )b ]
+       r2 r4 [d8-(_\markup { \italic \bold "con espressione" } b-) ]
        [a( )g d'( )b] [a( )g e'( )c ]
        [b8( )a] a4 r4 [a8 a]
        [a( \< b c \!cis\> ]  d4 \! )c
@@ -123,7 +123,7 @@ allegro =
        [dis()e] r e-. [e()f] r f-. |
        g4-.-\f\endcresc  e-. c-. bes-. |
        g-.-\ff e-. c-. r |
-       a'2 ~ [a8_""_#`(,italic-bf "sempre " (dynamic "f")) b16 c] [d( e d )e]
+       a'2 ~ [a8_""_\markup { \bold \italic "sempre " \dynamic "f" }  b16 c] [d( e d )e]
 
        
        f4. () d8 [f8 ()d f d]

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
index e385d1459f7ab99313768c5cac3c5f2b42b7f9c2..112ef41a7a1f69decab7e27517fb9c534c7950e0 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ly
@@ -4,34 +4,13 @@
 
 longgrace = \property Voice.Stem \override #'stroke-style = #'()
 endlonggrace = \property Voice.Stem \revert #'stroke-style
-ritenuto = \textscript #'(italic  "rit.")
+ritenuto = \textscript \markup { \italic  "rit." }
 
 \version "1.7.6"
-
-#(define italic-bf '((font-shape . italic) (font-series . bold)))
-
-\paper {
-
-  %% burp
-  %% the very idea of a style sheet, is that it's easy to override
-  %% it's gotten quite a bit better now!
-  
-  %% ugh, need this line:
-  foo = "bar"
-
-  #(define (set-style! name style)
-     (set-cdr! (assoc name style-alist) style))
-  
-  #(set-style! 'mark-letter '((font-family . roman)
-                              (font-series . bold)
-                             (font-shape . upright)
-                             (font-relative-size . 3)))
-}
-
   
 cresc = \notes {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
-    \property Voice.crescendoText = #`(,italic-bf "cresc.")
+    \property Voice.crescendoText = \markup { \italic \bold "cresc." }
     \property Voice.crescendoSpanner = #'dashed-line
 }
 
@@ -61,7 +40,10 @@ stopGraceMusic= \sequential {
         RehearsalMark \override #'padding = #1
         MultiMeasureRest \override #'padding = #0.5
         restNumberThreshold = #1
-        
+
+       RehearsalMark \override #'font-series = #'bold
+       RehearsalMark \override #'font-relative-size = #3
+
         Beam \override #'thickness = #0.6
         Beam \override #'space-function = #(lambda (beam mult) 0.8)
         Slur \override #'beautiful = #0.3

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
index 8b538614b08be0ae2afdec4a1896f4f4f50cd688..1c746d4e83d4a7a48e9cac99fba570cf632f88ea 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ly
@@ -7,7 +7,7 @@ romanze = \notes \relative c' {
        \time 2/2
        \property Score.skipBars = ##t
 
-       c'4.( _#'(italic (dynamic "p") " con molto espressione") 
+       c'4.( _\markup { \dynamic "p" \italic { "" con molto espressione } }
                )f8 a,4 a
        [bes8( c d bes] )g4 r8 g
        a r bes r c r [d()bes]