* input/test/force-hshift.ly: revise example.

* Documentation/bibliography/engraving.bib (note): typos.

* lily/beam-engraver.cc: move new-beam-event to beam-event

diff --git a/ChangeLog b/ChangeLog
index 9b6dd7ffd123c0197871885edb10d2eb42da8fb7..eb1287f2f3b5731468bbf03083257396d3ad2eed 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 2003-08-26  Han-Wen Nienhuys  <hanwen@cs.uu.nl>
 
+       * input/test/force-hshift.ly: revise example.
+
+       * Documentation/bibliography/engraving.bib (note): typos.
+
        * configure.in: bump GCC requirements to 3.x
 
        * lily/include/audio-item.hh (class Audio_tie): rename

diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib
index a2a25151bf10b6eedbbe20dc54c2e700526477c3..47c0a1df2c576fd4d34d51fc53d69d5253119f3b 100644 (file)
--- a/Documentation/bibliography/engraving.bib
+++ b/Documentation/bibliography/engraving.bib
@@ -212,7 +212,7 @@ year={1989}
   title={The G. Schirmer Manual of Style and Usage},
   address={New York},
   publisher={The G. Schirmer Publications Department},
-  year={2001}
+  year={2001},
 note={This is the style guide for Schirmer publications. This manual
 specifically focuses on preparing print for publication by
 Schirmer. It discusses many details that are not in other, normal
@@ -335,11 +335,11 @@ It can be ordered from the rental department.
 }
 
 @Book{jaschinski00:_notat,
-  editors =     {Andreas Jaschinski},
+  editor =      {Andreas Jaschinski},
   title =       {Notation},
   publisher =   {Bärenreiter Verlag},
   year =        2000,
-  number =      {BVK1625}
+  number =      {BVK1625},
 
   annote = {Articles from "Musik in Geschichte und Gegenwart"
 pertaining to notation.  Both "alternative" notation and ancient

diff --git a/Documentation/topdocs/NEWS.texi b/Documentation/topdocs/NEWS.texi
index ccdb2e4dc7cf107b0fafa1de882f3784f4af9bb0..559dae2246757be2472113841c6b55bc3afbed16 100644 (file)
--- a/Documentation/topdocs/NEWS.texi
+++ b/Documentation/topdocs/NEWS.texi
@@ -5,7 +5,7 @@
 @node Top, , , 
 @top
 
-@chapter        New features in 1.9 since 1.8
+@chapter New features in 1.9 since 1.8
 
 @itemize
 
@@ -53,14 +53,14 @@ following example,
 
 @example
   PRE
-  \repeat "unfold" 3  BODY \alternative @{ ALT1 ALT2 ALT3 @}
+  \repeat "unfold" 3  BODY \alternative @{ ALT1 ALT2 @}
   POST
 @end example
 
 @noindent
 the octave of BODY is based on PRE, the starting octave of ALT1 on
-BODY, the starting octave of ALT2 on ALT1, etc.
-
+BODY, the starting octave of ALT2 on ALT1, and the starting octave of
+POST on ALT2.
 
 The same mechanism is used for all other music expressions, except the
 chord. Backwards compatibility is retained through a special program option,
@@ -75,7 +75,7 @@ which is set through
 
 
 
-@chapter        New features in 1.8 since 1.6
+@chapter New features in 1.8 since 1.6
 
 @itemize
 

diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly
index b5909651acf355d37d7df5d80ed13d90e26d960b..29ec005980c6e3845a8e77a4a59aaa4656d46598 100644 (file)
--- a/input/test/force-hshift.ly
+++ b/input/test/force-hshift.ly
@@ -7,15 +7,12 @@ Force hshift to override collisions. " }
 \score { 
      \notes\relative c'
        \context Staff < {
-                       \property Voice.NoteColumn \override #'force-hshift = #0.1
-                       \stemUp
-                       \property Voice.NoteColumn \override #'horizontal-shift = #1
-                       <<d a'>>
-               } \\
-                {
-                       \stemDown
-                       \property Voice.NoteColumn \override #'horizontal-shift = #1
-                       \property Voice.NoteColumn \override #'force-hshift = #-0.1
+                       <<d g>>
+                       <<d g>>
+               } \\ {
+                       <<b f'>>
+\once \property Voice.NoteColumn
+  \override #'force-hshift = #1.7
                        <<b f'>>
                }
        > 

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 846b8a465ebbfff17ebd38a29ac9f1fad3f7dadf..45ff8a5a522e8da82940ecc0e82c1754eec4161d 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -237,4 +237,4 @@ Font_interface::properties_to_font_name (SCM fonts, SCM alist_chain)
 
 ADD_INTERFACE (Font_interface, "font-interface",
   "Any symbol that is typeset through fixed sets of glyphs (ie. fonts)",
-  "font-magnification font-style font font-series font-shape font-family font-name font-design-size font-relative-size");
+  "font-magnification font font-series font-shape font-family font-name font-design-size font-relative-size");

diff --git a/lily/score.cc b/lily/score.cc
index 6935d9f606c045b4ea02fb1d64346802926fa266..04e09684e38b068480a483a9fc2d277fc6121371 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -75,7 +75,7 @@ Score::~Score ()
 void
 Score::run_translator (Music_output_def *odef)
 {
-   Cpu_timer timer;
+  Cpu_timer timer;
   Global_translator * trans = odef->get_global_translator ();
   if (!trans)
     {