patch::: 1.3.77.mb1

1.3.77.mb1
==========

* Minor documentation updates

* Mark_engraver: has been broken since .73, fixed!

diff --git a/CHANGES b/CHANGES
index 75f8ff55c06d1a46ccca05f3b23788268c582b59..203e7c6e71677e7174fad55168ae57445535fa5c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,10 @@
+1.3.77.mb1
+==========
+
+* Minor documentation updates
+
+* Mark_engraver: has been broken since .73, fixed!
+
 1.3.77
 ======
 

diff --git a/Documentation/user/glossary.tely b/Documentation/user/glossary.tely
index 81e16eb771c7bbbff20918c61d9c010ba7c885a4..96f04614f27ae44eb83cfcc0478e9756fdec28d3 100644 (file)
--- a/Documentation/user/glossary.tely
+++ b/Documentation/user/glossary.tely
@@ -147,10 +147,10 @@ the duration of the long a. is proportionate to that of the main note.
 \key d \major;
 \time 4/4;
 <d4_"notation" a fis> r 
-{ \property Grace.stemStyle = ""
+{ \property Grace.flagStyle = ""
   \grace g16 }
 fis8 e16 fis 
-{ \property Grace.stemStyle = ""
+{ \property Grace.flagStyle = ""
   \grace a16 }
 g8 fis16 g | a4 \bar "||"; }
 \notes\relative c'' {

diff --git a/Documentation/user/properties.itely b/Documentation/user/properties.itely
index bf638acd416a96fa49c977192b23e736debd923c..670b0add0300c7c896d9741f1158a7a9940a4008 100644 (file)
--- a/Documentation/user/properties.itely
+++ b/Documentation/user/properties.itely
@@ -87,7 +87,7 @@ TODO:
 
  
 @table @samp  
-  @item @code{stemStyle}@indexcode{flagStyle} @propertytype{string}
+  @item @code{flagStyle}@indexcode{flagStyle} @propertytype{string}
     By default set to @code{"grace"} meaning that all unbeamed 
     notes with flags are typeset with a slash through the flag. 
     Setting to @code{""} gives standard flags.
@@ -120,7 +120,7 @@ c'8 \property Voice.flagStyle = "grace" c'8
     directions marked with `@code{^}' or `@code{_}' in the mudela file.
     
   @item @code{noAutoBeaming}@indexcode{beamAuto}  @propertytype{boolean}
-    If set to 1 then beams are not generated automatically.
+    If set to true then beams are not generated automatically.
 
   @item @code{beamAutoEnd}@indexcode{beamAutoEnd}  @propertytype{?}
     Specifies when automatically generated beams can end.  See

diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely
index 3d98430b1a00c691f9a24707552e3223ca82ed36..c606b6cb5b900ad829fee2fd197f97c3e39e2358 100644 (file)
--- a/Documentation/user/refman.itely
+++ b/Documentation/user/refman.itely
@@ -1624,14 +1624,14 @@ example) have a separate time signature within grace notes.  While in
 this score-within-a-score, you can create notes, beams, slurs, etc.
 Unbeamed eighth notes and shorter by default have a slash through the
 stem.  This behavior can be controlled with the
-@code{stemStyle}@indexcode{stemStyle} property.
+@code{flagStyle}@indexcode{flagStyle} property.
 
 @quotation
 
 @mudela[fragment,verbatim]
 \relative c'' {
   \grace c8 c4 \grace { [c16 c16] } c4
-  \grace { \property Grace.stemStyle = "" c16 } c4
+  \grace { \property Grace.flagStyle = "" c16 } c4
 }
 
 @end mudela
@@ -2487,13 +2487,6 @@ Nevertheless, here are some variables you may want to use or change:
   @item @code{interscoreline}@indexcode{interscoreline}  
     Sets the spacing between the score lines. Defaults to 16 pt.
 
-  @item @code{textheight}@indexcode{textheight}  
-    Sets the total height of the music on each page. Only used by
-    ly2dvi.
-
-  @item @code{interscoreline}@indexcode{interscoreline}  
-    Sets the spacing between the score lines. Defaults to 16 pt.
-
   @item @code{output}@indexcode{output}  
     Specifies an alternate name for the the output @file{s}.
     A @file{.tex}, @file{.midi} or @file{.ps} extension will be 

diff --git a/VERSION b/VERSION
index ea79fa155e6b7ee2dd1910e7db29e59704dd6393..e1d3b3952962c762955d62d17a04917ca20b1e80 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
 MAJOR_VERSION=1
 MINOR_VERSION=3
 PATCH_LEVEL=77
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=mb1
 
 # use the above to send patches: MY_PATCH_LEVEL is always empty for a
 # released version.

diff --git a/lily/mark-engraver.cc b/lily/mark-engraver.cc
index 0f2df8fcdf5e3b05744eb83ad47bbdfe92d6e83d..b57bafa3e28b2c280535a81553f76d31d2bf506b 100644 (file)
--- a/lily/mark-engraver.cc
+++ b/lily/mark-engraver.cc
@@ -163,7 +163,7 @@ Mark_engraver::do_process_music ()
        */
       
       SCM m = mark_req_l_->get_mus_property ("label");
-      if (gh_string_p (m)) 
+      if (!gh_string_p (m)) 
        m =  get_property ("rehearsalMark");
 ;