* scm/new-markup.scm (brew-new-markup-molecule): bugfix

* Documentation/user/macros.itexi: refcommands, refcommand macros.

* Documentation/user/tutorial.itely (Piano staffs): new section.
(Setting variables): new section
(Fine tuning layout): new section

diff --git a/ChangeLog b/ChangeLog
index ccbddc92b643497b6017692a76dad4b4ec1573e7..35e03b54e683296f855d2cd7e2303f5a4f49eedd 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2003-06-30  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * scm/new-markup.scm (brew-new-markup-molecule): bugfix 
+
        * python/lilylib.py (make_ps_images): bugfixes.
 
        * input/regression/volta-multi-staff.ly: new file.

diff --git a/Documentation/user/macros.itexi b/Documentation/user/macros.itexi
index aae87bb73f9da575df8e809483518f894c1894e6..5e18d7bcb7b8e9ee64b1758312105244abaa63ed 100644 (file)
--- a/Documentation/user/macros.itexi
+++ b/Documentation/user/macros.itexi
@@ -154,6 +154,12 @@ internals document,  @internalsref{\NAME\}
 @end macro
 
 
+@c
+@c ARGGGHHHHH! I want
+@c @cindex @code{@backslash\WHAT\}
+@c how do I do that?
+@c   --hwn
+
 @macro refcommand{WHAT}
 @cindex @code{\WHAT\}
 @code{\WHAT\}

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index cfa40c77454a650f8f5d9ee42132370cbdaeb872..df54da3b81d61c99bc29f8a4d1d36d4a3627b1b1 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -365,9 +365,9 @@ is invisible.
 
 @refcommands
 
-@refcommand \stemUp
-@refcommand \stemDown
-@refcommand \stemBoth
+@refcommand stemUp
+@refcommand stemDown
+@refcommand stemBoth
 
 
 @node Ties

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index c9649192105be0454399aef07de93d30e1d7dda3..6c2c0fd9541d3f1eaef72503c231f9a1ab64584c 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1063,8 +1063,12 @@ Entering such parts is done by entering each voice as a sequence (with
 @code{@{ .. @}}), and combing those simultaneously, separating the
 voices with @code{\\}:
 
-@lilypond[verbatim,relative]
-  < { a4 g2 f4-~ f4 } \\
+@example
+  < @{ a4 g2 f4-~ f4 @} \\
+    @{ r4 g4 f2 f4 @} >
+@end example
+@lilypond[relative]
+\context Staff  < { a4 g2 f4-~ f4 } \\
     { r4 g4 f2 f4 } >
 @end lilypond
 The notation @code{< .. >} is a shorthand for @code{\simultaneous @{
@@ -1073,7 +1077,11 @@ The notation @code{< .. >} is a shorthand for @code{\simultaneous @{
 For polyphonic typesetting spacer rests can also be convenient: these
 are rests that do not print.  It is useful for filling up voices that
 temporarily do not play:
-@lilypond[verbatim,relative]
+@example
+  < @{ a4 g2 f4-~ f4 @} \\
+    @{ s4 g4 f2 f4 @} >
+@end example
+@lilypond[relative]
   < { a4 g2 f4-~ f4 } \\
     { s4 g4 f2 f4 } >
 @end lilypond
@@ -1102,7 +1110,8 @@ but now this entire expression must be interpreted as a
  \context PianoStaff < \context Staff @dots{} >
 @end example
 
-Here is a complete-fledged example:
+Here is a full-fledged example:
+
 @lilypond[relative 0,fragment]
 \context PianoStaff
  < \context Staff = up {

diff --git a/input/regression/pc-mmrest.ly b/input/regression/pc-mmrest.ly
index a1c7ec844f6b87cbe96e6a96679f0a8c910c25b1..5898bd2ac28a3c7235c8cf5c9aacfe2e7e1d5417 100644 (file)
--- a/input/regression/pc-mmrest.ly
+++ b/input/regression/pc-mmrest.ly
@@ -10,8 +10,6 @@ one = \notes\relative c'' {
        f4 \!e-.-\f r2|
        R1|
        f2-\p-(es -)|
-       \property Voice.crescendoText = #'(lines " " "cresc." " ")
-       \property Voice.crescendoSpanner = #'dashed-line
        d1\<|
        d1|
        d2 d2|

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index e78ef4184e5c39f2e16e1af7c8a63c626112cb65..1ddde4bd9a46179b61d7c2310fd9019093c52cb8 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -658,13 +658,11 @@ against SIGNATURE, reporting MAKE-NAME as the user-invoked function.
 
 (define-public (brew-new-markup-molecule grob)
   (let*
-      ((t (ly:get-grob-property grob 'text)))
+      ((t (ly:get-grob-property grob 'text))
+       (chain (Font_interface::get_property_alist_chain grob)))
     (if (markup? t)
-       (interpret-markup grob
-                         (Font_interface::get_property_alist_chain grob)
-                         t
-                         )
-       (Text_item::text_to_molecule t)
+       (interpret-markup grob  chain t)
+       (Text_item::text_to_molecule grob t chain)
        )))
 
 (define-public empty-markup (make-simple-markup ""))