From: Jan Nieuwenhuizen Date: Thu, 25 Jan 2001 11:08:00 +0000 (+0100) Subject: patch::: 1.3.124.jcn3 X-Git-Tag: release/1.3.125~1 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=994cc3b8368898b4650b908db3e1f2d80a787527;p=lilypond.git patch::: 1.3.124.jcn3 1.3.124.jcn3 ============ * Updated Coriolan. * Bugfix: beams with no stems. --- diff --git a/CHANGES b/CHANGES index 90982aad40..3589336dc1 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,10 @@ +1.3.124.jcn3 +============ + +* Updated Coriolan. + +* Bugfix: beams with no stems. + 1.3.124.jcn2 ============ diff --git a/VERSION b/VERSION index 73340fcd4b..1cfc3072fa 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=124 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/bugs/hara-kiri-short.ly b/input/bugs/hara-kiri-short.ly new file mode 100644 index 0000000000..1cb4fdbedd --- /dev/null +++ b/input/bugs/hara-kiri-short.ly @@ -0,0 +1,40 @@ +\header{ +texidoc=" +Hara kiri staffs kill themselves if they are empty. This example really +contains two staffs, but the second contains only spaces, and is +therefore removed. Also, any staff brackets and braces are removed. +"; +} + +\version "1.3.117"; +zager = \context Staff = zager \notes \relative c'' { + \clef treble; + c1 +} + +zoger = \context Staff = zoger \notes \relative c'' { + \clef treble; + \skip 1* 1; +} + +zagers = \context GrandStaff < + \zager + \zoger +> + +\score{ + < + \context StaffGroup = zagers < + \zagers + > + > + \paper{ + linewidth = 80.0\mm; + + \translator { \HaraKiriStaffContext } +%uh? + + } +} + + diff --git a/input/test/hara-kiri-short.ly b/input/test/hara-kiri-short.ly index e467acb0bb..1cb4fdbedd 100644 --- a/input/test/hara-kiri-short.ly +++ b/input/test/hara-kiri-short.ly @@ -2,7 +2,7 @@ texidoc=" Hara kiri staffs kill themselves if they are empty. This example really contains two staffs, but the second contains only spaces, and is -therefore removed. +therefore removed. Also, any staff brackets and braces are removed. "; } diff --git a/lily/beam.cc b/lily/beam.cc index 41a9a52323..4b18be26eb 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -77,18 +77,23 @@ Beam::before_line_breaking (SCM smob) Grob * me = unsmob_grob (smob); // Why? + /* + Why what? Why the warning (beams with less than 2 stems are + degenerate beams, should never happen), or why would this ever + happen (don't know). */ if (visible_stem_count (me) < 2) { warning (_ ("beam has less than two stems")); } - - if (!Directional_element_interface::get (me)) - Directional_element_interface::set (me, get_default_dir (me)); - - consider_auto_knees (me); - set_stem_directions (me); - set_stem_shorten (me); - + if (visible_stem_count (me) >= 1) + { + if (!Directional_element_interface::get (me)) + Directional_element_interface::set (me, get_default_dir (me)); + + consider_auto_knees (me); + set_stem_directions (me); + set_stem_shorten (me); + } return SCM_EOL; } @@ -105,7 +110,7 @@ Beam::get_default_dir (Grob*me) Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); for (int i=0; i (m); - if (!visible_stem_count (me)) - return; Real forced_fraction = forced_stem_count (me) / visible_stem_count (me); if (forced_fraction < 0.5) @@ -298,7 +301,13 @@ Beam::after_line_breaking (SCM smob) /* weird: why do we do calc_position_and_height () ? regardless of this setting? - */ + If the user sets height, we still need to calculate the y-position. + If the user sets height-hs, we still need to calculate and + quantise y-position. + + We use least squares to calculate y-position and height, so we + inherently always calculate both. */ + /* check for user-override of dy */ SCM s = me->remove_grob_property ("height-hs"); if (gh_number_p (s)) @@ -516,6 +525,9 @@ Beam::set_stem_length (Grob*me,Real y, Real dy) Link_array stems= Pointer_group_interface__extract_elements (me, (Item*)0, "stems"); + if (stems.size () < 1) + return; + Grob *common = me->common_refpoint (stems[0], Y_AXIS); for (int i=1; i < stems.size (); i++) common = common->common_refpoint (stems[i], Y_AXIS); diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 4ed8e7dcdc..fa8d8c7eec 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -1,13 +1,13 @@ \header{ filename = "bassi-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "bassi.ly" diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly index 087d52081e..754f7c378a 100644 --- a/mutopia/Coriolan/bassi.ly +++ b/mutopia/Coriolan/bassi.ly @@ -1,13 +1,13 @@ \header{ filename = "bassi.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/c-midi.ly b/mutopia/Coriolan/c-midi.ly index 27f88fbaf1..34f7f61cf7 100644 --- a/mutopia/Coriolan/c-midi.ly +++ b/mutopia/Coriolan/c-midi.ly @@ -1,6 +1,6 @@ \header{ filename = "c-midi.ly"; -title = "Ouverture"; +%title = "Ouverture"; subtitle = "Coriolan"; opus = "Op. 62"; composer = "Ludwig van Beethoven (1770-1827)"; @@ -13,7 +13,7 @@ copyright = "public domain"; %% Hopefully, this can be junked when part-combiner+midi+dynamics work ok. %% -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index 951bbf06df..6b76ced2de 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -1,13 +1,13 @@ \header{ filename = "clarinetti-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index 97b6180eed..f04c1c2d3a 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -1,13 +1,13 @@ \header{ filename = "clarinetti.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index f3e81496fb..714b0ca5b1 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -1,13 +1,13 @@ \header{ filename = "clarinetto-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; clarinettoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index ac5558bbc8..4f62be221b 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -1,13 +1,13 @@ \header{ filename = "clarinetto-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; clarinettoII = \notes \relative c { R1*2 bes''4-.\ff r r2 | diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 2e9469c4da..3e7eb5eb3b 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -1,13 +1,13 @@ \header{ filename = "contrabasso.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; contrabasso = \notes \relative c { % copied 21 from cello diff --git a/mutopia/Coriolan/coriolan-midi.ly b/mutopia/Coriolan/coriolan-midi.ly index 544e817be3..a552d6bc99 100644 --- a/mutopia/Coriolan/coriolan-midi.ly +++ b/mutopia/Coriolan/coriolan-midi.ly @@ -1,3 +1,4 @@ +\version "1.3.120" \midi{ \tempo 4 = 150; diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly index aec442fd6a..9dfc0367f5 100644 --- a/mutopia/Coriolan/coriolan-paper.ly +++ b/mutopia/Coriolan/coriolan-paper.ly @@ -1,5 +1,6 @@ +\version "1.3.120" \paper{ - \paper_sixteen + \paperSixteen %textheight = 290.0\mm; %linewidth = 195.0\mm; diff --git a/mutopia/Coriolan/coriolan-part-combine-paper.ly b/mutopia/Coriolan/coriolan-part-combine-paper.ly index 32f8d1ea19..da1f4a06de 100644 --- a/mutopia/Coriolan/coriolan-part-combine-paper.ly +++ b/mutopia/Coriolan/coriolan-part-combine-paper.ly @@ -1,3 +1,4 @@ +\version "1.3.120" \paper{ textheight = 295.0\mm; diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly index 31fa654e03..3ba4e4aef8 100644 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ b/mutopia/Coriolan/coriolan-part-paper.ly @@ -1,3 +1,4 @@ +\version "1.3.120" \paper { textheight = 295.0\mm; linewidth = 180.0\mm; diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 4b8ba99b66..e9cf60505b 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -3,7 +3,7 @@ \header{ filename = "coriolan.ly"; -title = "Ouverture"; +%title = "Ouverture"; subtitle = "Coriolan"; opus = "Op. 62"; composer = "Ludwig van Beethoven (1770-1827)"; @@ -11,7 +11,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "paper16.ly" diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index c2df5e5c07..3d018aa1b9 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -1,13 +1,13 @@ \header{ filename = "corni-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 4768d87429..c2b243d21d 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -1,13 +1,13 @@ \header{ filename = "corni.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "corno-1.ly" \include "corno-2.ly" diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 8084a1bf68..5e23214676 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -1,13 +1,13 @@ \header{ filename = "corno-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; cornoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index d5c5a54aee..953d09fb4b 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -1,13 +1,13 @@ \header{ filename = "corno-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; cornoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index f1bb43748b..64b410e892 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -1,13 +1,13 @@ \header{ filename = "fagotti-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 6011c88044..4a50c25d5b 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -1,13 +1,13 @@ \header{ filename = "fagotti.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "fagotto-1.ly" \include "fagotto-2.ly" diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 7a9272fed5..b5c09cd867 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -1,13 +1,13 @@ \header{ filename = "fagotto-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; fagottoI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 8c01a540e1..9817c4e488 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -1,13 +1,13 @@ \header{ filename = "fagotto-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; fagottoII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index fdcb1881f1..d10be52e05 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -1,13 +1,13 @@ \header{ filename = "flauti-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index 1b9fe58c3b..c9b1ce3708 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -1,13 +1,13 @@ \header{ filename = "flauti.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "flauto-1.ly" \include "flauto-2.ly" diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index bbddad9bf5..02fff81178 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -1,13 +1,13 @@ \header{ filename = "flauto-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; flautoI = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index 5373ec6940..b685a9a439 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -1,13 +1,13 @@ \header{ filename = "flauto-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; flautoII = \notes \relative c { R1 *2 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index ad6f880a69..ac7b79ed2c 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -1,13 +1,13 @@ \header{ filename = "global.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/instruments.ly b/mutopia/Coriolan/instruments.ly index b3646502ca..a2a11fdd20 100644 --- a/mutopia/Coriolan/instruments.ly +++ b/mutopia/Coriolan/instruments.ly @@ -1,3 +1,4 @@ +\version "1.3.120" flauti.ly oboi.ly clarinetti.ly diff --git a/mutopia/Coriolan/music.ly b/mutopia/Coriolan/music.ly index 5960da4dbb..a7257ac9eb 100644 --- a/mutopia/Coriolan/music.ly +++ b/mutopia/Coriolan/music.ly @@ -1,3 +1,4 @@ +\version "1.3.120" flauto-1.ly flauto-2.ly oboe-1.ly diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index 95149d3abe..c49caa3375 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -1,13 +1,13 @@ \header{ filename = "oboe-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; oboeI = \notes \relative c'' { R1*2 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index e02d063176..5ab3cb7aab 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -1,13 +1,13 @@ \header{ filename = "oboe-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; oboeII = \notes \relative c{ R1*2| diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 64b9f7170b..6f5e72c097 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -1,13 +1,13 @@ \header{ filename = "oboi-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 1196885079..1fd9f653f6 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -1,13 +1,13 @@ \header{ filename = "oboi.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "oboe-1.ly" \include "oboe-2.ly" diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly index e69c8fd071..19b2ce721a 100644 --- a/mutopia/Coriolan/timpani-part.ly +++ b/mutopia/Coriolan/timpani-part.ly @@ -1,13 +1,13 @@ \header{ filename = "timpani-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "timpani.ly" diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 3426d0cad9..e03d9d491e 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -1,13 +1,13 @@ \header{ filename = "timpani.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; timpani = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 1c1fcf3fe8..38041aa359 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -1,13 +1,13 @@ \header{ filename = "trombe-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index 1e900b66ce..48940448b3 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -1,13 +1,13 @@ \header{ filename = "trombe.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "trombo-1.ly" \include "trombo-2.ly" diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index 5fca22aecf..5a60831967 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -1,13 +1,13 @@ \header{ filename = "trombo-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; tromboI = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 1bd4d977b5..6bcd74e563 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -1,13 +1,13 @@ \header{ filename = "trombo-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; tromboII = \notes \relative c { R1*2 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index dad0fd085a..037ae2553b 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -1,13 +1,13 @@ \header{ filename = "viola-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; violaI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index 05244d8d70..a94e489a76 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -1,13 +1,13 @@ \header{ filename = "viola-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; violaII = \notes \relative c { c1\ff ~ | diff --git a/mutopia/Coriolan/violi-part.ly b/mutopia/Coriolan/violi-part.ly index cbb5dab06f..b18b56b565 100644 --- a/mutopia/Coriolan/violi-part.ly +++ b/mutopia/Coriolan/violi-part.ly @@ -1,13 +1,13 @@ \header{ filename = "violi-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "violi.ly" diff --git a/mutopia/Coriolan/violi.ly b/mutopia/Coriolan/violi.ly index 5c03c23d6a..475efafc55 100644 --- a/mutopia/Coriolan/violi.ly +++ b/mutopia/Coriolan/violi.ly @@ -1,13 +1,13 @@ \header{ filename = "violi.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "viola-1.ly" diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index a8042c3505..e3dbb84e84 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -1,13 +1,13 @@ \header{ filename = "violino-1-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index e373879bf2..7d519fed55 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -1,13 +1,13 @@ \header{ filename = "violino-1.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; violinoI = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index f7b5899f6d..379bec66e3 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -1,13 +1,13 @@ \header{ filename = "violino-2-part.ly"; -% %title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index d5beb5653e..0db729ae9e 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -1,13 +1,13 @@ \header{ filename = "violino-2.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; violinoII = \notes \relative c { c'1\ff ~ | diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 3313fa8d67..3b523c7e19 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -1,13 +1,13 @@ \header{ filename = "violoncello.ly"; -xtitle = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; +%title = "Ouvert\\"ure zu Collins Trauerspiel \\"Coriolan\\" Opus 62"; description = ""; composer = "Ludwig van Beethoven (1770-1827)"; enteredby = "JCN"; copyright = "public domain"; } -\version "1.3.117"; +\version "1.3.120"; violoncello = \notes \relative c { c1\ff ~ | diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index eac251007c..224bfd0c84 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -234,6 +234,7 @@ taking grob as argument. This is called after before-line-breaking-callback, but before the actual line breaking itself. Return value is ignored") (grob-property-description 'stacking-dir dir? "stack contents of grobs in which direction ?") +(grob-property-description 'staff-position number? "vertical position in staff spaces, counted from the middle line.") (grob-property-description 'staff-space number? "Amount of line leading relative to global staffspace") (grob-property-description 'staffline-clearance number? "don't get closer than this to stafflines.") (grob-property-description 'stem ly-grob? "pointer to Stem object") diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index b274e9eca6..a5d1de75ed 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -115,6 +115,10 @@ set, connect all arpeggios that are found. In this way, you can make arpeggios that cross staffs. ") (translator-property-description 'createKeyOnClefChange boolean? "Print a key signature whenever the clef is changed.") +(translator-property-description 'crescendoText string? "Text to print at start of non-hairpin crecscendo, ie: @samp{cresc.}") +(translator-property-description 'crescendoSpanner symbol? "Type of spanner to be used for crescendi. One of: @samp{hairpin}, @samp{line}, @samp{dashed-line}, @samp{dotted-line}. If unset, hairpin type is used.") +(translator-property-description 'decrescendoText string? "Text to print at start of non-hairpin decrecscendo, ie: @samp{dim.}") +(translator-property-description 'decrescendoSpanner symbol? "Type of spanner to be used for decrescendi. One of: @samp{hairpin}, @samp{line}, @samp{dashed-line}, @samp{dotted-line}. If unset, hairpin type is used.") (translator-property-description 'currentBarNumber integer? "Contains the current barnumber. This property is incremented at every barline. ")