From 16f86be3db31bcf062a33fdd79c37c168e4883d4 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 14 Jul 2002 17:11:34 +0000 Subject: [PATCH] mutopia move --- COPYING | 2 +- ChangeLog | 2 + Documentation/topdocs/index.tely | 11 +- Documentation/user/refman.itely | 7 +- GNUmakefile.in | 10 +- NEWS | 9 +- VERSION | 2 +- autogen.sh | 3 + debian/copyright | 2 +- debian/rules | 2 +- input/GNUmakefile | 4 +- input/baerenreiter-sarabande.ly | 173 ---------------- input/mozart-hrn3-allegro.ly | 167 --------------- input/mozart-hrn3-defs.ly | 69 ------- input/mozart-hrn3-romanze.ly | 93 --------- input/mozart-hrn3-rondo.ly | 194 ------------------ .../J.S.Bach/Petites-Preludes/GNUmakefile | 2 +- input/mutopia/W.A.Mozart/GNUmakefile | 2 +- ly/declarations-init.ly | 2 - make/generic-vars.make | 1 - make/lilypond.mandrake.spec.in | 2 +- make/lilypond.redhat.spec.in | 2 +- make/lilypond.suse.spec.in | 2 +- scm/grob-description.scm | 2 +- 24 files changed, 33 insertions(+), 732 deletions(-) delete mode 100644 input/baerenreiter-sarabande.ly delete mode 100644 input/mozart-hrn3-allegro.ly delete mode 100644 input/mozart-hrn3-defs.ly delete mode 100644 input/mozart-hrn3-romanze.ly delete mode 100644 input/mozart-hrn3-rondo.ly diff --git a/COPYING b/COPYING index e144c3ebba..77b1b7108a 100644 --- a/COPYING +++ b/COPYING @@ -3,7 +3,7 @@ *** NOTE This license applies to all files except the included example -input files (which are in the subdirectory input/ and mutopia/ ) +input files (which are in the subdirectory input/ ) *** END NOTE diff --git a/ChangeLog b/ChangeLog index 3d24a7f4ff..be732e7134 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2002-07-14 Han-Wen + * input/mutopia/GNUmakefile: move mutopia/ to input/mutopia/ + * lily/beam.cc (quanting): add explicit support for cross-staff beaming: make slope penalty larger. diff --git a/Documentation/topdocs/index.tely b/Documentation/topdocs/index.tely index d21e1c0cd7..3ad72dd437 100644 --- a/Documentation/topdocs/index.tely +++ b/Documentation/topdocs/index.tely @@ -56,12 +56,9 @@ bug-free. You can access the website for the stable releases @unnumberedsec Want to know more? If you want to know more, visit the -@uref{Documentation/out-www/index.html, documentation page}. If you want -to see some sheet music, then have a look at the examples: we have -@uref{short-examples.html,short examples} and -@uref{long-examples.html,longer examples}. For even more sheet music, -head over to @uref{http://www.mutopiaproject.org, the mutopia project}. - - +@uref{Documentation/out-www/index.html, documentation page}. If you +want to see some sheet music, then have a look at the +@uref{examples.html, examples}. For even more sheet music, head over +to @uref{http://www.mutopiaproject.org, the mutopia project}. @bye diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index cc66ed528d..dce5be137f 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -4201,10 +4201,9 @@ The most basic settings influencing the spacing are @code{linewidth} and @code{indent}, both set in the @code{\paper} block. They control the indentation of the first line of music, and the lengths of the lines. If @code{linewidth} set to a negative value, a single -unjustified line is produced. The shorthand @code{\singleLine} -defines a default paper block that produces a single line. A similar -effect for scores that are longer than one line, can be produced by -setting @code{raggedright} to true in the @code{\paper} block. +unjustified line is produced. A similar effect for scores that are +longer than one line, can be produced by setting @code{raggedright} to +true in the @code{\paper} block. @cindex page layout diff --git a/GNUmakefile.in b/GNUmakefile.in index 0da6f9ad5e..75c4ed68dc 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -66,16 +66,12 @@ ifeq ($(KPATHSEA),0) endif -TOP_HTMLS = index.html short-examples.html long-examples.html +TOP_HTMLS = index.html examples.html -short-examples: web-reqs +examples: web-reqs $(MAKE) out=www -C input WWW $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html input/ -long-examples: web-reqs - $(MAKE) out=www -C mutopia WWW - $(PYTHON) $(buildscript-dir)/mutopia-index.py -o $(builddir)/$@.html mutopia/ - lily: lily/$(outdir)/lilypond lily/$(outdir)/lilypond: @@ -86,7 +82,7 @@ local-web: web-doc $(TOP_HTMLS:%.html=%) footify do-top-doc top-web web-ext = gz html midi pdf png txt top-web: cd $(builddir) && rm -f `find . -name \*.html~ -print` - cd $(builddir) && find Documentation input mutopia \ + cd $(builddir) && find Documentation input \ $(web-ext:%=-path '*/out-www/*.%' -or) -false \ > $(outdir)/weblist cd $(builddir) && ls *.png *.html >> $(outdir)/weblist diff --git a/NEWS b/NEWS index ac56aa9eaf..0ac58c806f 100644 --- a/NEWS +++ b/NEWS @@ -9,18 +9,21 @@ New features in 1.5 * Figured bass support. -* Improved beam formatting. +* Completely rewritten beam formatting: provides much better output +now. * Improved grace notes. * Improved accidental handling and formatting. -* Better spacing. Includes subtle details like optical stem spacing. +* Better spacing: both globally and locally. It includes subtle +details like optical stem spacing. * More ancient notation support: mensural ligatures, porrectuses, ambituses, more shapes. -* Bracket piano pedals. +* Piano notation: bracket pedals, directed arpeggios, arpeggio +brackets. * Some music entry optimizations. diff --git a/VERSION b/VERSION index cbea8b5041..a7cc14d77e 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=5 PATCH_LEVEL=67 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=hwn1 # Use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/autogen.sh b/autogen.sh index e3ee7da81d..a9b37f531f 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,4 +1,7 @@ #!/bin/sh +# WARNING WARNING WARNING +# do not edit! this is autogen.sh, generated from stepmake/autogen.sh +#!/bin/sh # Run this to generate configure and initial GNUmakefiles srcdir=`dirname $0` diff --git a/debian/copyright b/debian/copyright index d86145ba93..2d49d29f44 100644 --- a/debian/copyright +++ b/debian/copyright @@ -44,7 +44,7 @@ Copyright: *** NOTE This license applies to all files except the included example - input files (which are in the subdirectory input/ and mutopia/ ) + input files (which are in the subdirectory input/ ) *** END NOTE diff --git a/debian/rules b/debian/rules index ea2e3f7f62..6c0904551b 100644 --- a/debian/rules +++ b/debian/rules @@ -124,7 +124,7 @@ binary-arch: build install # cp -a Documentation/misc/[ACN]* $(r)/$(d)/misc/ # dh_installexamples input - cp -aP `find input mutopia \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \)` \ + cp -aP `find input \( -name '*.*ly' -o -name '*.abc' -o -name '*.tex' -o -name 'TODO' \)` \ $(r)/$(d)/examples for i in `find $(r)/$(d)/examples/ -type d -name out`; do \ mv -fv $$i/* $$i/..; rmdir $$i; done diff --git a/input/GNUmakefile b/input/GNUmakefile index edb0c1e19d..02c8a454d3 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -1,9 +1,9 @@ depth = .. -SUBDIRS=bugs test regression tutorial no-notation ascii-art template +SUBDIRS=bugs test regression tutorial no-notation ascii-art template mutopia # nereides is tweaked a lot, can't do (read webpage) -examples=trip star-spangled-banner paddy twinkle baerenreiter-sarabande mozart-hrn-3 +examples=trip star-spangled-banner paddy twinkle LOCALSTEPMAKE_TEMPLATES=ly mutopia EXTRA_DIST_FILES=paddy.abc diff --git a/input/baerenreiter-sarabande.ly b/input/baerenreiter-sarabande.ly deleted file mode 100644 index 7acd483dfd..0000000000 --- a/input/baerenreiter-sarabande.ly +++ /dev/null @@ -1,173 +0,0 @@ - -%% #(set! point-and-click line-column-location) - -\header { - title = "Solo Cello Suite II" - piece ="Sarabande" - composer = "J.S.Bach" - editor = "August Wenzinger" - source= "B\\\"arenreiter Urtext" - - texidoc = "The B\\\"arenreiter edition of the Cello Suites is the -most beautifully typeset piece of music in our collection of music (we -both own one. It is also lovely on French Horn). This piece does not -include articulation, but it does follows the same beaming and -linebreaking as the printed edition. This is done in order to -benchmark the quality of the LilyPond output. - -As of lilypond 1.5.42, the spacing and beam quanting is almost -identical. - -There are two tweaks in this file: a line-break was forced before -measure 25, we get back the linebreaking of Baerenreiter. The stem -direction is forced in measure 24. The last beam of that measure is up -in Baerenreiter because of context. We don't detect that yet. - -Note that the Barenreiter edition contains a few engraving -mistakes. The second line begins with measure 6 (but prints 5). The |: -half way in measure 13 has been forgotten. - " -} - - -\version "1.5.49" - - -sarabandeA = \context Voice \notes \relative c { - \property Staff.NoteCollision \set #'merge-differently-dotted = ##t - < { d8. e16 e4.-\trill d16 e } \\ - { d4 a2 } > - f4. [e8 d c] | - [bes g'] [f e16(f] [g a bes)d,] | - cis4.-\trill [b8 a g] | - - %% check spacing without accs: - %% c4.-\trill [bes8 a g] | - - < { d'8. e16 f4.-\trill d16 e | - f4. [d8 e f] } - \\ - { a2 } > | - %%5 - - g8 bes16()a c()bes a()g d'8 f, | - < e4.-\trill - \\ > - [d8 c bes] - %%8 - < { f'8 g16()a a4. g16()f | - g8 a16()bes bes4. c16()d } - \\ - { a,4 r8 bes4 } - > | - - %% 11 - [e,8 f] [c, g'] [f' e] | - f4 f,2 | - < { a'4 a4.-\trill bes8 - c bes16 a } \\ - { [f8 es] es4. r8 d4 } > - - fis8.-\trill es16 d8 c | - [bes g'] - [a, fis'] - [es' d] | - %%16 - < bes4.-\trill d, g, > [a8 g f!] | - e bes a f' g a | - d, as g es' f g | - [cis, bes'] [a g16 f] [e!8 f16 d] | - cis8 e16 a a,8. g'16 f8()e | - %%21 - < { d e16()f f4. e16()d | - e8 f16()g g4. a16()bes | - a8 cis16 d d,8 e16 f32 g f8-\trill e16()d } \\ - { bes4 g2 | - g4 s8 | - r r g, a4 } > - | - \stemUp - d4 d,16 a'( b cis d e f )g | - \stemBoth - \break - %%25 - < { a16(b c)b c4. b16()a | - b cis d cis d4. e16()f | } - \\ - { f,4 fis4. s8 | - gis4. } > - \voiceOne - d16(cis)d f, - [a,8 e'] - \oneVoice - [d' cis] | - d4 d,,2 | -} - - -sarabande = \context Staff \notes< - \apply #voicify-music \sarabandeA - -> - -\version "1.5.49" - -sarabandeCelloGlobal = \notes{ - \time 3/4 - \key f \major - \clef bass - \repeat "volta" 2 { - s2.*12 - } \repeat "volta" 2 { - s2.*16 - } -} - -sarabandeCelloScripts = \notes{ -} - -sarabandeCelloStaff = \context Staff < - \sarabande - \sarabandeCelloGlobal - \sarabandeCelloScripts -> - -% size perversions -smallerPaper = \paper { - \translator { \StaffContext - fontSize = #-1 - StaffSymbol \override #'staff-space = #0.8 - } - \translator { \ScoreContext - SpacingSpanner \override #'spacing-increment = #0.96 - } - - indent = 5.6 \mm - linewidth = 146.8 \mm -} - -baerPaper = \paper { - indent = 7. \mm - linewidth =183.5 \mm - interscoreline=4.0\mm - \translator { - \ScoreContext -% System \override #'molecule-callback = #box-grob-molecule - } -} - - -\score{ - \sarabandeCelloStaff - \paper{ - \baerPaper - } - \midi{ \tempo 4 = 40 } - \header{ - opus= "" - piece ="Sarabande" } -} - -%%% Local variables: -%%% LilyPond-indent-level:2 -%%% End: diff --git a/input/mozart-hrn3-allegro.ly b/input/mozart-hrn3-allegro.ly deleted file mode 100644 index 1bf3435eb1..0000000000 --- a/input/mozart-hrn3-allegro.ly +++ /dev/null @@ -1,167 +0,0 @@ -\version "1.5.49" -\include "mozart-hrn3-defs.ly" - -allegro = - \notes - \relative c' -{ - \time 4/4 - \key c \major - \partial 4 - r4 - | - R1*4 - c'2^"Tutti" g - c, r - R1*1 - r8 [g' g g] [g g e c] - g'4 g, r2 - R1*18 - r2 r4^"Solo" g'4 | - \mark "A" - e'4. () c8 [f (d c )b ] - [b()c] g4 r8 [g c e] - g2. [g16( f e )f] - dis4 () e4 r8 [c8-. c-. c-.] - c4.( [d16 e] f4 ) e - a,( d g,) c - d-. d-. \grace e16( [)d8. c16 d8. e16] - c4 r r2 - R1*3 - c,2 ~ [c8 e g c] - [c b ] b4 r2 - [c,8 () e g c] [e()g e c] - [c()b] b4 r2 - c4.( g8 e'4.) c8 - [g'()d ] d4 r4 d - [d8 () c] c4.( [d16 e] [d8 )c] - [c8(-\trill )b] b4 r2 | - d2( ~ [d8 e16 d] [c8 )b] | - [b()a] a4 r8 [a a a] - a4( cis e )g - \grace { \longgrace g16( \endlonggrace } - [ )fis8( e16 )d] d4-. r2 | - \mark "B" - R1*3 - r2 r4 [d8(_#`(,italic-bf "con espressione") )b ] - [a( )g d'( )b] [a( )g e'( )c ] - [b8( )a] a4 r4 [a8 a] - [a( \< b c \!cis\> ] d4 \! )c - [ais8() b] r8 \cresc b [b()c] r c - [cis ()d] r4 r2 - \endcresc g,1\f ~ g2 ~ [g8 a16 b] [c()d e c] - %% 64 - f4-. d-. b-. g-. - R1 - - c,2\p e4 g c \cresc e g4. e8 | - \endcresc d4.-\f [e16 fis] [g () fis e d] [c() b a g] - - < a1(-\trill - { s2 \grace{ [g16 a] } } > - \mark "C" - )g4 r r2 - R1*15 - \mark "D" - bes2-\mf d4 f - g,2~ [g8 g' es c]| - bes4( )a4. [c8( d )es] - cis4()d r8 [bes (c )d] - es2 () d4 r - es2 () d4 r - [c8( g' es )c] bes4()c - c4.( cis8 )d4 r - R1*2 - es1~es1| - e! - d - c - c, - e' - e, - c'2 [b8( a gis )a] - [gis8 e gis b ] e4 r | - r8 [e, a c] dis4 r - r8 [e, a c] dis4 r - r8 [e, g b] e4 r - r8 [fis, b dis] fis4 r - r8 [gis, b d] f4 r - r8 [g, b d_\ritenuto ] f4 r - \mark "E" - R1*8 - r2 r8 [g, g g] - e'4.() c8 [f( d c )b] - [b()c] g4 r8 [g c e] | - g2. [g16( f e )f] - dis4()e r8 [c-. c-. c-.] - c4.( [d16 e] f4 )e - a, ( d g, )c - d d - \grace { e8( } - [)d8. c16 d8. e16] - c4 r r2 - \mark "F" - R1*3 - c,2~[c8 e g c] - [c8()b] b4 r2 - [c,8 e g c ] [e ()g e c] - [c()b] b4 r2 - c2 (bes )a [a8(b c )cis] - d2( ~ [d8 e16 d] \grace { \longgrace d16( \endlonggrace } [)c8 b16 )c] - \grace { \longgrace c16 \endlonggrace }[ b8( a16 )g] g4 r2 | - R1*3 - r2 r4 [g'8()e] - \mark "G" - [d()c g'()e] [d()c a'()f] - [e()d] d4 r [d8 d] - d4(~ [d16 e d )e] [g8() f e d] | - c4 r r2 - R1 - c1 ~ - c | - [c8-. c-.] r c-. [cis()d] r\cresc d-. | - [dis()e] r e-. [e()f] r f-. | - g4-.-\f\endcresc e-. c-. bes-. | - g-.\ff e-. c-. r | - a'2 ~ [a8_""_#`(,italic-bf "sempre " (dynamic "f")) b16 c] [d( e d )e] - - - f4. () d8 [f8 ()d f d] - [c (e] )g2 \grace { \longgrace f16( \endlonggrace } [)e8( d16 )c] - - < d1-\trill ( - { s2 \grace { [c16 d] } } > - - ) c4 r r2 - R1 | - \mark "H" - \times 2/3 { [ c8 b a ] } \times 2/3 { [ g a b] } - \times 2/3 { [ c d e] } \times 2/3 { [ f e d] } | - \times 2/3 { [ c b a ] } \times 2/3 { [ g a b] } - \times 2/3 { [ c d e] } \times 2/3 { [ f e d] }| - c4 \times 2/3 { r8 [g'()e]} c4 \times 2/3 { r8 [e () c]} | - g4 \times 2/3 { r8 [c8() g] } \times 2/3 { [ e ()g e-. ] } \times 2/3 { [c () e c-.] }| - g4 r8 g'\f [a b c d]| - - < d1(-\trill - { s2 \grace { [c16 d] } } > - )c4 r r2 - R1*3 - - c4.^\fermata_"Cadenza ad lib." () d8 d4.-\trill^\fermata ( [c16 )d] - c4 r r2 - R1*8 - r4 [c8.^"tutti"-\f c16] c4 c - c [c,8. c16] c4 c| - c2 r2 \bar "|." - -} - - -\score -{ - \notes { \transpose bes \allegro } - \paper{ } - \header { piece = "allegro" opus = "" } - \midi{ \tempo 4=90 } -} diff --git a/input/mozart-hrn3-defs.ly b/input/mozart-hrn3-defs.ly deleted file mode 100644 index d453e8fad9..0000000000 --- a/input/mozart-hrn3-defs.ly +++ /dev/null @@ -1,69 +0,0 @@ - - -% #(set! point-and-click line-column-location) - -longgrace = \property Voice.Stem \override #'flag-style = #'() -endlonggrace = \property Voice.Stem \revert #'flag-style -ritenuto = \textscript #'(italic "rit.") - -\version "1.5.49" - -#(define italic-bf '((font-shape . italic) (font-series . bold))) - -%% burp -%% the very idea of a style sheet, is that it's easy to override -#(define (set-style! sheet name style) - (set-cdr! (assoc 'mark-letter (cdr (assoc 'style-alist sheet))) style)) - -#(define my-sheet (make-style-sheet 'paper20)) -#(set-style! my-sheet 'mark-letter '((font-family . roman) - (font-series . bold) - (font-shape . upright) - (font-relative-size . 3))) - -cresc = \notes { - \commandspanrequest \start "crescendo" - \property Voice.crescendoText = #`(,italic-bf "cresc.") - \property Voice.crescendoSpanner = #'dashed-line -} - -%% -%% TODO: a better mechanism for tweaking Grace settings. -%% - -startGraceMusic = \sequential { - \startGraceMusic - \property Voice.Beam \override #'space-function - = #(lambda (beam mult) (* 0.8 0.8)) - \property Voice.Beam \override #'thickness = #(* 0.384 (/ 0.6 0.48)) -} - -stopGraceMusic= \sequential { - \property Voice.Beam \revert #'thickness - \property Voice.Beam \revert #'space-function - \stopGraceMusic -} - -\paper{ - \stylesheet #my-sheet - \translator { - \ScoreContext - skipBars = ##t - midiInstrument = #"french horn" - %% try to mimic Breitkopf - RehearsalMark \override #'padding = #1 - MultiMeasureRest \override #'padding = #0.5 - MultiMeasureRest \override #'number-threshold = #1 - - Beam \override #'thickness = #0.6 - Beam \override #'space-function = #(lambda (beam mult) 0.8) - Slur \override #'beautiful = #0.3 - } - \translator { - \StaffContext - MinimumVerticalExtent = #'(-4.5 . 4.5) - } - indent = 10. \mm - linewidth = 189. \mm - -} diff --git a/input/mozart-hrn3-romanze.ly b/input/mozart-hrn3-romanze.ly deleted file mode 100644 index ca6fb662d7..0000000000 --- a/input/mozart-hrn3-romanze.ly +++ /dev/null @@ -1,93 +0,0 @@ - -\version "1.5.49" -\include "mozart-hrn3-defs.ly" - -romanze = \notes \relative c' { - \key f \major - \time 2/2 - \property Score.skipBars = ##t - - c'4.( _#'(italic (dynamic "p") " con molto espressione") - )f8 a,4 a - [bes8( c d bes] )g4 r8 g - a r bes r c r [d()bes] - a2( [)g8 a( bes )b] - c4. () f8 a,4 a | - % 6 - [bes8 (c d) bes] g4 r8 c, - [c8( e g )bes] [a( c f ) d] - c r e r f r r4 - \mark "A" - R1*8 - g4.\mf f8 [e d c bes] - % 18 - [bes( a d )c] c4 r - R1*2 - g'4. f8 [e d c bes] - [bes (a d ) c] c4 r - R1 - % 25 - [c16 ( d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.] - [c16\p () d c )d] [e ( f e )f] [g()e c-. c-.] [f()d b-. b-.] - [c8 \< c, c c] [c c c \! c ] - \mark "B" - c1\f - R1*9 - f'4.(\p )d8 b4 r8 g - g'4.() e8 c4 r8 cis | - % 39 - d4(~ [d16 e d )e] [f8 () d f() d] - c2()b4 r - R1*4 - e4. ()g8 c,4 ()cis - [d8( e f )d] b4 r8 g - [c ()e g g] [g( f e )d] - c4( - \grace { \longgrace e16 \endlonggrace } - [d8. )c16 \< ] [c8 c-.( c-. \! )c-.] - \mark "C" - - %% this is a trick to get the sfp-s to align. - \property Voice.Hairpin \override #'transparent = ##t - des1\sfp \> \! - g,1\sfp \> \! - c\sfp \> \! - c,\sfp - \property Voice.Hairpin \revert #'transparent - R1*3 - r8 [c-\p c c] c2~ - [c8 c' c c] c2~ - [c8 \< e( g f] [e \! d \> c bes] - \mark "D" - \! )a4 r r2 - R1*3 - c4.-\p () f8 a,4 a | - [bes8 (c d) bes] g4 r8 c, - [c8( e g )bes] [a( c f ) d] - c r e r f4 r4 - R1*3 - r2 r4 r8 c,8 - [c8( e g )bes] [a( c f ) d] - c r e r f4 r4 - g,1 - c,2 c4. c8 - [c8( e g )bes] [a( c f ) d] - c r e r f4 r4 % -. ? - - R1 - c8-. r e-. r f4 r4 - - % Finish with F if played separately - c8-.( r c,-. r ) c4 r4| - \bar "|." -} - - - -\score -{ - \notes { \transpose bes \romanze } - \header { piece = "romanze" opus = "" } - \midi{ \tempo 4 = 70 } - \paper{} -} diff --git a/input/mozart-hrn3-rondo.ly b/input/mozart-hrn3-rondo.ly deleted file mode 100644 index 95e7298451..0000000000 --- a/input/mozart-hrn3-rondo.ly +++ /dev/null @@ -1,194 +0,0 @@ -\version "1.5.49" - -% \include "mozart-hrn3-defs.ly" - -rondotheme = \notes \relative c' { - [c'8 c c] [c c c] - c4( cis8 )d r g, - [d'8 d d] [d d d] - d4( dis8 )e r c | - [c()d e] [f g a] - [g ()e c] c4 d8 - e4()d8 e4()f8 - e4.()d8 r r | -} - -lipbreaker = \notes \relative c' -{ - r8 [g'-. g-.] [c()e g,-.] - [c()e g,-.] [c()e g,-.] - [c c, c] [c c c] - [c c c] [c c c] -} - -rightsixteenth = { \property Voice.stemLeftBeamCount = 1 - \property Voice.stemRightBeamCount = 2 } -leftsixteenth = { \property Voice.stemLeftBeamCount = 2 - \property Voice.stemRightBeamCount = 1 } -bothsixteenth = { \property Voice.stemLeftBeamCount = 2 - \property Voice.stemRightBeamCount = 2 } - -rondo = \notes \relative c' -{ - \partial 8 - \time 6/8 - \key c \major - - g'8-\p | - - \rondotheme - - R2.*13 | - r8 r^\fermata d [d e f] - [g ()e c-.] [d()e d-.] - c4 c8 [d e f] - [g()e c-.] [d()e d-.] - c4 r8 r4 r8 | - R2.*7 - \mark "A" - c4.\p \grace { e16( } [)d8 c d] - c4 r8 r4 r8 - e4. \grace g16( [)f8 e f] - e4 r8 r4 r8 - g4. e4 c8 - g2.~ - [g8 a b] [c d e ] - e4.()d8 r r - R2.*4 - e2.~ | - [e8 d c] [c b a] - d2.~ - [d8 c b] [b a g] - g'4()e8 b4()cis8 - \mark "B" - d4 r8 r4 r8 - R2.*3 | - r8 [d-. d-.] [d()g d-.] - [d()g d-.] [d d d] - [d()g] r r4 r8 - R2.*1 - \lipbreaker - c4 r8 [c' d e] - d4()g8 [c, d e] - d4 r8 r4 r8 - R2. | - r4 r8 [c-. d-. e-.] - d4()g8 [c, d e] - [d()g fis] [e d c] - [b () e d] [c b a] - \mark "C" - g4 r8 r4 r8 - R2. | - % - r8 [g-\f g] [g( )b b-.] - [b()d d-.] [d()g g-.] - g2.~ - [g8 \> a g] [f e d] - < \rondotheme - { \! s8-\p } > - - R2.*12 - r4 r8 r4 c8 - \mark "D" - c4 f8 c4 a8 - a4.~a4 a8 - bes4 c8 d4 bes8 - g4. ~ g8 r r - R2.*3 - r4 r8 r4 c8 - a4. c - f ~ [f8. \rightsixteenth e16( \bothsixteenth d )c] - bes4 g8 e4 g8 - c,4. ~ c8 r r - R2.*3| - r4 r8 r4 c'8 - b4()c8 b4()c8 - bes4. ~ bes4 g8 - a4 () c8 f4 () b,8 - d4. () c8 r r - R2.*3| - r4 r8 r4 c'8 - b4()c8 b4()c8 - bes4. ~ bes4 g8 - a4 c8 [f () d b!] - d4. () c8 r r - \mark "E" - R2.*9 | - \lipbreaker - [c8 c' c] c4.~ - [c8 c d] [e e fis] - g4 r8 r4 r8 - R2. - r8 [g, g] [g g g] | - es'4. ~ [es8 d c] - b4 r8 r4 r8 - R2. | - r8 [g g] [g g g] - es'4. ~ [es8 d c] - \cresc b4. c4. d4. e4. - \mark "F" - \endcresc - - f2.\f ~ | - f4 r8 r4 r8 - r8 [g,\> g] [g g g] - - % Edition breitkopf says a-flat (silly!) - [fis g gis] - [a bes \! b] - - %% EB does the slur in the Rondo differently from the 1st adn 2nd time. - %% why. Should check with MS. - < \rondotheme - { s8-\p } > - R2.*7 - \mark "G" - R2.*4 - c,4.\mf c4 c8 - c4. e4 c8 - g'4. g4 g8 - g4. g,4 g8 - c4 r8 r4 r8 - r4 r8 r4 g'8 - [c ()e g,-.] [c ()e g,-.] - [c ()e g,-.] [c ()e g,-.] - \mark "H" - \cresc g'2. bes,2. - a4. [b16 c d e f g] - a4. f4 d8 - [\endcresc c8\f g' e] [c g e] - [ c e' c] [g e c] - g4 r8 [g''8 e c] - - - < d2.(-\trill - { s2 \grace { [c16 d] } } > - - - )c4 r8 r4 r8 - R2.*5 - r8 r8^\fermata d8\p [d e f] - [g ()e c] [d()e d] - \cresc [c c c] [d e f] - [g()e c] [d()e d] - \endcresc c4\f r8 r4 r8 - R2.*5 - [c8\f c, c] [c c c] - c4 r8 c4 r8 - - %This is technically incorrect, since we started with an 8th - % upstep, but both eulenburg and EB do this as well. - c4 r8 r4 r8 \bar "|." -} - - - - - -\score -{ - \notes { \transpose bes \rondo } - \header { piece = "rondo" opus = "" } - \midi{ \tempo 4 = 100 } - \paper { } -} diff --git a/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile index 48b1a47b36..c8c885df92 100644 --- a/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile +++ b/input/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile @@ -1,6 +1,6 @@ # mutopia/J.S.Bach/Petites-Preludes/Makefile -depth = ../../.. +depth = ../../../.. EXTRA_DIST_FILES= diff --git a/input/mutopia/W.A.Mozart/GNUmakefile b/input/mutopia/W.A.Mozart/GNUmakefile index 3a3bea4a15..f4fc66c5e0 100644 --- a/input/mutopia/W.A.Mozart/GNUmakefile +++ b/input/mutopia/W.A.Mozart/GNUmakefile @@ -1,6 +1,6 @@ # -depth = ../.. +depth = ../../.. examples=mozart-hrn-3 LOCALSTEPMAKE_TEMPLATES=ly mutopia diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly index f10830f9b2..9d903b9b19 100644 --- a/ly/declarations-init.ly +++ b/ly/declarations-init.ly @@ -30,8 +30,6 @@ melismaEnd = \property Staff.melismaBusy = ##f \include "engraver-init.ly" \include "grace-init.ly" -singleLine = \paper { linewidth = 1. } - % ugh \include "midi-init.ly" diff --git a/make/generic-vars.make b/make/generic-vars.make index 78a11c5c23..f3406eaf0f 100644 --- a/make/generic-vars.make +++ b/make/generic-vars.make @@ -39,7 +39,6 @@ EXTRA_DOC_FILES = \ Documentation/tex/*.bib\ Documentation/pictures/out/lelie_logo.gif\ input\ - mutopia\ INSTALLED_EXTRA_DOC_FILES = $(addprefix $(prefix:/%=%)/doc/lilypond/, $(EXTRA_DOC_FILES)) diff --git a/make/lilypond.mandrake.spec.in b/make/lilypond.mandrake.spec.in index 90e57085c8..3dce5d0904 100644 --- a/make/lilypond.mandrake.spec.in +++ b/make/lilypond.mandrake.spec.in @@ -88,7 +88,7 @@ mkdir -p $RPM_DOC_ROOT/HTML tar -C $RPM_DOC_ROOT/HTML -xzf out/web.tar.gz ln -s HTML/input $RPM_DOC_ROOT/Examples ln -s HTML/input/test $RPM_DOC_ROOT/Tricks -ln -s HTML/mutopia $RPM_DOC_ROOT/Mutopia + mkdir -p $RPM_DOC_ROOT/Printable ln -s ../HTML/Documentation/user/out-www/lilypond.ps.gz $RPM_DOC_ROOT/Printable/Manual.ps.gz ln -s ../HTML/Documentation/user/out-www/glossary.ps.gz $RPM_DOC_ROOT/Printable/Glossary.ps.gz diff --git a/make/lilypond.redhat.spec.in b/make/lilypond.redhat.spec.in index 82a3cad196..2286693328 100644 --- a/make/lilypond.redhat.spec.in +++ b/make/lilypond.redhat.spec.in @@ -146,4 +146,4 @@ chkfontpath --remove=/usr/share/lilypond/@TOPLEVEL_VERSION@/fonts/type1/ %doc web/ %doc input/ -%doc mutopia/ + diff --git a/make/lilypond.suse.spec.in b/make/lilypond.suse.spec.in index ebe46c3ecf..7fd4c33cd0 100644 --- a/make/lilypond.suse.spec.in +++ b/make/lilypond.suse.spec.in @@ -260,7 +260,7 @@ touch var/adm/SuSEconfig/run-texhash %files doc # this gets too messy... -%doc mutopia/ + %doc input/ %doc web/ # verbatim include of input: list the directory without issuing a %dir diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 6b9bf94cdc..606a61a079 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -132,7 +132,7 @@ ,Beam::check_concave ,Beam::slope_damping ,Beam::shift_region_to_valid -; ,Beam::quanting + ,Beam::quanting )) ;; TODO: should be in SLT. -- 2.39.2