From 45ff7830d129783c6531275ccdc3f99e6016dadf Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 6 Oct 2002 23:33:11 +0000 Subject: [PATCH] add \header to some input/test/ files. --- ChangeLog | 6 +++ Documentation/user/refman.itely | 9 +++-- input/regression/accidental-cautionary.ly | 7 +++- input/regression/auto-beam-triplet.ly | 14 +++++++ input/test/absolute-volume.ly | 4 ++ input/test/accidental-spacing.ly | 12 ------ input/test/ambitus.ly | 4 ++ input/test/american-chords.ly | 8 ++-- .../test/{accid.ly => ancient-accidentals.ly} | 6 +++ input/test/auto-beam-triplet.ly | 15 ------- input/test/bar-lines.ly | 3 ++ input/test/bar-number-every-fifth.ly | 7 ++++ input/test/beam-abbrev.ly | 1 - lily/phrasing-slur-engraver.cc | 40 +++++++++---------- 14 files changed, 78 insertions(+), 58 deletions(-) create mode 100644 input/regression/auto-beam-triplet.ly delete mode 100644 input/test/accidental-spacing.ly rename input/test/{accid.ly => ancient-accidentals.ly} (90%) delete mode 100644 input/test/auto-beam-triplet.ly diff --git a/ChangeLog b/ChangeLog index 052c45f401..ae0e8ef83c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ +2002-10-07 Han-Wen Nienhuys + + * input/test/{various}.ly: add \header fields and texidoc strings. + 2002-10-06 Han-Wen Nienhuys + * VERSION: 1.7.2 released + * scripts/convert-ly.py (FatalConversionError.conv): add rule for (ly-make-music "Foo_bar") -> (make-music-by-name 'FooBarEvent). diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index a4724a34bf..d1b6dc5d91 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1991,9 +1991,12 @@ Unbeamed eighth notes and shorter by default have a slash through the stem. This can be controlled with object property @code{stroke-style} of @internalsref{Stem}. The change in formatting is accomplished by inserting @code{\startGraceMusic} before handling the grace notes, and -@code{\stopGraceMusic} after finishing the grace notes. You can add to -these definitions to globally change grace note formatting. The -standard definitions are in @file{ly/grace-init.ly}. +@code{\stopGraceMusic} after finishing the grace notes. +You can add to these definitions to globally change grace note +formatting. The standard definitions are in @file{ly/grace-init.ly}. + +[TODO discuss Scheme functionality.] + Notice how the @code{\override} is carefully matched with a @code{\revert}. diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 21eb95ad6d..3980f84f02 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -2,11 +2,14 @@ \header { texidoc = "Cautionary accidentals are indicated using either -smaller accidentals (default) or parentheses." +smaller accidentals (default) or parentheses. + +" } -\score { \notes { +\score { + \notes { c''4 cis''?4 \property Staff.Accidental \override #'style = #'parentheses diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly new file mode 100644 index 0000000000..d48d74f8a9 --- /dev/null +++ b/input/regression/auto-beam-triplet.ly @@ -0,0 +1,14 @@ +\header +{ +texidoc = "Automatic beaming is also done on tuplets." +} + +\version "1.5.68" + +\score{ + \notes\relative c''{ + c8 c c c + \times 4/6 { c c c c c c} + } + \paper{ } +} diff --git a/input/test/absolute-volume.ly b/input/test/absolute-volume.ly index 07847440ca..c39c8f80bf 100644 --- a/input/test/absolute-volume.ly +++ b/input/test/absolute-volume.ly @@ -1,3 +1,7 @@ +\header { + texidoc = "Absolute dynamics have effect in MIDI files." +} + \version "1.5.68" \score{ diff --git a/input/test/accidental-spacing.ly b/input/test/accidental-spacing.ly deleted file mode 100644 index 0362047596..0000000000 --- a/input/test/accidental-spacing.ly +++ /dev/null @@ -1,12 +0,0 @@ -\version "1.5.68" - -\score { - \context Voice \notes\relative c { - c''4 c4 cis4 cis [c8 c \clef "bass" f,, f] - - } - \paper { - linewidth=-1.0 - } - \midi { } -} diff --git a/input/test/ambitus.ly b/input/test/ambitus.ly index 0c632e7dee..a3a6271732 100644 --- a/input/test/ambitus.ly +++ b/input/test/ambitus.ly @@ -1,3 +1,7 @@ +\header { + texidoc = "Ambituses indicate pitch ranges for voices." +} + \version "1.5.68" upper = \notes \relative c { diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 65b06126f6..d41428798e 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -1,9 +1,7 @@ \version "1.5.68" - -%{ - See scm/chord-names.scm: chord::names-alist-american - James Hammons -%} +\header { + texidoc = "Chord names in american styles, according to one of our users." +} \include "english.ly" #(set! chord::names-alist-american diff --git a/input/test/accid.ly b/input/test/ancient-accidentals.ly similarity index 90% rename from input/test/accid.ly rename to input/test/ancient-accidentals.ly index d26f5292bf..47f475224a 100644 --- a/input/test/accid.ly +++ b/input/test/ancient-accidentals.ly @@ -1,3 +1,9 @@ +\header { +texidoc = "Accidentals are available in different ancient styles. This +files lists all of them." + +} + \version "1.5.68" \score { diff --git a/input/test/auto-beam-triplet.ly b/input/test/auto-beam-triplet.ly deleted file mode 100644 index 607813ba59..0000000000 --- a/input/test/auto-beam-triplet.ly +++ /dev/null @@ -1,15 +0,0 @@ -\version "1.5.68" - -\score{ - \notes\relative c''{ - c8 c c c - \times 2/3 { c c c c c c} - } - \paper{ - % urg, avoid crash - \translator{ - \VoiceContext - \remove Tuplet_engraver - } - } -} diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index 19a90f016d..14ce35f846 100644 --- a/input/test/bar-lines.ly +++ b/input/test/bar-lines.ly @@ -1,4 +1,7 @@ \version "1.5.68" +\header { + texidoc = "Different types of bar lines demonstrated." +} \score diff --git a/input/test/bar-number-every-fifth.ly b/input/test/bar-number-every-fifth.ly index fbcde9ac7d..35da5797b0 100644 --- a/input/test/bar-number-every-fifth.ly +++ b/input/test/bar-number-every-fifth.ly @@ -1,3 +1,10 @@ + +\header +{ + + texidoc = "Bar numbers can also be printed at regular intervals." +} + \score { \context Staff \notes \transpose c'' { \property Score.BarNumber \override #'break-visibility = #end-of-line-invisible diff --git a/input/test/beam-abbrev.ly b/input/test/beam-abbrev.ly index 7133d8fcfe..2ca4dd423b 100644 --- a/input/test/beam-abbrev.ly +++ b/input/test/beam-abbrev.ly @@ -1,5 +1,4 @@ \version "1.5.68" - \score { \context Voice \notes\relative c { c'1:16 diff --git a/lily/phrasing-slur-engraver.cc b/lily/phrasing-slur-engraver.cc index 6395cfb115..dbcdba9a88 100644 --- a/lily/phrasing-slur-engraver.cc +++ b/lily/phrasing-slur-engraver.cc @@ -18,7 +18,7 @@ ALGRGRRGRG Derive this from Slur_engraver. This code is completely duplicate. - */ +*/ class Phrasing_slur_engraver : public Engraver { Link_array eventses_; @@ -50,18 +50,18 @@ Phrasing_slur_engraver::try_music (Music *ev) { if (ev->is_mus_type ("abort-event")) { - for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) - { - phrasing_slur_l_stack_[i]->suicide (); - } - phrasing_slur_l_stack_.clear (); - for (int i = 0; i < end_phrasing_slurs_.size (); i++) - { - end_phrasing_slurs_[i]->suicide (); - } - end_phrasing_slurs_.clear (); - eventses_.clear (); - new_phrasing_slur_evs_.clear (); + for (int i = 0; i < phrasing_slur_l_stack_.size (); i++) + { + phrasing_slur_l_stack_[i]->suicide (); + } + phrasing_slur_l_stack_.clear (); + for (int i = 0; i < end_phrasing_slurs_.size (); i++) + { + end_phrasing_slurs_[i]->suicide (); + } + end_phrasing_slurs_.clear (); + eventses_.clear (); + new_phrasing_slur_evs_.clear (); } else if (ev->is_mus_type ("phrasing-slur-event")) { @@ -69,7 +69,7 @@ Phrasing_slur_engraver::try_music (Music *ev) Let's not start more than one phrasing slur per moment. */ - Direction d = to_dir (ev->get_mus_property ("span-direction")); + Direction d = to_dir (ev->get_mus_property ("span-direction")); if (d == START) { @@ -112,16 +112,16 @@ Phrasing_slur_engraver::finalize () #else /* Let's not typeset unterminated stuff - */ + */ phrasing_slur_l_stack_[i]->suicide (); #endif } phrasing_slur_l_stack_.clear (); - for (int i=0; i < eventses_.size (); i++) - { - eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); - } + for (int i=0; i < eventses_.size (); i++) + { + eventses_[i]->origin ()->warning (_ ("unterminated phrasing slur")); + } } void @@ -188,7 +188,7 @@ Phrasing_slur_engraver::start_translation_timestep () ENTER_DESCRIPTION(Phrasing_slur_engraver, -/* descr */ "Print phrasing slurs. Similar to Slur_engraver", +/* descr */ "Print phrasing slurs. Similar to @ref{Slur_engraver}", /* creats*/ "PhrasingSlur", /* accepts */ "phrasing-slur-event", /* acks */ "note-column-interface", -- 2.39.5