From af9b40a33140482cf86db74d65a1bbf8e9b250af Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 26 Aug 2003 14:38:35 +0000 Subject: [PATCH] * input/test/force-hshift.ly: revise example. * Documentation/bibliography/engraving.bib (note): typos. * lily/beam-engraver.cc: move new-beam-event to beam-event --- ChangeLog | 4 ++++ Documentation/bibliography/engraving.bib | 6 +++--- Documentation/topdocs/NEWS.texi | 10 +++++----- input/test/force-hshift.ly | 15 ++++++--------- lily/font-interface.cc | 2 +- lily/score.cc | 2 +- 6 files changed, 20 insertions(+), 19 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9b6dd7ffd1..eb1287f2f3 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2003-08-26 Han-Wen Nienhuys + * 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 a2a25151bf..47c0a1df2c 100644 --- 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 ccdb2e4dc7..559dae2246 100644 --- 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 b5909651ac..29ec005980 100644 --- 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 - <> - } \\ - { - \stemDown - \property Voice.NoteColumn \override #'horizontal-shift = #1 - \property Voice.NoteColumn \override #'force-hshift = #-0.1 + <> + <> + } \\ { + <> +\once \property Voice.NoteColumn + \override #'force-hshift = #1.7 <> } > diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 846b8a465e..45ff8a5a52 100644 --- 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 6935d9f606..04e09684e3 100644 --- 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) { -- 2.39.2