From c89ca5505627d7b52922c4627e4afd02c03e039f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Fri, 16 Jul 1999 15:24:41 +0200 Subject: [PATCH] release: 1.1.61 --- Documentation/bibliography/engraving.bib | 15 +- Documentation/ntweb/GNUmakefile | 4 +- Documentation/ntweb/angels.ly | 109 ++++++ Documentation/ntweb/guile.patch | 78 +++++ Documentation/tex/feta.tex | 9 +- Documentation/tex/reference-manual.yo | 7 + Documentation/tex/tutorial.yo | 69 ++-- NEWS | 18 +- TODO | 7 +- VERSION | 4 +- aclocal.m4 | 2 + configure | 17 - input/bugs/choral.ly | 243 +++++++++++++ input/bugs/spacing.ly | 0 lily/axis-group-element.cc | 23 +- lily/axis-group-engraver.cc | 4 +- lily/include/axis-group-element.hh | 1 + lily/performance.cc | 7 +- lily/script-engraver.cc | 4 + lily/time-signature-performer.cc | 2 +- ly/auto-beam-settings.ly | 6 +- ly/performer.ly | 2 + make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mutopia/N.W.Gade/brass.ly | 26 +- mutopia/N.W.Gade/global.ly | 2 + mutopia/N.W.Gade/parts.ly | 1 + mutopia/N.W.Gade/score.ly | 13 +- mutopia/N.W.Gade/strings.ly | 72 ++-- mutopia/N.W.Gade/wood.ly | 421 +++++++++++------------ mutopia/gallina.ly | 151 ++++---- scm/lily.scm | 2 +- scripts/ly2dvi.py | 12 +- stepmake/aclocal.m4 | 2 + 35 files changed, 923 insertions(+), 430 deletions(-) create mode 100644 Documentation/ntweb/angels.ly create mode 100644 Documentation/ntweb/guile.patch create mode 100644 input/bugs/choral.ly delete mode 100644 input/bugs/spacing.ly diff --git a/Documentation/bibliography/engraving.bib b/Documentation/bibliography/engraving.bib index bfa65238d3..e423f0c1b0 100644 --- a/Documentation/bibliography/engraving.bib +++ b/Documentation/bibliography/engraving.bib @@ -50,8 +50,11 @@ @Book {read-notation, - note = {(Out of print) This is as close to the ``standard'' reference -work for music notation issues as one is likely to get. MB}, + + note = {This is as close to the ``standard'' + reference work for music notation issues as one is likely to get. + [Available at amazon]}, + title = {Music Notation: a Manual of Modern Practice}, author = {Gardner Read}, totalentry = {(2nd edition)}, @@ -70,7 +73,13 @@ work for music notation issues as one is likely to get. MB}, @Book {wanske, - note = {I. A very thorough overview of engraving practices of various craftsmen. It includes detailed specs of characters, dimensions etc. II. a thorough overview of a anonymous (by now antiquated) automated system. EDV Means e(lektronischen) D(aten)v(erarbeitung), electronic data processing HWN}, + +note = {I. A very thorough overview of engraving practices of various +craftsmen. It includes detailed specs of characters, dimensions +etc. II. a thorough overview of a anonymous (by now antiquated) +automated system. EDV Means e(lektronischen) D(aten)v(erarbeitung), +electronic data processing HWN. Available at amazon.de}, + year = {1988}, title = {Musiknotation --- Von der Syntax des Notenstichs zum EDV-gesteuerten Notensatz}, author = {Helene Wanske}, diff --git a/Documentation/ntweb/GNUmakefile b/Documentation/ntweb/GNUmakefile index d88681c0f4..fe2bbdef62 100644 --- a/Documentation/ntweb/GNUmakefile +++ b/Documentation/ntweb/GNUmakefile @@ -4,6 +4,8 @@ STEPMAKE_TEMPLATES=documentation TO_TOP_FILES=$(addprefix $(outdir)/, $(README_TOP_FILES)) PLAIN_FILES=angels.ly guile.patch +EXTRA_DIST_FILES += $(PLAIN_FILES) + include $(depth)/make/stepmake.make @@ -18,7 +20,7 @@ $(outdir)/%.html: %.yo --news=$(depth)/NEWS $@ dist-plain: - cp $(PLAIN_FILES) $(out-dir) + cp $(PLAIN_FILES) $(outdir) local-WWW: diff --git a/Documentation/ntweb/angels.ly b/Documentation/ntweb/angels.ly new file mode 100644 index 0000000000..0b2662a282 --- /dev/null +++ b/Documentation/ntweb/angels.ly @@ -0,0 +1,109 @@ +\header{ +filename = "angles.ly"; +title = "Angels We Have Heard on High"; +description = "Christmas Carol."; + +composer = "French Carol, 1854"; +enteredby = "Jeffrey B. Reed"; +copyright = "public domain"; +} + +global = \notes { + \time 2/2; + \keysignature bes; + \tempo 2=60; +} +\version "1.1.52"; +% \include "score-paper.ly" + +flute1 = \notes \relative c'' { + \clef violin; + \property Staff.instrument = "flute" + + a'4 a a c | + c4. bes8 a2 | + a4 g a c | + + a4. g8 f2 | + a4 a a c | + c4. bes8 a2 | + + a4 g a c | + a4. g8 f2 | + c'2( [ d8 c8 bes8 a8 ] | + + bes2 [ c8 bes8 a8 g8 ] | + a2 [ bes8 a8 g8 f8 ] | + )g4. c,8 c2 | + + f4 g a bes | + a2 g2 | + c2( [ d8 c8 bes8 a8 ] | + + bes2 [ c8 bes8 a8 g8 ] | + a2 [ bes8 a8 g8 f8 ] | + )g4. c,8 c2 | + + f4 g a bes | + a2( )g2 | + f1 \bar "|."; +} + +flute2 = \notes \relative c'' { + \clef violin; + \property Staff.instrument = "oboe" + + f4 f e e | + g4 e f2 | + f4 e f f | + + f4 e f2 | + f4 f e e | + f4 g f2 | + + f4 e f f | + f4 e f2 | + f4 ( [a8 g8 ] f2( | + + )f4 [g8 f8] e2( | + )e4 [f8 e8] d2 | + )c4.c8 c2 | + + c4 e f f | + f2 e2 | + f4 ( [a8 g8 ] f2( | + + )f4 [g8 f8] e2( | + )e4 [f8 e8] d2 | + )c4.c8 c2 | + + c4 e f f | + f2( )e2 | + c1 \bar "|."; +} + +$flute1_staff = \context Staff = flute1_group < + \global + \flute1 +> + +$flute2_staff = \context Staff = flute2_group < + \global + \flute2 +> + +$flutes = \context StaffGroup < + \$flute1_staff + \$flute2_staff +> + + +\score{ + < + \$flutes + > + \paper{} + \midi{ + \tempo 2 = 60 ; + } +} diff --git a/Documentation/ntweb/guile.patch b/Documentation/ntweb/guile.patch new file mode 100644 index 0000000000..44debc8f40 --- /dev/null +++ b/Documentation/ntweb/guile.patch @@ -0,0 +1,78 @@ +diff -urN ../guile-core/libguile/Makefile.am ./libguile/Makefile.am +--- ../guile-core/libguile/Makefile.am Sat Oct 10 13:00:59 1998 ++++ ./libguile/Makefile.am Wed Oct 21 10:58:56 1998 +@@ -10,7 +10,7 @@ + ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(PROC\|PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' + + lib_LTLIBRARIES = libguile.la +-bin_PROGRAMS = guile ++bin_PROGRAMS = guile.exe + + guile_SOURCES = guile.c + guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} +diff -urN ../guile-core/libguile/Makefile.in ./libguile/Makefile.in +--- ../guile-core/libguile/Makefile.in Sat Oct 10 13:00:59 1998 ++++ ./libguile/Makefile.in Wed Oct 21 10:59:02 1998 +@@ -94,7 +94,7 @@ + ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\(PROC\|PROC1\|SYMBOL\|VCELL\|CONST_LONG\).*\"\([^\"]\)*\"/\3/' + + lib_LTLIBRARIES = libguile.la +-bin_PROGRAMS = guile ++bin_PROGRAMS = guile.exe + + guile_SOURCES = guile.c + guile_LDADD = libguile.la ${THREAD_LIBS_LOCAL} +diff -urN ../guile-core/libguile/dynl-dl.c ./libguile/dynl-dl.c +--- ../guile-core/libguile/dynl-dl.c Mon Mar 30 23:03:30 1998 ++++ ./libguile/dynl-dl.c Wed Oct 21 09:41:55 1998 +@@ -45,8 +45,6 @@ + Author: Aubrey Jaffer + Modified for libguile by Marius Vollmer */ + +-#include +- + #ifdef RTLD_LAZY /* Solaris 2. */ + # define DLOPEN_MODE RTLD_LAZY + #else +diff -urN ../guile-core/libguile/filesys.c ./libguile/filesys.c +--- ../guile-core/libguile/filesys.c Fri Oct 09 20:51:15 1998 ++++ ./libguile/filesys.c Wed Oct 21 10:18:12 1998 +@@ -138,15 +138,19 @@ + if (fdes == -1) + scm_syserror (s_chown); + } ++#if 0 + SCM_SYSCALL (rv = fchown (fdes, SCM_INUM (owner), SCM_INUM (group))); ++#endif + } + else + { + SCM_ASSERT (SCM_NIMP (object) && SCM_ROSTRINGP (object), + object, SCM_ARG1, s_chown); + SCM_COERCE_SUBSTR (object); ++#if 0 + SCM_SYSCALL (rv = chown (SCM_ROCHARS (object), + SCM_INUM (owner), SCM_INUM (group))); ++#endif + } + if (rv == -1) + scm_syserror (s_chown); +@@ -557,14 +561,18 @@ + if (fdes == -1) + scm_syserror (s_truncate_file); + } ++#if 0 + SCM_SYSCALL (rv = ftruncate (fdes, csize)); ++#endif + } + else + { + SCM_ASSERT (SCM_NIMP (object) && SCM_ROSTRINGP (object), + object, SCM_ARG1, s_chown); + SCM_COERCE_SUBSTR (object); ++#if 0 + SCM_SYSCALL (rv = truncate (SCM_ROCHARS (object), csize)); ++#endif + } + if (rv == -1) + scm_syserror (s_truncate_file); diff --git a/Documentation/tex/feta.tex b/Documentation/tex/feta.tex index e7a84aff10..a65e6dd888 100644 --- a/Documentation/tex/feta.tex +++ b/Documentation/tex/feta.tex @@ -11,7 +11,7 @@ \font\fetanumber = feta-nummer12 \font\fetafinger = feta-nummer5 \font\fetadyn = feta-din10 scaled \magstep 2 -\font\title = cmbx12 scaled \magstep 4 +\font\titlefont = cmbx12 scaled \magstep 4 \font\subtitle = cmr9 \def\lilyfooter{Lily was here} @@ -35,11 +35,16 @@ {\setchar{#1}{\number\n}} \repeat}}}}\repeat} +\def\title#1{\centerline{\titlefont #1}} +\def\author#1{\centerline{#1}} -\centerline{\title FETA} +\title{FETA} \centerline{\subtitle (definitely not an abbreviation for Font-En-Tja)} +\author{Han-Wen Nienhuys and Jan Nieuwenhuizen} + + \vskip5mm \listfont{\fetatwenty}{0}{105} diff --git a/Documentation/tex/reference-manual.yo b/Documentation/tex/reference-manual.yo index 8ff34fad88..e1dd361566 100644 --- a/Documentation/tex/reference-manual.yo +++ b/Documentation/tex/reference-manual.yo @@ -1574,6 +1574,13 @@ set to code(\down) to print marks below the staff. dit(code(articulationScriptPadding)) Determines the extra space added between articulation marks, such as staccato, tenuto, trill, up/down bow or fermata, and the closest staff line or note. + + +dit(code(articulationScriptVerticalDirection)) Determines the location +of articulation marks. Set to code(\up) to print marks above the +staff; set to code(\down) to print marks below the staff. This +property does not override explicit directions marked with code(^) or +code(_) in the mudela file. ) subsubsubsect(Staff properties) diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index 72ffe2ff2f..23ceafe444 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -135,20 +135,20 @@ the input itself, line by line. verb(% lines preceded by a percent are comments.)COMMENT( -)The percent sign, `code(%)', introduces a line comment. If you want +)The percent sign, `code(%)', introduces a line comment. If you want to make larger comments, you can use block comments. These are delimited -by `code(%{)' and `code(%})' +by `code(%{)' and `code(%})'COMMENT( -verb(\input "paper16.ly") +)verb(\input "paper16.ly")COMMENT( -By default, LilyPond will use definitions for a staff of 20 +)By default, LilyPond will use definitions for a staff of 20 nop(point)footnote(A point is the standard measure of length for printing. One point is 1/72.27 inch.) high. If you want smaller output (e.g., 16 point), you have to import the settings for that size. You can do this by including a file. code(\include "file") is replaced by the contents of code(file). -LilyPond will inspect the standard search to look for the requested +LilyPond will inspect the standard search path to look for the requested file.COMMENT( )verb(\score { @@ -191,10 +191,9 @@ COMMENT( notes that are to be played and printed after each other. This is in contrast with simultaneous music: notes that are to be played like a chord. You should be careful not to confuse this brace with the one -coming after code(\score). +coming after code(\score).COMMENT( - -verb( +)verb( \time 3/4; % set the time signature. ) COMMENT( @@ -230,7 +229,7 @@ designates the duration of the note (it is a quarter note). COMMENT( )These are notes with pitch code(a') and code(b'). Because their duration is the same as the code(g), there is no need to enter the duration (It is not illegal to enter it anyway. You would then enter -code(a8 b8)) COMMENT( +code(a4 b4)) COMMENT( )verb( d4 g, g | @@ -238,7 +237,7 @@ code(a8 b8)) COMMENT( ) Three more notes: The code(|) is a ``barcheck''. When processing the music, LilyPond will check that barchecks are found at the start of -a bar. This can help you track down notes you forgot to enter. +a measure. This can help you track down notes you forgot to enter. verb( e'4 c8 d e fis ) COMMENT( @@ -252,11 +251,11 @@ verb( c4 d8( )c b a( )b4 c8 b a g | ) COMMENT( -) The next line shows something new: In mudela, one enters a slur by -marking the beginning and ending note of the slur with an opening and +) The next line shows how to make a slur: +the beginning and ending note of the slur is marked with an opening and closing parenthesis respectively. In the line shown above this is done for two slurs. Note that parentheses (slur markers) are between -the notes. As you can see, parentheses do not have to nest. +the notes. COMMENT(As you can see, parentheses do not have to nest.) verb( a4 b8 a g fis g2. | ) COMMENT( @@ -277,13 +276,13 @@ verb( needed: the first C sharp will be printed with an accidental, the second one without. COMMENT( -)verb( a8-. b-. cis-. d-. e-. fis-. % try some super and subscripts.)COMMENT( +)verb( a8-. b-. cis-. d-. e-. fis-. )COMMENT( -)There is more to music than pitches and rhythms. An important -aspect is articulation. You can enter articulation signs either in an -abbreviated form, by a dash and the the character for the -articulation to use, e.g. code(-.) for staccato as shown above. -COMMENT( +)There is more to music than pitches and rhythms. An important aspect +is articulation. You can enter articulation signs either in a verbose +in abbreviated for. Here we demonstrate the abbreviated form: it is +formed by a dash and the the character for the articulation to use, +e.g. code(-.) for staccato as shown above. COMMENT( )verb( fis a, r8 cis8 @@ -311,22 +310,21 @@ verb( This ends the sequential music. verb(\paper { - linewidth = 10.0\cm; + linewidth = 14.0\cm; }) This specifies a conversion from music to notation output. Most of the details of this conversions (font sizes, dimensions, etc.) have been taken care of, but to fit the output in this document, it has -to be smaller. We do this by setting the line width to 10 centimeter +to be smaller. We do this by setting the line width to 10 centimeters (approximately 4 inches). +COMMENT( -verb( +)verb( } )COMMENT( )The last brace ends the code(\score) block. - - There are a couple of things to note here. The input format tries to capture the meaning of em(music), and not notation. Therefore the format contains musical concepts like pitches and durations, instead @@ -803,12 +801,6 @@ equivalent to notes, so they can appear in the same places as notes. sect(Notation context) -COMMENT(This section is about translation contexts, a topic of LilyPond that -is advanced. You don't have to understand this to use -LilyPond to print simple music. If you don't want to typeset fancy -polyphonic music or tweak the LilyPond notation engine, you can skip -the next two sections.) - In bind(Section)ref(tutorial:more-staffs) it was explained that there are more ways to notate a simple chord: as a single voice on a single staff or in multiple staffs (and we'll soon see, that you can typeset @@ -1596,11 +1588,10 @@ switch = \context Voice = voiceA \notes { s4 \translator Staff = staffB s4 ) If you want to switch staffs you are in the middle of a slur or a -beam, you should take special precautions. In the paper block, -you must tell how far the staffs will be apart: +beam, the staffs should have a fixed distance. You do this by using the PianoStaff context. mudela(verbatim,center)( \score{ - \context GrandStaff < + \context PianoStaff < \context Staff=one \notes{ s2 } \context Staff=two \notes\relative c{ \time 4/8; @@ -1612,18 +1603,9 @@ mudela(verbatim,center)( > \paper { linewidth=-1.0; - % slur damping gets confused - slur_slope_damping = 100.0; - \translator{ - % we're using a grand staff - \GrandStaffContext - minVerticalAlign = 3.0*\staffheight; - maxVerticalAlign = 3.0*\staffheight; - } } } ) -as LilyPond cannot determine the interstaff distance. sect(Tuplets) @@ -1695,3 +1677,6 @@ COMMENT( } ) +sect(Grace notes) + +sect(\rhythm) diff --git a/NEWS b/NEWS index 9af9e4c235..11181c4da0 100644 --- a/NEWS +++ b/NEWS @@ -4,15 +4,31 @@ pl 60.jcn2 - slur height damping based on bow height - don't typeset unfinished (auto) beams +pl 60.jbr1 + - Documentation/ntweb/angels.y,Documentation/ntweb/guile.patch: added + - Documentation/ntweb/GNUmakefile: add above to EXTRA_DIST_FILES + +pl 59.mb2 + - Tempo changes in MIDI output! + - gallina.ly:auto-beaming + - added property articulationScriptVerticalDirection + (useful in N.W.Gade/score.ly) + - bf, N.W.Gade: removed some more misprints + +pl 60.uu1 + - bf: hara-kiri.ly + pl 60.jcn1 - interstaff slur tuning - added some regtests - removed now silly check in encompass-info +********** + pl 59.uu1 - papervar loose_column_distance - scripts don't collide. - - midi2ly outputs \context iso \type + - bf: midi2ly outputs \context iso \type pl 59.jbr1 - lily/colhpos.cc: fixed typo diff --git a/TODO b/TODO index bf57a9aacf..e4b3b4ec17 100644 --- a/TODO +++ b/TODO @@ -70,6 +70,7 @@ one of the spacing bugs mentioned in the TODO. - The paper11/13/26 files have to be updated. . * Grace_slur_engraver. +. * (gulp-file-to-str) for LilyPond . * input/star-spangled-banner.ly: fold for lyrics? . * don't create $srcdir/share/ . * Break_req handling is silly (break_forbid () + \break fucks up.) @@ -148,6 +149,11 @@ following example. .* BUGS . * [c8. c16 c16 c16] in 6/8 timesig. +. * +> \context Staff < +> {\voiceone c''4. r8} +> {\voicetwo c,4 r4} +> > .* STUFF . * break priority setting from SCM. @@ -393,7 +399,6 @@ languages: . * add to MIDI output: . * sharp / flat on trills (in MIDI ??) -. * tempo change . * ornaments (and trills?) . * slurs . * accents diff --git a/VERSION b/VERSION index d2754bc3fa..19b7d79fb4 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=60 -MY_PATCH_LEVEL=jcn2 +PATCH_LEVEL=61 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/aclocal.m4 b/aclocal.m4 index a86a37f121..ace44c49b3 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -6,6 +6,8 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in diff --git a/configure b/configure index 5f15b0176c..506ffcfa7f 100755 --- a/configure +++ b/configure @@ -3268,23 +3268,6 @@ test -n "$MAKEINFO" || MAKEINFO="error" fi -echo $ac_n "checking links for running from sourcetree""... $ac_c" 1>&6 -echo "configure:3273: checking links for running from sourcetree" >&5 -LILYPONDPREFIX=$absolute_builddir -LOCALES="it nl" -for i in $LOCALES; do - dir=$LILYPONDPREFIX/share/locale/$i/LC_MESSAGES - if test ! -x $dir ; then - mkdir -p $dir - fi - rm -f $dir/lilypond.mo - ln -sf $LILYPONDPREFIX/po/out/$i.mo $dir/lilypond.mo -done -rm -f afm; ln -sf $LILYPONDPREFIX/mf/out afm -rm -f tfm; ln -sf $LILYPONDPREFIX/mf/out tfm -rm -f cmtfm; ln -sf $TEX_TFMDIR cmtfm -echo "$ac_t""ok" 1>&6 - trap '' 1 2 15 cat > confcache <<\EOF diff --git a/input/bugs/choral.ly b/input/bugs/choral.ly new file mode 100644 index 0000000000..178c5ce0fa --- /dev/null +++ b/input/bugs/choral.ly @@ -0,0 +1,243 @@ + +\include "deutsch.ly" + +global = \notes { + \time 2/2; \partial 2*1; + \key g; + + s2 | s1 | s1 | + \time 3/2; + s1. | s1. | + \time 2/2; + s1 | s1 | s1 | s2 + + s2 | s1 | s1 | + \time 3/2; + s1. | s1. | + \time 2/2; + s1 | s1 + \time 3/2; + s1. \bar "||"; + + s1. | s1. | s1. | s1. | + s1. | s1. | s1. | s1. \bar "||"; + + \key es; + s1. | s1. | s1. | s1. | + s1. | s1. | s1. | s1 \bar "||"; + + \key g; + s2 | + \time 2/2; + s1 | s1 | + \time 3/2; + s1. | s1. | + \time 2/2; + s1 | s1 | s1 | s2 + + s2 | s1 | s1 | + \time 3/2; + s1. | s1. | + \time 2/2; + s1 | s1 | s1 \bar "|."; +} + +themeMelody = \notes \relative c'' { + g2 | g d' | h a | + g fis g | a ~ a \breathe b | + d b | a a | g ~ g ~ | g \breathe + + g2 | g d' | h a | + g fis g | a ~ a \breathe b | + d b | +} + +themeBeforeBreak1EndMelody = \notes \relative c'' { + a2 a | g ~ g ~ g4 r4 +} + +themeFinalEndMelody = \notes \relative c'' { + a2 a ~ | a1^\fermata +} + +themeRightHand = \notes \relative c' { + d2 | c | | d2 es es4 c4 | + | f2 | | + cis4 | + + | | | d2 es es4 c4 | + | f2 | +} + +themeBeforeBreak1EndRightHand = \notes \relative c' { + | cis4 r4 | +} + +themeFinalEndRightHand = \notes \relative c' { + | +} + +themeLeftHand = \notes \relative c { + < \context Voice = one { \stemup + h'2 | h c | cis c | a4 c c2 b4 a ~ | a1 \breathe + b2 | e d | h cis | b a | h \breathe + + g | a c | cis c | a4 c c2 b4 a ~ | a1 \breathe + b2 | e d | + } + \context Voice = two { \stemdown + | g ~ | g c | g a g | + | | a a | g a | h + + g | g g ~ | g c | g a g | + | | + } + > +} + +themeBeforeBreak1EndLeftHand = \notes \relative c' { + | a2 h4 r4 | +} + +themeFinalEndLeftHand = \notes \relative c' { + | +} + +themePedal = \notes \relative c' { + g4 fis | f2 c | a' d, | + h c es | d ~ d \breathe b | + e, g | a a | d, f4 a | h2 \breathe + + c2 | e2 c | a' d, | + h c es | d ~ d \breathe b | + e, g | +} + +themeBeforeBreak1EndPedal = \notes \relative c { + a2 a | d,2 f4 a h4 r4 | +} + +themeFinalEndPedal = \notes \relative c { + a2 a | d,1_\fermata +} + +break1Melody = \notes \relative c'' { + g4( fis e fis d' h | )a1. | + g4( es g b es g | | + b,2 g es | d1. | + b'2 g d' | a1 r2 | +} + +break1RightHand = \notes \relative c' { + e1. | g4( fis e fis g fis | + )es1. | dis'2 d4 c b a \breathe | + s1. | s1. | + es1 | r2 | +} + +break1LeftHand = \notes \relative c { + < + \context Voice = oben { + \stemup + c'1. | d2. c4 h a | b1. | d1. | + } + \context Voice = unten { + \stemdown + | | | d2. e4 fis d | + } + > + r4 b2( g4 b c | d c b g fis d | + <)es1 c'1> |

r2 | +} + +break2RightHand = \notes \relative c'' { + g8 r8 c,8 r8 r8 c r g' r c, r | + r c r b' r es, r r es r | + b' r es, r r es r d' r r | + d' r f, r r f r d' r r | + d' r g, r r g r d' r g, r | + es' r g, r r g b es r r | + d8 r b r d8 f d b a4-. | + \breathe +} + +break2LeftHand = \notes \relative c' { + r8 g r g r g r g r g r g | + r8 g r g r b r b r b r b | + r c r c r c r c r h r h | + r d r d r d r d r d r d | + r d r d r d r d r c r c | + r r r r r f' r | + r r r4 | + \breathe +} + +break2Pedal = \notes \relative c { + c2 c g' | es1 d2 | c1 h2 | + b1 d2 \breathe | g2 g f2 | es1 f2 | + b,2 g a | d1 \breathe +} + +\score { + < + \context PianoStaff < + \property PianoStaff.instrument = "Manual" + \context Staff = treble < + \global + \context Voice = melody { + \stemup \themeMelody \themeBeforeBreak1EndMelody + \break1Melody + \stemboth \break2RightHand + \stemup \themeMelody \themeFinalEndMelody + } + \context Voice = righthand { + \stemdown \themeRightHand \themeBeforeBreak1EndRightHand + \break1RightHand + \notes { + s1. | s1. | s1. | s1. | + s1. | s1. | s1. | s1 + } + \themeRightHand \themeFinalEndRightHand + } + > + \context Staff = bass < + \clef "bass"; + \global + \context Voice = lefthand { + \themeLeftHand \themeBeforeBreak1EndLeftHand + \break1LeftHand + \break2LeftHand + \themeLeftHand \themeFinalEndLeftHand + } + > + > + \context Staff = pedal { + \property Staff.instrument = "Pedal" + \clef "bass"; + < + \global + \context Voice = pedal { + \themePedal \themeBeforeBreak1EndPedal + \notes { + R1. R1. R1. R1. R1. R1. R1. R1. + } + \break2Pedal + \themePedal \themeFinalEndPedal + } + > + } + > + + \header { + tagline = ""; + } + + \paper { + linewidth = 18.8 \cm; + textheight = 28.0 \cm; + + \translator { \OrchestralScoreContext } +% \translator { \StaffContext \consists "Staff_margin_engraver"; } +% \translator { \PianoStaffContext \consists "Staff_margin_engraver"; } + } +} diff --git a/input/bugs/spacing.ly b/input/bugs/spacing.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/lily/axis-group-element.cc b/lily/axis-group-element.cc index 0c5322bec7..a562b52d88 100644 --- a/lily/axis-group-element.cc +++ b/lily/axis-group-element.cc @@ -90,6 +90,7 @@ Interval Axis_group_element::extra_extent (Axis a )const { Interval g; + purge_extra (); for (int i=0; i < extra_elems_.size (); i++) { Interval ge = extra_elems_[i]->extent (a); @@ -126,7 +127,7 @@ Axis_group_element::add_extra_element (Score_element *e) while (e && e != this) { se.push (e); - e = dynamic_cast (e->dim_cache_[Y_AXIS]->parent_l_ ? e->dim_cache_[Y_AXIS]->parent_l_->element_l() : 0); + e = dynamic_cast (e->parent_l (Y_AXIS)); } if (1) // e == this) @@ -140,3 +141,23 @@ Axis_group_element::add_extra_element (Score_element *e) } } + +/* + UGH GUH + */ +void +Axis_group_element::purge_extra () +{ + for (int i=0; i < extra_elems_.size ();) + { + Score_element *e = extra_elems_[i]; + while (e && e != this) + { + e = dynamic_cast (e->parent_l (Y_AXIS)); + } + if (e != this) + extra_elems_.del (i); + else + i++; + } +} diff --git a/lily/axis-group-engraver.cc b/lily/axis-group-engraver.cc index e13dcdd518..ad7e9784bb 100644 --- a/lily/axis-group-engraver.cc +++ b/lily/axis-group-engraver.cc @@ -52,7 +52,9 @@ Axis_group_engraver::process_acknowledged () staffline_p_->add_element (elts_[i]); /* UGH UGH UGH */ - else if (elts_[i]->get_elt_property (ly_symbol ("Axis_group_element::add_extra_element")) == SCM_BOOL_F) + else if (elts_[i]->get_elt_property (ly_symbol ("Axis_group_element::add_extra_element")) == SCM_BOOL_F + && ! dynamic_cast (elts_[i]->parent_l (Y_AXIS))) + { staffline_p_->add_extra_element (elts_[i]); } diff --git a/lily/include/axis-group-element.hh b/lily/include/axis-group-element.hh index c3221a0ec2..c77b0058c2 100644 --- a/lily/include/axis-group-element.hh +++ b/lily/include/axis-group-element.hh @@ -25,6 +25,7 @@ class Axis_group_element : public virtual Score_element, protected: virtual void do_print() const; virtual Link_array get_extra_dependencies() const; + void purge_extra (); virtual void do_substitute_element_pointer (Score_element*,Score_element*); virtual Link_array elem_l_arr() const; diff --git a/lily/performance.cc b/lily/performance.cc index b97df6b69c..7818d856de 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -115,9 +115,10 @@ Performance::output_header_track (Midi_stream& midi_stream) midi_track.add (Moment (0), &track_name); - Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4))); - Midi_tempo tempo (&tempo_a); - midi_track.add (Moment (0), &tempo); + // Some sequencers read track 0 last. + // Audio_tempo tempo_a (midi_l_->get_tempo_i (Moment (1, 4))); + // Midi_tempo tempo (&tempo_a); + // midi_track.add (Moment (0), &tempo); midi_stream << midi_track; } diff --git a/lily/script-engraver.cc b/lily/script-engraver.cc index 6842e4f4ed..f36e5e11a1 100644 --- a/lily/script-engraver.cc +++ b/lily/script-engraver.cc @@ -70,6 +70,10 @@ Script_engraver::do_process_requests() else ss->dir_ = force_dir; + Scalar dir_prop (get_property ("articulationScriptVerticalDirection", 0)); + if (dir_prop.isnum_b () && (int) dir_prop != CENTER) + ss->dir_ = (int) dir_prop; + if (l->dir_) ss->dir_ = l->dir_; diff --git a/lily/time-signature-performer.cc b/lily/time-signature-performer.cc index 95eeacabc0..9a326de1d1 100644 --- a/lily/time-signature-performer.cc +++ b/lily/time-signature-performer.cc @@ -1,5 +1,5 @@ /* - time_signature-performer.cc -- implement Time_signature_performer + time-signature-performer.cc -- implement Time_signature_performer source file of the GNU LilyPond music typesetter diff --git a/ly/auto-beam-settings.ly b/ly/auto-beam-settings.ly index 329da4ec89..c1911c7074 100644 --- a/ly/auto-beam-settings.ly +++ b/ly/auto-beam-settings.ly @@ -54,7 +54,11 @@ time6_8beamAutoEnd_32 = "1/8"; time9_8beamAutoEnd_8 = "3/8"; time9_8beamAutoEnd_16 = "3/8"; -time6_8beamAutoEnd_32 = "1/8"; +time9_8beamAutoEnd_32 = "1/8"; + +time12_8beamAutoEnd_8 = "3/8"; +time12_8beamAutoEnd_16 = "3/8"; +time12_8beamAutoEnd_32 = "1/8"; %{ diff --git a/ly/performer.ly b/ly/performer.ly index 184f18144f..f98ea244f5 100644 --- a/ly/performer.ly +++ b/ly/performer.ly @@ -13,6 +13,7 @@ StaffContext = \translator { \consists "Key_performer"; \consists "Time_signature_performer"; + \consists "Tempo_performer"; }; \translator { \StaffContext } @@ -99,6 +100,7 @@ PianoStaffContext = \translator { \accepts LyricVoice; \name Lyrics; \consists "Time_signature_performer"; + \consists "Tempo_performer"; } \translator { \type Performer_group_performer; diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 316aff9920..12b7f61068 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.60 -Inschrijf datum: 15JUL99 +Versie: 1.1.61 +Inschrijf datum: 16JUL99 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.60.tar.gz + 770k lilypond-1.1.61.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.60.tar.gz + 770k lilypond-1.1.61.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 224c0e5cc5..4aeb3eba9a 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.60 -Entered-date: 15JUL99 +Version: 1.1.61 +Entered-date: 16JUL99 Description: LilyPond is the GNU Project music typesetter. It transforms a musical @@ -12,8 +12,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.1.60.tar.gz + 770k lilypond-1.1.61.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.60.tar.gz + 770k lilypond-1.1.61.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 6a9b8996aa..aba10b009c 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.60 +Version: 1.1.61 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.60.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.61.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly index 6eb446c670..0ed9fa42a7 100644 --- a/mutopia/N.W.Gade/brass.ly +++ b/mutopia/N.W.Gade/brass.ly @@ -32,7 +32,7 @@ r r \times 2/3 {[g8 \f ( e ) g] } d4 () g r | r r [d16 \f ( g, e' d ] | [g, d' e ) d ] g,4 r | -r \grace g8 \f d'2 \> (| +r \grace g8 d'2 \f \> (| [g,8. a16 g8. a16 \! g8. ) a16 ] | g4 r r | R2. | @@ -155,12 +155,12 @@ e r d4 ( | ) e8 r d4_"dim." ( | ) c8 r g4 | g8 r [g'8.^""^"solo" ( \< \! a16 ] | -g4. \> \! ) e8 | -c4 ( d | +g4. \> \! e8 | +c4 d | e d | ) c [g'8. ( \< \! a16 ] | -g4. \> \! ) e8 | -c4 ( d | +g4. \> \! e8 | +c4 d | e d | ) c [c8. ( d16 ] | ) c2 ( | @@ -250,8 +250,8 @@ corII=\notes\relative c'' { \property Staff."midiInstrument" = "french horn" R2.*19 | -r4 r [g8^"solo" \p (\< \! ) e'] | -\grace d8 g2 \> ( [e8. ) \! c16 ] | +r4 r [g8^"solo" \p (\< ) e'] | +\grace d8 \! g2 \> ( [e8. ) \! c16 ] | g2 r 4 | r r \times 2/3 {[e'8 \p ( g, ) g' ]} | g4 \> () \! e r | @@ -336,7 +336,7 @@ R2*13 | c,4. \f c8 ( | )c,4. r8 | R2*2 | -c'4. \f c8 ( | +c'4. c8 ( | )c,4. c''8 | c,4. c'8 | c,4. r8 | @@ -427,7 +427,7 @@ d'4 r | R2 | d4 r | R2*2 | -e8 r r4 | +e8 \f r r4 | R2*19 | c4. \f r8 | c4. r8 | @@ -599,8 +599,8 @@ c4. r8 | R2*8 | e4. \f r8 | e4. r8 | -r4 g4 ( | -) fis8 r g4 ( | +r4 g4-> ( | % added > +) fis8 r g4-> ( | % added > ) fis8 r d'4 ( | ) e8 r r4 | r g, ( | @@ -718,7 +718,7 @@ R2*14 | [e8 e e g,,] | % In reality: e e e e | e g8 r r4 } {\voicetwo r2 | r | - r4_" Timp." r8 \clef bass; c, | + r4_" Timp." r8 \clef bass; c, \p | [c-. \< c-. c-. \! c-.] | c4.:8 \f r8 | R2 | @@ -744,7 +744,7 @@ c,2:8 \< | R2*4 | c4 \f r | c4 r | -c2:32 | +c2:32 ~ | % Added tie c8 r r4 | c4 r | c4_"dim." r | diff --git a/mutopia/N.W.Gade/global.ly b/mutopia/N.W.Gade/global.ly index 5908b22d5d..82221cbef6 100644 --- a/mutopia/N.W.Gade/global.ly +++ b/mutopia/N.W.Gade/global.ly @@ -1,10 +1,12 @@ globalNoKey=\notes { \time 3/4; +\tempo 4=100; % My own suggestion, M.B. \skip 2.*31; s4 s4^\fermata s8^\fermata \bar "||"; \break s8 \time 2/4; +\tempo 4=130; % My own suggestion, M.B. \skip 2*224; s4 s4^\fermata \bar "|."; diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly index e49da7e460..6fefbe715f 100644 --- a/mutopia/N.W.Gade/parts.ly +++ b/mutopia/N.W.Gade/parts.ly @@ -32,6 +32,7 @@ my_paper = \paper { textScriptPadding = 5.0; textStyle = "italic"; textEmptyDimension = 1; + beamAuto = 0; % Beams inserted explicitly as in the original. } } diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index b42398670c..1d68186fa3 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -58,10 +58,12 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \context Voice = corI < \globalNoKey \stemup \property Voice.dynamicDir = \up + \property Voice.articulationScriptVerticalDirection = \up \corI > \context Voice = corII { \stemdown \property Voice.dynamicDir = \down + \property Voice.articulationScriptVerticalDirection = \down \corII } > @@ -71,17 +73,19 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \context Voice = trpI < \globalNoKey \stemup \property Voice.dynamicDir = \up + \property Voice.articulationScriptVerticalDirection = \up \trpI > \context Voice = trpII { \stemdown \property Voice.dynamicDir = \down + \property Voice.articulationScriptVerticalDirection = \down \trpII } > > \context StaffGroup = percussion <\context Voice = timpani < \property Staff.instrument = "Timp. \& Triang." - \property Staff.instr = "Tmp \& Trg" + \property Staff.instr = "Tmp\&{}Trg" \global \timpani > @@ -123,12 +127,13 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + > \paper { % \paper_sixteen; - linewidth = 185.\mm; + linewidth = 180.\mm; textheight = 260.\mm; \translator { \OrchestralScoreContext minVerticalAlign = 2.5*\staffheight; barNumberScriptPadding = "12.0"; + markScriptPadding = "20.0"; } \translator { \StaffContext \consists "Staff_margin_engraver"; @@ -137,12 +142,13 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + textStyle = "italic"; textScriptPadding = 5.0; textEmptyDimension = 1; + beamAuto = 0; % Beams inserted explicitly as in the original. } } } \score{ - \context StaffGroup < + \context StaffGroup < \global \context Staff = oboe \oboe \context Staff = flauto \flauto \context Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >} @@ -157,6 +163,5 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \context Staff = contrabass \cb > \midi { - \tempo 4=120; } } diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly index e19eb2518c..9a831dbf58 100644 --- a/mutopia/N.W.Gade/strings.ly +++ b/mutopia/N.W.Gade/strings.ly @@ -139,7 +139,7 @@ R2*4 | [c16 ( \pp d c a][f a c d] | [f8 d ) c d ( ] | [ ) a bes () g d' ( ] | -[ a ) bes g ] [d'16 ( es ] | +[ ) a bes () g ] [d'16 ( es ] | [ d es d bes][g bes d es] | [ g8 es ) d bes ( ] | [) g a () f c' ( ] | @@ -170,7 +170,7 @@ bes4 ( \< c | \! d2 ~ | d4 \> c | \! d2 | -[d8 c][bes g] | +[d8_"dim." c][bes g] | [e c] \grace e8 [d ) c ] | R2 | r4 r8 d' \mf | @@ -390,8 +390,8 @@ a4:16 \p \< \! b4:16 \> | b4:16 \p \< \! c4:16 \> | \! b2:16 | b4:16 \p \< \! c4:16 \> | -\! b2:16 | -\grace d8 f2 ( \> | % grace note c8 corrected to d8 +b2:16 | +\grace d8 \! f2 ( \> | % grace note c8 corrected to d8 \! ) e | b-> ( | ) e4 r | @@ -418,7 +418,7 @@ d ( | ) c4 r | r r8 d' ( | [ ) a bes () g d' ( ] | -[ a ) bes g ] r | +[ ) a bes () g ] r | R2 | r4 r8 bes ( | [) g a () f c' ( ] | @@ -439,8 +439,8 @@ r4 r8 [c'16 \fz ( d ] | [f g f e][ ) d8 d,16 ( e ] | [ ) f8 e16 ( f][ ) g8 f16 ( g ] | [as bes as g][ ) f8 g'16 ( a! ] | % misprint fz to early -[bes! \fz c bes a][g a g ) f ] | -e r r8 r4 | +[bes! \fz c bes a][g a g f ] | +) e r r8 r4 | <{e,2 \p ~ | e4 \< \! f | e2 \> | @@ -469,14 +469,14 @@ b2:8 \< | < \! g4 bes! \f > r8 a ( | ) a'> a8 ( | ) a'> f,8 \p | -[fis-. g-. a-. bes-.] | +[fis-. \< g-. a-. \! bes-.] | % cresc. added bes4. a8 ( \f | ) a'> a8 ( | ) a'> f,8 \p | [fis-. \< g-. a-. \! bes-.] | [bes \f c16 ( d][)c8 c, \p ] | -c4^\trill ( d^\trill | -e^\trill \grace{[d16 e]} [ f8 ) c ] | +c4^\trill ( \< \! d^\trill | +e^\trill \> \grace{[d16 e]} [ \! f8 ) c ] | c4^\trill ( d^\trill | e^\trill \grace{[d16 e]} [ ) f8 a ( \f ] | d8 | @@ -510,8 +510,8 @@ c2 \> ~ | \! c | a4 ( \< c | d \! des | -c \f \> \! ) bes | -a ( \> g | +c \f \> ) bes | +a ( g | \! ) a r | R2 | c8 \p r r4 | @@ -522,8 +522,8 @@ c d4 e8 ~ | e f4 c8 ~ | c d4 e8 ~ | e \< e4 \! e8 ( | -) bes'!4. \fz \> \! a8 | -[g-. f-. e-.] r | +) bes'!4. \fz \> a8 | +[ \! g-. f-. e-.] r | R2 | r4 r8 es \p ~ | es es4 es8 ~ | @@ -631,7 +631,7 @@ d4 \> \! g | [f! ( g f g][e g e ) g] | [d ( g d g ][d g d g ] | [d g d g ] [c, g' c, g' ] -) d4 r | +) d4 \p r | r r8 | | | @@ -760,7 +760,7 @@ r r8 | [c-. \< bes-. a-. \! g-. ] | <{c,4. f,8 \f | f'4._> f,8 | - f'4. } + f'4._> } % added > {e4. c8 ( | ) c'4. c,8 ( | ) c'4. }> d'8 \p | % \p added @@ -862,7 +862,7 @@ e2 (\< \! f4 | g \> ) \! f r | e'2 ( f4 | g ) f f, ( \< | % added slur -) \! e2 f'4 ( | +) \! e2 f'4 \pp ( | ) e2 dis4 ( \< | \! ) e2 dis4 ( \pp | ) e2. ~ | @@ -915,8 +915,8 @@ r4 r8 c''8 \f (| [cis-. \< d-. e-. \! f-. ] | g,4. c8 \f ( | < ) c4. f,_> > c8 ( | % slur added -< ) c4. f,> c8-> | -[cis-. \p \< d-. e-. \! f-. ] | +< ) c4.-> f,> c8 \p | % > and \p moved one quaver backwards +[cis-. \< d-. e-. \! f-. ] | g,4 r8 <{ c8 \p | c2:8 | c2:8 \< | @@ -927,8 +927,8 @@ g,4 r8 <{ c8 \p | g2:8 | g2:8 | g2:8 | - [g8 g c cis] | - e,4.-> }> a8 | + [g8 g c cis (] | % added slur + ) e,4.-> }> a8 | [d-. e-. f-. b ( ] | ) b,4. \f b'8 ( | < ) d,4. \f g,> g8 ( | @@ -941,16 +941,16 @@ g,4 r8 <{ c8 \p | [e ( g fis ) g][c, ( a' gis ) a] | [b ( c d ) b][g ( a f )d ] | [c ( g' fis ) g][c, ( g' fis ) g] | -[c, ( g' fis ) g][c, ( g' fis ) g] | -c,4_"dim." r | +[c,_"dim." ( g' fis ) g][c, ( g' fis ) g] | +c,4 r | c4 r | -c8 r8 r4 | +c8 \p r8 r4 | R2 | r8 [c-.^"solo" \p d-. dis-. ] | e r e, r | c'4:16 \p d4:16 | e4:16 \< \! fis4:16 | -g!2:16 \> | +g2:16 \> | g4:16 \! a4:16 | g4:16 \< \! a4:16 | g4:16 \> \! a4:16 | @@ -962,9 +962,9 @@ f! ( | [e8 d c ) b ] | c4:16 \p d4:16 | e4:16 \< \! fis4:16 | -g!2:16 \> | -\! g4:16 \p \< \! a4:16 | -g4:16 \> \! a4:16 | +g2:16 \fz \> | +\! g4:16 \p \< a4:16 | +\! g4:16 \> \! a4:16 | g4:16 \< \! a4:16 | g4:16 \> a4:16 | g4:16 \! a4:16 | @@ -980,7 +980,7 @@ e | ) e4 r | [f16 ( g f_"dim." g][f g f8 ] | ) e4 r | -[c'16 ( d c a][f a c ) d] | +[c'16 \pp ( d c a][f a c ) d] | [f8 ( d ) c] r | fis,8-. r g-. r | d r [g d'16 ( es] | @@ -988,8 +988,8 @@ d r [g d'16 ( es] | [g8 es ) d] r | c, r f-. r | c r [f-. c'-. ] | -[bes-. a-. g-. f-.] | -[e d][c a'16 \f ( f] | +[bes-. \< a-. g-. \! f-.] | +[e-. d-.][c-. a'16 \f ( f] | [a f a f][a f a ) f] | % Misprint trem 8 [bes ( f bes f][a f a ) f] | [bes ( f bes f][) a8 f-.] | @@ -1022,13 +1022,13 @@ r4 r8 f' \f (| R2 | r4 r8 f'' (| ) f,4.-> f8 ( | -) f,4.-> f'8 (| +) f,4. f'8 (| <) c4. f, > f8 ( | <) c4. f,> f8 \p | [fis-. \< g-. a-. \! bes-. ] | c,4. f8 \f ( | <) f4. bes,_> > f8 (| -<) f4. bes,> f8 \p | % \p added +<) f4. bes,_> > f8 \p | % \p added [fis-. \< g-. a-. \! bes-. ] | c,4 r8 <{ f8 \p | f2:8 \< | @@ -1054,7 +1054,7 @@ c,4 r8 <{ f8 \p | [f16 ( c' b ) c][f,16 ( c' b ) c] | [f,16 ( c' b ) c][f,16 ( c' b ) c] | f,8 r e'4 ( | -) f8 r bes,4 ( | +) f8 r bes,4 \p ( | ) a2 ( | ) bes | a4 \< ( \! bes | @@ -1073,8 +1073,8 @@ c8 r r4 | r r | e, r e r | e r [e () c] | -c'4. \f \> \! d8 | -[e-._"dim." f-. g-.] r | +c'4. \f \> d8 | +[\! e-._"dim." f-. g-.] r | r r | r r | r r | diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly index 99230fd85b..8e25033682 100644 --- a/mutopia/N.W.Gade/wood.ly +++ b/mutopia/N.W.Gade/wood.ly @@ -1,5 +1,184 @@ \version "1.1.52"; +flauto=\notes\relative c''' { +\clef "treble"; +\property Staff."midiInstrument" = "flute" + +[c8. \f ( d16] c2 | +)c,8 r r4 r | +R2.*4 | +[c8. \p ( d16] c4. ) a8 | +[f8. ( e16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*4 | +[c'8. ( d16] c4. ) a8 | +[g8. ( a16 ] f4. ) a8 | +[c8. ( d16] c4. ) a8 | +[a8. ( g16 ] ) f4 r | +R2.*13 | +r4 r4 r8 r8 \time 2/4; +R2*4 | +a'8-. \pp r g-. r | +a8-. r g-. r | +R2*2 | +g8-. r f-. r | +g8-. r f-. r | +R2 | +r4 r8 [c'16 \f ( d] | +[c d c a][f a c d] | +[f8 d ) c] f, ( | +[f'8 d ) c] a ( | +[a'8 f ) e] a ( | +dis,2 | +) e4 r8 a8 ( | +dis,2 | +) e4 r8 a ( | +) es r d r | +c r d r | +g, r r4 | +R2*10 | +r4 r8 e' \p | +e [es-. es-.] d-. | +d-. [cis-. cis-.] c-. | +c \f [c16 ( d] [es8 d16 c] | % slur and \f added +) d4 r8 e!-. \p | +e-. [es-. es-.] d-. | +d-. [cis-. cis-.] c | +c-. \f [c16 ( d][es8 d16 c] | % \f added +) d4 r8 e,! ( | +)e'4.-> e,8 ( | +)e'4.-> a8 \p | +[g-. f-. e-. d-.] | +[cis16 ( \< e d \! b ] ) g8 e \f ( | +)e'4.-> e,8 ( | +)e'4.-> a8 \p | +[g-. \< f-. e-. \! d-.] | +g r r e-. \p | +e-. [es-. \< es-.] d-. | +d-. [c-. \! c-.] g-. | +g-. [fis-. \< fis-.] f-. | +f-. [e-. \! e-.] bes \f ( | +) bes'4.-> a8-. | +[f'-. e-. d-.] f, ( | +) f'4. \fz g,8 ( | +) g'4. \fz g,8 ( | +) e' r g4-> ( | +) e8 r g4-> ( | +) e8 r es4-> ( | +) d8 r r g, ( | +) e'! r g4 ( | +) e8 r g4 ( | +) e8 r es4-> ( | +) d8 r r g, ( | +) e'! r g4 ( | +) e8 r d4 ( | +) e8 r r4 | +R2*27 | +d2 ( \p | +) gis, | +R2*2 | +d'2 ( \p | +) gis, | +a ( | +) gis | +a_"dim." ( | +) gis ( | +) a ( | +bes!4 ) a8 r | +a r bes r | +fis r g r | +bes2 ( | +c4 ) bes8 r | +bes r a r | +e! r f r | +R2 | +r4 r8 [c'16 \f ( d] | % \f added +[c d c a][f a c d] | +[f8 d ) c] f, ( | +[f'8 d ) c] f,-. | +[g-. a-. bes-. a-. ] | +bes4 r8 bes,8 ( | +[bes' g ) f] bes,8 ( | +[bes' g ) f] bes,8 ( | +[d' g ) f! ] d ( | +gis,2 | +) a4. d8 ( | +gis,2 | +) a4. d,8 ( | +) d' r d-. r | +d-. r d-. r | +c r r4 | +R2*10 | +r4 r8 [c16^""^"solo" \p ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. [as16 ( bes ] | +) as8-. \f [f16 ( g][as8 g16 f ] | +) g4 r8 [c16 ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. [as16 bes ] | +as8 \f [f16 ( g][as8 g16 f ] | +) g4 r8 es ( | +)es'4.-> es,8 ( | +)es'4.-> d8 \p | +[c8-. \< bes-. a \! g ] | +[fis16 ( a g e! ] ) c8 es ( \f | +) es'4.-> es,8 ( | +) es'4.-> d8 \p | +[c8-. \< bes-. a \! g ] | +c r r a'-. \p | +a-. [gis-. \< gis-.] \! g-. | +g-. [f-. f-.] c-. | +c-. [b-. \< b-.] bes-. | +bes-. [a-. \! a-.] a( \f | +) es'4.-> d8 | +[bes-. a-. g-.] bes, ( | +) d'4. \fz c,8 ( | +) c'4. \fz c,8 ( | +) a' r c4-> ( | +) a8 r c4-> ( | +) a8 r as4-> ( | +) g8 r r c ( | +) a! r c4 ( | +) a8 r c4 ( | +) a8 r as4-> ( | +) g8 r r c, ( | +) a'! r c4_"dim." ( | +) a8 r g4 ( | +) f8 r c4 ( | +) a8 r r4 | +R2*19 | +r4 r8 [c'16 \p ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 ( c ] | +)bes8-. [a16 ( bes ] ) a8-. [c16 ( d] | +) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | +)bes8-. [a16 ( \! bes ] ) a8-. bes ( \f | +) bes,4. d8 ( | +) d'4. c8 ( | +) c,4. e8 ( | +) e'4. c8 ( | +) a'4 r | +[f8 ( d ) c ] c ( | +) a'4 r | +[f8 ( d ) c ] f, ( | +) f'4. e,8 ( | +) e'4. e8 | +[f-. e-. f-. e-.] | +[f-. e-. f-. e-.] | +f r e r | +f r e r | +f r a, r | +c r a r | +f4 r8 c' ( | +) a4 r8 c ( | +) f4 r8 c ( | +) a4 r8 c ( | +) f4 r | +R2 | +f4 \fz r + +} + oboe=\notes\relative c'' { \clef "treble"; \property Staff."midiInstrument" = "oboe" @@ -80,7 +259,7 @@ R2*2 | r8 [g,-.^""^"solo" \p a-. b-. ] | c r r4 | R2*10 | -\grace d8 \fz f2 \> ( | +\grace d8 f2 \fz \> ( | \! b,4 [c8 b] | a2-> | ) gis | @@ -92,7 +271,7 @@ e ( \> [ d8 \! c ] | \! e ) b | \grace e8 g4 ( \> dis | \! e_"dim." ) b | -\grace d!8 \fz f2 ( \> | +\grace d!8 f2 \fz ( \> | b,4 [ \! c8 b] | a2 \p | ) gis | @@ -157,7 +336,7 @@ r4 r8 bes, ( | ) a8 r g4 ( | ) f8 r r4 | R2*7 | -\grace f8 \f a4 \> ( e | +\grace f8 a4 \f \> ( e | f \! b, | ) c r | R2*7 | @@ -167,7 +346,7 @@ bes!4. \f r8 | R2 | c8-. \p r b-. r | bes!-. r a-. r | -c-. \p r b-. r | +c-. r b-. r | bes!-. r a-. bes \f ( | ) bes'4. bes,8 ( | ) bes'4. bes,8 ( | @@ -194,186 +373,6 @@ R2 | f4-. \fz r } - -flauto=\notes\relative c''' { -\clef "treble"; -\property Staff."midiInstrument" = "flute" - -[c8. \f ( d16] c2 | -)c,8 r r4 r | -R2.*4 | -[c8. \p ( d16] c4. ) a8 | -[f8. ( e16 ] f4. ) a8 | -[c8. ( d16] c4. ) a8 | -[a8. ( g16 ] ) f4 r | -R2.*4 | -[c'8. ( d16] c4. ) a8 | -[g8. ( a16 ] f4. ) a8 | -[c8. ( d16] c4. ) a8 | -[a8. ( g16 ] ) f4 r | -R2.*13 | -r4 r4 r8 r8 \time 2/4; -R2*4 | -a'8-. \pp r g-. r | -a8-. r g-. r | -R2*2 | -g8-. r f-. r | -g8-. r f-. r | -R2 | -r4 r8 [c'16 \f ( d] | -[c d c a][f a c d] | -[f8 d ) c] f, ( | -[f'8 d ) c] a ( | -[a'8 f ) e] a ( | -dis,2 | -) e4 r8 a8 ( | -dis,2 | -) e4 r8 a ( | -) es r d r | -c r d r | -g, r r4 | -R2*10 | -r4 r8 e' \p | -e [es-. es-.] d-. | -d-. [cis-. cis-.] c-. | -c [c16 ( d] [es8 d16 c] | % slur added -) d4 r8 e!-. \p | -e-. [es-. es-.] d-. | -d-. [cis-. cis-.] c | -c-. [c16 ( d][es8 d16 c] | -) d4 r8 e,! ( | -)e'4.-> e,8 ( | -)e'4.-> a8 \p | -[g-. f-. e-. d-.] | -[cis16 ( \< e d \! b ] ) g8 e \f ( | -)e'4.-> e,8 ( | -)e'4.-> a8 \p | -[g-. \< f-. e-. \! d-.] | -g r r e-. \p | -e-. [es-. \< es-.] d-. | -d-. [c-. \! c-.] g-. | -g-. [fis-. \< fis-.] f-. | -f-. [e-. \! e-.] bes \f ( | -) bes'4.-> a8-. | -[f'-. e-. d-.] f, ( | -) f'4. \fz g,8 ( | -) g'4. \fz g,8 ( | -) e' r g4-> ( | -) e8 r g4-> ( | -) e8 r es4-> ( | -) d8 r r g, ( | -) e' r g4 ( | -) e8 r g4 ( | -) e8 r es4-> ( | -) d8 r r g, ( | -) e' r g4 ( | -) e8 r d4 ( | -) e8 r r4 | -R2*27 | -d2 ( \p | -) gis, | -R2*2 | -d'2 ( \p | -) gis, | -a ( | -) gis | -a_"dim." ( | -) gis ( | -) a ( | -bes!4 ) a8 r | -a r bes r | -fis r g r | -bes2 ( | -c4 ) bes8 r | -bes r a r | -e! r f r | -R2 | -r4 r8 [c'16 \f ( d] | % \f added -[c d c a][f a c d] | -[f8 d ) c] f, ( | -[f'8 d ) c] f,-. | -[g-. a-. bes-. a-. ] | -bes4 r8 bes,8 ( | -[bes' g ) f] bes,8 ( | -[bes' g ) f] bes,8 ( | -[d' g ) f! ] d ( | -gis,2 | -) a4. d8 ( | -gis,2 | -) a4. d,8 ( | -) d' r d-. r | -d-. r d-. r | -c r r4 | -R2*10 | -r4 r8 [c16^""^"solo" \p ( d] | -) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | -)bes8-. [a16 ( \! bes ] ) a8-. [as16 ( bes ] | -) as8-. \f [f16 ( g][as8 g16 f ] | -) g4 r8 [c16 ( d] | -) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | -)bes8-. [a16 ( \! bes ] ) a8-. [as16 bes ] | -as8 \f [f16 ( g][as8 g16 f ] | -) g4 r8 es ( | -)es'4.-> es,8 ( | -)es'4.-> d8 \p | -[c8-. \< bes-. a \! g ] | -[fis16 ( a g e! ] ) c8 es ( \f | -) es'4.-> es,8 ( | -) es'4.-> d8 \p | -[c8-. \< bes-. a \! g ] | -c r r a'-. \p | -a-. [gis-. \< gis-.] \! g-. | -g-. [f-. f-.] c-. | -c-. [b-. \< b-.] bes-. | -bes-. [a-. \! a-.] a( \f | -) es'4.-> d8 | -[bes-. a-. g-.] bes, ( | -) d'4. \fz c,8 ( | -) c'4. \fz c,8 ( | -) a' r c4-> ( | -) a8 r c4-> ( | -) a8 r as4-> ( | -) g8 r r c ( | -) a! r c4 ( | -) a8 r c4 ( | -) a8 r as4-> ( | -) g8 r r c, ( | -) a'! r c4_"dim." ( | -) a8 r g4 ( | -) f8 r c4 ( | -) a8 r r4 | -R2*19 | -r4 r8 [c'16 \p ( d] | -) c8-. [b16 ( c ] ) b8-. [bes16 ( c ] | -)bes8-. [a16 ( bes ] ) a8-. [c16 ( d] | -) c8-. [b16 ( c ] ) b8-. [bes16 \< ( c ] | -)bes8-. [a16 ( \! bes ] ) a8-. bes ( \f | -) bes,4. d8 ( | -) d'4. c8 ( | -) c,4. e!8 ( | -) e'4. c8 ( | -) a'4 r | -[f8 ( d ) c ] c ( | -) a'4 r | -[f8 ( d ) c ] f, ( | -) f'4. e,8 | -e'4. e8 | -[f-. e-. f-. e-.] | -[f-. e-. f-. e-.] | -f r e r | -f r e r | -f r a, r | -c r a r | -f4 r8 c' ( | -) a4 r8 c ( | -) f4 r8 c ( | -) a4 r8 c ( | -) f4 r | -R2 | -f4 \fz r - -} - clarI=\notes\relative c'' { \key G; \clef "treble"; @@ -386,11 +385,11 @@ R2.*8 | [fis8. \> e16 ] \! d4 ) a | b2. \pp \< ( | \! ais4 ) b2 | -a4 \p ( [g8. a16 ] g4 | +a!4 \p ( [g8. a16 ] g4 | fis ) g8 r r4 | a4 ( [g8. a16 ] g4 | -fis ) g8 r [d^""^"solo" \mf \< () \! b' ] | -\grace a8 d2 ( \> [b8. \! g16] | +fis ) g8 r [d^""^"solo" \mf \< () b' ] | +\grace a8 \! d2 ( \> [b8. \! g16] | ) d2 r4 | R2. | r4 r \times 2/3 { [b'8^""^"solo" ( \ff d, ) d' ] } | @@ -410,8 +409,8 @@ fis r g d'-. \p | [d e d b][g b d e] | [g8 e ) d ] g, ( | [g' e ) d ] b ( | -[b' g ) fis] b | -f2 ( | +[b' g ) fis] b ( | % slur added +) f2 ( | ) fis!4 r8 b ( | ) f2 ( | ) fis!4 r8 b | @@ -437,7 +436,7 @@ d r b4 \f ( | [e-. dis-. dis-. d-. ] | d r b4 \f ( | ) cis8 [a'16-> ( b] ) a8 r | -d,4. r8 | +d,4.-> r8 | % added > d4.-> r8 | R2*2 | d4. \f r8 | @@ -466,10 +465,10 @@ cis4.-> fis8-. \p | % \p added ) fis8 r e4 \p ( | ) fis8 r r4 | R2*3 | -fis,2 \pp ~ | -fis ~ | -fis ~ | -fis4 r | +fis,2 \pp \< ~ | +\! fis ~ | +fis \> ~ | % cresc. added +\! fis4 r | % dim. added R2*4 | e'2 \fz \> ( | ) \! fis,4 r | @@ -621,11 +620,11 @@ R2.*8 | [a8. ( \> g16 ] \! ) fis4 r | b2. \pp \< ( | \! ais4 ) b2 | -a4 \p ( [g8. a16 ] g4 | +a!4 \p ( [g8. a16 ] g4 | fis ) g8 r r4 | a4 ( [g8. a16 ] g4 | -fis ) g8 r [d^""^"solo" \mf \< () \! b' ] | -\grace a8 d2 ( \> [b8. \! g16] | +fis ) g8 r [d^""^"solo" \mf \< () b' ] | +\grace a8 \! d2 ( \> [b8. \! g16] | ) d2 r4 | R2. | r4 r \times 2/3 { [b'8 ( \f d, ) d' ] } | @@ -684,7 +683,7 @@ r4 r8 g,8 ( | a8 r a4-> ~ | a8 r gis4 ( | [ ) g!8 g-. g-. g ( ] | -) fis! r a4 ~ | +) fis! r a4-> ~ | % added > a8 r a4-> ~ | a8 r gis4 ( | ) g!8 [g-. g-.] g ( | @@ -695,8 +694,8 @@ a8 r a4 \p ~ | a8 r r4 | R2*3 | fis2 \pp \< ~ | -fis ~ | -\! fis \>~ | +\! fis ~ | +fis \>~ | \! fis4 r | R2*4 | g2 \f \> ( | @@ -704,8 +703,8 @@ g2 \f \> ( | b2 \> ( | ) \! ais4 r | fis2 \pp \< ~ | -fis ~ | -\! fis \>~ | +\! fis ~ | +fis \>~ | \! fis4 r | R2*16 | f2 \pp ( | @@ -788,8 +787,8 @@ r4 [g8. ( \f a16 ] | d ~ | d4. r8 | R2*6 | -fis4. \fz \> \! g8 | -[a-. b-. c-. ] r | +fis4. \fz \> g8 | +[ \! a-. b-. c-. ] r | R2*3 | r4 r8 e, \f ( | ) e'4. a,8 ( | @@ -797,10 +796,10 @@ r4 r8 e, \f ( | ) a'4. fis,8 ( | ) d'4. c8 ( | ) b4 r8 g ( | -e'4 [d8 ) c ] | -b4 r8 g ( | -e'4 () ) d8 g, | -cis4. fis,8 ( | +e'4 [ ) d8 c ( ] | +) b4 r8 g ( | +e'4 () ) d8 g, ( | % ending slur added +) cis4. fis,8 ( | ) c'!4. c8 | [b-. c-. b-. c-. ] | [b-. c-. b-. c-. ] | @@ -902,7 +901,7 @@ e2 \p \< ~ | \! e \> ~ | \! e \< ~ | \! e \> | -\grace \! d'8 \fz ( ) f2 \> ( | +\grace d'8 ( ) \! f2 \fz \> ( | ) \! e4. r8 | f,2 \> ( ( | [ ) \! e8 d c ) b ] | @@ -914,7 +913,7 @@ e2 \p ~ e ~ | e ~ | e | -\grace d'8 \fz ( ) f2 \> ( | +\grace d'8 ( ) f2 \fz \> ( | ) \! e4. r8 | f,2 \p ( | ) e4 r | @@ -967,7 +966,7 @@ r r8 c' | [c c c ] f ( | ) c4.-> f8 ( | ) c4.-> r8 | -r4 r8 f8 ( | +r4 r8 d8 ( | ) e!4. c8 \f ( | ) f4.-> c8 ( | % slur added ) f4.-> r8 | diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 047efd54f0..e3a08a46fd 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -50,7 +50,7 @@ definition below. --MB global = \notes { \property StaffGroup.timeSignatureStyle = "old" \time 4/4; - \tempo 4=80; + \tempo 4=100; \skip 1*31; \property StaffGroup.timeSignatureStyle = "1" \time 3/2; @@ -58,43 +58,45 @@ global = \notes { \skip 1.*15; \property StaffGroup.timeSignatureStyle = "old" \time 4/4; - \tempo 4=80; + \tempo 4=100; } vi1=\context Staff = vi1 < \global \notes \relative c'' { +\property Staff.instrument = "Violin 1" +\property Staff.midiInstrument = "recorder" % The default midi violin is terrible - [d8 d d d] d4 [a16 b c a] | - [b8 g ][ g g16 a][ b8 g ][ g g16 a] | - [b8 g ][ g a16 b] c4 b | - [a8 d,] g2 fis4 | + d8 d d d d4 a16 b c a | + b8 g g g16 a b8 g g g16 a | + b8 g g a16 b c4 b | + a8 d, g2 fis4 | g2 r2 | r1 | - [d'8 d d d] d4 [a16 b c a] | - [b8 g ][ g g16 a][ b8 g ][ g g16 a] | - [b8 g ][ g a16 b][ c8 e d c] | - [b g] c2 b4 | + d'8 d d d d4 a16 b c a | + b8 g g g16 a b8 g g g16 a | + b8 g g a16 b c8 e d c | + b g c2 b4 | c2 r | r1 | - [g'8 g g g] g4 [d16 e f d] | - [e8 c ][ c c16 d][ e8 c ][ c c16 d] | - [e8 c ][ c d16 e] f4 e | - [d8 g,] c2 b4 | - [c8 g ][ g g16 a] b4 g | - r8 g [g g16 a] b4 g | - r8 [e16 fis ][ g8 g] [ fis! g g fis!] | + g'8 g g g g4 d16 e f d | + e8 c c c16 d e8 c c c16 d | + e8 c c d16 e f4 e | + d8 g, c2 b4 | + c8 g g g16 a b4 g | + r8 g g g16 a b4 g | + r8 e16 fis g8 g fis! g g fis! | g2 r | r1 | - r16 [d' c b ][ a g fis e] [d8 d' ][ d d16 c] | - [b8 d ][ d d16 c][ b8 d ][ d d16 e] | + r16 d' c b a g fis e d8 d' d d16 c | + b8 d d d16 c b8 d d d16 e | fis4 g2 fis!4 | - r16 [g f e ][ d c b a][ g8 g' ][ g g16 f] | - [e8 g ][ g g16 f][ e8 g ][ g g16 a] | + r16 g f e d c b a g8 g' g g16 f | + e8 g g g16 f e8 g g g16 a | b4 c2 b4 | - [c8 g ][ g g16 f] e4 d | - r8 g [g g16 f] e4 d | - r8 [d16 a ][ b8 b16 c] a2 | + c8 g g g16 f e4 d | + r8 g g g16 f e4 d | + r8 d16 a b8 b16 c a2 | b1 | \repeat "semi" 2 { @@ -102,31 +104,31 @@ vi1=\context Staff = vi1 < e1. | r4 c c c c c | d1. | - r4 [d8 c] b4 [c8 d] g,4 [a8 b] | + r4 d8 c b4 c8 d g,4 a8 b | e,1. | - r4 [e'8 d] cis4 [d8 e] a,4[ b8 cis!] | + r4 e'8 d cis4 d8 e a,4 b8 cis! | fis,1. | r4 d' d d d d | - e [e8 d] c4 [d8 e] a,4 [b8 c] | - fis,4 [fis'8 e] d4 [e8 fis!] b,4 [c8 d] | + e e8 d c4 d8 e a,4 b8 c | + fis,4 fis'8 e d4 e8 fis! b,4 c8 d | g,4 g' g g g g | - a4 [c8 b] a4 [b8 c] f,4 [g8 a] | + a4 c8 b a4 b8 c f,4 g8 a | d,4 g g g g g | - a [d,8 c] b4 [c8 d] a2 | + a d,8 c b4 c8 d a2 | } \repeat "semi" 2 { b1 | - [d8 d d d] d4 [a16 b c a] | - [b8 g ][ g g16 a] [b8 g ][ g g16 a] | - [b8 g] c2 b4 | + d8 d d d d4 a16 b c a | + b8 g g g16 a b8 g g g16 a | + b8 g c2 b4 | c2 r | - [g'8 g g g] g4 [d16 e f d] | - [e8 g, ][ g g16 a] [b8 d ][ d d16 e] | + g'8 g g g g4 d16 e f d | + e8 g, g g16 a b8 d d d16 e | fis4 g2 fis!4 | - r16 [g f e ][ d c b a] [g8 g' ][ g g16 f] | - e2 r8 d [d d16 e] | - [fis a g fis ][ e d c b] [a8 d ][ d d16 e] | + r16 g f e d c b a g8 g' g g16 f | + e2 r8 d d d16 e | + fis a g fis e d c b a8 d d d16 e | fis4 g2 fis!4 | \cadenza 1; g\breve @@ -136,67 +138,69 @@ vi1=\context Staff = vi1 < vi2=\context Staff = vi2 < \global \notes \relative c'' { +\property Staff.instrument = "Violin 2" +\property Staff.midiInstrument = "recorder" % The default midi violin is terrible r1 | r | r | - [d8 d d d] d4 [a16 b c a] | - [b8 g ][ g g16 a] [b8 g ][ g g16 a] | - [b8 g ][ g a16 b] c4 b | - [a8 d,] g2 fis4 | + d8 d d d d4 a16 b c a | + b8 g g g16 a b8 g g g16 a | + b8 g g a16 b c4 b | + a8 d, g2 fis4 | g2 r2 | r1 | - [g'8 g g g] g4 [d16 e f d] | - [e8 c ][ c c16 d] [e8 c ][ c c16 d] | - [e8 c ][ c d16 e] f4 e | - [d8 g,] c2 b4 | + g'8 g g g g4 d16 e f d | + e8 c c c16 d e8 c c c16 d | + e8 c c d16 e f4 e | + d8 g, c2 b4 | c2 r | r1 | - [g'8 g g g] g4 [d16 e f d] | - e2 r8 g, [g g16 a] | - b4 g r8 g [g a16 b] | + g'8 g g g g4 d16 e f d | + e2 r8 g, g g16 a | + b4 g r8 g g a16 b | c4 b a2 | - g r16 [d' c b ][ a g fis e] | - [d8 d' ][ d d16 c] [b8 d ][ d d16 e] | + g r16 d' c b a g fis e | + d8 d' d d16 c b8 d d d16 e | fis4 g g4. fis!8 | g2 r | - r16 [d c b ][ a g fis e] [d8 d' ][ d d16 c] | + r16 d c b a g fis e d8 d' d d16 c | b4 c2 b4 | c d g,2 | - r16 [g' f e ][ d c b a] [g8 g' ][ g g16 f] | - e4 d r8 g [g g16 f] | - e4 d r8 [c16 g ][ b8 b16 c] | + r16 g' f e d c b a g8 g' g g16 f | + e4 d r8 g g g16 f | + e4 d r8 c16 g b8 b16 c | a4 g2 fis4 | g1 | \repeat "semi" 2 { r1. | - r4 [g'8 f] e4 [f8 g] c,4 [d8 e] | + r4 g'8 f e4 f8 g c,4 d8 e | a,1. | - r4 [a'8 g] fis4 [g8 a] d,4 [e8 fis!] | + r4 a'8 g fis4 g8 a d,4 e8 fis! | b,1. | r4 g' g g g g | a1. | r4 a a a a a | - b [d,8 c] b4 [c8 d] g,4 [a8 b] | - e,4 [g'8 f] e4 [f8 g] c,4 [d8 e] | - a,4 [a'8 g] fis4 [g8 a] d,4 [e8 fis!] | - b,4 [b'8 a] g4 [a8 b] e,4 [fis8 g] | + b d,8 c b4 c8 d g,4 a8 b | + e,4 g'8 f e4 f8 g c,4 d8 e | + a,4 a'8 g fis4 g8 a d,4 e8 fis! | + b,4 b'8 a g4 a8 b e,4 fis8 g | c,4 a a a a a | - b [d8 c] b4 [c8 d] d,4 e | + b d8 c b4 c8 d d,4 e | fis2 g fis! | } \repeat "semi" 2 { g1 | r1 | r1 | - [g'8 g g g] g4 [d16 e f d] | - [e8 c ][ c c16 d] [e8 g, ][ g g16 a] | - [b8 g] c2 b4 | + g'8 g g g g4 d16 e f d | + e8 c c c16 d e8 g, g g16 a | + b8 g c2 b4 | c2 r | - r16 [d c b ][ a g fis e] [d8 d' ][ d d16 c] | + r16 d c b a g fis e d8 d' d d16 c | b4 c2 b4 | - [c8 g ][ g g16 a] [b d c b ][ a g fis e] | - [d8 d' ][ d d16 e] [fis16 a g fis ][ e d c b] | - [a d c b ][ a g fis e] d4 d' | + c8 g g g16 a b d c b a g fis e | + d8 d' d d16 e fis16 a g fis e d c b | + a d c b a g fis e d4 d' | \cadenza 1; b\breve } @@ -207,6 +211,9 @@ bc=\context Staff = bc < \global \notes\transpose c'{ \clef "bass"; +\property Staff.instrument = "Basso Continuo" +\property Staff.midiInstrument = "bassoon" % The default midi violin is terrible + G2 d^"4 3" | G1 | g2 c4 G | d1^"3 4 3" | @@ -256,12 +263,9 @@ bc=\context Staff = bc < \bc > \paper{ - gourlay_maxmeasures=7.; - \translator { \VoiceContext - + textScriptPadding = 3; %% Uncomment to get the original layout without beams. -%%%% Compare to the definition in init/engraver.ly. % \remove "Beam_engraver"; % \remove "Auto_beam_engraver"; @@ -269,6 +273,5 @@ bc=\context Staff = bc < } } \midi{ - \tempo 4=80; } } diff --git a/scm/lily.scm b/scm/lily.scm index 26920e72b1..1e66463e58 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -105,7 +105,7 @@ (("Clef_item" "Span_bar") . (minimum_space 3.7)) (("Time_signature" "Span_bar") . (minimum_space 2.0)) (("Key_item" "Span_bar") . (minimum_space 2.5)) - (("Staff_bar" "Time_signature") . (minimum_space 1.5)) ;double check this. + (("Staff_bar" "Time_signature") . (minimum_space 2.0)) ;double check this. (("Time_signature" "begin-of-note") . (extra_space 2.0)) ;double check this. (("Key_item" "begin-of-note") . (extra_space 2.5)) (("Staff_bar" "begin-of-note") . (extra_space 1.0)) diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index ddc1138316..86ebadd0ea 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -322,6 +322,8 @@ class TeXOutput: \\end{document} """) this.__fd.close() + if os.path.isfile(outfile): + os.remove(outfile) if ( os.name == 'posix' ): stat = os.system('latex \'\\nonstopmode \\input %s\'' % (this.__outfile)) @@ -330,11 +332,11 @@ class TeXOutput: (this.__outfile)) if stat: sys.exit('ExitBadLatex') - if os.path.isfile(outfile): - os.remove(outfile) - os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile) - sys.stderr.write( '\n' + program_id() + ': dvi file name is %s\n\n' - % (outfile)) + if not os.path.isfile(outfile): + os.rename(this.__base + '.' + str(os.getpid()) + '.dvi', outfile) + + sys.stderr.write('\n' + program_id() + ': dvi file name is %s\n\n' + % (outfile)) if Props.get('postscript'): psoutfile=this.__base + '.ps' diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index caee78ed68..a86a37f121 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -4,6 +4,8 @@ dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl WARNING WARNING WARNING WARNING dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 +dnl WARNING WARNING WARNING WARNING +dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4 dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in -- 2.39.2