From b9c65b122d107a6f7c1a44d3041f6cfeb78fc4a2 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Wed, 28 Mar 2001 01:27:11 +0200 Subject: [PATCH] release: 1.3.144 ============ * LilyPond-mode: show what's going on (font building) in *view* buffer. * Added environment settings to ly2dvi and lilypond-book. * Bugfix: make diff links diff into patch-dir, like make release. * Bugfix: make diff/release for different configs. * Bugfix: convert-ly: don't change item name ChordName to ChordNames. * Added flag (LilyPond-kick-xdvi) to LilyPond emacs mode to allow simultaneous view processes. * Small doco fixes. * Cosmetic bugfixes to chord names. * Fixed order of piano pedal strings (Amelie). * Changed embarrassing 'chorda' to corda (Thanks, Amelie). * Bugfixes: ly2dvi: empty tagline, don't fail if gettext.py can't be imported, check for linewidth before indexing, copy midi output. 1.3.142. --- AUTHORS.txt | 6 +- CHANGES | 37 +- Documentation/regression-test.tely | 4 +- Documentation/topdocs/AUTHORS.texi | 10 +- Documentation/user/refman.itely | 19 +- GNUmakefile.in | 4 +- VERSION | 4 +- buildscripts/ly2dvi-old.py | 1237 ----------------- flower/include/interval.hh | 5 +- input/bugs/textcresc.ly | 12 + input/regression/mensural.ly | 9 + .../{noteheadstyle.ly => note-head-style.ly} | 26 +- input/test/nested-groups.ly | 46 + input/test/test-german-chords.ly | 6 +- input/tricks/drums.ly | 59 + input/tricks/follow-thread.ly | 5 +- input/tricks/german-chords.ly | 37 - input/tricks/improv.ly | 46 + lily/audio-staff.cc | 1 + lily/hairpin.cc | 3 + lily/include/audio-staff.hh | 1 + lily/include/music.hh | 1 + lily/include/note-head.hh | 1 + lily/midi-item.cc | 194 +-- lily/midi-walker.cc | 3 +- lily/music.cc | 9 + lily/note-head.cc | 26 +- lily/performance.cc | 8 +- lily/staff-performer.cc | 3 + lily/stem.cc | 38 +- lily/system-start-delimiter-engraver.cc | 17 +- ly/drumpitch.ly | 154 ++ ly/engraver.ly | 29 +- ly/params.ly | 2 + make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mf/feta-bolletjes.mf | 64 +- mutopia/Coriolan/GNUmakefile | 18 - mutopia/Coriolan/bassi-part.ly | 14 - mutopia/Coriolan/bassi.ly | 56 - mutopia/Coriolan/clarinetti-part.ly | 15 - mutopia/Coriolan/clarinetti.ly | 22 - mutopia/Coriolan/clarinetto-1.ly | 240 ---- mutopia/Coriolan/clarinetto-2.ly | 205 --- mutopia/Coriolan/contrabasso.ly | 401 ------ mutopia/Coriolan/coriolan-midi.ly | 4 - mutopia/Coriolan/coriolan-paper.ly | 67 - mutopia/Coriolan/coriolan-part-paper.ly | 65 - mutopia/Coriolan/coriolan.ly | 66 - mutopia/Coriolan/corni-part.ly | 16 - mutopia/Coriolan/corni.ly | 21 - mutopia/Coriolan/corno-1.ly | 205 --- mutopia/Coriolan/corno-2.ly | 219 --- mutopia/Coriolan/fagotti-part.ly | 15 - mutopia/Coriolan/fagotti.ly | 19 - mutopia/Coriolan/fagotto-1.ly | 348 ----- mutopia/Coriolan/fagotto-2.ly | 330 ----- mutopia/Coriolan/flauti-part.ly | 15 - mutopia/Coriolan/flauti.ly | 16 - mutopia/Coriolan/flauto-1.ly | 260 ---- mutopia/Coriolan/flauto-2.ly | 172 --- mutopia/Coriolan/global.ly | 29 - mutopia/Coriolan/header.ly | 192 --- mutopia/Coriolan/instruments.ly | 14 - mutopia/Coriolan/music.ly | 20 - mutopia/Coriolan/oboe-1.ly | 271 ---- mutopia/Coriolan/oboe-2.ly | 182 --- mutopia/Coriolan/oboi-part.ly | 15 - mutopia/Coriolan/oboi.ly | 15 - mutopia/Coriolan/timpani-part.ly | 15 - mutopia/Coriolan/timpani.ly | 149 -- mutopia/Coriolan/trombe-part.ly | 15 - mutopia/Coriolan/trombe.ly | 21 - mutopia/Coriolan/trombo-1.ly | 155 --- mutopia/Coriolan/trombo-2.ly | 154 -- mutopia/Coriolan/viola-1.ly | 408 ------ mutopia/Coriolan/viola-2.ly | 400 ------ mutopia/Coriolan/viole-part.ly | 15 - mutopia/Coriolan/viole.ly | 56 - mutopia/Coriolan/violino-1-part.ly | 15 - mutopia/Coriolan/violino-1.ly | 449 ------ mutopia/Coriolan/violino-2-part.ly | 15 - mutopia/Coriolan/violino-2.ly | 438 ------ mutopia/Coriolan/violoncello.ly | 478 ------- mutopia/D.Zipoli/GNUmakefile | 10 - mutopia/D.Zipoli/verso_2.ly | 104 -- mutopia/F.Schubert/standchen-16.ly | 0 mutopia/F.Schubert/standchen-20.ly | 0 mutopia/GNUmakefile | 2 +- mutopia/Hymns/GNUmakefile | 10 - mutopia/Hymns/diademata.ly | 101 -- mutopia/Hymns/laudatedom.ly | 76 - mutopia/Hymns/maccabaeus.ly | 109 -- mutopia/Hymns/ode.ly | 76 - mutopia/Hymns/passion.ly | 85 -- mutopia/Hymns/stille.ly | 225 --- mutopia/dummy.m4 | 0 mutopia/gallina.ly | 294 ---- scm/chord-name.scm | 3 +- scm/drums.scm | 159 +++ scm/generic-property.scm | 1 - scm/grob-description.scm | 6 +- scm/grob-property-description.scm | 7 +- scm/interface-description.scm | 9 +- scm/lily.scm | 1 + scm/midi.scm | 214 +++ scm/output-lib.scm | 17 + 107 files changed, 970 insertions(+), 9007 deletions(-) delete mode 100644 buildscripts/ly2dvi-old.py create mode 100644 input/bugs/textcresc.ly create mode 100644 input/regression/mensural.ly rename input/regression/{noteheadstyle.ly => note-head-style.ly} (54%) create mode 100644 input/test/nested-groups.ly create mode 100644 input/tricks/drums.ly delete mode 100644 input/tricks/german-chords.ly create mode 100644 input/tricks/improv.ly create mode 100644 ly/drumpitch.ly delete mode 100644 mutopia/Coriolan/GNUmakefile delete mode 100644 mutopia/Coriolan/bassi-part.ly delete mode 100644 mutopia/Coriolan/bassi.ly delete mode 100644 mutopia/Coriolan/clarinetti-part.ly delete mode 100644 mutopia/Coriolan/clarinetti.ly delete mode 100644 mutopia/Coriolan/clarinetto-1.ly delete mode 100644 mutopia/Coriolan/clarinetto-2.ly delete mode 100644 mutopia/Coriolan/contrabasso.ly delete mode 100644 mutopia/Coriolan/coriolan-midi.ly delete mode 100644 mutopia/Coriolan/coriolan-paper.ly delete mode 100644 mutopia/Coriolan/coriolan-part-paper.ly delete mode 100644 mutopia/Coriolan/coriolan.ly delete mode 100644 mutopia/Coriolan/corni-part.ly delete mode 100644 mutopia/Coriolan/corni.ly delete mode 100644 mutopia/Coriolan/corno-1.ly delete mode 100644 mutopia/Coriolan/corno-2.ly delete mode 100644 mutopia/Coriolan/fagotti-part.ly delete mode 100644 mutopia/Coriolan/fagotti.ly delete mode 100644 mutopia/Coriolan/fagotto-1.ly delete mode 100644 mutopia/Coriolan/fagotto-2.ly delete mode 100644 mutopia/Coriolan/flauti-part.ly delete mode 100644 mutopia/Coriolan/flauti.ly delete mode 100644 mutopia/Coriolan/flauto-1.ly delete mode 100644 mutopia/Coriolan/flauto-2.ly delete mode 100644 mutopia/Coriolan/global.ly delete mode 100644 mutopia/Coriolan/header.ly delete mode 100644 mutopia/Coriolan/instruments.ly delete mode 100644 mutopia/Coriolan/music.ly delete mode 100644 mutopia/Coriolan/oboe-1.ly delete mode 100644 mutopia/Coriolan/oboe-2.ly delete mode 100644 mutopia/Coriolan/oboi-part.ly delete mode 100644 mutopia/Coriolan/oboi.ly delete mode 100644 mutopia/Coriolan/timpani-part.ly delete mode 100644 mutopia/Coriolan/timpani.ly delete mode 100644 mutopia/Coriolan/trombe-part.ly delete mode 100644 mutopia/Coriolan/trombe.ly delete mode 100644 mutopia/Coriolan/trombo-1.ly delete mode 100644 mutopia/Coriolan/trombo-2.ly delete mode 100644 mutopia/Coriolan/viola-1.ly delete mode 100644 mutopia/Coriolan/viola-2.ly delete mode 100644 mutopia/Coriolan/viole-part.ly delete mode 100644 mutopia/Coriolan/viole.ly delete mode 100644 mutopia/Coriolan/violino-1-part.ly delete mode 100644 mutopia/Coriolan/violino-1.ly delete mode 100644 mutopia/Coriolan/violino-2-part.ly delete mode 100644 mutopia/Coriolan/violino-2.ly delete mode 100644 mutopia/Coriolan/violoncello.ly delete mode 100644 mutopia/D.Zipoli/GNUmakefile delete mode 100644 mutopia/D.Zipoli/verso_2.ly delete mode 100644 mutopia/F.Schubert/standchen-16.ly delete mode 100644 mutopia/F.Schubert/standchen-20.ly delete mode 100644 mutopia/Hymns/GNUmakefile delete mode 100644 mutopia/Hymns/diademata.ly delete mode 100644 mutopia/Hymns/laudatedom.ly delete mode 100644 mutopia/Hymns/maccabaeus.ly delete mode 100644 mutopia/Hymns/ode.ly delete mode 100644 mutopia/Hymns/passion.ly delete mode 100644 mutopia/Hymns/stille.ly delete mode 100644 mutopia/dummy.m4 delete mode 100644 mutopia/gallina.ly create mode 100644 scm/drums.scm diff --git a/AUTHORS.txt b/AUTHORS.txt index 4d2bed6671..a6d2b4b04e 100644 --- a/AUTHORS.txt +++ b/AUTHORS.txt @@ -1,7 +1,7 @@ -AUTHORS - who did what on GNU LilyPond? -*************************************** +AUTHORS +******* This file lists authors of GNU LilyPond, and what they wrote. This list is alphabetically ordered. @@ -77,3 +77,5 @@ list is alphabetically ordered. * August S.Sigov Russian translation + * Rune Zedeler Drum notation + diff --git a/CHANGES b/CHANGES index ecaaf2c40b..61b66fd970 100644 --- a/CHANGES +++ b/CHANGES @@ -3,9 +3,6 @@ * LilyPond-mode: show what's going on (font building) in *view* buffer. -1.3.143.jcn2 -============ - * Added environment settings to ly2dvi and lilypond-book. * Bugfix: make diff links diff into patch-dir, like make release. @@ -17,9 +14,6 @@ * Added flag (LilyPond-kick-xdvi) to LilyPond emacs mode to allow simultaneous view processes. -1.3.143.jcn1 -============ - * Small doco fixes. * Cosmetic bugfixes to chord names. @@ -31,15 +25,34 @@ simultaneous view processes. * Bugfixes: ly2dvi: empty tagline, don't fail if gettext.py can't be imported, check for linewidth before indexing, copy midi output. +1.3.142.rz1 +=========== + +* Added "hacky" drum notation/midi. See input/tricks/drums.ly and + ly/drumpitch.ly. Moved midi-instruments to scm. + +* Added temporary nested staffgroups/choirstaffs support + use Context InnerStaffGroup / InnerChoirStaff. + +1.3.143.uu1 +=========== + +* Bugfix: hairpin that hangs on otherwise empty column should not +collapse into flat line. Inserted sanity check in Interval::center(). + +* Programmable stem-attachments for note heads. + +* Set default empty instrument name for Staff, to avoid weird effects for +named grand staffs. + +* remove various entries from mutopia/ + 1.3.143 ======= -1.3.142.hwn2 -============ - * Glossary bugfixes for lilypond code. -* Bugfix: don't crash if dy or y not set. +* Bugfix: don't crash if dy or y not set in Beam. * Doco updates: moved contents of tricks chapter to input/tricks, inserted lilypond-book tutorial, added polyphony section. @@ -100,7 +113,7 @@ from the font (WARNING: FONT CHANGED). * Cleanups in (de)crescendo code, fixed continued (de)crescendi. -* German chords (Rune Zedler) +* German chords (Rune Zedeler) 1.3.141 ======= @@ -168,6 +181,8 @@ Slur::set_spacing_rods into Spanner::set_spacing_rods 1.3.140 ======= + + 1.3.139.jcn5 ============ diff --git a/Documentation/regression-test.tely b/Documentation/regression-test.tely index 1a15cc7735..1f9b51238b 100644 --- a/Documentation/regression-test.tely +++ b/Documentation/regression-test.tely @@ -23,7 +23,9 @@ and documenting bugfixes. @lilypondfile[printfilename]{rest-ledger.ly} -@lilypondfile[printfilename]{noteheadstyle.ly} +@lilypondfile[printfilename]{note-head-style.ly} + +@lilypondfile[printfilename]{mensural.ly} @lilypondfile[printfilename]{easy-notation.ly} diff --git a/Documentation/topdocs/AUTHORS.texi b/Documentation/topdocs/AUTHORS.texi index de250b805c..85276d489a 100644 --- a/Documentation/topdocs/AUTHORS.texi +++ b/Documentation/topdocs/AUTHORS.texi @@ -2,14 +2,14 @@ @setfilename AUTHORS.info @settitle AUTHORS - who did what on GNU LilyPond- -@node Top, , AUTHORS - who did what on GNU LilyPond-, (dir) +@node Top @top @menu -* AUTHORS - who did what on GNU LilyPond-::AUTHORS - who did what on GNU LilyPond- +* AUTHORS:: @end menu -@node AUTHORS - who did what on GNU LilyPond-, Top, , Top -@chapter AUTHORS - who did what on GNU LilyPond? +@node AUTHORS +@chapter AUTHORS This file lists authors of GNU LilyPond, and what they wrote. This @@ -76,6 +76,8 @@ list is alphabetically ordered. Some lilypond input. @item @email{august@@infran.ru, August S.Sigov} Russian translation +@item @email{rune@@zedeler.dk, Rune Zedeler} + Drum notation @end itemize @bye diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index a46c14eaee..4f3e0a3fab 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -1385,13 +1385,6 @@ is an example how to do it: @end lilypond -@refbugs - -When using spacer notes to subdivide note dynamics and @code{linewidth = --1}, starting a hairpin on the first spacer note (the one coinciding -with the real note) exposes an embarassing bug. - - @c . {Repeats} @node Repeats @@ -2300,7 +2293,8 @@ used, for the next ones @code{instr} is used. @end lilypond This requires that you add the @code{Instrument_name_engraver} to the -staff context. You can also use markup texts: +staff context. You can also use markup texts to construct more +complicated instrument names: @lilypond[verbatim,singleline] @@ -2317,6 +2311,14 @@ staff context. You can also use markup texts: @end lilypond +@refbugs + +When you put a name on a grand staff or piano staff (By adding an +@code{Instrument_name_engraver} to that context and setting +e.g. @code{\property GrandStaff.instrument}), the width of the brace is +not taken into account. You must add extra spaces to the end of the name +to avoid a collision. + @node Transpose @subsection Transpose @cindex Transpose @@ -3439,7 +3441,6 @@ Xdvi} version 22.36 or newer. @item emacs @end itemize - Add one these lines to the top of your .ly file. The first one is for line location only. The second one is more convenient, but requires patching @code{emacsclient}. diff --git a/GNUmakefile.in b/GNUmakefile.in index 473c9a50fe..42da1397ef 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -76,7 +76,9 @@ local-web: fonts lily $(TOP_HTMLS:%.html=%) footify do-top-doc top-web top-web: rm -f `find . -name \*.html~ -print` - find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' | tar -czf $(outdir)/web.tar.gz -T - + find `find Documentation input mutopia *.png index.html -type d -name 'out-www'` -not -name '*dvi' -not -name '*ly' -not -name '*tex' -not -name '*.ps' -not -name 'out-www' > $(outdir)/weblist + ls *.png *.html >> $(outdir)/weblist + cat $(outdir)/weblist | tar -czf $(outdir)/web.tar.gz -T - #WWW: local-WWW diff --git a/VERSION b/VERSION index 2e0a72bbfa..e8ff955fc9 100644 --- a/VERSION +++ b/VERSION @@ -1,8 +1,8 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 -PATCH_LEVEL=143 -MY_PATCH_LEVEL=jcn3 +PATCH_LEVEL=144 +MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/buildscripts/ly2dvi-old.py b/buildscripts/ly2dvi-old.py deleted file mode 100644 index 139599fe7b..0000000000 --- a/buildscripts/ly2dvi-old.py +++ /dev/null @@ -1,1237 +0,0 @@ -#!@PYTHON@ - - -# TODO: -# -# * Rewrite this. The control structure is too hairy. -# * (c) on page 1 -# * more helpful info on lily crashes -# * Should use files in /tmp/ only. This potentially messes with -# user generated files in the CWD - - -""" -======================================================================= -LilyPond to dvi converter - -Features include Title information, paper size specification, and image -orientation. - -Usage: ly2dvi.py [OPTION]... [FILE]... -Input: LilyPond source or LilyPond generated TeX files -Output: DVI file -======================================================================= -""" - -name = 'ly2dvi' -version = '@TOPLEVEL_VERSION@' -errorlog = '' - -import sys -import os -import getopt -import re -import string -import time -import glob -import tempfile - -# Can't grep localized msgs -os.environ['LC_ALL'] = '' -os.environ['LANG'] = '' -os.environ['LC_LANG'] = '' - - - -class Input: - """ - This class handles all ly2dvi.py input file methods - - Public methods: - - __init__() Constructor - open(file) Open a .ly file or .tex file using lilyinclude path - close() Close current file - type() Determine file type .ly (input) or .tex (output) - setVars() Set title definitions found in .tex (output) file - """ - - # - # Constructors - # - - def __init__(this): - this.__fd = None - - # - # open - # - def open(this,file): - """ - open file and set private class variable __fd. The search - sequence is: current directory followed by the directories - found in include property list. Each directory is searched - for file, file.ly, file.sly and file.fly. - - input: file filename - output: void - error: ExitNotFound Exception - """ - - for i in [''] + Props.get('include')[0:]: - ifile = os.path.join(i,file) - for j in ['','.ly','.fly', '.sly']: - jfile = ifile+j - try: - this.__fd = open( jfile, 'r' ) - return - except: - pass - sys.exit('ExitNotFound', file) - - - # - # close - # - def close(this): - """ - close file object __fd - - input: void - output: void - error: None - """ - this.__fd.close() - - - # - # type - # - def type(this): - """ - Determine input file type. LilyPond source is 'input' type - and LilyPond generated TeX file is 'output' type - - input: void - output: 'input' | 'output' - error: None - """ - - firstline = this.__fd.readline() - this.__fd.seek(0) - if re.match('% Generated automatically by: GNU LilyPond [0-9]+[.0-9]+',firstline ): - return 'output' - else: - return 'source' - - - # - # setVars - # - def setVars(this): - """ - Search for properties in the current input file and set the - appropriate values. The supported properties names are in - local variable varTable along with the property list - titledefs. - - input: void - output: None - error: None - """ - - varTable = [ - # regexp set method - # ------ ---------- - ( 'language', Props.setLanguage ), - ( 'latexheaders', Props.setHeader ), - ( 'latexpackages', Props.setPackages ), - ( 'paperorientation', Props.setOrientation ), - ( 'paperpapersize', Props.setPaperZize ), - ( 'papertextheight', Props.setTextHeight ), - ( 'paperlinewidth', Props.setLineWidth ), - ( 'filename', Props.setFilename ), - ] - - titles={} - for line in this.__fd.readlines(): - m=re.match('\\\\def\\\\lilypond([\w]+){(.*)}',line) - if m: - for var in varTable: - if m.group(1) == var[0]: - var[1](m.group(2),'file') - break - for var in Props.get('titledefs'): - if m.group(1) == var: - titles[var]=m.group(2) - break - Props.setTitles(titles,'file') - this.__fd.seek(0) - - - -class TeXOutput: - """ - This class handles all ly2dvi.py output file methods - - private methods: - __lilypondDefs(opt) Send title info to output file - - Public methods: - __init__() Constructor - write(str) Write a string to output file - start(file) Start the latex file - next() Process next output file - end() Finish latex file and run latex - """ - - # - # constructor - # - def __init__(this): - this.__fd = None - this.__base = '' - this.__outfile = '' - - # - # __medelaDefs - # - def __lilypondDefs(this,opt): - """ - Write titles to output - - input: opt Supports header and subheader output - output: None - error: None - """ - - titles = Props.get('titles') - for key in titles.keys(): - this.write('%s\\lilypond%s{%s}%%\n' % (opt,key,titles[key])) - - # - # write - # - def write(this,str): - """ - Write str to current output file - - input: str String to write - output: None - error: None - """ - - this.__fd.write(str) - - # - # start - # - def start(this,file): - """ - Start LaTeX file. Sets the linewidth (and possibly the - textheight) and leaves the page layout to the geometry - package. Creates temporary output filename and opens it - for write. Sends the LaTeX header information to output. - Lastly sends the title information to output. - - input: file output file name - output: None - error: None - """ - - now=time.asctime(time.localtime(time.time())) - - # Only set the textheight if it was explicitly set by the user, - # otherwise use the default. Helps to handle landscape correctly! - if Props.get('textheight') > 0: - textheightsetting = ',textheight=' + `Props.get('textheight')` + 'pt' - else: - textheightsetting = '' - - - top= r""" -%% Creator: %s -%% Generated automatically by: %s, from %s, at %s - -\documentclass[%s]{article} - -%s -\usepackage{geometry} -\usepackage[latin1]{inputenc} -%%\usepackage[T1]{fontenc} -%% -%% don not waste unused space at bottom of page -%% (unless we have footnotes ...) -%%\headheight9pt -%%\headsep0pt -%% Maybe this is too drastic, but let us give it a try. -\geometry{width=%spt%s,headheight=2mm,headsep=0pt,footskip=2mm,%s} -\input{titledefs} -%s -\makeatletter -\renewcommand{\@oddhead}{\parbox{\textwidth}%% - {\mbox{}\small\theheader\hfill\textbf{\thepage}}}%% -%% UGR. -%%\renewcommand{\@evenhead}{eve!{\small\lilypondinstrument{,}\quad\textbf{\thepage}}\hfil}%% -\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\thefooter}}%% -%s -\begin{document} -""" % ( program_id(), program_id(), Props.get('filename'), now, Props.get('papersize'), - Props.get('language'), Props.get('linewidth'), textheightsetting, - Props.get('orientation'), Props.get('header'), Props.get('pagenumber')) - - base, ext = os.path.splitext(file) - this.__base = base - tempfile.template= base + '_ly' - this.__outfile = tempfile.mktemp(ext) - base, ext = os.path.splitext(this.__outfile) - this.__tmpbase = base - try: - this.__fd = open(this.__outfile,"w") - except: - sys.exit('ExitNoWrite', this.__outfile) - this.write(top) - this.__lilypondDefs('') - this.write("""\ -\\makelilytitle -""") - - # - # next - # - def next(this): - """ - Write LaTeX subheader information to support more than one - score in a document. Lastly send current title information to - output. - - input: None - output: None - error: None - """ - - this.write("""\ -\\def\\theopus{}% -\\def\\thepiece{}% -\\def\\lilypondopus{}% -\\def\\lilypondpiece{}% -""") - this.__lilypondDefs("\\def") - this.write("""\ -\\def\\theopus{\\lilypondopus}% ugh -\\def\\thepiece{\\lilypondpiece}% -\\makelilypiecetitle -""") - - - # - # end - # - def end(this): - """ - Close output file and run latex on it. - - input: None - output: None - error: ExitBadLatex Exception - """ - - outfile=this.__base + '.dvi' - if Props.get('output') != '': - if not os.path.exists(Props.get('output')): - os.mkdir(Props.get('output')) - - outfile = os.path.join(Props.get('output'), outfile ) - - this.write(r""" -%% \vfill\hfill{\lilypondtagline} -\makeatletter -\renewcommand{\@oddfoot}{\parbox{\textwidth}{\mbox{}\lilypondtagline}}%% -\makeatother -\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)) - else: # Windows shells don't eat the single quotes - stat = os.system('latex \\nonstopmode \\input %s' % - (this.__outfile)) - if stat: - sys.exit('ExitBadLatex') - if not os.path.isfile(outfile): - os.rename(this.__tmpbase + '.dvi', outfile) - - sys.stderr.write('\n' + program_id() + ': dvi file name is %s\n\n' - % (outfile)) - - if Props.get('postscript'): - dvipsopts='' - if Props.get('orientation') == 'landscape': - dvipsopts=dvipsopts + ' -t landscape' - psoutfile=this.__base + '.ps' - if Props.get('output') != '': - psoutfile = os.path.join(Props.get('output'), psoutfile ) - stat = os.system('dvips %s -o %s %s' % (dvipsopts,psoutfile,outfile)) - if stat: - sys.exit('ExitBadPostscript') - - - - - -# ARG! THIS CODE IS BLOATED: -# FIXME: Junk all set/get methods. - -class Properties: - """ - This class handles all ly2dvi.py property manipulation - - Public methods: - - __init__() Constructor - set methods - """ - - def __init__(this): - - # - # Following is the order of priority for property assignment. The - # list is organized from lowest to highest priority. Each - # assignment is overridden by the next requester in the list. - # - # Requester Description - # --------- ----------- - # init Initial default values - # file The values found in the LilyPond generated TeX files - # environment Envrionment variables LILYINCLUDE, LILYPONDPREFIX - # rcfile $LILYPONDPREFIX/.lilyrc - # rcfile $HOME/.lilyrc - # rcfile ./.lilyrc - # commandline command line arguments - # - this.__overrideTable = { - 'init' : 0, - 'file' : 1, - 'environment' : 2, - 'rcfile' : 3, - 'commandline' : 4, - 'program' : 5 - } - - this.__roverrideTable = {} # reverse lookup used for debug - for i in this.__overrideTable.items(): - this.__roverrideTable[i[1]]=i[0] - - this.__data = { - 'papersize' : ['a4paper', this.__overrideTable['init']], - 'textheight' : [0, this.__overrideTable['init']], - 'linewidth' : [500, this.__overrideTable['init']], - 'orientation' : ['portrait', this.__overrideTable['init']], - 'language' : ['%', this.__overrideTable['init']], - 'include' : [[], this.__overrideTable['init']], - 'debug' : [0, this.__overrideTable['init']], - 'keeplilypond' : [0, this.__overrideTable['init']], - 'keeply2dvi' : [0, this.__overrideTable['init']], - 'pagenumber' : ['%', this.__overrideTable['init']], - 'separate' : [0, this.__overrideTable['init']], - 'output' : ['', this.__overrideTable['init']], - 'header' : ['%', this.__overrideTable['init']], - 'dependencies' : [0, this.__overrideTable['init']], - 'root' : ['', this.__overrideTable['init']], - 'tmp' : ['d:\tmp', this.__overrideTable['init']], - 'filename' : ['', this.__overrideTable['init']], - 'titledefs' : [[], this.__overrideTable['init']], - 'titles' : [{}, this.__overrideTable['init']], - 'lilyOutputFiles' : [[], this.__overrideTable['init']], - 'postscript' : [0, this.__overrideTable['init']], - } - - # - # Try to set root and HOME first before calling rcfile - # - if os.environ.has_key('LILYPONDPREFIX'): - this.setRoot(os.environ['LILYPONDPREFIX'], 'environment') - else: - p=os.path.split(sys.argv[0]) - p=os.path.split(p[0]) - # bit silly. for ly2dvi, overrules compiled-in datadir... - # how to do this better (without running lily, of course? - this.setRoot(os.path.join(p[0],'share','lilypond'), 'init') - - if not os.environ.has_key('HOME'): - if os.environ.has_key('HOMEDRIVE') and \ - os.environ.has_key('HOMEPATH'): - os.environ['HOME'] = os.environ['HOMEDRIVE'] + \ - os.environ['HOMEPATH'] - else: - os.environ['HOME'] = os.curdir - - this.rcfile() # Read initialization file(s) - - if os.environ.has_key('LILYINCLUDE'): - tmp=this.get('include') - for s in string.split(os.environ['LILYINCLUDE'],os.pathsep): - tmp.append(s) - this.__set('include', tmp, 'environment') - - - t = os.pathsep - if os.environ.has_key ('TEXINPUTS'): - t = os.environ['TEXINPUTS'] + os.pathsep - - ly2dvi_t = t + \ - os.path.join(this.get('root'), 'tex' ) + \ - os.pathsep + os.path.join(this.get('root'), 'ps' ) - # Don't add the magic `//' to TEXINPUTS - ly2dvi_t = re.sub ('//*', '/', ly2dvi_t) - os.environ['TEXINPUTS'] = ly2dvi_t - - m = '' - if os.environ.has_key ('MFINPUTS'): - m = os.environ['MFINPUTS'] - ly2dvi_m = m + os.pathsep + \ - os.path.join(this.get('root'), 'mf') - ly2dvi_m = re.sub ('//*', '/', ly2dvi_m) - # Don't add the magic `//' to MFINPUTS - os.environ['MFINPUTS'] = ly2dvi_m - - if os.environ.has_key('TMP'): - this.__set('tmp',os.environ['TMP'],'environment') - - - def read_titledefs (this): - fd=this.get_texfile_path ('titledefs.tex') - mudefs=[] - - for line in fd.readlines(): - m=re.match('\\\\newcommand\*{\\\\lilypond([\w]+)}',line) - if m: - mudefs.append(m.group(1)) - fd.close - this.__set('titledefs', mudefs, 'init') - - # - # __set - # - def __set(this,var,value,requester): - """ - All of the set methods call this to set a property. If the value - was last set by a requestor of lesser priority the new value is - assigned, else the old value has priority and is unchanged. - """ - - if this.__overrideTable[requester] < this.__data[var][1]: - return 0 - else: - this.__data[var] = [value, this.__overrideTable[requester]] - - # - # get - # - def get(this,var): - """ - All of the get methods call this to get a property value. List - variable types are return by value to facilitate an append operation. - """ - - if var == 'include' or var == 'lilyOutputFiles': - return this.__data[var][0][0:] # return a copy not a ref - else: - return this.__data[var][0] - - # - # get_texfile_path - # - def get_texfile_path (this, var): - """ - locate and open titledefs.tex file - """ - - if os.name == 'nt': - path = os.path.join(this.get('root'), 'tex', var) - else: - path ='' - cmd =('kpsewhich tex %s %s' % (var,errorlog)) - sys.stderr.write ('executing: %s'% cmd) - pipe = os.popen (cmd, 'r') - path = pipe.readline ()[:-1] # chop off \n - return_status = pipe.close() - sys.stderr.write ('\n') - if return_status and not path: - path = os.path.join(this.get('root'), 'tex', var) - fd = open(path, 'r') - return fd - - - # - # Read rc file - # - def rcfile(this): - """ - Read initialization file(s) - """ - varTable = [ - # name set method - # ---- ---------- - ( 'DEBUG', this.setDebug ), - ( 'DEPENDENCIES', this.setDependencies ), - ( 'KEEPLILYPOND', this.setKeeplilypond ), - ( 'KEEPLY2DVI', this.setKeeply2dvi ), - ( 'LANGUAGE', this.setLanguage ), - ( 'LATEXHF', this.setHeader ), - ( 'LATEXPKG', this.setPackages ), - ( 'LILYINCLUDE', this.setInclude ), - ( 'LILYPONDPREFIX', this.setRoot ), - ( 'NONUMBER', this.setNonumber ), - ( 'ORIENTATION', this.setOrientation ), - ( 'OUTPUTDIR', this.setOutput ), - ( 'PAPERSIZE', this.setPaperZize ), - ( 'PHEIGHT', this.setTextHeight ), - ( 'POSTSCRIPT', this.setPostscript ), - ( 'PWIDTH', this.setLineWidth ), - ( 'SEPARATE', this.setSeparate ), - ( 'TMP', this.setTmp ), - ] - - if ( os.name == 'posix' ): - dotFilename='.lilyrc' - else: # Windows apps like edit choke on .lilyrc - dotFilename='_lilyrc' - - for d in [os.path.join(this.get('root'),'ly'), \ - os.environ['HOME'], os.curdir ]: - file=os.path.join(d,dotFilename) - try: - fd = open( file, 'r' ) - except: - continue - - for line in fd.readlines(): - if re.match('#.*',line): - continue - m=re.search('([\w]+)=(.*)',line) - if m: - for var in varTable: - if m.group(1) == var[0]: - var[1](m.group(2),'rcfile') - break - fd.close - - # - # setPaperZize - # - def setPaperZize(this,size,requester): - """ - Set paper size properties - """ - - paperTable = [ - # regex width height name - # ----- ----- ------ ---- - ( 'a0.*', 2389, 3381, 'a0paper' ), - ( 'a1$|a1p.*', 1690, 2389, 'a1paper' ), - ( 'a2.*', 1194, 1690, 'a2paper' ), - ( 'a3.*', 845, 1194, 'a3paper' ), - ( 'a4.*', 597, 845, 'a4paper' ), - ( 'a5.*', 423, 597, 'a5paper' ), - ( 'a6.*', 298, 423, 'a6paper' ), - ( 'a7.*', 211, 298, 'a7paper' ), - ( 'a8.*', 305, 211, 'a8paper' ), - ( 'a9.*', 105, 305, 'a9paper' ), - ( 'a10.*', 74, 105, 'a10paper' ), - ( 'b0.*', 2847, 4023, 'b0paper' ), - ( 'b1.*', 2012, 2847, 'b1paper' ), - ( 'b2.*', 1423, 2012, 'b2paper' ), - ( 'b3.*', 1006, 1423, 'b3paper' ), - ( 'b4.*', 712, 1006, 'b4paper' ), - ( 'b5.*', 503, 712, 'b5paper' ), - ( 'archA$', 650, 867, 'archApaper' ), - ( 'archB$', 867, 1301, 'archBpaper' ), - ( 'archC$', 1301, 1734, 'archCpaper' ), - ( 'archD$', 1734, 2602, 'archDpaper' ), - ( 'archE$', 2602, 3469, 'archEpaper' ), - ( 'flsa$|flse$', 614, 940, 'flsapaper' ), - ( 'halfletter$', 397, 614, 'halfletterpaper' ), - ( 'ledger$', 1229, 795, 'ledgerpaper' ), - ( 'legal$', 614, 1012, 'legalpaper' ), - ( 'letter$', 614, 795, 'letterpaper' ), - ( 'note$', 542, 723, 'notepaper' ) - ] - - found=0 - for paper in paperTable: - if re.match(paper[0],size): - found=1 - this.__set('papersize',paper[3],requester) - break - - if not found: - sys.exit('ExitBadPaper',size) - - # - # setTextHeight - # - def setTextHeight(this,size,requester): - """ - Set textheight property - """ - - m=re.match('([0-9][.0-9]*)(cm|mm|pt|$)',size) - if m: - if m.group(2) == 'cm': - this.__set('textheight',\ - float(m.group(1)) * 72.27/2.54, requester ) - elif m.group(2) == 'mm': - this.__set('textheight',\ - float(m.group(1)) * 72.27/25.4, requester ) - elif m.group(2) == 'pt': - this.__set('textheight', float(m.group(1)), requester ) - elif m.group(2) == '': - this.__set('textheight', float(m.group(1)), requester ) - else: - sys.exit('ExitBadHeight', m.group(2)) - else: - sys.exit('ExitBadHeight', size) - - # - # setLineWidth - # - def setLineWidth(this,size,requester): - """ - Set linewidth propery - """ - - m=re.match('([0-9][.0-9]*)(cm|mm|pt|$)',size) - if m: - if m.group(2) == 'cm': - this.__set('linewidth', \ - float(m.group(1)) * 72.27/2.54, requester ) - elif m.group(2) == 'mm': - this.__set('linewidth', \ - float(m.group(1)) * 72.27/25.4, requester ) - elif m.group(2) == 'pt': - this.__set('linewidth', float(m.group(1)), requester ) - elif m.group(2) == '': - this.__set('linewidth', float(m.group(1)), requester ) - else: - sys.exit('ExitBadWidth', m.group(2)) - else: - sys.stderr.write ('ly2dvi: warning: ignoring linewidth: ' + size + '\n') - - # - # setOrientation - # - def setOrientation(this,orient,requester): - """ - Set orientation property - """ - - if orient == 'landscape' or orient == 'portrait': - this.__set('orientation', orient, requester ) - else: - sys.exit('ExitBadOrient', orient) - - # - # setLanguage - # - def setLanguage(this,lang,requester): - """ - Set language property - """ - - this.__set('language', '\\usepackage[%s]{babel}' % (lang), requester ) - - # - # setInclude - # - def setInclude(this,inc, requester): - """ - Append an include path - """ - - tmp = this.get('include') - tmp.append(inc) - this.__set('include', tmp, requester ) - - # - # setDebug - # - def setDebug(this,value,requester): - """ - Set or Clear debug flag - """ - - if int(value) == 1: - this.__set('debug',1,requester) - else: - this.__set('debug',0,requester) - - # - # setKeeplilypond - # - def setKeeplilypond(this, value, requester): - """ - Set or Clear keeplilypond flag - """ - - if int(value) == 1: - this.__set('keeplilypond',1,requester) - else: - this.__set('keeplilypond',0,requester) - - # - # setKeeply2dvi - # - def setKeeply2dvi(this, value, requester): - """ - Set or Clear keeply2dvi flag - """ - - if int(value) == 1: - this.__set('keeply2dvi',1,requester) - else: - this.__set('keeply2dvi',0,requester) - - # - # setNonumber - # - def setNonumber(this, value, requester): - """ - Set nonumber flag - """ - - if int(value) == 1: - this.__set('pagenumber','\\pagestyle{empty}',requester) - else: - this.__set('pagenumber','%',requester) - - # - # setSeparate - # - def setSeparate(this, value, requester): - """ - Set or Clear separate flag - """ - - if int(value) == 1: - this.__set('separate',1,requester) - else: - this.__set('separate',0,requester) - - # - # Set output directory name - # - def setOutput(this,out,requester): - this.__set('output',out,requester) - - # - # Set latex header name - # - def setHeader(this,head, requester): - this.__set('header','\\input{' + head + '}'+this.get('header'),requester) - - # - # Set latex package name - # - def setPackages(this,pkgs, requester): - this.__set('header','\\usepackage{' + pkgs + '}'+this.get('header'),requester) - - # - # Set or Clear Dependencies flag to generate makefile dependencies - # - def setDependencies(this, value, requester): - """ - Set or Clear dependencies flag - """ - - if int(value) == 1: - this.__set('dependencies',1,requester) - else: - this.__set('dependencies',0,requester) - - # - # Set tmp directory - # - def setTmp(this,dir, requester): - this.__set('tmp',dir,requester) - - # - # Set lilypond source file name - # - def setFilename(this,file, requester): - this.__set('filename',file,requester) - - # - # Set title commands - # - def setTitles(this,titles, requester): - this.__set('titles',titles,requester) - - # - # Set title commands - # - def addLilyOutputFiles(this,filelist,requester): - """ - Add a to the lily output list - """ - - tmp = this.get('lilyOutputFiles') - tmp = tmp + filelist - this.__set('lilyOutputFiles',tmp,requester) - - # - # Set/Clear postscript flag - # - def setPostscript(this,value,requester): - """ - Set postscript flag - """ - - if int(value) == 1: - this.__set('postscript',1,requester) - else: - this.__set('postscript',0,requester) - - # - # Set root - # - def setRoot(this,path, requester): - """ - Set LilyPond root directory - """ - - os.environ['LILYPONDPREFIX'] = path - if os.name == 'nt' or os.name == 'dos': - path = unc2dos(path); - - this.__set('root',path,requester) - - - # - # printProps - # - def printProps(this): - """ - Print properties - """ - - for key in this.__data.keys(): - print "%s <%s>:<%s>" % (key,this.get(key), - this.__roverrideTable[this.__data[key][1]]) - - - -# -# Misc functions -# - -def getLilyopts(): - inc = '' - if len(Props.get('include')) > 0: - inc = string.join (map (lambda x: '-I "%s"' % x, Props.get('include'))) - dep='' - if Props.get('dependencies'): - dep=' --dependencies' - return inc + dep - -def writeLilylog(file,contents): - if Props.get('keeplilypond'): - base, ext = os.path.splitext(file) - tempfile.template=base + "_li" - file=tempfile.mktemp('.log') - output = Props.get('output') - if output != '': - file = os.path.join( output, file ) - try: - fd = open( file, 'w' ) - except: - sys.exit('ExitNoWrite', file) - fd.write(contents) - fd.close() - -def getTeXFile(contents): - texfiles=[] - for line in string.split(contents,'\n'): - m = re.search('paper output to (.+)\.\.\.', line) - if m: - texfiles.append(m.group(1)) - - if texfiles == []: - sys.exit('ExitNoTeXName') - else: - return texfiles - -def getDepFiles (log): - files=[] - for line in string.split (log,'\n'): - m = re.search ("dependencies output to (.+)\.\.\.", line) - if m: - files.append (m.group (1)) - return files - -def unc2dos(path): - """ - Convert a path of format ///this/that/the/other to - :\this\that\the\other - """ - m=re.match('^//([A-Za-z])(/.*)$',path) - if m: - return m.group(1) + ':' + os.path.normpath(m.group(2)) - - - -def program_id (): - return 'ly2dvi (GNU LilyPond) ' + version; - - -def mailaddress(): - try: - return os.environ['MAILADDRESS'] - except KeyError: - return '(address unknown)' - - -def identify (): - sys.stderr.write (program_id () + '\n') - -def print_version (): - sys.stdout.write (program_id () + '\n') - -def help (): - sys.stdout.write ( -"""Usage: %s [OPTION]... [FILE]... - -Generate dvi file from LilyPond source/output - -Options: - -D,--debug increase verbosity - -F,--headers= name of additional LaTeX headers file - -H,--Height= set paper height (points) (see manual page) - -I,--include=DIR add DIR to LilyPond\'s search path - -K,--keeplilypond keep LilyPond output files - -L,--landscape set landscape orientation - -N,--nonumber switch off page numbering - -O,--orientation= set orientation (obsolete -- use -L instead) - -P,--postscript generate PostScript file - -W,--Width= set paper width (points) (see manual page) - -M,--dependencies tell LilyPond to make a dependencies file - -h,--help this help text - -k,--keeply2dvi keep ly2dvi output files - -l,--language= give LaTeX language (babel) - -o,--outdir= set output directory - --output= set output directory - -p,--papersize= give LaTeX papersize (eg. a4) - -s,--separate run all files separately through LaTeX - -files may be (a mix of) input to or output from LilyPond(1) -""" % name) - - - -# -# main -# - -def main(): - """Generate dvi files from LilyPond source/output""" - - infile = Input() - outfile = TeXOutput() - texInputFiles=[] - tempfile.tempdir="" - - (options, files) = getopt.getopt (sys.argv[1:], - 'DF:H:I:KLNPW:Mhkl:o:p:s', - ['debug', 'headers=', 'Height=', - 'include=', 'keeplilypond', 'landscape', - 'nonumber', 'Width=', 'dependencies', - 'help', 'keeply2dvi', 'language=', - 'outdir=', 'output=', 'version', - 'papersize=', 'separate', 'postscript']) - - for opt in options: - o = opt[0] - a = opt[1] - if o == '--debug' or o == '-D': - Props.setDebug(1,'commandline') - elif o == '--headers' or o == '-F': - Props.setHeader(a,'commandline') - elif o == '--include' or o == '-I': - Props.setInclude(a,'commandline') - elif o == '--Height' or o == '-H': - Props.setTextHeight(a,'commandline') - elif o == '--keeplilypond' or o == '-K': - Props.setKeeplilypond(1,'commandline') - elif o == '--landscape' or o == '-L': - Props.setOrientation('landscape','commandline') - elif o == '--nonumber' or o == '-N': - Props.setNonumber(1,'commandline') - elif o == '--Width' or o == '-W': - Props.setLineWidth(a,'commandline') - elif o == '--dependencies' or o == '-M': - Props.setDependencies(1,'commandline') - elif o == '--help' or o == '-h': - help() - sys.exit (0) - elif o == '--keeply2dvi' or o == '-k': - Props.setKeeply2dvi(1,'commandline') - elif o == '--language' or o == '-l': - Props.setLanguage(a,'commandline') - elif o == '--outdir' or o == '-o' or o == '--output': - Props.setOutput(a,'commandline') - elif o == '--papersize' or o == '-p': - Props.setPaperZize(a,'commandline') - elif o == '--separate' or o == '-s': - Props.setSeparate(1,'commandline') - elif o == '--postscript' or o == '-P': - Props.setPostscript(1,'commandline') - elif o == '--version': - print_version () - return 0 - else: - print o - raise getopt.error - - identify() - Props.read_titledefs () - - if len(files): - for file in files: - infile.open(file) - type = infile.type() - infile.close() - if type == 'source': - if os.environ.has_key('OS') and \ - os.environ['OS'] == 'Windows_95': - cmd = 'ash -c "lilypond %s %s 2>&1"' %(getLilyopts(), file) - else: - cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) - sys.stderr.write ('executing: %s\n'% cmd) - - fd = os.popen(cmd , 'r') - log = '' - - s = fd.readline() - while len(s) > 0: - sys.stderr.write (s) - sys.stderr.flush () - log = log + s - s = fd.readline () - if 0: - s = fd.read (1) - while len(s) > 0: - sys.stderr.write (s) - sys.stderr.flush () - s = fd.read (1) - log = log + s - stat = fd.close() - if stat: - sys.exit('ExitBadLily', cmd ) - texFiles=getTeXFile(log) - depFiles=getDepFiles (log) - writeLilylog(file,log) - Props.addLilyOutputFiles(texFiles,'program') - texInputFiles = texInputFiles + texFiles - else: - texInputFiles.append(file) - - firstfile=1 - for file in texInputFiles: - infile.open(file) - infile.setVars() # first pass set variables - infile.close() - if Props.get('debug'): - Props.printProps() - if firstfile: - outfile.start(file) # allow for specified name - else: - outfile.next() - outfile.write("""\ -\\input{%s} -""" % (file)) - if Props.get('separate'): - outfile.end() - else: - firstfile=0 - if not Props.get('separate'): - outfile.end() - - # --outdir mess - if Props.get ('output'): - outdir=Props.get ('output') - for i in depFiles: - text=open (i).read () - # ugh, should use lilypond -o DIR/foo.tex - # or --dep-prefix to fix dependencies - text=re.sub ('\n([^:]*).tex', '\n' + outdir + '/\\1.dvi', text) - text=re.sub (' ([^:]*).tex', ' ' + outdir + '/\\1.dvi', text) - open (os.path.join (outdir, i), 'w').write (text) - os.remove (i) - - else: - help() - sys.exit('ExitBadArgs','No files specified') - -# -# Exit values -# -ExitTable = { - 'ExitInterupt' : ['Ouch!', 1 ], - 'ExitBadArgs' : ['Wrong number of arguments', 2 ], - 'ExitNotFound' : ['File not found', 3 ], - 'ExitBadPaper' : ['Unknown papersize', 4 ], - 'ExitBadHeight' : ['Invalid Height specification', 5 ], - 'ExitBadWidth' : ['Invalid Width specification', 6 ], - 'ExitBadOrient' : ['Invalid Orientation specification', 7 ], - 'ExitNoWrite' : ['Permission denied', 8 ], - 'ExitNoTeXName' : ['Hmm, I could not find an output file name', 9 ], - 'ExitBadLily' : ['LilyPond failed', 10 ], - 'ExitBadLatex' : ['Latex failed', 11 ], - 'ExitBadPostscript' : ['Postscript failed', 12 ], - 'ExitUnknown' : ['Unknown Exit Code', 20 ], - } - -def cleanup(): - lilyfiles = [] - tmpfiles = [] - if not Props.get('keeplilypond'): - lilyfiles = Props.get('lilyOutputFiles') - if not Props.get('keeply2dvi'): - tmpfiles = glob.glob('*_ly[0-9]*.*') - for file in lilyfiles + tmpfiles: - if os.path.isfile(file): - os.remove(file) - - -Props = Properties() - -try: - main() - -except KeyboardInterrupt: - print ExitTable['ExitInterupt'][0] - cleanup() - sys.exit(ExitTable['ExitInterupt'][1]) - -except SystemExit, errno: - if ExitTable.has_key(errno.args[0]): - msg = ExitTable[errno.args[0]] - else: - msg = ExitTable['ExitUnknown'] - if len(errno.args) > 1: - sys.stderr.write( '%s: %s: %s\n' % (name, msg[0], errno.args[1])) - else: - sys.stderr.write( '%s %s\n' % (name, msg[0])) - if Props.get('debug'): - Props.printProps() - cleanup() - sys.exit(msg[1]) -else: - cleanup() - - - - diff --git a/flower/include/interval.hh b/flower/include/interval.hh index 849a76e8e8..69b14e891f 100644 --- a/flower/include/interval.hh +++ b/flower/include/interval.hh @@ -24,7 +24,10 @@ struct Interval_t : public Drul_array { static T infinity () ; static String T_to_str (T arg); - T center () { return (elem (LEFT) + elem (RIGHT)) / T (2);} + T center () { + assert (!empty_b ()); + return (elem (LEFT) + elem (RIGHT)) / T (2); + } void translate (T t) { elem (LEFT) += t; diff --git a/input/bugs/textcresc.ly b/input/bugs/textcresc.ly new file mode 100644 index 0000000000..e9f6eac683 --- /dev/null +++ b/input/bugs/textcresc.ly @@ -0,0 +1,12 @@ + + +\score { \notes { + \context Voice { + \property Voice.crescendoText = "cresc." + \property Voice.crescendoSpanner = #'dashed-line + c2. r8 c8 \< \break \! c1 + } +} +\paper { linewidth = 5.\cm;} +} + diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly new file mode 100644 index 0000000000..4ed65a571f --- /dev/null +++ b/input/regression/mensural.ly @@ -0,0 +1,9 @@ +\header { +texidoc = "There is limited support for mensural notation: note head shapes are available. Mensural stems are centered on the note heads, both for up and down stems."; +} + +\score {\notes { \context Voice { +\property Voice.NoteHead \override #'style = #'mensural +\transpose d''' { c4 c2 c8 c16 c16 c1 c\breve c\longa } +\transpose c'' { c4 c2 c8 c16 c16 c1 c\breve c\longa } +}}} diff --git a/input/regression/noteheadstyle.ly b/input/regression/note-head-style.ly similarity index 54% rename from input/regression/noteheadstyle.ly rename to input/regression/note-head-style.ly index 1254c6b505..32f660bd08 100644 --- a/input/regression/noteheadstyle.ly +++ b/input/regression/note-head-style.ly @@ -14,43 +14,43 @@ either up or down stems. \score { \notes \relative c{ -% anyone wanna pop? + c''4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \override #'style = #'diamond +\property Voice.NoteHead \set #'style = #'diamond c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \override #'style = #'transparent +\property Voice.NoteHead \set #'style = #'transparent c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \override #'style = #'cross +\property Voice.NoteHead \set #'style = #'cross c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \override #'style = #'mensural +\property Voice.NoteHead \set #'style = #'mensural c4 c2 c8 c16 c16 c1 c\breve c\longa -\property Voice.NoteHead \override #'style = #'harmonic +\property Voice.NoteHead \set #'style = #'harmonic c4 c2 c8 c16 c16 c1 c\breve -\property Voice.NoteHead \override #'style = #'baroque +\property Voice.NoteHead \set #'style = #'baroque c4 c2 c8 c16 c16 c1 c\breve c\longa \context Voice < \context Thread = TA { - \property Thread.NoteHead \override #'style = #'cross - \property Voice.Stem \override #'direction = #1 + \property Thread.NoteHead \set #'style = #'cross + \property Voice.Stem \set #'direction = #1 c16 } \context Thread = TB - { \property Thread.NoteHead \override #'style = #'default a16 } + { \property Thread.NoteHead \set #'style = #'default a16 } \context Thread = TC - { \property Thread.NoteHead \override #'style = #'mensural d16 } + { \property Thread.NoteHead \set #'style = #'mensural d16 } > \context Voice <\context Thread = TA { - \property Thread.NoteHead \override #'style = #'default + \property Thread.NoteHead \set #'style = #'default c4 c4 } \context Thread = TB { - \property Thread.NoteHead \override #'style = #'mensural + \property Thread.NoteHead \set #'style = #'mensural c'4 \stemDown c } > diff --git a/input/test/nested-groups.ly b/input/test/nested-groups.ly new file mode 100644 index 0000000000..07858bbbf5 --- /dev/null +++ b/input/test/nested-groups.ly @@ -0,0 +1,46 @@ +\header{ +texidoc=" +In InnerStaffGroup and InnerChoirStaff, the brackets should be shiftet leftwards. +"; +filename = "nested-groups.ly"; +description = "Test of nested staff groups and choirstaffs"; +enteredby = "RZ"; +copyright = "public domain"; +Tested = "Nested StaffGroups"; +} + +\version "1.3.140" % rz1 + +\score { \notes +< + \context StaffGroup = ga < + \context Staff = sb {c' d' e' f'} + \context InnerStaffGroup = isga < + \context Staff = sd {c' d' e' f'} + \context GrandStaff=gs < + \context Staff = sgsa {c' d' e' f'} + \context Staff = sgsb {c' d' e' f'} + > + \context Staff = sc {c' d' e' f'} + > + \context ChoirStaff = csa < + \context Staff = sd {c' d' e' f'} + \context InnerStaffGroup=gc < + \context Staff = sq {c' d' e' f'} + > + \context Staff = se {c' d' e' f'} + > + > + \context ChoirStaff = csb < + \context Staff = sg {c' d' e' f'} + \context InnerStaffGroup = isgb < + \context Staff = sh {c' d' e' f'} + \context Staff = si {c' d' e' f'} + > + \context Staff = sj {c' d' e' f'} + > + +> + + \paper { linewidth = -1; } +} diff --git a/input/test/test-german-chords.ly b/input/test/test-german-chords.ly index 0df2a1a39d..62fba8edb1 100644 --- a/input/test/test-german-chords.ly +++ b/input/test/test-german-chords.ly @@ -1,13 +1,13 @@ \include "german-chords.ly" + % #(set! german-Bb #t) ch = \chords { beses1/+beses bes/+bes b/+b bis/+bis ases/+ases as/+as a/+a ais/+ais fisis/+fisis} - \score { < - \context ChordNames=ch {\ch} - \context Staff=st \chords {\ch} + \context ChordNames=chn {\ch} + \context Staff=stf \chords {\ch} > \paper {} } diff --git a/input/tricks/drums.ly b/input/tricks/drums.ly new file mode 100644 index 0000000000..ae4ac81487 --- /dev/null +++ b/input/tricks/drums.ly @@ -0,0 +1,59 @@ +% tests drum notation and midi-drums. +% see ly/drumpitch.ly for list of instruments and paper-kits. +% scm/midi.scm for list of midi-drumkits. + +\include "drumpitch.ly"; + +\version "1.3.142" + +drh = \notes { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 } +drl = \notes {\repeat "unfold" 3 {bd4 sn8 bd bd4 } bd8 tommh tommh bd toml toml bd tomfh16 tomfh } +timb = \notes \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r4 cb8 cb} + +\score { \repeat "volta" 2 + < + \context TwoLineStaff=timbst \notes < + \property Staff.instrument="timbales" + \clef "percussion"; + \apply #(drums->paper 'timbales) \timb + > + \context Staff=drumst \notes < + \property Staff.instrument="drums" + \clef "percussion"; + \apply #(drums->paper 'drums) < + \context Voice=voa {\stemUp \drh } + \context Voice=vob {\stemDown \drl } + > + > + > + \paper { + \translator { + \StaffContext + \consists Instrument_name_engraver; + Script \override #'padding = #0.5 + } + \translator { + \StaffContext + \name TwoLineStaff; + \alias Staff; + \consists Instrument_name_engraver; + StaffSymbol \override #'line-count = #2; + BarLine \override #'bar-size = #2; + } + \translator { + \ScoreContext + \accepts TwoLineStaff; + } + } +} + +\score { \repeat "unfold" 2 + \context Staff \notes < + \property Staff.instrument="drums" + \timb + \drh + \drl + > + \midi{ \tempo 4=120; } +} + diff --git a/input/tricks/follow-thread.ly b/input/tricks/follow-thread.ly index c09efe2075..2771cb871b 100644 --- a/input/tricks/follow-thread.ly +++ b/input/tricks/follow-thread.ly @@ -5,11 +5,14 @@ Theads can be traced automagically when they switch staffs by setting property @code{followVoice}. "; } -% followThread: connect note heads with line when thread switches staff + +\version "1.3.139" +% followVoice: connect note heads with line when thread switches staff fragment = \notes { \context PianoStaff < \property PianoStaff.followVoice = ##t + \property Voice.VoiceFollower \set #'type = #'dashed-line \context Staff \context Voice { c'1 \translator Staff=two diff --git a/input/tricks/german-chords.ly b/input/tricks/german-chords.ly deleted file mode 100644 index b04aa71cb8..0000000000 --- a/input/tricks/german-chords.ly +++ /dev/null @@ -1,37 +0,0 @@ - -% german-chords.ly: -% german/norwegian/danish? - - -#(define (pitch->chord-name-text-banter pitch) - (if (equal? (cdr pitch) '(6 0)) - '("H") - (if (equal? (cdr pitch) '(6 -1)) '("B") - (pitch->text pitch)))) - -#(define (pitch->note-name-text-banter pitch) - (if (equal? (cdr pitch) '(6 -1)) '("b") - (cons - (string-append - (if (equal? (cadr pitch) 6) "h" - (make-string 1 (integer->char (+ (modulo (+ (cadr pitch) 2) 7) 97)))) - (case (caddr pitch) - ((-1) "eses") - ((-1) "es") - ((0) "") - ((1) "is") - ((2) "isis"))) - '()))) - - - -\score { - < - \context ChordNames \chords { b1/+b bes/+bes bis/+bis } - \notes\transpose c'' \chords { b1/+b bes/+bes bis/+bis } - > - \paper { - linewidth = -1; - } -} - diff --git a/input/tricks/improv.ly b/input/tricks/improv.ly new file mode 100644 index 0000000000..ff350187ec --- /dev/null +++ b/input/tricks/improv.ly @@ -0,0 +1,46 @@ + +improOn = \notes {\translator Voice = impro } +improOff = \notes {\translator SquashVoice = melo } + +global = \notes { s1*3 \bar "|."; } + +\score { + < + \context ChordNames \chords {e8:m7*7 a2.:m7 bes4:m7 b1:m7 e8:m } + \context Staff \notes < + \context SquashVoice = impro { \global } + \context Voice = melo \transpose c'' { + e8 e g a a16()bes()a8 g \improOn e8 + ~e2~e8 f4 fis8 + ~fis2 \improOff a16()bes a8 g e + } + > + > + \paper { + \translator { + \VoiceContext + \name SquashVoice; + \alias Voice; + \consists Pitch_squash_engraver; + \consists Local_key_engraver; + squashedPosition = 6; + NoteHead \override #'style = #'slash + Accidentals \override #'transparent = ##t + } + \translator { + \VoiceContext + \alias SquashVoice; + \consists Local_key_engraver; + } + \translator { + \ScoreContext + \accepts SquashVoice; + } + \translator { + \StaffContext + \remove Local_key_engraver; + \accepts SquashVoice; + } + linewidth = -1; + } +} diff --git a/lily/audio-staff.cc b/lily/audio-staff.cc index 4a89b66555..791287ab25 100644 --- a/lily/audio-staff.cc +++ b/lily/audio-staff.cc @@ -24,6 +24,7 @@ Audio_staff::output (Midi_stream& midi_stream_r, int track_i) { Midi_track midi_track; midi_track.number_i_ = track_i; + midi_track.channel_i_ = channel_i_; for (Midi_walker i (this, &midi_track); i.ok (); i++) i.process (); midi_stream_r << midi_track; diff --git a/lily/hairpin.cc b/lily/hairpin.cc index 6471957ecf..c3b9fe33f9 100644 --- a/lily/hairpin.cc +++ b/lily/hairpin.cc @@ -70,6 +70,9 @@ Hairpin::brew_molecule (SCM smob) make the padding a little smaller, here. */ Interval e =b->extent (common, X_AXIS); + if (e.empty_b ()) + e = Interval (0,0) + b->relative_coordinate (common, X_AXIS); + x_points[d] = e.center () - d * padding /3; // ugh. } else diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh index 2bda2aff9f..23aa6e4b57 100644 --- a/lily/include/audio-staff.hh +++ b/lily/include/audio-staff.hh @@ -16,6 +16,7 @@ struct Audio_staff : public Audio_element { void output (Midi_stream& midi_stream_r, int track_i); Link_array audio_item_l_arr_; + int channel_i_; }; #endif // AUDIO_STAFF_HH diff --git a/lily/include/music.hh b/lily/include/music.hh index 2b11f459c1..2c67ebdd90 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -58,6 +58,7 @@ public: /// Scale the music in time by #factor#. virtual void compress (Moment factor); VIRTUAL_COPY_CONS (Music); + Music (); Music (Music const &m); Music (SCM); protected: diff --git a/lily/include/note-head.hh b/lily/include/note-head.hh index 99404f4d8e..833a86f6ac 100644 --- a/lily/include/note-head.hh +++ b/lily/include/note-head.hh @@ -24,6 +24,7 @@ public: static Molecule ledger_line (Interval, Grob*) ; DECLARE_SCHEME_CALLBACK (brew_ez_molecule, (SCM )); static bool has_interface (Grob*); + static Real stem_attachment_coordinate (Grob *, Axis a); }; #endif // NOTEHEAD_HH diff --git a/lily/midi-item.cc b/lily/midi-item.cc index fc0cf8c8a2..fb3d1eb5e6 100644 --- a/lily/midi-item.cc +++ b/lily/midi-item.cc @@ -118,177 +118,6 @@ Midi_header::Midi_header (int format_i, int tracks_i, int clocks_per_4_i) set ("MThd", str, ""); } - -/* why doesn't this start at 0 ? - - TODO: -> IN GUILE! - */ -char const* const instrument_name_sz_a_[ ] = { - /* default is usually piano */ - /* 0 "piano", */ - - /* (1-8 piano) */ - /* 1 */ "acoustic grand", - /* 2 */ "bright acoustic", - /* 3 */ "electric grand", - /* 4 */ "honky-tonk", - /* 5 */ "electric piano 1", - /* 6 */ "electric piano 2", - /* 7 */ "harpsichord", - /* 8 */ "clav", - - /* (9-16 chrom percussion) */ - /* 9 */ "celesta", - /* 10 */ "glockenspiel", - /* 11 */ "music box", - /* 12 */ "vibraphone", - /* 13 */ "marimba", - /* 14 */ "xylophone", - /* 15 */ "tubular bells", - /* 16 */ "dulcimer", - - /* (17-24 organ) */ - /* 17 */ "drawbar organ", - /* 18 */ "percussive organ", - /* 19 */ "rock organ", - /* 20 */ "church organ", - /* 21 */ "reed organ", - /* 22 */ "accordion", - /* 23 */ "harmonica", - /* 24 */ "concertina", - - /* (25-32 guitar) */ - /* 25 */ "acoustic guitar (nylon)", - /* 26 */ "acoustic guitar (steel)", - /* 27 */ "electric guitar (jazz)", - /* 28 */ "electric guitar (clean)", - /* 29 */ "electric guitar (muted)", - /* 30 */ "overdriven guitar", - /* 31 */ "distorted guitar", - /* 32 */ "guitar harmonics", - - /* (33-40 bass) */ - /* 33 */ "acoustic bass", - /* 34 */ "electric bass (finger)", - /* 35 */ "electric bass (pick)", - /* 36 */ "fretless bass", - /* 37 */ "slap bass 1", - /* 38 */ "slap bass 2", - /* 39 */ "synth bass 1", - /* 40 */ "synth bass 2", - - /* (41-48 strings) */ - /* 41 */ "violin", - /* 42 */ "viola", - /* 43 */ "cello", - /* 44 */ "contrabass", - /* 45 */ "tremolo strings", - /* 46 */ "pizzicato strings", - /* 47 */ "orchestral strings", - /* 48 */ "timpani", - - /* (49-56 ensemble) */ - /* 49 */ "string ensemble 1", - /* 50 */ "string ensemble 2", - /* 51 */ "synthstrings 1", - /* 52 */ "synthstrings 2", - /* 53 */ "choir aahs", - /* 54 */ "voice oohs", - /* 55 */ "synth voice", - /* 56 */ "orchestra hit", - - /* (57-64 brass) */ - /* 57 */ "trumpet", - /* 58 */ "trombone", - /* 59 */ "tuba", - /* 60 */ "muted trumpet", - /* 61 */ "french horn", - /* 62 */ "brass section", - /* 63 */ "synthbrass 1", - /* 64 */ "synthbrass 2", - - /* (65-72 reed) */ - /* 65 */ "soprano sax", - /* 66 */ "alto sax", - /* 67 */ "tenor sax", - /* 68 */ "baritone sax", - /* 69 */ "oboe", - /* 70 */ "english horn", - /* 71 */ "bassoon", - /* 72 */ "clarinet", - - /* (73-80 pipe) */ - /* 73 */ "piccolo", - /* 74 */ "flute", - /* 75 */ "recorder", - /* 76 */ "pan flute", - /* 77 */ "blown bottle", - /* 78 */ "skakuhachi", - /* 79 */ "whistle", - /* 80 */ "ocarina", - - /* (81-88 synth lead) */ - /* 81 */ "lead 1 (square)", - /* 82 */ "lead 2 (sawtooth)", - /* 83 */ "lead 3 (calliope)", - /* 84 */ "lead 4 (chiff)", - /* 85 */ "lead 5 (charang)", - /* 86 */ "lead 6 (voice)", - /* 87 */ "lead 7 (fifths)", - /* 88 */ "lead 8 (bass+lead)", - - /* (89-96 synth pad) */ - /* 89 */ "pad 1 (new age)", - /* 90 */ "pad 2 (warm)", - /* 91 */ "pad 3 (polysynth)", - /* 92 */ "pad 4 (choir)", - /* 93 */ "pad 5 (bowed)", - /* 94 */ "pad 6 (metallic)", - /* 95 */ "pad 7 (halo)", - /* 96 */ "pad 8 (sweep)", - - /* (97-104 synth effects) */ - /* 97 */ "fx 1 (rain)", - /* 98 */ "fx 2 (soundtrack)", - /* 99 */ "fx 3 (crystal)", - /* 100 */ "fx 4 (atmosphere)", - /* 101 */ "fx 5 (brightness)", - /* 102 */ "fx 6 (goblins)", - /* 103 */ "fx 7 (echoes)", - /* 104 */ "fx 8 (sci-fi)", - - /* (105-112 ethnic) */ - /* 105 */ "sitar", - /* 106 */ "banjo", - /* 107 */ "shamisen", - /* 108 */ "koto", - /* 109 */ "kalimba", - /* 110 */ "bagpipe", - /* 111 */ "fiddle", - /* 112 */ "shanai", - - /* (113-120 percussive) */ - /* 113 */ "tinkle bell", - /* 114 */ "agogo", - /* 115 */ "steel drums", - /* 116 */ "woodblock", - /* 117 */ "taiko drum", - /* 118 */ "melodic tom", - /* 119 */ "synth drum", - /* 120 */ "reverse cymbal", - - /* (121-128 sound effects) */ - /* 121 */ "guitar fret noise", - /* 122 */ "breath noise", - /* 123 */ "seashore", - /* 124 */ "bird tweet", - /* 125 */ "telephone ring", - /* 126 */ "helicopter", - /* 127 */ "applause", - /* 128 */ "gunshot", - 0 -}; - Midi_instrument::Midi_instrument (Audio_instrument* a) { audio_l_ = a; @@ -296,23 +125,19 @@ Midi_instrument::Midi_instrument (Audio_instrument* a) } String -Midi_instrument::str () const +Midi_instrument::str() const { Byte program_byte = 0; bool found = false; - for (int i = 0; !found && instrument_name_sz_a_[i]; i++) - if (audio_l_->str_ == String (instrument_name_sz_a_[ i ])) - { - program_byte = (Byte)i; - found = true; - } - - if (!found) - { + SCM proc = scm_eval2 (ly_symbol2scm ("midi-program"), SCM_EOL); + SCM program = gh_call1 (proc, ly_symbol2scm (audio_l_->str_.ch_C())); + found = (program != SCM_BOOL_F); + if (found) + program_byte = gh_scm2int(program); + else warning (_f ("no such instrument: `%s'", audio_l_->str_.ch_C ())); - } - - String str = to_str ((char) (0xc0 + channel_i_)); + + String str = to_str ((char) (0xc0 + channel_i_)); //YIKES! FIXME: Should be track. -rz str += to_str ((char)program_byte); return str; } @@ -587,7 +412,6 @@ String Midi_track::data_str () const { String str = Midi_chunk::data_str (); - if (midi_debug_global_b) str += "\n"; for (Cons *i=event_p_list_.head_; i; i = i->next_) diff --git a/lily/midi-walker.cc b/lily/midi-walker.cc index 8be7056b36..d9637672fb 100644 --- a/lily/midi-walker.cc +++ b/lily/midi-walker.cc @@ -132,7 +132,8 @@ Midi_walker::process () */ if (Midi_item* midi_p = Midi_item::midi_p (audio_p)) { - midi_p->channel_i_ = track_l_->number_i_; + midi_p->channel_i_ = track_l_->channel_i_; + //midi_p->channel_i_ = track_l_->number_i_; if (Midi_note* note_p = dynamic_cast (midi_p)) { if (note_p->length_mom ()) diff --git a/lily/music.cc b/lily/music.cc index 2718004d2b..917e14021b 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -31,6 +31,13 @@ ly_deep_mus_copy (SCM m) } +Music::Music () +{ + immutable_property_alist_ = SCM_EOL; + mutable_property_alist_ = SCM_EOL; + smobify_self (); +} + Music::Music (Music const &m) { immutable_property_alist_ = m.immutable_property_alist_; @@ -50,6 +57,7 @@ Music::Music (SCM l) smobify_self (); } + SCM Music::mark_smob (SCM m) { @@ -298,3 +306,4 @@ init_functions () scm_make_gsubr ("ly-music-name", 1, 0, 0, (Scheme_function_unknown)ly_music_name); } ADD_SCM_INIT_FUNC (musicscm,init_functions); +ADD_MUSIC(Music); diff --git a/lily/note-head.cc b/lily/note-head.cc index fe74fcbb82..37b75e13a6 100644 --- a/lily/note-head.cc +++ b/lily/note-head.cc @@ -72,7 +72,11 @@ Note_head::brew_molecule (SCM smob) return SCM_EOL; } - // ugh: use gh_call () + /* + ugh: use gh_call () + + UGH: use grob-property. + */ Molecule out = Font_interface::get_default_font (me)->find_by_name (String ("noteheads-") + ly_scm2string (scm_eval2 (gh_list (ly_symbol2scm ("find-notehead-symbol"), me->get_grob_property ("duration-log"), @@ -131,3 +135,23 @@ Note_head::brew_ez_molecule (SCM smob) return m.smobbed_copy (); } + + +Real +Note_head::stem_attachment_coordinate (Grob *me, Axis a) +{ + SCM v = me->get_grob_property ("stem-attachment-function"); + + if (!gh_procedure_p (v)) + return 0.0; + + SCM st = me->get_grob_property ("style"); + SCM result = gh_apply (v, gh_list (st, SCM_UNDEFINED)); + + if (!gh_pair_p (result)) + return 0.0; + + result = (a == X_AXIS) ? gh_car (result) : gh_cdr (result); + + return gh_number_p (result) ? gh_scm2double (result) : 0.0; +} diff --git a/lily/performance.cc b/lily/performance.cc index 436224bde8..be168b2de0 100644 --- a/lily/performance.cc +++ b/lily/performance.cc @@ -49,7 +49,7 @@ Performance::output (Midi_stream& midi_stream) output_header_track (midi_stream); progress_indication ("\n"); progress_indication (_ ("Track ... ")); - int channel = 1; + int channel = 0; for (int i =0; i < audio_staff_l_arr_.size (); i++) { Audio_staff *s = audio_staff_l_arr_[i]; @@ -62,7 +62,9 @@ Performance::output (Midi_stream& midi_stream) channel 10, the percussion channel by default. */ if (channel == 9) - channel++; + channel++; + if (s->channel_i_ < 0) + s->channel_i_ = channel; s->output (midi_stream, channel++); if (verbose_global_b) progress_indication ("]"); @@ -74,6 +76,8 @@ Performance::output_header_track (Midi_stream& midi_stream) { Midi_track midi_track; + midi_track.channel_i_ = 9; + // perhaps multiple text events? String id_str; String str = String (_ ("Creator: ")); diff --git a/lily/staff-performer.cc b/lily/staff-performer.cc index 41e7d1cf92..f79bf760f2 100644 --- a/lily/staff-performer.cc +++ b/lily/staff-performer.cc @@ -91,6 +91,9 @@ Staff_performer::create_audio_elements () void Staff_performer::stop_translation_timestep () { + SCM proc = scm_eval2 (ly_symbol2scm ("percussion-p"), SCM_EOL); + SCM drums_p = gh_call1 (proc, ly_symbol2scm (instrument_str_.ch_C())); + audio_staff_p_->channel_i_ = (drums_p == SCM_BOOL_T ? 9 : -1 ); if (name_p_) { play_element (name_p_); diff --git a/lily/stem.cc b/lily/stem.cc index 13272bc71b..2b965b1c25 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -503,14 +503,17 @@ TODO: */ - Real slope =0.0; if (Grob *hed = support_head (me)) { - head_wid = hed->extent (hed,X_AXIS).length (); + Real slope =0.0; + + Interval head_height = hed->extent (hed,Y_AXIS); + Real y_attach = Note_head::stem_attachment_coordinate ( hed, Y_AXIS); - slope = gh_scm2double (hed->get_grob_property ("attachment-slope")); + y_attach = head_height.linear_combination (y_attach); + stem_y[Direction (-d)] += d * y_attach; } - stem_y[Direction (-d)] += d * head_wid * slope/ (2*dy); + if (!invisible_b (me)) { @@ -542,14 +545,29 @@ Stem::off_callback (SCM element_smob, SCM) Real r=0; if (Grob * f = first_head (me)) { - Interval head_wid (0, f->extent (f,X_AXIS).length ()); + Interval head_wid = f->extent (f,X_AXIS); + + Real attach = + Note_head::stem_attachment_coordinate(f, X_AXIS); - if (to_boolean (me->get_grob_property ("stem-centered"))) - return gh_double2scm (head_wid.center ()); - - Real rule_thick = gh_scm2double (me->get_grob_property ("thickness")) * me->paper_l ()->get_var ("stafflinethickness"); Direction d = get_direction (me); - r = head_wid[d] - d * rule_thick * 0.5; + + Real real_attach = head_wid.linear_combination (d * attach); + + r = real_attach; + + /* + If not centered: correct for stem thickness. + */ + if (attach) + { + Real rule_thick + = gh_scm2double (me->get_grob_property ("thickness")) + * me->paper_l ()->get_var ("stafflinethickness"); + + + r += - d * rule_thick * 0.5; + } } return gh_double2scm (r); } diff --git a/lily/system-start-delimiter-engraver.cc b/lily/system-start-delimiter-engraver.cc index 27ee99dc86..cc017cbb2e 100644 --- a/lily/system-start-delimiter-engraver.cc +++ b/lily/system-start-delimiter-engraver.cc @@ -52,17 +52,16 @@ System_start_delimiter_engraver::acknowledge_grob (Grob_info inf) */ if (gh_symbol_p (gl) && gl == ly_symbol2scm ("brace") && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket")) - inf.elem_l_->translate_axis (-1.0, X_AXIS); // ugh + inf.elem_l_->translate_axis (-0.8, X_AXIS); // ugh else if (gh_symbol_p (gl) && gl == ly_symbol2scm ("bracket") - && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket")) - { - inf.elem_l_->translate_axis ( -0.8, X_AXIS); // ugh - inf.elem_l_->set_grob_property ("arch-height", - gh_double2scm(gh_scm2double(inf.elem_l_->get_grob_property - ("arch-height"))+0.5)); - } + && gh_symbol_p (my_gl) && my_gl == ly_symbol2scm ("bracket")) + { + inf.elem_l_->translate_axis ( -0.8, X_AXIS); // ugh + inf.elem_l_->set_grob_property ("arch-height", + gh_double2scm(gh_scm2double(inf.elem_l_->get_grob_property + ("arch-height"))+0.5)); + } } - } System_start_delimiter_engraver::System_start_delimiter_engraver () diff --git a/ly/drumpitch.ly b/ly/drumpitch.ly new file mode 100644 index 0000000000..928512c847 --- /dev/null +++ b/ly/drumpitch.ly @@ -0,0 +1,154 @@ +% GM drum pitches. +% I use different accidentals to distinguish drums at the same GM pitch. +% Always accidental 0 (white keys) or 1 (black keys) to get the "correct" gm name. +% i.e. fis, for closed highat ; ges, for highat. + +% 2001/03/25 Rune Zedeler + + +#(define drum-pitch-names `( + (acousticbassdrum bda ,(make-pitch -3 6 0 )) + (bassdrum bd ,(make-pitch -2 0 0 )) + (hisidestick ssh ,(make-pitch -3 6 2)) + (sidestick ss ,(make-pitch -2 0 1)) + (losidestick ssl ,(make-pitch -2 1 -1)) + (acousticsnare sna ,(make-pitch -2 1 0)) + (snare sn ,(make-pitch -2 2 -2)) + (handclap hc ,(make-pitch -2 1 1)) + (electricsnare sne ,(make-pitch -2 2 0)) + (lowfloortom tomfl ,(make-pitch -2 3 0)) + (closedhihat hhc ,(make-pitch -2 3 1)) + (hihat hh ,(make-pitch -2 4 -1)) + (highfloortom tomfh ,(make-pitch -2 4 0)) + (pedalhihat hhp ,(make-pitch -2 4 1)) + (lowtom toml ,(make-pitch -2 5 0)) + (openhihat hho ,(make-pitch -2 5 1)) + (halfopenhihat hhho ,(make-pitch -2 5 1)) + (lowmidtom tomml ,(make-pitch -2 6 0)) + (himidtom tommh ,(make-pitch -1 0 0)) + (crashcymbala cymca ,(make-pitch -1 0 1)) + (crashcymbal cymc ,(make-pitch -1 1 -1)) + (hightom tomh ,(make-pitch -1 1 0)) + (ridecymbala cymra ,(make-pitch -1 1 1)) + (ridecymbal cymr ,(make-pitch -1 2 -1)) + (chinesecymbal cymch ,(make-pitch -1 2 0)) + (ridebell rb ,(make-pitch -1 3 0)) + (tambourine tamb ,(make-pitch -1 3 1)) + (splashcymbal cyms ,(make-pitch -1 4 0)) + (cowbell cb ,(make-pitch -1 4 1)) + (crashcymbalb cymcb ,(make-pitch -1 5 0)) + (vibraslap vibs ,(make-pitch -1 5 1)) + (ridecymbalb cymrb ,(make-pitch -1 6 0)) + (hibongo boh ,(make-pitch 0 0 0)) + (lobongo bol ,(make-pitch 0 0 1)) + (mutehiconga cghm ,(make-pitch 0 1 0)) + (openhiconga cgho ,(make-pitch 0 1 1)) + (hiconga cgh ,(make-pitch 0 2 -1)) + (loconga cgl ,(make-pitch 0 2 0)) + (hitimbale timh ,(make-pitch 0 3 0)) + (lotimbale timl ,(make-pitch 0 3 1)) + (hiagogo agh ,(make-pitch 0 4 0)) + (loagogo agl ,(make-pitch 0 4 1)) + (cabasa cab ,(make-pitch 0 5 0)) + (maracas mar ,(make-pitch 0 5 1)) + (shortwhistle whs ,(make-pitch 0 6 0)) + (longwhistle whl ,(make-pitch 1 0 0)) + (shortguiro guis ,(make-pitch 1 0 1)) + (longguiro guil ,(make-pitch 1 1 0)) + (guiro gui ,(make-pitch 1 0 2)) + (claves cl ,(make-pitch 1 1 1)) + (hiwoodblock wbh ,(make-pitch 1 2 0)) + (lowoodblock wbl ,(make-pitch 1 3 0)) + (mutecuica cuim ,(make-pitch 1 3 1)) + (opencuica cuio ,(make-pitch 1 4 0)) + (mutetriangle trim ,(make-pitch 1 4 1)) + (triangle tri ,(make-pitch 1 4 2)) + (opentriangle trio ,(make-pitch 1 5 0)) + ; "transposing" pitches: + (oneup ua ,(make-pitch 0 1 0)) + (twoup ub ,(make-pitch 0 2 0)) + (threeup uc ,(make-pitch 0 3 0)) + (fourup ud ,(make-pitch 0 4 0)) + (fiveup ue ,(make-pitch 0 5 0)) + (onedown da ,(make-pitch -1 6 0)) + (twodown db ,(make-pitch -1 5 0)) + (threedown dc ,(make-pitch -1 4 0)) + (fourdown dd ,(make-pitch -1 3 0)) + (fivedown de ,(make-pitch -1 2 0)) +)) + +#(define drums `( + (acousticbassdrum default ,#f ,(make-pitch -1 4 0)) + (bassdrum default ,#f ,(make-pitch -1 4 0)) + (sidestick cross ,#f ,(make-pitch 0 1 0)) + (acousticsnare default ,#f ,(make-pitch 0 1 0)) + (snare default ,#f ,(make-pitch 0 1 0)) + (handclap triangle ,#f ,(make-pitch 0 1 0)) + (electricsnare default ,#f ,(make-pitch 0 1 0)) + (lowfloortom default ,#f ,(make-pitch -1 3 0)) + (closedhihat cross "stopped" ,(make-pitch 0 3 0)) + (hihat cross ,#f ,(make-pitch 0 3 0)) + (highfloortom default ,#f ,(make-pitch -1 5 0)) + (pedalhihat cross ,#f ,(make-pitch -1 2 0)) + (lowtom default ,#f ,(make-pitch 0 0 0)) + (openhihat cross "open" ,(make-pitch 0 3 0)) + (halfopenhihat xcircle ,#f ,(make-pitch 0 3 0)) + (lowmidtom default ,#f ,(make-pitch 0 1 0)) + (himidtom default ,#f ,(make-pitch 0 2 0)) + (crashcymbala xcircle ,#f ,(make-pitch 0 5 0)) + (crashcymbal xcircle ,#f ,(make-pitch 0 5 0)) + (hightom default ,#f ,(make-pitch 0 4 0)) + (ridecymbala cross ,#f ,(make-pitch 0 5 0)) + (ridecymbal cross ,#f ,(make-pitch 0 5 0)) + (chinesecymbal mensural ,#f ,(make-pitch 0 5 0)) + (ridebell default ,#f ,(make-pitch 0 5 0)) + (splashcymbal diamond ,#f ,(make-pitch 0 5 0)) + (cowbell triangle ,#f ,(make-pitch 0 5 0)) + (crashcymbalb cross ,#f ,(make-pitch 0 5 0)) + (vibraslap diamond ,#f ,(make-pitch 0 4 0)) + (ridecymbalb cross ,#f ,(make-pitch 0 5 0)) + )) + +#(define timbales `( + (losidestick cross ,#f ,(make-pitch -1 6 0)) + (lotimbale default ,#f ,(make-pitch -1 6 0)) + (cowbell triangle ,#f ,(make-pitch 0 0 0)) + (hisidestick cross ,#f ,(make-pitch 0 1 0)) + (hitimbale default ,#f ,(make-pitch 0 1 0)) + )) + +#(define congas `( + (losidestick cross ,#f ,(make-pitch -1 6 0)) + (loconga default ,#f ,(make-pitch -1 6 0)) + (hisidestick cross ,#f ,(make-pitch 0 1 0)) + (hiconga default ,#f ,(make-pitch 0 1 0)) + (openhiconga default open" ,(make-pitch 0 1 0)) + (mutehiconga default stopped" ,(make-pitch 0 1 0)) + )) + +#(define bongos `( + (lobongo default ,#f ,(make-pitch -1 6 0)) + (hibongo default ,#f ,(make-pitch 0 1 0)) + )) + +#(define guiro `( + (shortguiro default "staccato",(make-pitch 0 0 0)) + (longguiro default "tenuto" ,(make-pitch 0 0 0)) + (guiro default ,#f ,(make-pitch 0 0 0)) + )) + +#(define triangle `( + (opentriangle cross "open" ,(make-pitch 0 0 0)) + (mutetriangle cross "stopped" ,(make-pitch 0 0 0)) + (triangle cross ,#f ,(make-pitch 0 0 0)) + )) + + + +\pitchnames +#(append (map (lambda (x) (cons (car x) (caddr x))) drum-pitch-names) + (map (lambda (x) (cons (cadr x) (caddr x))) drum-pitch-names) + ) + + +\version "1.3.142"; diff --git a/ly/engraver.ly b/ly/engraver.ly index a9ac7371fe..6536fe26bb 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -1,4 +1,4 @@ -\version "1.3.122" +\version "1.3.140" % % setup for Request->Element conversion. Guru-only @@ -45,6 +45,12 @@ StaffContext=\translator { \consistsend "Axis_group_engraver"; + % explicitly set instrument, so we don't get + % weird effects when doing instrument names for + % piano staffs + + instrument = #"" + instr = #"" \accepts "Voice"; } @@ -57,9 +63,9 @@ StaffContainerContext = \translator { \name StaffContainer; } -ChoirStaffContext = \translator { +InnerChoirStaffContext = \translator { \type "Engraver_group_engraver"; - \name ChoirStaff; + \name InnerChoirStaff; alignmentReference = \center; \consists "System_start_delimiter_engraver"; SystemStartDelimiter \override #'glyph = #'bracket @@ -71,6 +77,12 @@ ChoirStaffContext = \translator { \accepts "Lyrics"; \accepts "ChordNames"; } +ChoirStaffContext = \translator { + \InnerChoirStaffContext + \name ChoirStaff; + \accepts "InnerChoirStaff"; + \accepts "InnerStaffGroup"; +} RhythmicStaffContext=\translator{ @@ -233,9 +245,9 @@ PianoStaffContext = \translator{ % \consistsend "Axis_group_engraver"; } -StaffGroupContext= \translator { +InnerStaffGroupContext= \translator { \type "Engraver_group_engraver"; - \name StaffGroup; + \name InnerStaffGroup; \consists "Span_bar_engraver"; \consists "Span_arpeggio_engraver"; @@ -251,6 +263,13 @@ StaffGroupContext= \translator { \accepts "Lyrics"; \accepts "ChordNames"; } +StaffGroupContext = \translator { + \InnerStaffGroupContext + \name StaffGroup; + \accepts "InnerChoirStaff"; + \accepts "ChoirStaff"; + \accepts "InnerStaffGroup"; +} % UGH! JUNKME diff --git a/ly/params.ly b/ly/params.ly index 4b9a7a9309..684fe2850e 100644 --- a/ly/params.ly +++ b/ly/params.ly @@ -14,11 +14,13 @@ outputscale = \staffheight / 4.0; \translator { \NoteNamesContext } \translator { \ScoreContext } \translator { \ChoirStaffContext} +\translator { \InnerChoirStaffContext} \translator { \GraceContext} \translator { \RhythmicStaffContext} \translator { \StaffContext } \translator { \VoiceContext} \translator { \StaffGroupContext } +\translator { \InnerStaffGroupContext } \translator { \ChordNamesContext } \translator { \GrandStaffContext} \translator { \LyricsContext } diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index df77291fd3..c38907f0d8 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,15 +1,15 @@ Begin3 Title: LilyPond -Version: 1.3.143 -Entered-date: 26MAR01 +Version: 1.3.144 +Entered-date: 28MAR01 Description: @BLURB@ Keywords: music notation typesetting midi fonts engraving Author: hanwen@cs.uu.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 - 1000k lilypond-1.3.143.tar.gz + 1000k lilypond-1.3.144.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 1000k lilypond-1.3.143.tar.gz + 1000k lilypond-1.3.144.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 572146d4a5..450a63de56 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,11 +1,11 @@ %define info yes Name: lilypond -Version: 1.3.143 +Version: 1.3.144 Release: 1 License: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.143.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.3.144.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond # Icon: lilypond-icon.gif diff --git a/mf/feta-bolletjes.mf b/mf/feta-bolletjes.mf index 9b0b1150c8..5973b51718 100644 --- a/mf/feta-bolletjes.mf +++ b/mf/feta-bolletjes.mf @@ -461,46 +461,46 @@ fet_beginchar("Quart trianglehead", "2triangle", "trianglehead") fill triangle scaled (7h/6) shifted (w/2,-h/6); fet_endchar; - -slw := staff_space; -slw# := staff_space#; -slt := 1.25stafflinethickness; -slt# := 1.25stafflinethickness#; -slxt = 1.5slt; -slxt# := 1.5slt#; -slh := 1.5staff_space; -slh# := 1.5staff_space#; - -fet_beginchar("Whole slashhead","0slash","wholeslashhead") - wid := slw#+2slxt#+staff_space#; - set_char_box(0,wid-stafflinethickness#,slh#/2,slh#/2); - define_pixels (wid); +%%% Editable values: +slope := 1.7; % slope of slash. From scm/grob-description.scm. How to auto-copy? +slt := 2/3*0.48staff_space; % thickness of lines. quarter notes get 1.5slt width. +slh := 2staff_space; % height of char. + +%%% Calculated values: +sxa := 0; % how much the char exceeds the boundingbox horizontally: +slxt := sqrt(slt*slt+(slt/slope)*(slt/slope)); % Width of hor. pen - with thanks to Pythagoras +slw := slh/slope; % width of sloping part of slash: + +% is this really nessesary? -rz +fac# := staff_space#/staff_space; +slt# := fac#*slt; +slh# := fac#*slh; +sxa# := fac#*sxa; +slxt# := fac#*slxt; +slw# := fac#*slw; + +def draw_slash(expr hwid) = + wid# := slw#+2slxt#+hwid*fac#; + set_char_box(0,wid#-2sxa#,slh#/2,slh#/2); + define_pixels (wid#); pickup penrazor scaled slxt; - draw (-b+slxt/2-stafflinethickness/2,-d) -- (-b+slxt/2+slw-stafflinethickness/2,h); - draw (w-slxt/2-slw+stafflinethickness/2,-d) -- (w-slxt/2+stafflinethickness/2,h); + draw (-b+slxt/2-sxa,-d) -- (-b+slxt/2+slw-sxa,h); + draw (w-slxt/2-slw+sxa,-d) -- (w-slxt/2+sxa,h); pickup penrazor scaled slt rotated 90; - draw (-b+slxt-stafflinethickness/2,-d+slt/2) -- (w-slw+stafflinethickness/2,-d+slt/2); - draw (-b+slw-stafflinethickness/2,h-slt/2) -- (w-slxt+stafflinethickness/2,h-slt/2); + draw (-b+slxt-sxa,-d+slt/2) -- (w-slw+sxa,-d+slt/2); + draw (-b+slw-sxa,h-slt/2) -- (w-slxt+sxa,h-slt/2); +enddef; + +fet_beginchar("Whole slashhead","0slash","wholeslashhead") + draw_slash(staff_space); fet_endchar; fet_beginchar("Half slashhead","1slash","halfslashhead") - wid := slw#+2slxt#+0.6staff_space#; - set_char_box(0,wid-stafflinethickness#,slh#/2,slh#/2); - define_pixels (wid); - pickup penrazor scaled slxt; - draw (b+slxt/2-stafflinethickness/2,-d) -- (b+slxt/2+slw-stafflinethickness/2,h); - draw (w-slxt/2-slw+stafflinethickness/2,-d) -- (w-slxt/2+stafflinethickness/2,h); - pickup penrazor scaled slt rotated 90; - draw (b+slxt-stafflinethickness/2,-d+slt/2) -- (w-slw+stafflinethickness/2,-d+slt/2); - draw (b+slw-stafflinethickness/2,h-slt/2) -- (w-slxt+stafflinethickness/2,h-slt/2); + draw_slash(0.6staff_space); fet_endchar; fet_beginchar("Quart slashhead","2slash","quartslashhead") - wid := slw#+slxt#; - set_char_box(0,slw#+slxt#-stafflinethickness#,slh#/2,slh#/2); - define_pixels (wid); - pickup penrazor scaled slxt; - draw (b+slxt/2-stafflinethickness/2,-d) -- (b+slxt/2+slw-stafflinethickness/2,h); + draw_slash(-slxt/2); fet_endchar; % thick is the distance between the two parallel lines in the cross (distance between centres of lines) diff --git a/mutopia/Coriolan/GNUmakefile b/mutopia/Coriolan/GNUmakefile deleted file mode 100644 index e8eca2d4d9..0000000000 --- a/mutopia/Coriolan/GNUmakefile +++ /dev/null @@ -1,18 +0,0 @@ -# mutopia/Makefile - -depth = ../.. - -# do Coriolan if you have plenty RAM / CPU / quotum -# examples=coriolan - -LOCALSTEPMAKE_TEMPLATES=mutopia - -include $(depth)/make/stepmake.make - -parts=$(patsubst %.ly,%,$(wildcard *-part.ly)) - -tarball=coriolan -mutopia-examples=coriolan $(parts) - - - diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly deleted file mode 100644 index aeb07de094..0000000000 --- a/mutopia/Coriolan/bassi-part.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "1.3.120"; - -instrument = "Violoncello and Contrabass" - -\include "header.ly" -\include "global.ly" -\include "bassi.ly" - -\score{ - \bassiGroup - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/bassi.ly b/mutopia/Coriolan/bassi.ly deleted file mode 100644 index 9053f3cdf4..0000000000 --- a/mutopia/Coriolan/bassi.ly +++ /dev/null @@ -1,56 +0,0 @@ -\version "1.3.120"; - -\include "violoncello.ly" -\include "contrabasso.ly" - -%{ -bassiGroup = \context PianoStaff = bassi_group \notes < - \staffCombinePianoStaffProperties - \context Staff=oneBassi { - \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #'(lines - "Violoncello" " e" "Contrabasso") - - \property Staff.instr = #"Vc." - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \global - } - \context Staff=twoBassi { - \property Staff.midiInstrument = #"contrabass" - \property Staff.instrument = #"Contrabasso" - \property Staff.instr = #"Cb." - \property Staff.transposing = #-12 - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \global - } - \context Staff=oneBassi \partcombine Staff - \context Voice=oneBassi \violoncello - \context Voice=twoBassi \contrabasso -> -%} - -bassiGroup = \context PianoStaff = bassi_group \notes < - \context Staff=violoncelloStaff < - \property Staff.midiInstrument = #"cello" - \property Staff.instrument = #"Violoncello " - \property Staff.instr = #"Vc. " - \clef "bass"; - \global - \violoncello - > - \context Staff=contrabassoStaff < - \property Staff.midiInstrument = #"contrabass" - \property Staff.instrument = #"Contrabasso " - \property Staff.instr = #"Cb. " - \property Staff.transposing = #-12 - \clef "bass"; - \global - \contrabasso - > -> diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly deleted file mode 100644 index 653fa57f15..0000000000 --- a/mutopia/Coriolan/clarinetti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Clarinet" - -\include "header.ly" -\include "global.ly" -\include "clarinetti.ly" - -\score{ - \clarinettiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly deleted file mode 100644 index f0b2be8559..0000000000 --- a/mutopia/Coriolan/clarinetti.ly +++ /dev/null @@ -1,22 +0,0 @@ - -\version "1.3.120"; - -\include "clarinetto-1.ly" -\include "clarinetto-2.ly" - -clarinettiStaff = \context Staff = clarinetti < - \property Staff.midiInstrument = #"clarinet" - - \property Staff.instrument = #`("Clarinetti in B" ,text-flat) - - \property Staff.instr = #`(lines "Cl." (rows "(B" ,text-flat ")")) - \property Staff.transposing = #-2 - - \Time - \notes { \key f \major; } - \End - \context Voice=one \partcombine Voice - \context Thread=one \clarinettoI - \context Thread=two \clarinettoII -> - diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly deleted file mode 100644 index 33177987ff..0000000000 --- a/mutopia/Coriolan/clarinetto-1.ly +++ /dev/null @@ -1,240 +0,0 @@ - -\version "1.3.120"; - -clarinettoI = \notes \relative c { - R1 *2| - d''4-.\ff r r2| - R1 *3| - e4-. r r2| - R1 *3| - f4-. r r2| - R1| - f4-. r r2| - e4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2\p\< ( a| - )gis2. \!a4-.\f| - R1*13| - d1\ff ~| - d4(f, bes)a| - a'4. r8 a4. r8| - g4. r8 d4. r8| - d4. r8 bes4. r8| - c4. r8 d4. r8| - f2\sf r| - f\sf r| - e\sf r| - e\sf r| - es1\sf| - d\sf| - c2. c4\sf| - c2. c4\sf| - c2. c4\sf| - c2. c4\sf| - c4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - a'2.\p\< ( bes4| - a g e)c| - c'2.( d4| - c2)bes| - a2.(bes4| - a g e)c| - \!c'2\ff es,| - d1~| - d\pp~| - d~| - d~| - d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2.\<( c4| - bes a fis)d| - \!d'2\ff f| - e1~| - e4\p r r2| - R1*11| - f2.\ff()e4| - d(c d)c| - f2.()e4| - d(c d)c| - bes2.()a4| - g(f g)f| - bes2.()a4| - g(f g)f| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - r r8 bes bes4\sf()c| - bes2 b| - e a,| - d1~| - d| - d4 r f r| - d r e r| - a,\p r r2| - r r4 r8 e'\f| - e4 r r2| - r r4 r8 e| - e4 r r2| - R1*3| - c4\f r b r| - a r g r| - f r a r8 c| - c4 r8 e e4 r8 e| - e1~| - e| - e4. e8 e4 r8 e| - e4 r8 e e4 r8 e| - e4\p r r2| - R1*3| - r4 r8 es d4 r8 a| - bes4 r r2| - r4 r8 es d4 r8 a| - fis4 r r2| - R1*3| - r4 r8 g'8 f4 r8 c| - d4 r r2| - R1*2| - r4 r8 as'-"cresc" g4 r8 d| - es4 r r2| - R1*5| - g,4 r r r8 f| - es4 r r r8 d| - c4 r8 c' c4 r8 c| - c4 r8 c c4 r8 c| - R1*4| - bes4\ff r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 bes| - a4 r8 a a4 r8 a| - g4 r r2| - R1| - es'4-.\ff r r2| - R1*3| - e2\sf r| - e\sf r| - R1*3| - a,2\ff r| - a\ff r| - R1*2| - r2 r4 es'\ff(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - fis2.\p\<(g4| - fis e cis)a| - \!a2\ff c| - b1~| - b4\pp r r2| - R1*5| - b2\ff d| - cis1~| - cis\p~| - cis~| - cis~| - cis| - d2.\f(\>c4| - \!c\p bes2)a4| - R1| - r2 r4 d(| - )cis r r2| - r r4 r8 cis| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d4\< r r2| - r r4 r8 d| - e4 r r r8 e| - f4 r r r8 f| - \!cis2.\ff()d4| - cis(d cis)d| - cis2.\ff()d4| - cis(d cis)d| - es2.()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - es2 cis| - d b| - cis d| - e d| - cis4 r bes r| - g r a r| - d,\p r r2| - r r4 r8 a'\f| - a4 r r2| - r r4 r8 a\f| - a4 r r2| - R1*3| - f'4\f r8 bes a4 r8 e| - d4 r8 g f4 r8 c| - bes4 r r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - f'2.\p\<(g4| - f e cis)a| - a1| - \!bes\f~| - bes| - c\f~| - c\p| - d\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d\p\<~| - d~| - d~| - d~| - \!d4.\ff e8 f4.\sf()e8| - r4 r8 e e4.\sf()e8| - r4 r8 fis8 g4.\sf()fis8| - r4 r8 fis8 g4.\sf()fis8| - r4 r8 fis8 a4.\sf()g8| - r4 r8 g8 bes4.\sf()a8| - f4.-"sempre"\ff cis8 d4. bes8| - a4. bes8 a4. g'8| - f4. cis8 d4. bes8| - a4. bes8 a4. g'8| - f4 r8 e f4 r8 cis| - d4 r8 cis d4 r8 cis| - d1~| - d| - d4-. r r2| - R1| - d1~ d| - e4-. r r2| - R1| - d1~| - d| - f4-. e-. r2| - R1| - d4-. d-. r2| - d4-. d-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - d4\> r e r| - R1| - \!a,4\p r r2| - R1| - a4 r r2| - R1| - d,4\pp r r2| - R1*18| -} diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly deleted file mode 100644 index e71c8f4015..0000000000 --- a/mutopia/Coriolan/clarinetto-2.ly +++ /dev/null @@ -1,205 +0,0 @@ - -\version "1.3.120"; - -clarinettoII = \notes \relative c { - R1*2 bes''4-.\ff r r2| - R1*3| - cis4-. r r2| - R1 *3| - d4-. r r2| - R1| - d4-. r r2| - cis4-. r r2| - R1 *5| - r2 r4 cis,4-.| - R1*13| - g'1\ff ~| - g4( f g)f| - a4. r8 a4. r8| - e'4. r8 a,4. r8| - a4. r8 g4. r8| - a4. r8 bes4. r8| - d2\sf r| - d\sf r| - cis\sf r| - cis\sf r| - c1\sf| - b| - g2. as4\sf| - g2. as4\sf| - g2. as4\sf| - g2. as4\sf| - g4 r r2| - R1*11| - c2\ff es,| - d1~| - d\p~| - d~| - d~| - d| - %a deux| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes'2.\<(c4| - bes a fis)d| - \!d'2\ff f,| - e1~| - e4\p r r2| - R1*11| - f2.\ff()e4| - d'(c d)c| - f,2.()e4| - d'(c d)c| - R1*4| - r4 r8 f, f4\sf()a| - r4 r8 f f4\sf()a| - r4 r8 f f4\sf()a| - r4 r8 f f4\sf()a| - bes2 gis| - a fis| - g f| - b a| - gis4 r f r| - d r e r| - a,\p r r2| - r r4 r8 b'\f| - c4 r r2| - r r4 r8 b\f| - c4 r r2| - R1*3| - %a deux; urg| - c4\f r b r| - a r g r| - f r a r8 a| - a4 r8 e e4 r8 e| - c'1~| - c| - c4. c8 c4 r8 c| - c4 r8 c c4 r8 c| - c4\p r r2| - R1*21| - %a deux; urg| - g4\f r r r8 f| - es4 r r r8 d| - c4 r8 fis g4 r8 g| - a4 r8 a a4 r8 a| - R1*4| - %a deux| - bes4\ff r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 g| - g4 r8 g fis4 r8 fis| - g4 r r2| - R1| - c4-.\ff r r2| - R1*3| - g2\sf r| - g\sf r| - R1*3| - fis2\ff r| - fis\sf r| - R1*2| - r2 r4 es4\ff(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e2. f4\sf(| - )e4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - fis2.\p\<( g4| - fis e cis)a| - %a deux; urg| - \!a'2\ff c| - b1~| - b4 r r2| - R1*5| - b2\ff d| - cis1~| - cis4\p r r2| - R1*13| - e,2.\ff()f4| - g(f g)f| - e2.\ff()f4| - g(f g)f| - es2.()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - r2 es'4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - r2 es4\sf()d| - bes2 a~| - a g~| - g bes~| - bes g| - %a deux; urg| - g4 r bes r| - g r a r| - d,\p r r2| - r r4 r8 e\f| - f4 r r2| - r r4 r8 e\f| - f4 r r2| - R1*3| - f4\f r8 bes a4 r8 e| - d4 r8 g f4 r8 c| - bes4 r r2| - R1*14| - bes'1\f~| - bes4\p r r2| - %a deux; urg| - c1\f~| - c\p| - a1\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d,\p\<~| - d~| - d~| - d~| - \!d4.\ff e8 f4.\sf()e8| - r4 r8 e f4.\sf()e8| - r4 r8 fis g4.\sf()fis8| - r4 r8 fis g4.\sf()fis8| - r4 r8 fis a4.\sf()g8| - r4 r8 g bes4.\sf()a8| - %a deux; urg copied clarinetto-1(270,273)| - f'4.-"sempre"\ff cis8 d4. bes8| - a4. bes8 a4. g'8| - f4. cis8 d4. bes8| - a4. bes8 a4. g'8| - f4 r8 cis d4 r8 e,| - f4 r8 e f4 r8 e| - d1~| - d| - bes'4-. r r2| - R1| - d,1~| - d| - cis'4-. r r2| - R1| - d,1~| - d| - d'4-. cis-. r2| - R1| - a4-. c-. r2| - bes4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - bes4\> r a r| - R1| - \!a4\p r r2| - R1| - g4 r r2| - R1| - d4\pp r r2| - R1*18| -} - diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly deleted file mode 100644 index 69a2c13dab..0000000000 --- a/mutopia/Coriolan/contrabasso.ly +++ /dev/null @@ -1,401 +0,0 @@ - -\version "1.3.120"; - -contrabasso = \notes \relative c { - % copied 21 from cello - c1\ff~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - fis,4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - c4\p r4 r2| - c4 r4 r2| - c4 r4 r2| - R1| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4.\< c8 bes4. bes8| - - %20 - as4. as8 \!g4\f r4| - R1| - - bes,4\p r4 r2| - bes4 r4 r2| - bes4 r4 r2| - %25 - R1| - - % copied 14 from cello - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes'4.\< bes8 as4. as8| - g4 \!g4-.\f r2| - R1 - as4.\p as8 g4. g8| - f2.-"cresc" g4| - f2. g4| - f4. g8 f4. g8| - f4. g8 f4. g8| - as1\ff ~| - %35 - as4(g f)es| - d4. r8 c4. r8| - b4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - %40 - fis2\sf r| - fis2\sf r| - f2\sf r| - f2\sf r| - e2\sf r| - %45 - es2\sf r| - des2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - % 50 - d4 r r2| - R1 - es'4\p r r r8 es(| - )as,4 r r r8 as(| - )g4 r r r8 g(| - )d'4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )es4\< r r r8 es(| - )as,4 r r r8 as(| - )g4 r r r8 g(| - )d'4 r r r8 d(| - %60 - )es4 r r r8 es(| - )as,4 r r r8 as(| - \!)g2\ff f| - e c'| - f,4\p r r r8 f(| - %65 - )bes4 r r r8 bes(| - )as4 r r r8 as(| - )e4 r r r8 e(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes(| - %70 - \!)as2\ff g| - fis d'| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g,4\p\< r r r8 g(| - )c4 r r r8 c(| - % ) { s2 s4 \!s8}>| - \!)b1\sf| - %75 - % copied 3 from cello - c4\p r d r| - es r d r| - c r cis r| - d4\pp r d r| - d r d r| - %80 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d r d\< r| - d r d r| - d r d r| - d r d r| - % copied 8 from cello - \!c'2.\ff()bes4| - %85 - a(g a)g| - c2.()bes4| - a(g a)g| - f2.()es4| - d(c d)c| - %90 - f2.()es4| - d(c d)c| - c4 r r2| - c4 r r2| - c4 r r2| - %95 - c4 r r2| - % copied 6 from cello| - c4. c'8 c,4. c'8| - b,4. b'8 bes,4. bes'8| - as,4. as'8 g,4. g'8| - fis,4. fis'8 es4. es8| - %100 - d4 r8 d es4 r8 es| - c4 r8 c d4 r8 d| - g,4\p r r2| - r2 r4 r8 fis\f| - %105 - g4 r r2| - r2 r4 r8 fis\f| - g4 r r2| - R1*3| - % copied 8 from cello - %110 - [g'8:8 bes d es][f, a cis d]| - [es,8: g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,,2 ~ g4. g8| - %115 - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4. g8 g4 r8 g| - g4\p r r2| - % urg, this is *rest*, not skip: - % need own staff for rests, mustn't collapse to one cello staff - %120 - 1 - R1*21| - % copied 4 frorm cello - [des'8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - f,4\p r r2| - R1*3| - % copied 10 from cello| - [f8:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - %150 - % r[des,16 des][e e g g]r8[c,16 c][e e f f]| - [bes, des e g][as, c e f]| - % r8[des16 des][f f g g][c, c e e][g g c c]| - [bes, des f g][c, e g c]| - f,1\ff ~| - f| - bes,4-. r r2 - %155 - R1| - f'1\ff ~| - f| - b,2\sf r| - b2\sf r| - %160 - R1*3| - bes2\ff r| - bes2\sf r| - R1*2| - r2 r4 bes\ff(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b4 r r2| - R1| - c4\p r r r8 c(| - )f,4 r r r8 f(| - %180 - )e4 r r r8 e(| - )b'4 r r r8 b(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4\< r r r8 c(| - )f,4 r r r8 f(| - )e4 r r r8 e'(| - %185 - )b4 r r r8 b(| - )c4 r r r8 c(| - )f,4 r r r8 f(| - \!)e2\ff d'| - cis a| - %190 - d4\p r r r8 d(| - )g,4 r r r8 g(| - )f4 r r r8 f(| - )cis'4 r r r8 cis(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )d4\< r r r8 d(| - - %195 - )g,4 r r r8 g(| - \!)d2\ff e'| - dis b| - e4\p r r r8 es(| - )a,4 r r r8 a(| - )g1| - - %200 - f| - % copied 18 from cello - es'4\fp r e r| - f r g r| - as r g r| - f r fis r| - - %205 - g r g r| - g r g r| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g r g\< r| - g r g r| - - %210 - g r g r| - g r g r| - \!f2.\ff()es4| - d( c d )c| - f2.\ff()es4| - - %215 - d( c d )c| - bes2.\ff()as4| - g( f g )f| - bes2.\ff()as4| - g( f g )f| - - %220 - f4 r r2| - f'4 r r2| - f4 r r2| - f4 r r2| - % copied 6 from cello| - f4. f'8 f,4. f'8| - e,4. e'8 es,4. es'8| - d,4. d'8 c,4. c'8| - b,4. b'8 as,4. as'8| - g,4 r8 g as4 r8 as| - - %230 - f4 r8 f g4 r8 g| - c4\p r r2| - r2 r4 r8 b\f| - c4 r r2| - r2 r4 r8 b\f| - %235 - c4 r r2| - R1*3| - - %copied 59 from cello - [c8\f es g as][bes, d fis g]| - - %240 - [as, c e f][g, bes d es]| - f4 r r2| - R1*3| - c4\p r r r8 c(| - - %245 - )f4 r r r8 f(| - )e4 r r r8 e(| - )b4 r r r8 b(| - )c4 r r r8 c(| - )f4 r r r8 f(| - - %250 - )es4 r r r8 es(| - )b4 r r r8 b(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4\< r r r8 c(| - )f4 r r r8 f,(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p| - bes\f| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4.\p\< as'8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!f,4.\ff f'8 f2\sf| - - %265 - f,4. f'8 f2\sf| - g,4. g'8 g2\sf| - g,4. g'8 g2\sf| - as,4. as'8 as2\sf| - b,4. b'8 b2\sf| - - %270 - [c,8-"sempre"\ff b c d][es d es c]| - [b c d c][b c b g]| - [c8 b c d][es d es c]| - [b c d c][b c b g]| - [c b c g][c b c g]| - - %275 - [c b c g][c b c g]| - c1 ~| - c| - f,4-. r r2| - R1| - - %280 - c'1 ~| - c| - f,4-. r r2| - R1| - c'1 ~| - - %285 - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f,4-. g-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - \!c4\p r r2| - R1| - g4-#"pizz." r r2| - - %295 - R1| - c4 r r2| - r2 r4 g| - c r r2| - r2 r4 g| - - %300 - c r r2| - R1| - g4 r r2| - R1| - c4 r r2| - - %305 - R1| - g4 r r2| - R1*3| - - %310 - c4\pp r r2| - R1| - c4 r r2| - c4 r r2| - c4 r r2| -} diff --git a/mutopia/Coriolan/coriolan-midi.ly b/mutopia/Coriolan/coriolan-midi.ly deleted file mode 100644 index 85b6ea4ea4..0000000000 --- a/mutopia/Coriolan/coriolan-midi.ly +++ /dev/null @@ -1,4 +0,0 @@ -\version "1.3.120" -\midi{ - \tempo 4 = 150; -} diff --git a/mutopia/Coriolan/coriolan-paper.ly b/mutopia/Coriolan/coriolan-paper.ly deleted file mode 100644 index 76e7c949fe..0000000000 --- a/mutopia/Coriolan/coriolan-paper.ly +++ /dev/null @@ -1,67 +0,0 @@ -\version "1.3.120" -\paper { - \paperSixteen - - % Fine for my a4 laserprinter: - %textheight = 285.0\mm; - %linewidth = 190.0\mm; - - % Mandatory Mutopia settings: - textheight = 270.0\mm; - linewidth = 180.0\mm; - indent = 30.\mm; - - \translator { - \ThreadContext - \consists "Rest_engraver"; - - % Set value for engraver at thread level, - % to override the default that is set in ScoreContext - % for added engraver at Voice level - %%% devNullThread = #'() - } - \translator { - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. Why? - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immediately. - % --> move to Score level to be able to override - % The staff combine part switches it on. - - %% devNullThread = #'never - %%%\consists "Thread_devnull_engraver"; - - % While adds brings back rests of second voice, - % it prints some on the bar lines and it is messy - % because collisions don't work. Also, it increases - % memory usage from 91M RSS, to 116M. - \consists "Multi_measure_rest_engraver"; - \consists "Bar_engraver"; - } - \translator { - \HaraKiriStaffContext - - \consists "Mark_engraver"; - MultiMeasureRest \override #'minimum-width = #6 - \remove "Multi_measure_rest_engraver"; - \remove "Bar_engraver"; - } - \translator { - \OrchestralScoreContext - % skipBars = ##t - - soloText = #"I." - soloIIText = #"II." - % By default, turn off the Thread_devnull_engraver - % at Voice level - %%%devNullThread = #'never - - TimeSignature \override #'style = #'C - TextSpanner \override #'font-shape = #'italic - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - } -} diff --git a/mutopia/Coriolan/coriolan-part-paper.ly b/mutopia/Coriolan/coriolan-part-paper.ly deleted file mode 100644 index 9db2de15cb..0000000000 --- a/mutopia/Coriolan/coriolan-part-paper.ly +++ /dev/null @@ -1,65 +0,0 @@ -\version "1.3.120" -\paper { - %\paperSixteen - - % Fine for my a4 laserprinter: - %textheight = 285.0\mm; - %linewidth = 190.0\mm; - - % Mandatory Mutopia settings: - textheight = 270.0\mm; - linewidth = 180.0\mm; - - \translator { - \ThreadContext - \consists "Rest_engraver"; - - % Set value for engraver at thread level, - % to override the default that is set in ScoreContext - % for added engraver at Voice level - %%%devNullThread = #'() - } - \translator { - \VoiceContext - \remove "Rest_engraver"; - - % The staff combine (bassi part) needs a - % thread_devnull_engraver here. - % Instead of maintaining two separate hierarchies, - % we switch add it, but switch it off immediately. - % --> move to Score level to be able to override - % The staff combine part switches it on. - - %% devNullThread = #'never - %%%\consists "Thread_devnull_engraver"; - - \consists "Multi_measure_rest_engraver"; - \consists "Bar_engraver"; - } - % We need the HaraKiri staff for Staff Combining, - % but we better remove the Instrument_name_engraver. - \translator { - \HaraKiriStaffContext - - \consists "Mark_engraver"; - \remove "Instrument_name_engraver"; - - \remove "Multi_measure_rest_engraver"; - \remove "Bar_engraver"; - } - \translator { - \OrchestralScoreContext - skipBars = ##t - - soloText = #"I." - soloIIText = #"II." - % By default, turn off the Thread_devnull_engraver - % at Voice level - %%%devNullThread = #'never - - TimeSignature \override #'style = #'C - TextSpanner \override #'font-shape = #'italic - BarNumber \override #'padding = #3 - RestCollision \override #'maximum-rest-count = #1 - } -} diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly deleted file mode 100644 index 73bd1d222e..0000000000 --- a/mutopia/Coriolan/coriolan.ly +++ /dev/null @@ -1,66 +0,0 @@ -\version "1.3.120"; - -instrument = "Orchestra" -% instrument = "" - -\include "header.ly" -\include "global.ly" - -\include "paper16.ly" - -\include "bassi.ly" -\include "clarinetti.ly" -\include "corni.ly" -\include "fagotti.ly" -\include "flauti.ly" -\include "oboi.ly" -\include "timpani.ly" -\include "trombe.ly" -\include "viole.ly" -\include "violino-1.ly" -\include "violino-2.ly" - - -legniGroup = \context StaffGroup = legni_group < - \flautiStaff - \oboiStaff - \clarinettiStaff - \fagottiStaff -> - -ottoniGroup = \context StaffGroup = otonni_group < - \corniStaff - \trombeStaff -> - -timpaniGroup = \context StaffGroup = timpani_group < - \timpaniStaff - % Force a staff bracket (?) - \context Staff = timpany \End -> - -violiniGroup = \context GrandStaff = violini_group < - \violinoIStaff - \violinoIIStaff -> - -archiGroup = \context StaffGroup = archi_group < - \violiniGroup - \violeGroup - \bassiGroup -> - - -\score{ - < - \legniGroup - \ottoniGroup - \timpaniGroup - \archiGroup - > - \header{ - instrument = ""; - } - \include "coriolan-paper.ly" - \include "coriolan-midi.ly" -} diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly deleted file mode 100644 index 86a85f65ab..0000000000 --- a/mutopia/Coriolan/corni-part.ly +++ /dev/null @@ -1,16 +0,0 @@ - -\version "1.3.120"; - -instrument = "French Horn" - -\include "header.ly" -\include "global.ly" -\include "corni.ly" - -\score{ - \corniStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - - diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly deleted file mode 100644 index d04a79cd33..0000000000 --- a/mutopia/Coriolan/corni.ly +++ /dev/null @@ -1,21 +0,0 @@ - -\version "1.3.120"; - -\include "corno-1.ly" -\include "corno-2.ly" - -corniStaff = \context Staff = corni < - \property Staff.midiInstrument = #"french horn" - - \property Staff.instrument = #`(rows "Corni in E" ,text-flat) - - \property Staff.instr = #`(lines "Cor." (rows "(E" ,text-flat ")")) - \property Staff.transposing = #3 - \Time - \notes { \key c \major; } - \End - \context Voice=one \partcombine Voice - \context Thread=one \cornoI - \context Thread=two \cornoII -> - diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly deleted file mode 100644 index ce6ddeb8fe..0000000000 --- a/mutopia/Coriolan/corno-1.ly +++ /dev/null @@ -1,205 +0,0 @@ - -\version "1.3.120"; - -cornoI = \notes \relative c { - R1*2| - f''4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - c4-. r r2| - R1| - e4-. r r2| - e4-. r r2| - R1*5| - r2 r4 e4-.\f| - R1*6| - r4 g-.\f r2| - R1*2| - % `a 2 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r8 f\p\< f2 e4| - r8 f f2 e4| - f4. e8 f4. e8| - f4. e8 f4. e8| - \!f1\ff % ~| - f4 ( e f )e - e4. r8 e4. r8| - e4. r8 e4. r8| - e4. r8 d4. r8| - g4. r8 f4. r8 - c2 \sf r2 - c2 \sf r2 - R1*2 - e1\sf - c1\sf - g2. g4\sf - g2. g4\sf - g2. g4\sf - g2. g4\sf - g r4 r2| - R1| - g\p~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g| - g2\ff d'2 e1| - R1*20| - c2. \ff e4| - r4 e r e c2. e4 r4 e r e| - f2. e4| - e e e e| - f2. e4| - e e e e| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf| - r4 r8 c8 c2\sf | - c4 r4 c r| -| - e4 r e r| - r2 e4 r| - r2 e4 r| -| - R1*4 | - e4\f r4 r2 R1| - e4\f r4 r2| - R1*3| - e4\f r8 e e4 r8 e| -| - e4 r8 e e4 r8 e| -| - e4 r8 e g4 r8 g| -| - g4 r8 g8 r2| - g1~| - g| - g4. g8 g4 r8 g| -| - g4 r8 g8 g4 r8 g8| - g4\p r4 r2| - R1*21| - d4\f r4 r2| - g4 r r2| - g4 r8 g g4 r8 g| -| - g4 r8 g g4 r8 g| -| - f4\p r4 r2| -| - R1*3| - f4 r e r| - d r c r| - g' r f r| - e r e r| - d r r2| -| - R1| - d4-.\ff r4 r2| - R1*3| - f2\sf r2 f2 \sf r2| - R1*3| - e2\ff r2 e \sf r2| - R1*3| - d2.\ff r4| - d2. r4| - d2. r4| - d2. r4| - e2. r4| - e2. r4| - e2. r4| - e2. r4| - e4 r4 r2| - R1*11| - e2 d2| - R1*17| - r4 r8 e,8 e4. e8| - r4 r8 e8 e4. e8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 e8\< e4. e8| - r4 r8 e8 e4. e8| - r4 r8 e8 e4. e8| - r4 r8 e8 e4. e8| - \!f'2.\ff e4| - d e d e| - f2. e4| - d e d e| - g2. f4| - g f g f | - g2. f4| - g f g f | - r4 r8 f f2| - r4 r8 f f2| - r4 r8 f f2| - r4 r8 f f2 | - f2 e~| - e d~| - d1 ~ d1| - d4 r4 f r| - d r e r| - R1| - r2 r4 r8 e\f| - e4 r4 r2| - r2 r4 r8 e8| - e4 r r2| - R1*3| - %a deux| - c4\f r e r| - d r c r| - d r r2| - R1| - e1\p~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e| - %a deux| - \!c\f| - d\p| - d\f| - e\p| - e\f| - d4\p r r2| - R1*3| - %a deux| - d\ff| - d| - e| - e| - f| - e| - e4.-"sempre"\ff e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4 r8 e e4 r8 e| - e4 r8 e e4 r8 e| - R1*2| - d4-. r r2| - R1*3| - f4-. r r2| - R1*5| - %a deux| - e4-. e-. r2| - d4-. e-. r2| - R1*25| -} - diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly deleted file mode 100644 index e5153a951c..0000000000 --- a/mutopia/Coriolan/corno-2.ly +++ /dev/null @@ -1,219 +0,0 @@ - -\version "1.3.120"; - -cornoII = \notes \relative c { - R1*2| - d''4-.\ff r r2| - R1*3| - d4-. r r2| - R1*3| - c4-. r r2| - R1| - e,4-. r r2| - e4-. r r2| - R1*5| - r2 r4 e4-.\f| - R1*6| - r4 g-.\f r2| - R1*2| - % `a 2 - % urg, yes this is a-deux, but lily doesn't know about I. / a2 yet. - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r8 f'\p\< f2 e4| - r8 f f2 e4| - f4. e8 f4. e8| - f4. e8 f4. e8| - \!d1\ff ~| - d4(e d)c| - d4. r8 c4. r8| - e,4. r8 e4. r8| - e'4. r8 d4. r8| - e,4. r8 d'4. r8| - c2\sf r| - c\sf r| - R1*2| - e1\sf| - c,\sf| - g2. g4\sf| - g2. g4\sf| - g2. g4\sf| - g2. g4\sf| - g4 r r2| - R1| - g1\p~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1~| - g1| - g2\ff d''| - e1| - R1*20| - c2.\ff e,4| - r e r e| - c'2. e,4| - r e r e| - d'2. c4| - d c d c| - d2. c4| - d c d c| - %a deux| - r r8 c c2\sf| - r4 r8 c c2\sf| - r4 r8 c c2\sf| - r4 r8 c c2\sf| - c4 r c r| - e, r e r| - r2 c'4 r| - r2 c4 r| - R1*4| - e,4\f r r2| - R1| - e4\f r r2| - R1*3| - e4\f r8 e e4 r8 e| - e4 r8 e e4 r8 e| - e'4 r8 e e4 r8 e| - e4 r8 e r2| - e1~| - e~| - e4. e8 e4 r8 e| - e4. e8 e4 r8 e| - e4\p r r2| - R1*21| - d4\f r r2| - g,4 r r2| - g4 r8 g g4 r8 g| - g4 r8 g e'4 r8 e| - d4\p r r2| - R1*3| - d4\ff r c r| - d r c r| - g r d' r| - d r e r| - d4 r r2| - R1| - g,4-.\ff r r2| - R1*3| - d'2\sf r| - d2\sf r| - R1*3| - e2\ff r| - e2\sf r| - R1*3| - %a deux| - d2.\ff r4| - d2. r4| - d2. r4| - d2. r4| - e2. r4| - e2. r4| - e2. r4| - e2. r4| - e4 r r2| - R1| - e,1\p~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e~| - e~| - e~| - e| - \!e2\ff d'| - R1*17| - %a deux| - r4 r8 e,\p e4. e8| - r4 r8 e e4. e8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 e\< e4. e8| - r4 r8 e e4. e8| - r4 r8 e e4. e8| - r4 r8 e e4. e8| - \!d'2.\ff c4| - d c d c| - d2.\ff c4| - d c d c| - g2. d'4| - g, d' g, d'| - g,2. d'4| - g, d' g, d'| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - r4 r8 d d4\sf()es| - d2 d| - %a deux| - e d~| - d1~| - d| - %a deux| - d4 r f r| - d r e r| - R1| - r2 r4 r8 e,\f| - e4 r r2| - r2 r4 r8 e\f| - e4 r r2| - R1*3| - %a deux| - c'4\f r e r| - d r c r| - d r r2| - R1| - e,1\p~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - e~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e\<~| - e~| - e| - %a deux| - \!c'1\f| - d\p| - d\f| - e\p| - e\f| - d4\p r r2| - R1*3| - %a deux; urg: copied corno| - d\ff| - d| - e| - e| - f| - e| - e4.-"sempre"\ff e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4. e8 e4. e8| - e4 r8 e, e4 r8 e| - e4 r8 e e4 r8 e| - R1*2| - d'4-. r r2| - R1*3| - d4-. r r2| - R1*5| - %a deux| - e4-. e-. r2| - d4-. e-. r2| - R1*25| -} diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly deleted file mode 100644 index 76b4f2bcbb..0000000000 --- a/mutopia/Coriolan/fagotti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Bassoon" - -\include "header.ly" -\include "global.ly" -\include "fagotti.ly" - -\score{ - \fagottiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly deleted file mode 100644 index f8f6e2c467..0000000000 --- a/mutopia/Coriolan/fagotti.ly +++ /dev/null @@ -1,19 +0,0 @@ - -\version "1.3.120"; - -\include "fagotto-1.ly" -\include "fagotto-2.ly" - -fagottiStaff = \context Staff = fagotti < - \property Staff.midiInstrument = #"bassoon" - \property Staff.instrument = #"Fagotti" - \property Staff.instr = #"Fg." - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - \global - \context Voice=one \partcombine Voice - \context Thread=one \fagottoI - \context Thread=two \fagottoII -> - diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly deleted file mode 100644 index f67592c2a5..0000000000 --- a/mutopia/Coriolan/fagotto-1.ly +++ /dev/null @@ -1,348 +0,0 @@ - -\version "1.3.120"; - -fagottoI = \notes \relative c { - R1*2| - as'4-.\ff r r2| - R1 *3| - as4-. r r2| - R1*3| - a4-. r r2| - R1| - c4-. r r2| - b4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - ges'2\p\< f2 ~| - f4 \!e-.\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d| - d2 d| - d d| - \!c1\ff ~| - c4(bes as)g| - f4. r8 es4. r8| - b'4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - fis2\sf r| - fis\sf r| - f\sf r| - f\sf r| - e1\sf es\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d4 r r2| - R1*9| - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g'2.(as4 \p\<| - g f d)bes - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - | - \!bes2\ff as| - g c~| - c1\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c| - \!c2\ff bes| - a d~| - d1~| - d~| - d2.()f4| - f(es2)d4| - d(c2)bes4| - bes(a bes)g| - fis r8 a\pp a4. a8| - r4 r8 a a4. a8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 bes\< bes4. bes8| - r4 r8 bes bes4. bes8| - r4 r8 c8 c4. c8| - r4 r8 d d4. d8| - \!es2.\ff()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - d2.()es4| - d( c d)c| - d2.()es4| - d( c d)c| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - es1| - d2 des| - c1~| - c| - d4 r es r| - c r d r| - g,4\p r r2| - R1*7| - - %% 110| - % copied from cello, copied from viola| - [g8 bes d es][f, a cis d]| - [es,8:8 g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,2 ~ g4. g8| - %115| - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - - g4\p r r2| - - - R1*3| - r4 r8 des' c4 r8 g| - as4 r r2| - r4 r8 des c4 r8 g| - e4 r r2| - R1*3| - r4 r8 f' es4 r8 bes| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c4\< r4 r2| - R1*2| - r4 r8 ges' f4 r8 c| - des4 r bes2| - c1| - - % 136 a deux - \!des2\p( c| - bes as| - ges f| - )es as,| - - %% 140 copied from cello (from viola)| - [des8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c1\p\< ~| - c1~| - c1~| - c| - - %%148 copied from cello (from viola)| - [\!f,8:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - %150| - % r[des,16 des][e e g g]r8[c,16 c][e e f f]| - [bes, des e g][as, c e f]| - % r8[des16 des][f f g g][c, c e e][g g c c]| - [bes, des f g][c, e g c]| - f,1\ff~| - f| - des'4 r r2| - R1| - f,1~| - f| - b2\sf r| - b2\sf r| - R1*3| - bes2\ff r| - bes\sf r| - R1*2| - r2 r4 e,4\ff(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g4 r r2| - R1| - g,1\p~| - g~| - g~| - g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e''2.(\()bes4| - \!bes\p(as2)g4| - g'4(f2)es4| - es(d es)c| - b r8 d\p d4. d8| - r4 r8 d d4. d8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 es\< es4. es8| - r4 r8 es es4. es8| - r4 r8 - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - - f f4. f8| - r4 r8 g g4. g8 % - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - - | - \!f2.\ff()es4| - d(c d)c| - f2.\ff()es4| - d(c d)c| - bes2.()as4| - g(f g)f| - bes2.()as4| - g(f g)f| - r r8 des' des4\sf()es| - r r8 des des4\sf()es| - r r8 des des4\sf()es| - r r8 des des4\sf()es| - des2 b| - c a| - b c| - d c| - g4 r as r| - f r g r| - c,4 r r2| - R1*7| - - %%238 copied from cello from viola| - [c8\f es g as][bes, d fis g]| - [as, c e f][g, bes d es]| - - f4 r r2| - - R1*7| - es'2.\p(f4| - es d b)g| - g'2.(as4| - g2)f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\<( f4| - es d b)g| - R1| - \!c1\f| - des\p| - d\f| - es\p| - e\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as,4.\p\< as8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!f4.\ff as8 as2\sf| - r4 r8 as as2\sf| - r4 r8 bes bes2\sf| - r4 r8 bes bes2\sf| - r4 r8 c c2\sf| - r4 r8 d d2\sf| - - %% 270 copied from cello| - [c,8-"sempre"\ff b c d][es d es c]| - [b c d c][b c b g]| - [c8 b c d][es d es c]| - [b c d c][b c b g]| - [c b c g][c b c g]| - %275| - [c b c g][c b c g]| - - - c1~| - c| - f4 r r2| - R1| - c1~| - c| - f4 r r2| - R1| - c1~| - c| - es'4-. d-. r2| - R1| - g,4-. g-. r2| - as4-. bes-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!c,4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - r r4 g\p\>~| - g1~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - g~| - \!g\>~| - g~| - g| - \!c4\pp r r2| - R1*4| -} - diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly deleted file mode 100644 index a5f3fc17b5..0000000000 --- a/mutopia/Coriolan/fagotto-2.ly +++ /dev/null @@ -1,330 +0,0 @@ - -\version "1.3.120"; - -fagottoII = \notes \relative c { - R1*2| - f4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - fis4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g,4-.| - R1*6| - r4 g'\f r2| - R1*6| - as1\ff ~| - as4(g f)es| - d4. r8 c4. r8| - b4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - fis2\sf r| - fis\sf r| - f\sf r| - f\sf r| - e1\sf| - es\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d2. es4\sf| - d4 r r2| - R1*9| - - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g''2.(as4 \p\<| - g f d)bes| - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \!g2\ff f| - e c~| - c1\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c| - \!c2\ff g'| - fis d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g,4 \p\< r r r8 g(| - )c4 r r r8 c(| - \!)b1\sf\>| - \!c4\p r4 r2| - R1*2| - r4 r8 fis\pp fis4. fis8| - r4 r8 fis fis4. fis8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 g\< g4. g8| - r4 r8 g g4. g8| - r4 r8 a a4. a8| - r4 r8 bes bes4. bes8| - \!c2.\ff()bes4| - a(g a)g| - c2.()bes4| - a(g a)g| - b2.()c4| - d,(c d)c| - b'2.()c4| - d,(c d)c| - r4 r8 c'8 c4\sf()des| - r4 r8 c8 c4\sf()des| - r4 r8 c8 c4\sf()des| - r4 r8 c8 c4\sf()des| - c1| - b2 bes| - as g| - fis es| - d4 r es r| - c r d r| - g1\p| - fis| - g\fp| - fis| - g2\fp(f| - es d| - c bes| - )a d| - - %a deux| - %% 110| - % copied from cello, copied from viola| - [g8 bes d es][f, a cis d]| - [es,8:8 g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,,2 ~ g4. g8| - %115| - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - - g'1\p| - - - fis| - g| - f| - e| - f| - e| - c| - f| - e| - f| - g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as\<| - g| - as| - a| - bes| - c| - - %a deux| - \!des2\p( c| - bes as| - ges f| - )es as,| - - %% 140 copied from cello (from viola)| - [des8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - - f,4\p r r2| - R1*3| - - % a deux| - %%148 copied from cello (from viola)| - [f8:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - %150| - % r[des,16 des][e e g g]r8[c,16 c][e e f f]| - [bes, des e g][as, c e f]| - % r8[des16 des][f f g g][c, c e e][g g c c]| - [bes, des f g][c, e g c]| - f,1\ff~| - f| - bes,4-. r r2| - R1| - f'1\ff~| - f| - b,2\sf r| - b\sf r| - R1*3| - bes2\ff r| - bes2\sf r| - R1*2| - r2 r4 bes\ff(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. bes4\sf(| - )as2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b2. c4\sf(| - )b4 r r2| - R1| - % a deux| - g1\p~| - g~| - g~| - g~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g\<~| - g~| - g~| - g~| - g~| - g| - \!e'2\ff d| - cis a~| - a1\p~| - a~| - a~| - a~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - a\<~| - a| - \!f'2\ff e| - dis b~| - b1\p| - a\<| - g| - f| - \!es4\f r r2| - R1*3| - r4 r8 b'' b4. b8| - r4 r8 b b4. b8| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 c\< c4. c8| - r4 r8 c c4. c8| - - r4 r8 - \clef "tenor"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #2 - d d4. d8| - r4 r8 es es4. es8| - - \clef "bass"; - %\property Staff.clefGlyph = #"clefs-F" - %\property Staff.clefPosition = #2 - - \!f,2.\ff()es4| - d(c d)c| - f2.\ff()es4| - d(c d)c| - bes2.()as4| - g(f g)f| - bes2.()as4| - g(f g)f| - f4 r r2| - f4 r r2| - f4 r r2| - f4 r r2| - f'2 f| - e es| - d c| - b' as| - % a deux| - g4 r as r| - f r g r| - c,1\p| - b| - c| - b| - c2\fp( bes| - as g| - f es'| - )d g,| - - %a deux| - %%238 copied from cello from viola| - [c8\f es g as][bes, d fis g]| - [as, c e f][g, bes d es]| - - f4 r r2| - - R1*14| - ges\f| - f\p| - as\f| - g\p| - bes\f| - %a deux| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4.\p\< as8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!f4.\sf f8 f2\sf| - r4 r8 f f2\sf| - r4 r8 g g2\sf| - r4 r8 g g2\sf| - r4 r8 as as2\sf| - r4 r8 b b2\sf| - - % a deux| - %% 270 copied from cello| - [c,8-"sempre"\ff b c d][es d es c]| - [b c d c][b c b g]| - [c8 b c d][es d es c]| - [b c d c][b c b g]| - [c b c g][c b c g]| - %275| - [c b c g][c b c g]| - - % a deux| - c1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - c'4-. b-. r2| - R1| - es,4-. e-. r2| - f4-. g-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - %a deux| - \!c,4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} - diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly deleted file mode 100644 index 31a71c2007..0000000000 --- a/mutopia/Coriolan/flauti-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Flute" - -\include "header.ly" -\include "global.ly" -\include "flauti.ly" - -\score{ - \flautiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly deleted file mode 100644 index 7cb233b198..0000000000 --- a/mutopia/Coriolan/flauti.ly +++ /dev/null @@ -1,16 +0,0 @@ - -\version "1.3.120"; - -\include "flauto-1.ly" -\include "flauto-2.ly" - -flautiStaff = \notes \context Staff = flauti < - \property Staff.midiInstrument = #"flute" - \property Staff.instrument = #"Flauti" - \property Staff.instr = #"Fl." - \global - \context Voice=one \partcombine Voice - \context Thread=one \flautoI - \context Thread=two \flautoII -> - diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly deleted file mode 100644 index 2f2fab90bf..0000000000 --- a/mutopia/Coriolan/flauto-1.ly +++ /dev/null @@ -1,260 +0,0 @@ - -\version "1.3.120"; - -flautoI = \notes \relative c { - R1 *2| - c'''4-.\ff r r2| - R1 *3| - d4-. r r2| - R1 *3| - es4-. r r2| - R1| - g4-. r r2| - b,4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 g'\p\< (| - )fis2. \!g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 f\p\< ~| - f4 \!e-.\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d1| - d2 d2| - d2 d2| - \!f1\ff ~| - f4(es des)c| - b4. r8 c4. r8| - d4. r8 es4. r8| - e4. r8 f4. r8| - g4. r8 as4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g2.\p\<(f4| - as g d)bes - \!bes2\ff des| - c1~| - c\p~| - c~| - c~| - c~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\<~| - c~| - \!c2\ff es| - d1~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d\p\<~| - d~| - d2.()f4| - f(es2)d4| - d(c2)bes4| - bes(a bes)g| - \!fis\pp r r2| - r2 r4 r8 a| - bes4 r r2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r r4 r8 bes\<| - c4 r r r8 c| - d4 r r r8 d| - \!es2.\ff()d4| - fis(g fis)g| - es2.()d4| - fis(g fis)g| - as2.()g4| - b,(c b)c| - as'2.()g4| - b,(c b)c| - r2 es\sf| - r es\sf| - r es\sf| - r es\sf| - es1| - d2 des| - c1~| - c| - c4 r es r| - c r d r| - g,\p r r2| - r r4 r8 a\sf| - bes4 r r2| - r r4 r8 a\f| - bes4 r r2| - R1*3| - bes,4\f r8 es' d4 r 8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 g'| - g4 r8 g fis4 r8 fis| - g1~| - g~| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*3| - r4 r8 des\p c4 r8 g| - as4 r r2| - r4 r8 des c4 r8 g| - e4 r r2| - R1*3| - r4 r8 f' es4 r8 bes| - c4 r r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 ges'\< f4 r8 c| - \!des4 r r2| - R1*5| - f4 r r r8 es| - des4 r r r8 c| - bes4 r8 e f4 r8 f| - g4 r8 g e4 r8 e| - R1*4| - as,4\ff r8 des8 c4 r8 g| - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 f'| - f4 r8 f e4 r8 e| - f4 r r2| - R1| - des4-.\ff r r2| - R1*3| - d2\sf r| - d2\sf r| - R1*3| - d2\ff r| - d2\sf r| - R1*2| - r2 r4 des4\ff(| - )c2. des4\sf(| - )c2. des4\sf(| - )c2. des4\sf(| - )c2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e2.\p\<(f4| - e d b )g| - \!g2\ff bes| - a1~a4\p r r2| - R1*3| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - a1\<~| - a| - \!a2\ff c| - b a| - g2.\p( a4| - g fis dis )b| - g'1~| - g| - g4\f r r2| - R1| - r4 f'2\p()es4| - es(d es)d| - b r r2| - R1*5| - as2.\ff()g4| - b(c b)c| - as2.\ff()g4| - b(c b)c| - des2.()c4| - e(f e)f| - des2.()c4| - e(f e)f| - r2 des4\sf()c| - r2 des4\sf()c| - r2 des4\sf()c| - r2 des4\sf()c| - des2 b| - c2 f~| - f f~| - f1| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 d\f| - es4 r r2| - r r4 r8 d\f| - es4 r r2| - R1*3| - es4\f r d r| - c r8 f8 es4 r8 bes| - as4-. des4-. r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\p\<(f4| - es d b)g| - g1| - \!as\f~| - as\p| - bes\f~| - bes\p| - c1\f~| - c\p~| - c~| - c~| - c~| - c\ff~| - c~| - c~| - c~| - c| - d| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b c4 r8 b| - c4 r8 b c4 r8 b| - c4 r r2| - R1| - c4-. r r2| - R1| - c,~| - c| - d'4 r r2 - R1 - c,~| - c| - es'4-. b-. r2| - R1| - c4-. c4-. r2| - c4-. c4-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!es4\p r r2| - R1| - d,4 r r2| - R1| - c4\pp r r2| - R1*18 -} diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly deleted file mode 100644 index 403d48e955..0000000000 --- a/mutopia/Coriolan/flauto-2.ly +++ /dev/null @@ -1,172 +0,0 @@ - -\version "1.3.120"; - -flautoII = \notes \relative c { - R1 *2| - as'''4-.\ff r r2| - R1 *3| - b4-. r r2| - R1 *3| - c4-. r r2| - R1| - es4-. r r2| - d,4-. r r2| - R1 *4| - r2 r2| - r2 r4 b'4-.| - R1*6| - r4 c r2| - R1*6| - c1 ~| - c4( es, des)c| - g'4. r8 g4. r8| - d4. r8 es4. r8| - c'4. r8 c4. r8| - c4. r8 c4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f4 bes2.~| - bes4 bes2.~| - bes4 bes2.~| - bes4 bes2.~| - bes4 r r2| - R1*33| - a2.\ff()bes4| - c(bes c)bes| - a2.()bes4| - c(bes c)bes| - b2.()c4| - f,(es f)es| - b'2.()c4| - f,(es f)es| - r2 c'4\sf()bes| - r2 c4\sf()bes| - r2 c4\sf()bes| - r2 c4\sf()bes| - R1| - r2 g2| - as2 c,~| - c1| - c4 r es r| - c r d r| - es,\p r r2| - r r4 r8 d'\f| - d4 r r2| - r r4 r8 d\f| - d4 r r2| - R1*3| - bes4\f r8 es d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 bes'| - bes4 r8 bes a4 r8 a| - bes1~| - bes~| - bes4 r8 bes bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - bes4\p r4 r2| - R1*21| - f4\f r r r8 es| - des4 r r r8 c| - bes4 r8 bes' bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - R1*4| - as4\ff r8 des c4 r8 g| - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 as| - g4 r8 g g4 r8 g| - as4 r r2| - R1| - f4\ff r r2| - R1*3| - d'2\sf r| - d2\sf r| - R1*3| - des2\ff r| - des2\sf r| - R1*35| - e,1(| - )d| - c4\f r r2| - R1*9| - d2.\ff()es4| - b(c b)c| - d2.\ff()es4| - b(c b)c| - g'2.()as4| - bes( as bes)as| - g2.()as4| - bes( as bes)as| - % 220 a deux?| - R1*5| - r2 a| - b c| - d c| - b4 r as r| - f r g r| - c,\p r r2| - r r4 r8 g'\f| - g4 r r2| - r r4 r8 g\f| - g4 r r2| - R1*3| - es4\f r d r| - c r8 f es4 r8 bes| - as4 des r2| - R1*14| - %a deux| - as'1\f~| - as\p| - bes\f~| - bes\p| - c1\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\<~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - %a deux urg: copied flauto-1(270,277)| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b c4 r8 b| - c4 r8 b c4 r8 b| - c4 r r2| - R1| - as4-. r r2| - R1| - %a deux| - c,1~| - c| - b'4-. r r2| - R1| - %a deux| - c,1~| - c| - es4-. d-. r2| - R1| - c4-. g'-. r2| - as4-. e-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r f r| - R1| - \!es4\p r r2| - R1| - b4 r r2| - R1| - c4\pp r r2| - R1*18| -} - diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly deleted file mode 100644 index 1ad0eaef57..0000000000 --- a/mutopia/Coriolan/global.ly +++ /dev/null @@ -1,29 +0,0 @@ - -\version "1.3.120"; - -Time = \time 4/4; -Key = \notes { \key es \major; } -End = { \skip 1*314; \bar "|."; } - -global = \notes { - \Time - \Key - \End -} - -staffCombinePianoStaffProperties = { - \property PianoStaff.devNullThread = #'() - \property PianoStaff.soloADue = ##t - \property PianoStaff.soloText = #"" - \property PianoStaff.soloIIText = #"" - % This is non-conventional, but currently it is - % the only way to tell the difference. - \property PianoStaff.aDueText = #"a2" - \property PianoStaff.splitInterval = #'(1 . 0) - \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) - \property PianoStaff.noDirection = ##t -} - -#(set! point-and-click line-column-location) -#(define text-flat '((font-relative-size . -2) (music "accidentals--1"))) - diff --git a/mutopia/Coriolan/header.ly b/mutopia/Coriolan/header.ly deleted file mode 100644 index 61c4076303..0000000000 --- a/mutopia/Coriolan/header.ly +++ /dev/null @@ -1,192 +0,0 @@ -% Ugh, we need to override some LaTeX titling stuff -\header { - title = "Ouvertüre\\vrule width0pt height 0pt depth 1ex"; - subtitle = "\\normalsize Zu Heinrich Joseph v. Collins Trauerspiel\\vrule width0pt height 0pt depth 1ex"; - subsubtitle = "\\Large\\bf Coriolan"; - opus = "Op. 62"; - piece = "\\hspace*{30mm}\\normalfont\\large Allegro con brio"; - composer = "Ludwig van Beethoven (1770-1827)"; - enteredby = "JCN"; - instrument = \instrument; - - % mutopia headers. - mutopiatitle = "Ouverture Coriolan"; - mutopiacomposer = "L.v.Beethoven (1770-1827)"; - mutopiaopus = "O62"; - mutopiainstrument = \instrument; - date = "1807"; - - source = "Six Great Overtuers in Full Score, Ludwig van Beethoven; Dover - Publications INC, New York (1985). Unabridged republication of - Beethoven's Werke, Ouverturen fuer Orchester: No. 18-21, 26-27; - Breitkopf and Haertel, Leipzig, n.d. [1862-1865]."; - - %{ - - i. Six Great Overtuers in Full Score, Ludwig van Beethoven; Dover - Publications INC, New York (1985). Free of copyright and - copyright marks. Reprint. Originally published: Breitkopf and - Haertel, n.d. [1862-1865] (Ludwig van Beethoven's Werke; Ser 3) - No. 18-21, 26-27. - M1004.B4097 - ISBN 0-486-24789-9 - - Differences of Mutopia score - - The printed output of this Mutopia score exhibits a number of - differences to the original source i. These differences fall into - two catogaries: changes made by the editor (enteredby), and - automatic changes made by the GNU LilyPond typesetting mechanism. - - a. Changes by the editor - - 1. The old notation of dotted quarter notes on the fourth beat - are modernised to a quarter note, a tie, and an eight note, - ie: - - \partial 4; c4. -> c4 ~ | c8 - - GNU LilyPond 1.3.136 can not handle the old notation. When - this old notation will be supported, it should be fairly - straightforward to find and change these instances. It would - be advisable, however, to keep the current, modern printout, - and document this as a change in b. - - 2. Notes are entered by their name, no efforts were made to - force the printing of reminder accidentals to mimic the - original edition, see b.2,3. - - 3. Empty staffs are removed through the Hara-kiri-staff - mechanism. This change can be undone very easily. - - 4. Margins are changed to Mutopia dictated values. This change - can be undone very easily, however, see b.7. - - b. Automatic changes by the GNU LilyPond typesetting mechanism - - 1. Bar lines are not connected between staff groups. - - 2. Accidentals are not repeated within one bar, in - - \key es\major; b2 b - - only the first b gets an accidental. Note that not in all - cases these accidentals are consistently repeated, however, - they are printed in most cases where the two notes are - more than one note apart. - - 3. Reminder accidentals are not printed, in - - \key es\major; b1 | bes - - no flat is printed with the bes. - - 4. Stem.default-neutral-direction and - Beam.default-neutral-direction are 1 (up). - - 5. Beam-dir-algorithm is 'majority. - - 6. The part combiner prints "I.", "II." and "`a 2." strings - where appropriate. - - 7. Line breaks are calculated. - - 8. GNU LilyPond has bugs that affect the Coriolan, see test - sources in input/bugs/*.ly. - - - Other editions. - - ii. Edition Eulenburg No.626 Coriolan, Overture for Orchestra - Op. 62; Ernst Eulenburg LTD, (not dated). Edited 1936 by - dr. Max Unger from and following score autograph and original - published parts, ie, Stimmen-Drucke N.Simrock Bonn (most - probably from 1807) and Industriekontor Vienna (1807). - - iii. Beethoven's Werke -- Ouverturen fuer Orchester; Breitkopf - u. Haertel, Leipzig (not dated, but very old and worn). - - iv. Beethoven Werke II,1 -- Ouverturen und Wellingtons Sieg; - G. Henle Verlag, Muenchen (1974). Veroeffentlichung des - Beethovenhauses in Bonn. Die ausgabe wurde durch die - Unterstuetzung des Landes Nordrhein-Westfalen ermoeglicht. - - - Background. - - From Overture Coriolan is no Urtext edition available, although - there are Urtext editions of Beethoven's symphonies. - - Edition Eulenburg is the ``first after many years'' that tries to - stay as close to the original text as possible. During the 1900s, - it was customary for editors not to respect the original text and - make any changes they thought necessary. Unger made corrections for - a few ``small and obvious'' inaccuracies. Together with Breitkopf - and Haertel, this is the only score edition to abbreviate (LilyPond - source notation) - - [es16 es g g] [b b c c] - - using the notation - - [es8:16 g: b: c:] - - editions of individual parts by Breitkopf and Haertel use this - common practice abbreviation too. - - Edition Beethoven's Werke by Breitkopf and Haertel comes without any - commentary, copyright mark or date. There are no significant - differences with ed. Unger. The copy was very old and worn, but is - probably younger than ed. Unger. - - Edition Beethoven Werke by G. Henle was a new study based upon the - three main sources, the score autograph, the published parts - Stimmen-Drucke N.Simrock Bonn (most probably from 1807) and - Industriekontor Vienna (1807). They reinforce the assumptions made - by Unger that both published parts were first prints, noting that - both must have worked from a different copy of the autograph (and - not from the autograph itself), and that Simrock's is a bit closer - to the original autograph. This edition is supposed to deviate from - the autograph only in using `modernised notation' for the following - cases (GNU LilyPond source notation), as described by the foreword. - - a. Use dots instead of ties for sustaining of notes when there's no - measure break: - - c4 ~ c8 -> c4. - - We very much doubt this, as the 1862 edition already has this, - but in contrast, has a different change, see i.a.1 above. - - b. Don't repeat accidentals within the same measure: - - \key es \major; b4 c b! c | -> \key es \major; b4 c b c - - We think that also other changes may have been made, see i.b.3 - above. - - c. Start slurring from first tied note, not from second: - - c4 ~ c8 ( d ) e -> c4 ( ~ c8 d ) e - - From these deviations, the third is the only one unique to this - edition, but these are easy to spot and mostly parenthesed; the - other two deviations are standard modern day music notation practice - and thus common to all editions. - - %} - - style = "Classical"; - copyright = "Public Domain"; - maintainer = "Jan Nieuwenhuizen"; - maintainer_email = "janneke@gnu.org"; - lastupdated = "2001/Mar/19"; - mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small - \\\\This music is part of the Mutopia project, - \\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset - and placed in the public domain by " + \maintainer + - ".\\\\Unrestricted modification and redistribution is permitted - and encouraged---copy this music and share it.}"; - tagline = \mutopiapublicdomain; - footer = "Mutopia-2001/03/19-57"; -} diff --git a/mutopia/Coriolan/instruments.ly b/mutopia/Coriolan/instruments.ly deleted file mode 100644 index a2a11fdd20..0000000000 --- a/mutopia/Coriolan/instruments.ly +++ /dev/null @@ -1,14 +0,0 @@ -\version "1.3.120" -flauti.ly -oboi.ly -clarinetti.ly -fagotti.ly -corni.ly -trombe.ly -timpani.ly -violino-1.ly -violino-2.ly -viola-1.ly -viola-2.ly -violoncello.ly -contrabasso.ly diff --git a/mutopia/Coriolan/music.ly b/mutopia/Coriolan/music.ly deleted file mode 100644 index a7257ac9eb..0000000000 --- a/mutopia/Coriolan/music.ly +++ /dev/null @@ -1,20 +0,0 @@ -\version "1.3.120" -flauto-1.ly -flauto-2.ly -oboe-1.ly -oboe-2.ly -clarinetto-1.ly -clarinetto-2.ly -fagotto-1.ly -fagotto-2.ly -corno-1.ly -corno-2.ly -trombo-1.ly -trombo-2.ly -timpani.ly -violino-1.ly -violino-2.ly -viola-1.ly -viola-2.ly -violoncello.ly -contrabasso.ly diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly deleted file mode 100644 index 347b86a58e..0000000000 --- a/mutopia/Coriolan/oboe-1.ly +++ /dev/null @@ -1,271 +0,0 @@ - -\version "1.3.120"; - -oboeI = \notes \relative c'' { - R1*2| - as'4-.\ff r r2| - R1*3| - as4-. r r2| - R1*3| - a4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1 *4| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as2\p\< ( g| - )fis2. \!g4-.\f| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - ges2\p\< f ~| - f4 \!e\f r2| - R1| - f2\p()es| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d1\<| - d| - d2 d| - d d| - \!f1\ff ~| - f4(es des)c| - f4. r8 es4. r8| - g4. r8 g4. r8| - g4. r8 f4. r8| - g4. r8 as4. r8| - a2\sf r| - a\sf r| - as\sf r| - as\sf r| - g1\sf| - ges\sf| - f2. ges4| - f2. ges4| - f2. ges4| - f2. ges4| - f4 r r2| - R1*9| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g2.\p\<( as4| - g f d)bes| - \!bes'2\ff des| - c bes| - as4\p r r2| - R1*3| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as2.\p\<( bes4| - as g e)c| - \!c'2\ff es,| - d1~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - d\p\< ~| - d~| - \!d2.\sf\>()f4| - \!f\p( es2)d4| - d(c2)bes4| - bes(a bes)g| - fis\pp r r2| - r r4 r8 fis'| - g4 r r2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r r4 r8 g\<| - a4 r r r8 a| - bes4 r r r8 bes| - \!fis2.\ff()g4| - fis(g fis)g| - fis2.()g4| - fis(g fis)g| - as2.()g4| - b,(c b)c| - as'2.()g4| - b,(c b)c| - r2 as'4\sf()g| - r2 as4\sf()g| - r2 as4\sf()g| - r2 as4\sf()g| - as2 fis| - g e| - f es| - a g| - fis4 r es r| - c r d r| - g,\p r r2| - r r4 r8 a'\f| - bes4 r r2| - r r4 r8 a\f| - bes4 r r2| - R1*3| - bes4\f r a r| - g r f r| - es r g r8 bes| - bes4 r8 bes a4 r8 a| - g1~| - g~| - g4. g8 g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*15| - r4 r8 as-"cresc" ges4 r8 des| - es4 r8 bes' as4 r8 es| - f4 r r2| - R1*3| - f4\f r r r8 es| - des4 r r r8 c| - bes4 r8 es f4 r8 f| - g4 r8 g e4 r 8 e| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'1\p\< ~| - c~| - c~| - c| - \!c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - des4 r8 des c4 r8 c| - f,4 r r2| - R1| - f4-.\ff r r2| - R1*3| - as2\sf r| - as2\sf r| - R1*3| - g2\ff r| - g2\sf r| - R1*2| - r2 r4 e\ff(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. e4\sf(| - )f2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g2. fis4\sf(| - )g4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e2.\p\< (f4| - e d b)g| - g'2.(a4 g2)f| - e2.( f4| - e d b)g| - \!g'2\ff bes| - a1~| - a\p~| - a~| - a~| - a| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - f2.\<( g4| - f e cis)a| - \!a'2\ff c| - b1~| - b\p~| - b~| - b~| - b| - c2.\f\>()bes4| - \!bes\p(as2)g4| - g4(f2)es4| - es(d es)c| - b r r2| - r r4 r8 d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es4\< r r2| - r r4 r8 es| - f4 r r r8 f| - g4 r r r8 g| - \!as2.\ff()g4| - f(es f)es| - as2.\ff()g4| - f(es f)es| - e2.()f4| - e(f e)f| - e2.()f4| - e(f e)f| - r2 as| - r as\sf| - r as\sf| - r as\sf| - as g~| - g f~| - f1~| - f| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 g'\f| - g4 r r2 r r4 r8 g\f| - g4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4\f r8 c c4 r8 d| - as4 r r2| - R1*7| - es2.\p( f4| - es d b)g| - g'2.(as4| - g2)f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es2.\<( f4| - es d b)g| - c1| - \!es\f| - f\p| - f\f| - g\p| - g\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\<~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - es,4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b'8 c4 r8 d,| - es4 r8 g g4 r8 g| - c,1~| - c| - as'4-. r r2| - R1| - c,1~| - c| - b'4-. r r2| - R1| - c,1~| - c| - c'4-. b-. r2| - R1| - c4-. g-. r2| - as4-. e-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r f r| - R1| - \!es4\p r r2| - R1| - d4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly deleted file mode 100644 index c3d92600a8..0000000000 --- a/mutopia/Coriolan/oboe-2.ly +++ /dev/null @@ -1,182 +0,0 @@ - -\version "1.3.120"; - -oboeII = \notes \relative c{ - R1*2| - f''4-.\ff r r2| - R1*3| - f4-. r r2| - R1*3| - es4-. r r2| - R1| - es4-. r r2| - b4-. r r2| - R1*5| - r2 r4 b4-.| - R1*6| - r4 bes\f r2| - R1*6| - c1\ff ~| - c4( es des)c| - b4. r8 c4. r8| - d4. r8 es4. r8| - e4. r8 c4. r8| - e4. r8 f4. r8| - es2\sf r| - es2\sf r| - d2\sf r| - d2\sf r| - R1*2| - bes2. bes4\sf| - bes2. bes4\sf| - bes2. bes4\sf| - bes2. bes4\sf| - bes4 r r2| - R1*33| - es2.\ff()d4| - c(bes c)bes| - es2.()d4| - c(bes c)bes| - R1*4| - r2 es\sf| - r es\sf| - r es\sf| - r es\sf| - es1| - d2 des| - c1~| - c| - %a deux; urg: copied oboe-1(100:2,102)| - c4 r es r| - c r d r| - g,\p r r2| - r r4 r8 d'\f| - d4 r r2| - r r4 r8 d\f| - d4 r r2| - R1*3| - %a deux; urg: copied oboe-1(110,111)| - bes'4\f r a r| - g r f r| - es r g r8 g| - g4 r8 g fis4 r8 fis| - bes,1~| - bes~| - bes4. bes8 bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - bes4\p r r2| - R1*21| - %a deux; urg copied ...| - \!f'4\f r r r8 es| - des4 r r r8 c| - bes4 r8 bes bes4 r8 bes| - bes4 r8 bes bes4 r8 bes| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c1\p\< ~| - c~| - c~| - c| - \!c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - des4 r8 des c4 r8 c| - f,4 r r2| - R1| - des'4\ff r r2| - R1*3| - f2\sf r| - f2\sf r| - R1*3| - e2\ff r| - e2\sf r| - R1*23| - g,2\ff bes| - a1~| - a\p~| - a~| - a~| - a~| - R1*2| - a2\ff c| - b1~| - b4\p r r2| - R1*13| - d2.\ff()es4| - b(c b)c| - d2.\ff()es4| - b(c b)c| - g2.()as4| - bes(as bes)as| - g2.()as4| - bes(as bes)as| - %a deux; urg copied oboe-1(220,230)| - r2 as'| - r as\sf| - r as\sf| - r as\sf| - as g~| - g f~| - f1~| - f| - f4 r as r| - f r g r| - c,\p r r2| - r r4 r8 d\f| - es4 r r2| - r r4 r8 d\f| - es4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 bes| - as4 r r2| - R1*14| - c1\f| - des\p| - d\f| - es\p| - e\f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\< ~| - c~| - c~| - c~| - \!c\ff~| - c~| - c~| - c~| - c| - d| - %a deux; urg: copied oboe-1(270,274:1)| - es4.-"sempre"\ff b8 c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 d es4 r8 b| - c4 r8 d es4 r8 d| - c,1~| - c| - f'4-. r r2| - R1| - c,1~| - c| - d'4-. r r2| - R1| - c,1~| - c| - es'4-. d-. r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r d r| - R1| - \!c4\p r r2| - R1| - b4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly deleted file mode 100644 index a7df6c4802..0000000000 --- a/mutopia/Coriolan/oboi-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Oboe" - -\include "header.ly" -\include "global.ly" -\include "oboi.ly" - -\score{ - \oboiStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly deleted file mode 100644 index ffbb68bd86..0000000000 --- a/mutopia/Coriolan/oboi.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -\include "oboe-1.ly" -\include "oboe-2.ly" - -oboiStaff = \context Staff = oboi < - \property Staff.midiInstrument = #"oboe" - \property Staff.instrument = #"Oboi" - \property Staff.instr = #"Ob." - \global - \context Voice=one \partcombine Voice - \context Thread=one \oboeI - \context Thread=two \oboeII -> diff --git a/mutopia/Coriolan/timpani-part.ly b/mutopia/Coriolan/timpani-part.ly deleted file mode 100644 index 80fcd99dac..0000000000 --- a/mutopia/Coriolan/timpani-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Timpani" - -\include "header.ly" -\include "global.ly" -\include "timpani.ly" - -\score{ - \timpaniStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly deleted file mode 100644 index 7c30e18680..0000000000 --- a/mutopia/Coriolan/timpani.ly +++ /dev/null @@ -1,149 +0,0 @@ - -\version "1.3.120"; - -timpani = \notes \relative c { - R1*2| - c4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4-.\p\< r| - r2 c4-. r| - r2 c4-. r| - c r c r| - \!c1\ff-\trill| - c8 r g r g r g r| - g4 r g r| - g r c r| - c r c r| - c r c r| - c\sf r r2| - c4\sf r r2| - R1*3| - c4\sf r r2| - R1*38| - c2:16\ff c4 g| - c g c g| - c2:16 c4 g| - c g c g| - g2:16 g4 g| - g c g c| - g2:16 g4 g| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - R1*3| - g4\f r r2| - R1| - g4\f r r2| - R1*3| - g4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - R1| - % should extend over two bars tr ~~~~~~ - g1\trill~| - g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*24| - c4\f r8 c c4 r8 c| - R1*4| - c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*18| - r2 r4 c\sf| - g r r c\sf| - g r r c\sf| - g r r c\sf| - g r r c\sf| - g r r2| - R1*35| - g2:16\ff g4 g| - g c g c| - g2:16\ff g4 g| - g c g c| - c2:16 c4 c| - c c c c| - c2:16 c4 c| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r2 r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*23| - c4\ff r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r r2| - g4 r r2| - c4-"sempre"\ff r c r| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - c r r2| - R1| - c4-. r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!c4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} - -timpaniStaff = \context Staff = timpani < - \property Staff.midiInstrument = #"timpani" - \property Staff.instrument = #"Timpani in C-G " - \property Staff.instr = #"Timp." - \clef "bass"; - \Time - \notes { \key c \major; } - \context Voice=timpani - \timpani -> - diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly deleted file mode 100644 index 8d80cf6884..0000000000 --- a/mutopia/Coriolan/trombe-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Trumpet" - -\include "header.ly" -\include "global.ly" -\include "trombe.ly" - -\score{ - \trombeStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly deleted file mode 100644 index cf414bb131..0000000000 --- a/mutopia/Coriolan/trombe.ly +++ /dev/null @@ -1,21 +0,0 @@ - -\version "1.3.120"; - -\include "trombo-1.ly" -\include "trombo-2.ly" - -trombeStaff = \context Staff = trombe < - \context Staff=trombe { - \property Staff.midiInstrument = #"trumpet" - - \property Staff.instrument = #"Trombe in C" - \property Staff.instr = #`(lines "Tbe." (rows "(C)")) - - \notes { \key c \major; } - \End - } - \context Voice=one \partcombine Voice - \context Thread=one \tromboI - \context Thread=two \tromboII -> - diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly deleted file mode 100644 index 781155c4fe..0000000000 --- a/mutopia/Coriolan/trombo-1.ly +++ /dev/null @@ -1,155 +0,0 @@ - -\version "1.3.120"; - -tromboI = \notes \relative c { - R1*2| - c''4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4\p\< r| - r2 c4 r| - r2 c4 r| - c r c r| - \!c1\ff ~| - c8 r g r g r g r| - g4. r8 g4. r8| - g4. r8 c4. r8| - c4. r8 c4. r8| - c4. r8 c4. r8| - c2\sf r| - c2\sf r| - R1*3| - c1\sf| - R1*38| - c2.\ff g4| - c g c g| - c2. g4| - c g c g| - g2. g4| - g c g c| - g2. g4| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - r d4 r| - R1| - r2 r4 r8 d\f| - g,4 r r2| - r r4 r8 d'\f| - g,4 r r2| - R1*3| - %a deux| - g4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - d'4 r8 d d4 r8 d| - g,1~| - g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*24| - c4\f r8 c c4 r8 c| - R1*4| - c4\ff r8 c c4 r8 c| - c4\ff r8 c c4 r8 c| - c4\ff r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*5| - d2\sf r| - d\sf r| - R1*11| - r2 r4 c\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g4 r r2| - R1*35| - g2.\ff g4| - g c g c| - g2.\ff g4| - g c g c| - c2. c4| - c c c c| - c2. c4| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*18| - e1\f(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c\p\< ~| - c~| - c~| - c~| - \!c4.\ff c8 c2~| - c4. c8 c2~| - c4. c8 c2~| - c4. c8 c2~| - c4. c8 c2| - r4 r8 d d2| - c4-"sempre"\ff r c r| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - %a deux| - c,1~| - c| - c'4-. r r2| - R1| - c,1~| - c| - c'4-. r r2| - R1| - c,1~| - c| - c'4-. d-. r2| - R1| - c4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!g4\p r r2| - R1| - g4 r r2| - R1| - c,4\pp r r2| - R1*18| -} - diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly deleted file mode 100644 index 1c84a9b838..0000000000 --- a/mutopia/Coriolan/trombo-2.ly +++ /dev/null @@ -1,154 +0,0 @@ - -\version "1.3.120"; - -tromboII = \notes \relative c { - R1*2| - c'4-.\ff r r2| - R1*3| - c4-. r r2| - R1*3| - c4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - R1*5| - r2 r4 g4-.\f| - R1*6| - r4 c-.\f r2| - R1*2| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r2 c4\p\< r| - r2 c4 r| - r2 c4 r| - c r c r| - \!c1\ff ~| - c8 r g r g r g r| - g4. r8 g4. r8| - g4. r8 c4. r8| - c4. r8 c4. r8| - c4. r8 c4. r8| - c2\sf r| - c2\sf r| - R1*3| - c1\sf| - R1*38| - c2.\ff g4| - c g c g| - c2. g4| - c g c g| - g2. g4| - g c g c| - g2. g4| - g c g c| - c r r2| - c4 r r2| - c4 r r2| - c4 r r2| - c4 r c r| - g r g r| - c r c r| - c r c r| - c r r2| - r2 d'4 r| - R1| - r2 r4 r8 d\f| - g,,4 r r2| - r2 r4 r8 d''8\f| - g,,4 r r2| - R1*3| - %a deux| - g'4\f r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g,4 r8 g g4 r8 g| - d''4 r8 d d4 r8 d| - g,,1~| - g| - g4 r8 g g4 r8 g| - g4 r8 g g4 r8 g| - g4\p r r2| - R1*24| - c4\f r8 c c4 r8 c| - R1*4| - c4\ff r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r8 c c4 r8 c| - r2 c4 r8 c| - c4 r r2| - R1*5| - d'2\sf r| - d\sf r| - R1*11| - r2 r4 c,\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g2. c4\sf| - g4 r r2| - R1*35| - g2.\ff g4| - g c g c| - g2.\ff g4| - g c g c| - c2. c4| - c c c c| - c2. c4| - c c c c| - R1*8| - g4 r c r| - c r g r| - R1| - r2 r4 r8 g\f| - c4 r r2| - r r4 r8 g\f| - c4 r r2| - R1*3| - c4\f r8 c c4 r8 c| - c4 r8 c c4 r8 c| - c4 r r2| - R1*18| - c1\f~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c\p\< ~| - c~| - c~| - c~| - \!c4.\ff c8 c2~| - c4. c8 c2~| - c4. c8 c2~| - c4. c8 c2~| - c4. c8 c2| - r4 r8 g'8 g2| - c,4-"sempre"\ff r c r| - g r r2| - c4 r c r| - g r r2| - c4 r c r| - c r c r| - %a deux| - c1~| - c| - c4-. r r2| - R1| - c1~| - c| - c4-. r r2| - R1| - c1~| - c| - c4-. d'-. r2| - R1| - c,4-. c-. r2| - c4-. c-. r2| - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - c4\> r g r| - R1| - \!g4\p r r2| - R1| - g4 r r2| - R1| - c4\pp r r2| - R1*18| -} diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly deleted file mode 100644 index 782d6d4703..0000000000 --- a/mutopia/Coriolan/viola-1.ly +++ /dev/null @@ -1,408 +0,0 @@ - -\version "1.3.120"; - -violaI = \notes \relative c { - c'1\ff ~| - c| - f,4-. r r2| - R1| - % copied 3 bars from three back... - %5 - c'1 ~| - c| - f,4-. r r2| - R1| - c'1 ~| - c| - fis,4-. r r2| - R1| - g'4-. r r2| - g4-. r r2| - % copied from violino-1... - %15 - [c,,8-.\p es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. as'-.] [as()g]| - [g8-. c-.] [c()b] [b-. f'-.] [f()es]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es4.\< es8 d4. d8| - %20 - c4. c8 \!b4\f r4| - R1| - r4 [des,8\p()c][c-. f-.]f4-"ten."| - r4 [des8\p()c][c-. f-.]f4-"ten."| - r4 [des8\p()c][c-. ges'-.][ges()f]| - %25 - [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - des4.\< des8 c4. c8| - bes4 \!bes4-.\f r2| - R1 - % same rhythm as violins... - r8 c-.\p c4. c8-. c4~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [c8\< c-.]c2.~| - %30 - [c8 c-.]c2.~| - [c8 c-.] c4. c8-. c4~| - [c8 c-.] c4. c8-. c4| - [\!c16\ff c c c][c c c c]c2:16| - %35 - [c16 c c c][bes bes bes bes][as as as as][g g g g]| - g2:16 g:| - g: g:| - c: c:| - e: f:| - %40 - c2\sf [c,8-. es-.][es()d]| - c'2\sf [c,8-. es-.][es()d]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [des,-. des()c]| - %45 - a'2\sf [a8-. c-.][c()bes]| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1| - es,4\p r r r8 es(| - )as4 r r r8 as (| - )g4 r r r8 g(| - %55 - )d4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )es4 r\< r r8 es(| - )as4 r r r8 as(| - )g4 r r r8 g(| - )d4 r r r8 d(| - %60 - )es4 r r r8 es(| - )as4 r r r8 as| - \!bes2:16\ff as:| - g: e:| - f4\p r r r8 f(| - %65 - )bes4 r r r8 bes(| - )as4 r r r8 as(| - )e4 r r r8 e(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes| - %70 - \!c2:\ff bes:| - a: fis:| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| - %75 - r [es'\p(c)es] r [d(bes)d]| - r [c(g)c] r [bes(g)bes]| - r [as(g)as] r [bes(g)bes]| - [d,-.\pp d'-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - %80 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [d8\< d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4| - \!fis2:\ff fis4: g:| - %85 - d2: d:| - fis: fis4: g:| - c,: d: c: d:| - b2: b4: c:| - f: es: f: es:| - %90 - b2: b4: c:| - d: c: d: c:| - c,4 r8 c' c4\sf()des| - r r8 c c4\sf()des| - - r r8 c c4\sf()des| - - r r8 c c4\sf()des| - - [c16 es es es]es4:[es16 fis fis fis]fis4:| - [b,16 d d d]d4:[bes16 e e e]e4:| - [as,16 c c c ]c4:[g16 c c c]c4:| - [a16 c c c]c4:[g16 c c c]c4:| - %100 - [c8 d,]d4. es8-. es4 ~| - [es8 c-.]c4. d8-. d4| - % shared with cello from here on; - % except for some abbrevs below... - [g8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis\f]| - [g bes cis\p d][es d bes g] - %105 - [fis a cis d][es d a fis\f]| - [g bes cis\p d][f, a cis d]| - [es, g b c][d, g a bes]| - [c, es g a]r[d, fis g]| - r[c, es g][d fis a d]| - %110 - % cello has eighth notes here... - [g,16 g bes bes][d d es es][f, f a a][cis cis d d]| - [es,8: g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - d2: d: - %115 - | - d: d:| - d: d:| - d: d:| - % urg, 2 copied from 102 - [g,8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis]| - %120 - [g bes c des][c des bes g]| - [f as c des][c des as f]| - [e g b c][b c g e]| - [f as b c][b c as f]| - [e g b c][b c g e]| - %125 - [c e fis g][fis g e c]| - [f as b c][des c as f]| - [e g b c][des c g e]| - [f as c des][c des as f]| - [g bes d es][d es bes g]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as\< c d es][f es c as]| - %131 - [g bes d es][f es bes g]| - % shared with cellos until here - % shared with violino-2 from here on - [as as c es][f es c as]| - [a c es f][ges f c a]| - [bes des f ges][as ges des bes]| - %135 - [c es g as][bes as es c]| - [\!des\p f a bes][c, es g as]| - [bes, des f ges][as, c e f]| - [ges, bes d es][f, as c des]| - [es, ges bes des][as c es as,]| - %140 - % shared with cello from here on; - % except cello has eighth notes - [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [bes8: des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c,: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f,8\p\< as c des][es, g b c]| - [des, f a bes][c, es g as]| - % uhuh, still 'same as cello'; - % but now rests for notes that viola cannot reach... - %145 - r[des, e g]r[c, e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - r[bes des, f][c e g c]| - % cello has eight notes; - % viola has rest where can't reach - [\!f,:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - %150 - r[des,16 des][e e g g]r8[c,16 c][e e f f]| - r8[des16 des][f f g g][c, c e e][g g c c]| - f,1\ff ~| - f| - f'4 r r2 - R1 - %155 - f,1 ~| - f| - d'2\sf [f,8-. as-.][as()g]| - - d'2\sf [f,8-. as-.][as()g]| - % ugh, should be quoted and transposed... - %160 - [f8-.\p as-.][as()f][g-. c-.][c()b]| - R1*2| - - g2\ff [es8-. g-.][g()f]| - g2\sf [es8-. g-.][g()f]| - %165 - [e-.\p bes'-.][bes()as][g-. des'-.][des()c]| - R1*2| - r4 [e,8-.\ff g-.][g()f] r4| - r4 [e8-. g-.][g()f] r4| - %170 - r4 [e8-. g-.][g()f] r4| - r4 [e8-. g-.][g()f][fis-.fis-.]| - - g4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - %175 - r4 [fis8-.as-.][as()g] c4\sf(| - )b r r2| - R1 - % ugh, should be quoted and transposed - c,4\p r r r8 c8(| - )f4 r r r8 f8(| - %180 - )e4 r r r8 e8(| - )b'4 r r r8 b8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4 r\< r r8 c,8(| - % copied - )f4 r r r8 f8(| - )e4 r r r8 e8(| - %185 - )b'4 r r r8 b8(| - )c4 r r r8 c,8(| - )f4 r r r8 f8| - \!g'2:16\ff f:| - e: cis:| - %190 - d,4\p r r r8 d8(| - )g4 r r r8 g8(| - )f4 r r r8 f8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )cis4\< r r r8 cis8(| - )d4 r r r8 d8(| - %195 - )g4 r r r8 g8| - [\!a16\ff a' a a]a4: g2:| - fis: dis:| - - e,4\p r r r8 e8(| - )a4\< r r r8 a8(| - %200 - [)g(g e g][e g e)g]| - % quote and transpose - [f(g f g][f g f)\!g]| - [c\f\>(c g)c]r[c(bes)\!c]| - r[c\p(as)c]r[c(g)c]| - r[c(f,)c']r[c(g)c]| - %205 - r[c\p(as)c]r[c(a)c]| - [b-. g'-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g8 g-.\<] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - %210 - [g8 g-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 (| - \!)b,2:16\ff b4: c:| - g'2: g:| - - %214 - b,2:16\ff b4: c:| - g'2: g:| - - e2:16\ff e4: f:| - bes,: c: bes: c:| - - e2:16\ff e4: f:| - bes,: c: bes: c:| - - %220 - r4 r8 as as2\sf| - r4 r8 as as2\sf| - r4 r8 as as2\sf| - r4 r8 as as2\sf| - [des16 des f f]des4: [b16 b d d]b4:| - %225 - [bes16 bes c c]bes4: [a16 a c c]a4:| - [f16 f b b]f4: [as16 as c c]as4:| - [as16 as d d]as4: [as16 as c c]as4:| - [g8 g]g4. as8 as4 ~| - [as8 as]f4. f8 g4| - %230 - c,\p r r2| - r r4 r8 b'\f| - c4 r r2| - r r4 r8 b\f| - c4 r r2| - R1*3| - [c,16c es es][g g as as][bes bes d d][fis fis g g]| - [as, as c c][e e f f][g, g bes bes][d d es es]| - %240 - f,4 r r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4\p\< r r r8 c8(| - )f4 r r r8 f,8(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p - e'2:16\f e:| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as,8\p\< f']f4. es8 es4 ~| - [es8 as]as4. g8 g4 ~| - [g8 f]f4. es8 es4 ~| - [es8 as]as4. g8 g4| - r r8 \!d\ff es4.\sf()d8| - %265 - r4 r8 d es4.\sf()d8| - r4 r8 e f4.\sf()e8| - r4 r8 e f4.\sf()e8| - r4 r8 e g4.\sf()f8| - r4 r8 f as4.\sf()g8| - %270 - g2:16-"sempre" g:\ff| - g: g:| - g: g:| - g: g:| - [g8 b, c g][c b c g]| - %275 - [c b c g][c b c g]| - c,1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f4-. g-. r2| - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r g r| - R1| - \!c4\p r r2| - R1| - g4-#"pizz." r r2| - R1| - c,4 r r2| - R1*15| - c4-#"pizz." r r2| - c4 r r2| - c4 r r2| -} diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly deleted file mode 100644 index 87235e5ce5..0000000000 --- a/mutopia/Coriolan/viola-2.ly +++ /dev/null @@ -1,400 +0,0 @@ - -\version "1.3.120"; - -violaII = \notes \relative c { - c1\ff ~| - c| - f4-. r r2| - R1| - % copied 3 bars from three back... - %5 - c1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - fis4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - % copied from violino-1... - %15 - [c,8-.\p es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. as'-.] [as()g]| - [g8-. c-.] [c()b] [b-. f'-.] [f()es]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - es4.\< es8 d4. d8| - %20 - c4. c8 \!b4\f r4| - R1| - r4 [des,8\p()c][c-. f-.]f4-"ten."| - r4 [des8\p()c][c-. f-.]f4-"ten."| - r4 [des8\p()c][c-. ges'-.][ges()f]| - %25 - [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - des4.\< des8 c4. c8| - bes4 \!bes4-.\f r2| - R1 - % same rhythm as violins... - r8 c,-.\p c4. c8-. c4~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [c8\< c-.]c2.~| - %30 - [c8 c-.]c2.~| - [c8 c-.] c4. c8-. c4~| - [c8 c-.] c4. c8-. c4| - [\!as'16\ff as as as][as as as as]as2:16| - %35 - [f16 f f f][g g g g][f f f f][es es es es]| - f2:16 es:| - f: es:| - g: as:| - bes: c:| - %40 - c,2\sf [c8-. es-.][es()d]| - c2\sf [c8-. es-.][es()d]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [d,-. d()c]| - b'2\f r8 [des,-. des()c]| - %45 - a'2\sf [a8-. c-.][c()bes]| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes] r4| - r4 [a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1| - es,4\p r r r8 es(| - )as4 r r r8 as (| - )g4 r r r8 g(| - %55 - )d4 r r r8 d(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )es4 r\< r r8 es(| - )as4 r r r8 as(| - )g4 r r r8 g(| - )d4 r r r8 d(| - %60 - )es4 r r r8 es(| - )as4 r r r8 as| - \!g2:16\ff f:| - e: c:| - f4\p r r r8 f(| - %65 - )bes4 r r r8 bes(| - )as4 r r r8 as(| - )e4 r r r8 e(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )f4\< r r r8 f(| - )bes4 r r r8 bes| - %70 - \!as2:\ff g:| - fis: d:| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g4\p\< r r r8 g(| - )c,4 r r r8 c| - [\!f8\sf(\>as f as][f g d)\!g]| - %75 - r [c\p(g)c] r [bes(g)bes]| - r [g(es)g] r [g(d)g]| - r [g(es)g] r [g(e)g]| - [d-.\pp d'-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - %80 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [d8\< d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 ~| - [d8 d-.] es4. es8-. d4 (| - \!)fis2:\ff fis4: g:| - %85 - d2: d:| - fis: fis4: g:| - c,: d: c: d:| - b2: b4: c:| - f: es: f: es:| - %90 - b2: b4: c:| - d: c: d: c:| - c,4 r8 c' c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - [c16 es es es]es4:[es16 fis fis fis]fis4:| - [b,16 d d d]d4:[bes16 e e e]e4:| - [as,16 c c c ]c4:[g16 c c c]c4:| - [a16 c c c]c4:[g16 c c c]c4:| - %100 - [c8 d,]d4. es8-. es4 ~| - [es8 c-.]c4. d8-. d4| - % shared with cello from here on; - % except for some abbrevs below... - [g8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis\f]| - [g bes cis\p d][es d bes g] - %105 - [fis a cis d][es d a fis\f]| - [g bes cis\p d][f, a cis d]| - [es, g b c][d, g a bes]| - [c, es g a]r[d, fis g]| - r[c, es g][d fis a d]| - %110 - % cello has eighth notes here... - [g,16 g bes bes][d d es es][f, f a a][cis cis d d]| - [es,8: g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,2: g: - %115 - | - g: g:| - g: g:| - g: g:| - % urg, 2 copied from 102 - [g8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis]| - %120 - [g bes c des][c des bes g]| - [f as c des][c des as f]| - [e g b c][b c g e]| - [f as b c][b c as f]| - [e g b c][b c g e]| - %125 - [c e fis g][fis g e c]| - [f as b c][des c as f]| - [e g b c][des c g e]| - [f as c des][c des as f]| - [g bes d es][d es bes g]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as\< c d es][f es c as]| - %131 - [g bes d es][f es bes g]| - % shared with cellos until here - % shared with violino-2 from here on - [as as c es][f es c as]| - [a c es f][ges f c a]| - [bes des f ges][as ges des bes]| - %135 - [c es g as][bes as es c]| - [\!des\p f a bes][c, es g as]| - [bes, des f ges][as, c e f]| - [ges, bes d es][f, as c des]| - [es, ges bes des][as c es as,]| - %140 - % shared with cello from here on; - % except cello has eighth notes - [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [bes8: des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c,: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f,8\p\< as c des][es, g b c]| - [des, f a bes][c, es g as]| - % uhuh, still 'same as cello'; - % but now rests for notes that viola cannot reach... - %145 - r[des, e g]r[c, e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - r[bes des, f][c e g c]| - % cello has eight notes; - % viola has rest where can't reach - [\!f,:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - %150 - r[des,16 des][e e g g]r8[c,16 c][e e f f]| - r8[des16 des][f f g g][c, c e e][g g c c]| - f,1\ff ~| - f| - bes4 r r2 - %155 - R1 - f1 ~| - f| - b2\sf [f8-. as-.][as()g]| - - b2\sf [f8-. as-.][as()g]| - % ugh, should be quoted and transposed... - %160 - [f8-.\p as-.][as()f][g-. c-.][c()b]| - R1*2| - - e,2\ff [es8-. g-.][g()f]| - e2\sf [es8-. g-.][g()f]| - %165 - [e-.\p bes'-.][bes()as][g-. des'-.][des()c]| - R1*2| - r4 [e,8-.\ff g-.][g()f] r4| - r4 [e8-. g-.][g()f] r4| - %170 - r4 [e8-. g-.][g()f] r4| - r4 [e8-. g-.][g()f][fis-.fis-.]| - - g4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - %175 - r4 [fis8-.as-.][as()g] c4\sf(| - )b r r2| - R1 - % ugh, should be quoted and transposed - c,4\p r r r8 c8(| - )f4 r r r8 f8(| - %180 - )e4 r r r8 e8(| - )b'4 r r r8 b8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4 r\< r r8 c,8(| - % copied - )f4 r r r8 f8(| - )e4 r r r8 e8(| - %185 - )b'4 r r r8 b8(| - )c4 r r r8 c,8(| - )f4 r r r8 f8| - \!e'2:16\ff d:| - cis: a:| - %190 - d,4\p r r r8 d8(| - )g4 r r r8 g8(| - )f4 r r r8 f8(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )cis4\< r r r8 cis8(| - )d4 r r r8 d8(| - %195 - )g4 r r r8 g8| - [\!f16\ff f' f f]f4: e2:| - dis: b:| - e,4\p r r r8 e8(| - )a4\< r r r8 a8(| - %200 - [)g(g e g][e g e)g]| - % quote and transpose - [f(g f g][f g f)\!g]| - [c\f\>(g c,)g']r[bes(g)\!bes]| - r[as\p(f)as]r[g(es)g]| - r[f(c)f]r[g(es)g]| - %205 - r[as\p(d,)as']r[a(es)a]| - [g-. g'-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g8 g-.\<] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 ~| - %210 - [g8 g-.] as4. as8-. g4 ~| - [g8 g-.] as4. as8-. g4 (| - \!)b,2:16\ff b4: c:| - g'2: g:| - %214 - b,2:16\ff b4: c:| - g'2: g:| - bes,2:16\ff bes4: as:| - g: f: g: f:| - bes2:16\ff bes4: as:| - g: f: g: f:| - %220 - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - [des'16 des f f]des4: [b16 b d d]b4:| - %225 - [bes16 bes c c]bes4: [a16 a c c]a4:| - [f16 f b b]f4: [as16 as c c]as4:| - [as16 as d d]as4: [as16 as c c]as4:| - [g8 g]g4. as8 as4 ~| - [as8 as]f4. f8 g4| - %230 - c,\p r r2| - r r4 r8 b'\f| - c4 r r2| - r r4 r8 b\f| - c4 r r2| - R1*3| - [c,16c es es][g g as as][bes bes d d][fis fis g g]| - [as, as c c][e e f f][g, g bes bes][d d es es]| - %240 - f,4 r r2| - R1*11| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4\p\< r r r8 c8(| - )f4 r r r8 f,8(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p - bes2:16\f bes:| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as8\p\< f']f4. es8 es4 ~| - [es8 as]as4. g8 g4 ~| - [g8 f]f4. es8 es4 ~| - [es8 as]as4. g8 g4| - r r8 \!d\ff es4.\sf()d8| - %265 - r4 r8 d es4.\sf()d8| - r4 r8 e f4.\sf()e8| - r4 r8 e f4.\sf()e8| - r4 r8 e g4.\sf()f8| - r4 r8 f as4.\sf()g8| - %270 - g2:16-"sempre"\ff g:| - g: g:| - g: g:| - g: g:| - [g8 b, c g][c b c g]| - %275 - [c b c g][c b c g]| - c,1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - f4-. r r2| - R1| - c1 ~| - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f4-. g-. r2| - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r g r| - R1| - \!c4\p r r2| - R1| - g4-#"pizz." r r2| - R1| - c,4 r r2| - R1*15| - c4-#"pizz." r r2| - c4 r r2| - c4 r r2| -} diff --git a/mutopia/Coriolan/viole-part.ly b/mutopia/Coriolan/viole-part.ly deleted file mode 100644 index 4b43332ce2..0000000000 --- a/mutopia/Coriolan/viole-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Viola" - -\include "header.ly" -\include "global.ly" -\include "viole.ly" - -\score{ - \violeGroup - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/viole.ly b/mutopia/Coriolan/viole.ly deleted file mode 100644 index 2398bd9fc7..0000000000 --- a/mutopia/Coriolan/viole.ly +++ /dev/null @@ -1,56 +0,0 @@ - -\version "1.3.120"; - -\include "viola-1.ly" -\include "viola-2.ly" - -%{ -violeGroup = \context PianoStaff = viole_group \notes < - \property PianoStaff.aDueText = #"" - \context Staff=oneViole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - \context Staff=twoViole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola II" - \property Staff.instr = #"Vla. II" - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - - \context Staff=oneViole \partcombine Staff - \context Voice=one \violaI - \context Voice=two \violaII -> -%} - -violeGroup = \notes \context Staff = viole < - \property Staff.aDueText = #"" - \context Staff=viole { - \property Staff.midiInstrument = #"viola" - \property Staff.instrument = #"Viola" - \property Staff.instr = #"Vla." - - \clef "alto"; - %\property Staff.clefGlyph = #"clefs-C" - %\property Staff.clefPosition = #0 - - \global - } - \context Voice=one \partcombine Voice - \context Thread=one \violaI - \context Thread=two \violaII -> - diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly deleted file mode 100644 index fa881001a4..0000000000 --- a/mutopia/Coriolan/violino-1-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Violin I" - -\include "header.ly" -\include "global.ly" -\include "violino-1.ly" - -\score{ - \violinoIStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly deleted file mode 100644 index 38bab61f52..0000000000 --- a/mutopia/Coriolan/violino-1.ly +++ /dev/null @@ -1,449 +0,0 @@ - -\version "1.3.120"; - -violinoI = \notes \relative c { - c'1\ff ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - r r2| - r r2| - [c8-.\p es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. g-.] g4-"ten."| - [c,8-. es-.] [es()d] [d-. as'-.] [as()g]| - [g8-. c-.] [c()b] [b-. f'-.] [f()es]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8-.\< as-.] as4. g8-. g4 ~| - %20 - [g8 fis] fis4 ~ fis \!g-.\f| - R1| - [bes,,8\p-. des-.][des()c][c-. f-.]f4-"ten."| - [bes,8\p-. des-.][des()c][c-. f-.]f4-"ten."| - [bes,8\p-. des-.][des()c][c-. ges'-.][ges()f]| - %25 - [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [des-.\< ges-.] ges4. f8-. f4~| - [f8 e-.]\!e4-.\f r2| - R1| - %29 - r8 f-.\p f4. es8-. es4~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8\< d-.]d2.~| - [d8 d-.]d2.~| - [d8 d-.] d4. d8-. d4~| - [d8 d8-.] d4. d8-. d4| - [\!f16\ff f f f][f f f f]f2:16| - %35 - [f16 f f f][es es es es][des des des des][c c c c]| - b2:16 c:| - d: es:| - e: f:| - g: as:| - %40 - a2\sf [c,,8-. es-.][es()d]| - a''2\sf [c,,8-. es-.][es()d]| - as''2\sf [b,,8-. d-.][d()c]| - as''2\sf [b,,8-. d-.][d()c]| - g''1\sf| - - %45 - ges\sf| - - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - f2. ges4\sf| - %50 - f1\>~| - f4 d( bes)as| - \!g2.\p( as4| - g f d ) bes| - bes'2.( c4| - - %55 - bes2 )as| - \property Voice.crescendoText = #'(lines " " "cresc." " ") % poco a poco - \property Voice.crescendoSpanner = #'dashed-line - g4 ~| - ~| - ~| - | - %60 - bes'2:16 bes:| - bes: bes:| - \!bes:\ff des:| - c: bes:| - as2.\p( bes4| - - %65 - as g e )c| - c'2.( des4| - c2 ) bes| - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as16\< c c c][c c c c] c2:16| - c: c:| - - %70 - \!c:\ff es:| - d: c:| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2.\p\<( c4| - bes a fis ) d| - \!d'\sf\>( as g )f| - %75 - \!r8[es\p(c)es]r[d(bes)d]| - r[c(g)c]r[bes(g)bes]| - r[a(g)a]r[bes(g)bes]| - [fis-.\pp a-.] a4. a8-. a4~| - [a8 a-.] a4. a8-. a4~| - %80 - [a8 bes-.] bes4. bes8-. bes4~| - [bes8 bes-.] bes4. bes8-. bes4~| - [bes8 c-.] c4. c8-. c4~| - [c8 d-.] d4. d8-. d4| - es2:16\ff es4: d:| - %85 - fis: g: fis: g:| - es2: es4: d:| - - fis: g: fis: g:| - as2: as4: g:| - - b: c: b: c:| - %90 - as2: as4: g:| - - b: c: b: c:| - r8 es as,4\sf~as()g| - r8 es' as,4\sf~as()g| - r8 es' as,4\sf~as()g| - %95 - r8 es' as,4\sf~as()g| - r8 es' as,4. fis8 es'4~| - [es8 d] g,4. e8 des'4~| - [des8 c] f,4. c'8 es,4 ~| - - [es8 c'] a4. c8 g4 ~| - %100 - [g8 fis] d,4. es8-. es4~| - - [es8 c-.] c4. d8-. d4| - g, r8 es'' d4 r8 bes8| - - a4 r8 es' d4 r8 a\f| - bes4 r8 es8\p d4 r8 bes| - %105 - a4 r8 es' d4 r8 a8\f| - bes4 r8 es\p d4 r8 a| - g4 r8 c bes4 r8 f| - es4 r8 a g4 r8 d| - c4 r8 g' fis4 r8 c'| - %110 - bes4\f r8 es' d4 r8 a| - - g4 r8 c bes4 r8 f| - - es4 r8 a g4 r8 cis,,| - d4 r8 g' d,4 r8 fis'| - - bes,,4. g''8 g2 ~| - - %115 - g4. bes8 bes2 ~| - bes4. g8 g4 r8 bes| - bes4 r8 d d4 r8 g| - - g4\p r8 es, d4 r8 bes| - a4 r8 es' d4 r8 a| - - %120 - bes4 r8 es des4 r8 bes| - as4 r8 es' des4 r8 as| - g4 r r2| - r4 r8 es' des4 r8 as| - g4 r r2| - %125 - r4 r8 c bes4 r8 e,| - - as4 r8 des c4 r8 as| - - g4 r8 des' c4 r8 g| - as4 r8 es' des4 r8 as| - - bes4 r r2| - %130 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 f'8\< es4 r8 c| - bes4 r8 f' es4 r8 bes| - c4 r8 f es4 r8 c| - c4 r r2| - r4 r8 as' ges4 r8 des| - %135 - es4 r8 bes' as4 r8 es| - \!f4\p r8 bes as4 r8 es| - des4 r8 ges f4 r8 c| - bes4 r8 es des4 r8 as| - ges4 r8 des' c4 r8 ges'| - %140 - f4\f r8 bes as4 r8 es| - des4 r8 ges f4 r8 c| - bes4 r8 e f4 r8 bes,| - bes4 r8 g' e4 r8 bes'| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4\p r8 des\< c4 r8 g| - - %145 - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 c| - bes4 r8 f' e4 r8 bes'| - \!as4\ff r8 des c4 r8 g| - f4 r8 bes as4 r8 es| - - %150 - des4 r8 g f4 r8 c,| - des4 r8 f' c,4 r8 e'| - - f,1\ff ~| - f| - des''4 r r2| - %155 - R1| - f,,1 ~| - f| - - [f,8-. as-.][as()g]| - [f,8-. as-.][as()g]| - %160 - [f8-.\p as-.][as()g] [g-. c-.][c()b]| - [b8-. es-.][es()d] [d-. g-.]g4-"ten."| - R1| - [e,8-. g-.][g()f]| - [e,8-. g-.][g()f]| - %165 - [e-.\p bes'-.][bes()as][g-.des'-.][des()c]| - [bes-. g'-.][g()f][e-. g-.]g4-"ten."| - - r2 r4 des'4\ff (| - )c2. des4\sf(| - )c2. des4\sf(| - %170 - )c2. des4\sf(| - )c2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - )d2. es4\sf(| - %175 - )d2. es4\sf(| - )d1\> ~| - d4( b g )f - \!e2.\p( f4| - e d b ) g| - %180 - g'2.( a4| - g2 )f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e4 g2\< g4 ~| - - g g2 g4 ~| - g g2 g4 ~| - %185 - g g2 g4| - [g16 g g g][g g g g]g2:16| - g: g:| - \!g:\ff bes:| - a: g:| - %190 - f2.\p( g4| - f e cis ) a| - a'2.( bes4| - a2 ) g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f16\< a a a][a a a a]a2:16| - - %195 - a2 a| - \!a2:16\ff c:| - b: a:| - g2.\p( a4| - g\< fis dis ) b| - %200 - b'1 ~| - b - [\!c8\f\>c,(g)c]r[c(bes)c]| - r[\!c\p(as)c]r[c(g)c]| - r[c(f,)c']r[c(g)c]| - %205 - r[c(as)c]r[c(a)c]| - [b-. d-.]d4. d8-. d4 ~| - [d8-. d-.]d4. d8-. d4 ~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [d8-. es-.]es4.\< es8-. es4 ~| - [es8-. es-.]es4. es8-. es4 ~| - %210 - [es8-. f-.]f4. f8-. f4 ~| - [f8-. g-.]g4. g8-. g4| - \!as2:16\ff as4: g:| - b,: c: b: c:| - as'2:16\ff as4: g:| - b,: c: b: c:| - des'2:16\ff des4: c:| - e,: f: e: f:| - des'2:16\ff des4: c:| - e,: f: e: f:| - %220 - r8 as des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4. b8 g'4| - %225 - r8 g c,4. a8 f'4 ~| - [f8 f] b,4. f'8 as,4 ~| - [as8 f'] d4. f8 c4 ~| - [c8 b] g,4. as8 as'4 ~| - [as8 as] f4. f8 g4| - %230 - c,4\p r8 as' g4 r8 es| - d4 r8 as' g4 r8 d\f| - es4 r8 as\p g4 r8 es| - d4\p r8 as' g4 r8 d\f| - es4\p r8 as'\p g4 r8 d| - %235 - c4 r8 f es4 r8 bes| - as4 r8 d c4 r8 g| - f4 r8 c' b4 r8 f'| - es4\f r8 as g4 r8 d| - c4 r8 f es4 r8 bes| - %240 - as4-. des-. r2| - R1*3| - e2.\p( f4| - e d b ) g| - g'2.( a4| - g2 ) f| - es4 g2 g4 ~| - g4 g2 g4 ~| - %250 - g4 g2 g4 ~| - g4 g2 g4 ~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g16\< g g g][g g g g]g2:16| - g: g:| - g: g:| - \!as:\f as:| - as:\p as:| - bes:\f bes:| - bes:\p bes:| - c:\f c:| - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r8 c\< c4. c8 c4 ~| - [c8 c] c4. c8 c4 ~| - [c8 c] c4. c8 c4 ~| - [c8 c] c4. c8 c4 ~| - \!c4.\ff ~| - %265 - ~| - ~| - ~| - | - d4. d8 d2\sf| - %270 - es4.-"sempre" b8\ff c4. as8| - g4. as8 g4. f'8| - es4. b8 c4. as8| - g4. as8 g4. f'8| - es4 r8 b8 c4 r8 b,| - %275 - c4 r8 b,8 c4 r8 b| - c1 ~| - c| - r r2| - R1 - c1 ~| - c| - r r2| - R1 - c1 ~| - c| - es''4-. b-. r2| - R1| - c4-. g-. r2| - as4-. e-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - f4\> r d r| - R1| - \!es4\p r r2| - R1| - d,4-#"pizz." r r2| - - %295 - R1| - - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - c1^"arco"\> ~| - c2 b2| - c1 ~| - c2 b2| - - %300 - c1 ~| - c| - b ~| - b| - c ~| - - %305 - c| - b ~| - \!b\> ~| - b ~| - b| - - %310 - \!c4\pp r r2| - R1| - c4-#"pizz." r r2| - c4 r r2| - c4 r r2| -} - -violinoIStaff = \context Staff = violino1 < - \property Staff.midiInstrument = #"violin" - \property Staff.instrument = #"Violino I " - \property Staff.instr = #"Vl. I " - \notes< - \global - \context Voice=violinoi - \violinoI - > -> - diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly deleted file mode 100644 index 5ea5093f07..0000000000 --- a/mutopia/Coriolan/violino-2-part.ly +++ /dev/null @@ -1,15 +0,0 @@ - -\version "1.3.120"; - -instrument = "Violin II" - -\include "header.ly" -\include "global.ly" -\include "violino-2.ly" - -\score{ - \violinoIIStaff - \include "coriolan-part-paper.ly" - \include "coriolan-midi.ly" -} - diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly deleted file mode 100644 index 20f05cac29..0000000000 --- a/mutopia/Coriolan/violino-2.ly +++ /dev/null @@ -1,438 +0,0 @@ - -\version "1.3.120"; - -violinoII = \notes \relative c { - c'1\ff ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - c1 ~| - c| - r r2| - R1| - %13 - r r2| - r r2| - R1 *3| - r2 [b8-.\p f'-.] [f()es]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8-. as-.] as4.\< g8-. g4 ~| - %20 - [g8 fis-.] fis4 ~ fis \!g-.\f| - R1*4| - r2 - %25 - [a,8-.\p es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [des-.\< ges-.]ges4. f8-. f4~| - [f8 e-.]\!e4-.\f r2| - R1 - %29 - %copied... \transpose c \violino-1(29, 39) - r8 f-.\p f4. es8-. es4~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [es8\< d-.]d2.~| - [d8 d-.]d2.~| - [d8 d-.] d4. d8-. d4~| - [d8 d8-.] d4. d8-. d4| - [\!f16\ff f f f][f f f f]f2:16| - %35 - [f16 f f f][es es es es][des des des des][c c c c]| - b2:16 c:| - d: es:| - e: f:| - - | - %40 - a2\sf [c,8-. es-.][es()d]| - a'2\sf [c,8-. es-.][es()d]| - d2\sf [b8-. d-.][d()c]| - d2\sf [b8-. d-.][d()c]| - des2\sf [bes8-. d-.][d()c]| - %45 - c2\sf [a8-. c-.][c()bes]| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes] r4| - r4[a8-. c-.][c()bes][bes()a]| - %50 - bes4 r r2| - R1*5| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g'2.\p\<( as4| - g f d ) bes| - bes'2.( c4| - bes2 )as| - %60 - [g16 bes bes bes][bes bes bes bes]bes2:| - - %copied... \transpose c, violino-1(61,74) - bes: bes:| - \!bes:\ff des:| - c: bes:| - as2.\p( bes4| - - %65 - as g e )c| - c'2.( des4| - c2 ) bes| - - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as16\< c c c][c c c c] c2:16| - c: c:| - - %70 - \!c:\ff es:| - d: c:| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes2.\p\<( c4| - bes a fis ) d| - \!d'\sf\>( as g )f| - %75 - % nono, only looks like transpose - r8[\!c'\p(g)c]r[bes(g)bes]| - r[g(es)g]r[g(d)g]| - r[g(es)g]r[g(e)g]|r8 fis-.\pp fis4. fis8-. fis4~| - % urg, can't copy: \transpose g \violino-1(75,91) - % a -> fis - % bes -> g - % c -> a - % d -> bes - [fis8 fis-.] fis4. fis8-. fis4~| - %80 - [fis8 g-.] g4. g8-. g4~| - [g8 g-.] g4. g8-. g4~| - [g8 a-.] a4. a8-. a4~| - [a8 bes-.] bes4. bes8-. bes4| - % different - a2:16\ff a4: bes:| - c: bes: c: bes:| - a2:16 a4: bes:| - c: bes: c: bes:| - b2: b4: c:| - f: es: f: es:| - %90 - b2: b4: c:| - f: es: f: es:| - % copied: \transpose c, \violino-1(92,95) - r8 es as,4\sf~as()g| - r8 es' as,4\sf~as()g| - r8 es' as,4\sf~as()g| - %95 - r8 es' as,4\sf~as()g| - % transpose viola... - [es16 as as as]as4:16[fis16 a a a]a4:16| - [d,16 g g g]g4:16[e16 g g g]g4:16| - [c,16 f f f]f4:16[c16 es es es]es4:16| - [c16 a' a a]a4:16[c,16 g' g g]g4:16| - %100 - [fis8 d]d4. es8 es4~| - [es8 c-.]c4. d8-. d4| - - g,\p r r2| - r2 r4 r8 | - - r r2| - %105 - r2 r4 r8 | - - r r r8 a'\p| - g4 r r r8 f| - es4 r r r8 d| - - c4 r8 g' fis4 r8 c'| - - % looks lot like violino-1 110-113 - %110 - bes4\f r8 es d4 r8 a| - - g4 r8 c bes4 r8 f| - - es4 r8 a g4 r8 cis,| - <[d16 s> ] | - | - | - | - | - r r2| - - R1*13 - %131 - % copied from viola(131,140) - [as8 as c es][f es c as]| - [a c es f][ges f c a]| - [bes des f ges][as ges des bes]| - - %135 - [c es g as][bes as es c]| - [des\p f a bes][c, es g as]| - - % urg, copied, but nog ges, f, on violino. - [bes, des f ges][as, c e f]|r [bes, d es]r[as, c des]| - % [es, ges bes des][as c es as,]| - r[bes bes des][as c es ges]| - - % copied: \transpose c \violino-1(140,149) - %140 - f4\f r8 bes as4 r8 es| - des4 r8 ges f4 r8 c| - bes4 r8 e f4 r8 bes,| - bes4 r8 g' e4 r8 bes'| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4\p r8 des\< c4 r8 g| - - %145 - f4 r8 bes as4 r8 es| - des4 r8 g f4 r8 c| - bes4 r8 f' e4 r8 bes'| - \!as4\ff r8 des c4 r8 g| - f4 r8 bes as4 r8 es| - - % copied somewhat from violino-1(150,168) - %150 - des4 r8 g f4 r8 c| - des4 r8 f' c,4 r8 e'| - - f,1\ff ~| - f| - r r2| - %155 - R1| - f1 ~| - f| - - [f8-. as-.][as()g]| - [f8-. as-.][as()g]| - %160 - R1| - [b,8-. es-.][es()d] [d-. g-.]g4-"ten."| - R1| - [e8-. g-.][g()f]| - [e8-. g-.][g()f]| - - %165 - R1 - [bes,8-.\p g'-.][g()f][e-. g-.]g4-"ten."| - R1| - % copied \transpose c' viola(168, 175) - r4 [e8-.\ff g-.][g()f] r4| - r4 [e8-. g-.][g()f] r4| - - %170 - r4 [e8-. g-.][g()f] r4| - r4 [e8-. g-.][g()f][fis-.fis-.]| - g4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - r4 [fis8-.as-.][as()g] r4| - - %175 - r4 [fis8-.as-.][as()g] es'4\sf(| - % copied violino-1(176,201) - )d1\> ~| - d4( b g )f - \!e2.\p( f4| - e d b ) g| - - %180 - g'2.( a4| - g2 )f| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - e4 g2\< g4 ~| - g g2 g4 ~| - g g2 g4 ~| - - %185 - g g2 g4| - [g16 g g g][g g g g]g2:16| - g: g:| - \!g:\ff bes:| - a: g:| - - %190 - f2.\p( g4| - f e cis ) a| - a'2.( bes4| - a2 ) g| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f16\< a a a][a a a a]a2:16| - - %195 - a2 a| - \!a2:16\ff c:| - b: a:| - g2.\p( a4| - g\< fis dis ) b| - - %200 - b'1 ~| - b - % similar violino-1 only until 219 - [\!c8\f\>g(c)g]r[bes(g)bes]| - r[\!as\p(f)as]r[g(es)g]| - r[f(c)f]r[g(es)g]| - - %205 - r[as(d,)as']r[a(es)a]| - [g-. b-.]b4. b8-. b4 ~| - [b8-. b-.]b4. b8-. b4 ~| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [b8-. c-.]c4.\< c8-. c4 ~| - [c8-. c-.]c4. c8-. c4 ~| - - %210 - [c8-. d-.]d4. d8-. d4 ~| - [d8-. es-.]es4. es8-. es4| - \!as,2:16\ff as4: g:| - f: es: f: es:| - as2:16\ff as4: g:| - f: es: f: es:| - des'2:16\ff des4: c:| - bes: as: bes: as:| - des2:16\ff des4: c:| - bes: as: bes: as:| - - % copied violino-1(220, 223) - %220 - r8 as des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - r8 as' des,4\sf ~ des()c| - % looks lot like viola... - [f16 f as as]f4:16[d16 d g g]d4:| - - %225 - [c16 c g' g]c,4:16[c16 c f f]c4:| - [b16 b f' f]b,4:16[c16 c f f]c4:| - [d16 d f f]d4:16[c16 c f f]c4:| - [d8 g,] g'4. as8 as4 ~| - [as8 as] f4. f8 g4| - - %230 - c,4\p r r2| - - r2 r4 r8 | - - r r2| - r2 r4 r8 | - - r r2| - %235 - R1*3| - %copied violino-1(238,243) - es'4\f r8 as g4 r8 d| - - c4 r8 f es4 r8 bes| - - %240 - as4-. des-. r2| - R1*3| - - %245 - [g,8\p( e' c e][g e c )g~]| - [g8( d' b d][g d b )g~]| - [g8( e' c e][g e c )g~]| - [g8( f' d f][g f d )g,~]| - [g8( es' c es][g es c )g~]| - [g8( d' b d][g d b )g~]| - - %250 - [g8( es' c es][g es c )g~]| - [g8( f' d f][g f d )g,~]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g8(\< es' c es][g es c )g~]| - [g8( d' b d][g d b )g~]| - [g8( es' c es][g es c )g]| - - %255 - <\!c2:16\f es:> | - [as8\p( f' des f][as f des )as]| - | - [bes8\p( g' es g][bes g es )bes]| - | - %copied viola-1(260, 273) - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f8\p\< f']f4. es8 es4 ~| - [es8 as]as4. g8 g4 ~| - [g8 f]f4. es8 es4 ~| - [es8 as]as4. g8 g4| - r r8 \!d\ff es4.\sf()d8| - - %265 - r4 r8 d es4.\sf()d8| - r4 r8 e f4.\sf()e8| - r4 r8 e f4.\sf()e8| - r4 r8 e g4.\sf()f8| - r4 r8 f as4.\sf()g8| - - %270 - g2:16-"sempre"\ff g:| - g: g:| - g: g:| - g: g:| - g4. d8 es4. d,8| - - %275 - es4 r8 b8 c4 r8 b| - c1 ~| - c| - r r2| - R1 - c1 ~| - c| - r r2| - R1 - c1 ~| - c| - r2| - R1| - r2| - as4-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - > r g' r| - R1| - \!g4\p r r2| - R1| - b,4-#"pizz." r r2| - - %295 - R1| - c4 r r2| - R1*15| - c4-#"pizz." r r2| - c4 r r2| - c4 r r2| -} - -violinoIIStaff = \context Staff = violino2 < - % MIDI hoort geeneens verschil tussen een - % eerste en tweede viool ;-) - \property Staff.midiInstrument = #"violin" - \property Staff.instrument = #"Violino II " - \property Staff.instr = #"Vl. II " - \notes< - \global - \context Voice=violinoii - \violinoII - > -> diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly deleted file mode 100644 index 0e1c0d5466..0000000000 --- a/mutopia/Coriolan/violoncello.ly +++ /dev/null @@ -1,478 +0,0 @@ - -\version "1.3.120"; - -violoncello = \notes \relative c { - c1\ff~| - c| - f,4-. r r2| - R1| - c'1~| - c| - f,4-. r r2| - R1| - c'1~| - c| - fis,4-. r r2| - R1| - g4-. r r2| - g4-. r r2| - c4\p r4 r2| - c4 r4 r2| - c4 r4 r2| - R1| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - c'4.\< c8 bes4. bes8| - - %20 - as4. as8 \!g4\f r4| - R1| - % 4 bars same as violino-1... - [bes,8\p-. des-.][des()c][c-. f-.]f4-"ten."| - [bes,8\p-. des-.][des()c][c-. f-.]f4-"ten."| - [bes,8\p-. des-.][des()c][c-. ges'-.][ges()f]| - - %25 - [f-. bes-.][bes()a][a-. es'-.][es()des]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - bes4.\< bes8 as4. as8| - g4 \!g4-.\f r2| - R1 - as4.\p as8 g4. g8| - f2.-"cresc" g4| - f2. g4| - f4. g8 f4. g8| - f4. g8 f4. g8| - as1\ff ~| - - %35 - as4(g f)es| - d4. r8 c4. r8| - b4. r8 c4. r8| - bes4. r8 as4. r8| - g4. r8 f4. r8| - - %40 - fis2\sf [c'8-. es-.][es()d] - fis,2\sf [c'8-. es-.][es()d] - f,2\sf [b8-. d-.][d()c] - f,2\sf [b8-. d-.][d()c] - e,2\sf [bes'8-. des-.][des()c] - - %45 - es,2\sf [a8-. c-.][c()bes]| - d,4 [a'8-. c-.][c()bes] es,4\sf| - d4 [a'8-. c-.][c()bes] es,4\sf| - d4 [a'8-. c-.][c()bes] es,4\sf| - d4 [a'8-. c-.][c()bes] es,4\sf| - - %50 - d4 r r2| - R1| - [bes'8\p(g'es g][bes g es)bes~]| - [bes(f'd f][bes f d)bes~]| - [bes(g'es g][bes g es)bes~]| - - %55 - [bes(as'f as][bes as f)bes,~]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [bes\<(g'es g][bes g es)bes~]| - [bes(f'd f][bes f d)bes~]| - [bes(g'es g][bes g es)bes~]| - [bes(as'f as][bes as f)bes,~]| - - %60 - [bes(g'es g][bes g es)bes~]| - [bes(f'd f][bes f d)as]| - \!g2\ff f| - e c| - [f8\p(as'f as][c as f)c~]| - [c(g'e g][c g e)c~]| - [c(as'f as][c as f)c~]| - [c(bes'g bes][c bes g)c,~]| - [c(as'f as][c as f)c~]| - [c(g'e g][bes g e)bes]| - - %70 - as2\ff g| - fis d| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g8\p\<(bes' g bes][d bes g)d~]| - [d8(a' fis a][d a fis)d]| - [\!f8\sf\>(as f as][f g d)g]| - - %75 - \!c,4\p r d r| - es r d r| - c r cis r| - d\pp r8 d d4. d8| - r4 r8 d d4. d8| - - %80 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - r4 r8 d d4.\< d8| - r4 r8 d d4. d8| - r4 r8 d d4. d8| - r4 r8 d d4. d8| - \!c'2.\ff()bes4| - %85 - a(g a)g| - c2.()bes4| - a(g a)g| - f2.()es4| - d(c d)c| - - %90 - f2.()es4| - d(c d)c| - c r8 c' c4\sf()des| - r r8 c c4\sf()des| - r r8 c c4\sf()des| - - %95 - r r8 c c4\sf()des| - c,4. c'8 c,4. c'8| - b,4. b'8 bes,4. bes'8| - as,4. as'8 g,4. g'8| - fis,4. fis'8 es4. es8| - - %100 - d4 r8 d es4 r8 es| - c4 r8 c d4 r8 d| - % copied \transpose c, viola-1(102, 130) - % except for some abbrevs below... - [g8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis\f]| - [g bes cis\p d][es d bes g] - - %105 - [fis a cis d][es d a fis\f]| - [g bes cis\p d][f, a cis d]| - [es, g b c][d, g a bes]| - % [c, es g a]r[d, fis g]| - [c, es g a][bes, d fis g]| - % r[c, es g][d fis a d]| - [a, c es g][d fis a d]| - - %110 - % cello has eighth notes here... - % [g,16 g bes bes][d d es es][f, f a a][cis cis d d]| - % see if this:8 neat trick works... - [g,:8 bes d es][f, a cis d]| - [es,8: g: b: c:][d,: f: a: bes:]| - [c,: es: g: a:][cis,: e: g: bes:]| - [d,: g: bes: d:][d,: fis: a: d:]| - g,,2 ~ g4. g8| - - %115 - g2 ~ g4. g8| - g4. g8 g4 r8 g| - g4. g8 g4 r8 g| - % urg, 2 copied from 102 - [g'8\p bes cis d][es d bes g]| - [fis a cis d][es d a fis]| - - %120 - [g bes c des][c des bes g]| - [f as c des][c des as f]| - [e g b c][b c g e]| - [f as b c][b c as f]| - [e g b c][b c g e]| - - %125 - [c e fis g][fis g e c]| - [f as b c][des c as f]| - [e g b c][des c g e]| - [f as c des][c des as f]| - [g bes d es][d es bes g]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [as\< c d es][f es c as]| - - %131 - [g bes d es][f es bes g]| - % shared with viola until here - as1| - a| - bes| - c| - \!des2\p( c| - bes as| - ges f| - )es [as,8 c es as]| - - %140 - % copied from viola-1 (140,152) - % except cello has eighth notes - % [des,16\f des f f][a a bes bes][c, c es es][g g as as]| - [des,8\f f a bes][c, es g as]| - [bes,8:8 des: f: ges:][as,: c: e: f:]| - [g,: bes: c: des:][f,: bes: c: des:]| - [e,: g: bes: des:][c: e: g: c:]| - %shared with cello from here on - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [f,8\p\< as c des][es, g b c]| - [des, f a bes][c, es g as]| - % uhuh, still 'same as cello'; - % but now rests for notes that viola cannot reach... - % r[des, e g]r[c, e f]| - [bes, des e g][as, c e f]| - % hmm, don't want to miss more than one note, - % take bes octave higher - % r[bes des, f][c e g c]| - [g, bes des f][c e g c]| - % cello has eight notes; - % viola has rest where can't reach - [\!f,:\ff as: c: des:][es,: g: b: c:]| - [des,: f: a: bes:][c,: es: g: as:]| - - %150 - % r[des,16 des][e e g g]r8[c,16 c][e e f f]| - [bes, des e g][as, c e f]| - % r8[des16 des][f f g g][c, c e e][g g c c]| - [bes, des f g][c, e g c]| - f,1\ff ~| - f| - bes,4-. r r2 - - %155 - R1| - f'1\ff ~| - f| - b,2\sf [f'8-. as-.][as()g]| - b,2\sf [f'8-. as-.][as()g]| - - %160 - R1*3| - bes,2\ff [e8-. g-.][g()f]| - bes,2\sf [e8-. g-.][g()f]| - - %165 - R1*2| - r2 r4 bes,\ff(| - )as4 [e'8-. g-.][g()f] bes,4\sf(| - )as4 [e'8-. g-.][g()f] bes,4\sf(| - - %170 - )as4 [e'8-. g-.][g()f] bes,4\sf(| - )as4 [e'8-. g-.][g()f][fis-. fis-.]| - g4 [fis8-. as-.][as()g] c,4\sf(| - )b4 [fis'8-. as-.][as()g] c,4\sf(| - )b4 [fis'8-. as-.][as()g] c,4\sf(| - - %175 - )b4 [fis'8-. as-.][as()g] c,4\sf(| - )b4 r r2| - R1| - [g8\p(e' c d][g e c )g~]| - [g(d' b d][g d b )g~]| - - %180 - [g(e' c d][g e c )g~]| - [g(f' d f][g f d )g,~]| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [g\<(e' c d][g e c )g~]| - [g(d' b d][g d b )g~]| - - %185 - [g(e' c d][g e c )g~]| - [g(f' d f][g f d )g,~]| - [g(e' c d][g e c )g~]| - [g(d' b d][g d b )g]| - - %190 - \!e2\ff d'| - cis a ~| - [a8( f' d f][a f d )a~]| - [a( e' cis e][a e cis )a~]| - [a8( f' d f][a f d )a~]| - [a( g' e g][a g e )a,~]| - - %195 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - [a8\<( f' d f][a f d )a~]| - [a( e' cis e][a e cis )g]| - \!f2\ff e| - dis b'~| - [b8\p( g' e g][b g e )b~]| - - %200 - [b8\<( fis' dis fis ][b fis dis )b~]| - [b8( g' e g][e g e )g]| - [f(g f g][f g f)g]| - \!es4\fp r e r| - f r g r| - - %205 - as r g r| - f r fis r| - g r g r| - g r g r| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - g r g\< r| - - %210 - g r g r| - g r g r| - g r g r| - \!f2.\ff()es4| - d( c d )c| - - %215 - f2.\ff()es4| - d( c d )c| - bes2.\ff()as4| - g( f g )f| - bes2.\ff()as4| - - %220 - g( f g )f| - r4 r8 f' f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - r4 r8 f f4\sf()ges| - - %225 - f4. f'8 f,4. f'8| - e,4. e'8 es,4. es'8| - d,4. d'8 c,4. c'8| - b,4. b'8 as,4. as'8| - g,4 r8 g as4 r8 as| - - %230 - f4 r8 f g4 r8 g| - [c8\p es fis g][as g es c]| - [b d fis g][as g d b\f]| - [c es fis\p g][as g es c]| - [b d fis g][as g d b\f]| - - %235 - [c es g\p as][bes, d fis g]| - [as, c e f][g, bes d es]| - [f, as c d][es g b c]| - [d, f as c][g, b d g]| - [c,\f es g as][bes, d fis g]| - - %240 - [as, c e f][g, bes d es]| - f4 r r2| - R1*3| - c4\p r r r8 c(| - - %245 - )f4 r r r8 f(| - )e4 r r r8 e(| - )b4 r r r8 b(| - )c4 r r r8 c(| - )f4 r r r8 f(| - - %250 - )es4 r r r8 es(| - )b4 r r r8 b(| - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - )c4\< r r r8 c(| - )f4 r r r8 f,(| - )es1| - - %255 - \!ges\f| - f\p| - as\f| - g\p| - bes\f| - - %260 - \property Voice.crescendoText = #'(lines " " "cresc." " ") - \property Voice.crescendoSpanner = #'dashed-line - as4.\p\< as'8 g4. g8| - f4. f8 es4. es8| - as4. as8 g4. g8| - f4. f8 es4. es8| - \!f,4.\ff f'8 f2\sf| - - %265 - f,4. f'8 f2\sf| - g,4. g'8 g2\sf| - g,4. g'8 g2\sf| - as,4. as'8 as2\sf| - b,4. b'8 b2\sf| - - %270 - [c,8-"sempre"\ff b c d][es d es c]| - [b c d c][b c b g]| - [c8 b c d][es d es c]| - [b c d c][b c b g]| - [c b c g][c b c g]| - - %275 - [c b c g][c b c g]| - c1 ~| - c| - f,4-. r r2| - R1| - - %280 - c'1 ~| - c| - f,4-. r r2| - R1| - c'1 ~| - - %285 - c| - fis4-. f-. r2| - R1| - es4-. e-. r2| - f,4-. g-. r2| - - %290 - \property Voice.decrescendoText = #'(lines " " "dim." " ") - \property Voice.decrescendoSpanner = #'dashed-line - as4\> r b r| - R1| - \!c4\p r r2| - R1| - g4-#"pizz." r r2| - - %295 - R1| - c4 r r2| - [c8-.-"arco" es-.][es()d][d-. as'-.][as()g]| - R1 - \property Voice.decrescendoText = #'(lines " " "sempre pi\\`u piano" " ") - % urg, "" is assumed to be hairpin... - %\property Voice.decrescendoSpanner = #"" - \property Voice.decrescendoSpanner = #'dashed-line - \times 2/3 { c,4\> ( es d ~ } \times 2/3 { d as' )g }| - - %300 - r2 r4 c,(| - es2. ) d4| - r2 r4 d(| - as'2. )g4 ~| - g1 (| - - %305 - es| - )d(| - \!)as'\> ~| - as ~| - as2.()g4| - - %310 - \!c,\pp r r2| - R1| - % no mistake: octave lower than contrabass, ie, sounding equal - c,4-#"pizz." r r2| - c4 r r2| - c4 r r2| -} diff --git a/mutopia/D.Zipoli/GNUmakefile b/mutopia/D.Zipoli/GNUmakefile deleted file mode 100644 index 2d7fc58cf0..0000000000 --- a/mutopia/D.Zipoli/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -# - -depth = ../.. - -examples= -LOCALSTEPMAKE_TEMPLATES=mutopia - -include $(depth)/make/stepmake.make - - diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly deleted file mode 100644 index 99f5be0792..0000000000 --- a/mutopia/D.Zipoli/verso_2.ly +++ /dev/null @@ -1,104 +0,0 @@ -\header{ -filename="verso_2.ly"; -enteredby = "Peter Chubb"; -arranger = "Peter Chubb"; -composer = "Domenico Zipoli"; -date = "c1700"; -title = "Verso II"; -} - -%{ - This is an organ piece that I've arranged for Recorder trio. - The third part can be played either on a second treble - recorder, or on a tenor. - - Copright 1998 Peter Chubb. - This work may be used and modified freely - under the Gnu Public Licence. -%} - -\version "1.3.117"; - -voiceOne = \notes \relative c' { - a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| - [a8 gis16 fis16] gis4 a4^"'" e'4 | f2 ~ [f8 g16 f] e4 ~| [e8 f16 e] [d8 c] d2 | - c2 bes4 ~ [bes8 c16 bes] | a4~[a8 bes16 a] g4~ [g8 a16 g] f4 ~ [ f8 g16 f] e4 a4~| - [a8 g16 fis] g4 ~ g f | e2 ~ e4 g4 ~ | g [fis8 e] fis2 \bar "|."; -} - -voiceTwo = \notes \relative c' { - [d8 e f d ] g4 c, | f d e2 | f4 ~ [f8 g16 f] e4 a| - d,4. d8 c4 a'4 | r4 a4 bes4 ~ [bes8 c16 bes] | a2 ~ [a8 bes16 a] g4 ~| - [ g8 a16 g ] f4 ~ [f8 g16 f] e4 | f2 ~ f4 e4 ~| e4 d4~ d4 cis4 | - d2 cis4 d4~ | d4 [cis8 b] cis2 | d1 \bar "|."; -} - -voiceThree = \notes \relative c' - { - r1 | r2 [a8 b c a] | d4 g, c4. [d16 c] | - b4. b8 [a b c a ] | [d, e f d ] g4 c,4 | f2 bes4 ~ [bes8 c16 bes]| - a4 ~ [a8 bes16 a] g4 c, | [f8 g a f ] [c d e cis] | [d e f d] a2 | - bes4. [c16 bes] a4 d | a1 | d1 \bar"|."; -} - -global=\notes { - \time 2/2; - \keysignature c; - \property Staff.timeSignatureStyle = "C" -} - - -recorder= { -% For three recorders. -% - \context StaffGroup - < - \context Staff = descant { - \property Staff.Instrument = "Descant" - \clef "G^8"; - \notes \transpose bes' {\global \voiceOne } - } - - \context Staff = treble { - \property Staff.Instrument = "Treble" - \clef "G"; - \notes \transpose bes' {\global \voiceTwo } - } - - \context Staff = lower { - \property Staff.Instrument = "Tenor or Treble II" - \clef "G"; - \notes \transpose bes'' {\global \voiceThree } - } - > -} - -% -% For keyboard (Organ) -% Not quite the same as the original. -% TODO: add inner part; -% Try to make parts cross staves as apropriate. -% -organ={ - \context GrandStaff - < - \context Staff = treble { - \clef "G"; - \global - \context Staff < - { \voiceOne \voiceOne } - { \voiceTwo \voiceTwo } - > - } - \context Staff = bass { - \clef "F"; \global \voiceThree - } - > -} - -\score{ - \recorder - - \paper{} -} - diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile index 047ce5a4e7..e7f9036a56 100644 --- a/mutopia/GNUmakefile +++ b/mutopia/GNUmakefile @@ -2,7 +2,7 @@ depth = .. -SUBDIRS = J.S.Bach Coriolan F.Schubert D.Zipoli Hymns E.Satie +SUBDIRS = J.S.Bach F.Schubert E.Satie LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/mutopia/Hymns/GNUmakefile b/mutopia/Hymns/GNUmakefile deleted file mode 100644 index 2d7fc58cf0..0000000000 --- a/mutopia/Hymns/GNUmakefile +++ /dev/null @@ -1,10 +0,0 @@ -# - -depth = ../.. - -examples= -LOCALSTEPMAKE_TEMPLATES=mutopia - -include $(depth)/make/stepmake.make - - diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly deleted file mode 100644 index dbfad5a36a..0000000000 --- a/mutopia/Hymns/diademata.ly +++ /dev/null @@ -1,101 +0,0 @@ -\header { - filename = "diademata.ly"; - enteredby = "Peter Chubb"; - composer = "Sir G. J. Elvey"; - date = "1868"; - title = "Diademata"; - metre = "6 6. 8 6. D"; -} - -\version "1.3.117"; - -sop=\notes \transpose c''{ - ees2 ees4 ees4 g2 g2 | c'1. - c'2 | bes2 ees aes g | f1. - f2 | g bes c' bes | a g4( )f bes2 - ees'2 | d' ees' c' c' | bes1. - bes2 | bes g f ees | c'1. - c'2 | c' a g f | d'1. - d'2 | ees'2. d'4 c'2 bes | aes f g - bes2 | aes g f f | ees\breve - -} - -alt=\notes \transpose c''{ - bes,2 bes,4 bes,4 ees2 ees2 | ees1. - ees2 | ees ees d ees | d1. - d2 | ees f ees g | ees c f - ees2 | f g c f | d1. - d2 | ees ees d ees | ees1. - e2 | f f ees ees | d1. - f2 | ees ees ees ees | ees d ees - ees | ees ees ees d | ees\breve -} - - -ten=\notes \transpose c' { - g2 g4 g4 g2 g2 | aes1. - aes2 | bes c' aes bes | bes1. - bes2 | bes bes g g | c' a bes - a2 | bes bes bes a | bes1. - bes2 | bes bes aes bes | c'1. - bes2 | a c' bes c' | bes1. - bes2 | bes bes aes bes | c' bes bes - bes c' bes bes2. aes4 | g\breve -} - -bass=\notes \transpose c' { - ees2 ees4 ees4 c2 c2 | aes,1. - aes2 | g aes f ees | bes,1. - bes,2 | ees d c ees | f ees d - c2 bes, ees f f | bes,1. - aes2 | g ees f g | aes1. - g2 | f f g a | bes1. - aes2 | g g aes g | f bes ees - g,2 | aes, ees bes, bes, | ees\breve -} - -global = \notes{ - \time 4/2; - \key ees \major; - \skip 2*4; \skip 1.; \bar "||"; - \skip 2; \skip 2*4; \skip 1.; \bar "||";\break - \skip 2; \skip 2*12;\skip 1.; \bar "||";\break - \skip 2; \skip 2*4; \skip 1.; \bar "||"; - \skip 2; \skip 2*4; \skip 1.; \bar "||";\break - \skip 2; \skip 2*12;\skip 1.; \bar "||"; -} - -upperStaff = \context Staff = upper { - \clef "treble"; - \context Staff < - \global - { \voiceOne \sop } - { \voiceTwo \alt } - > -} - -lowerStaff = \context Staff = lower { - \clef "bass"; - \context Staff < - \global - { \voiceOne \ten } - { \voiceTwo \bass } - > -} - -\score{ - \context ChoirStaff\notes < - \upperStaff - \lowerStaff - > - \paper { - indent = 0.0\mm; - linewidth= 140.0\mm; - gourlay_maxmeasures = 6.0; - \translator{ - \StaffContext - \remove "Time_signature_engraver"; - } - } -} diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly deleted file mode 100644 index 36ba5b2f12..0000000000 --- a/mutopia/Hymns/laudatedom.ly +++ /dev/null @@ -1,76 +0,0 @@ -\header { -title = "Laudate Dominum"; -composer = "Parry"; -metre = "10 10 . 11 11"; -} - -\version "1.3.117"; - -sop = \notes \transpose c''{ - f4 | d' bes c' | f2 \bar "||"; - bes4 | g f ees | d2 \bar "||"; - f4 | d' c' f | bes2 \bar "||"; - a4 | c' bes g | f2 \bar "||"; - f4 | bes bes bes | bes [a8 ~ g8] \bar "||"; - [a8~bes8] | c'4 bes c' | f2 \bar "||"; - a4 | d' d' d' | [bes8 ~ a8] g4 \bar "||"; - ees'4 | d' bes c' | bes2 \bar "||"; -} - -alto = \notes \transpose c'' { - f4 | f f g | f2 \bar "||"; - f4 | bes, d c | bes,2 \bar "||"; - f4 | bes a f | f ~ g \bar "||"; - f4 | fis g e | f2 \bar "||"; - c4 | bes, ees f | g ees \bar "||"; - f4 | g f g | f2 \bar "||"; - f4 | fis g a | g g \bar "||"; - g | f4. g8 a4 | bes2 \bar "||"; -} - -tenor = \notes \transpose c' { - f4 | bes d' [c'8 ~ bes] | a2 \bar "||"; - f4 | g g a | bes2 \bar "||"; - d'4 | e' f' c' | d' ~ c' \bar "||"; - c'4 | ees' d' bes | a2 \bar "||"; - a4 | bes bes aes | g bes \bar "||"; - bes | ees' d' [c'8 ~ bes8] | a2 \bar "||"; - c'4 | c' bes a | [d'8 ~ c'8] bes4 \bar "||"; - bes4 | bes d' ees' | d'2 \bar "||"; -} - -bass = \notes \transpose c'{ - f4 | bes d ees | f2 \bar "||"; - d4 | ees c f | bes,2 \bar "||"; - bes4 | g a a, | d ~ e \bar "||"; - f | a, bes, c | f2 \bar "||"; - ees4 | d c d | ees ees \bar "||"; - d | c d ees | f2 \bar "||"; - ees4| d e fis | g g \bar "||"; - c4 | f f f | bes,2 \bar "||"; -} - -global = \notes { - \time 3/4; - \partial 4; - \key bes \major; -} - -\score { - < - \context Staff=top { - \global \clef "G"; - \context Staff < - \notes{\voiceOne \sop } - \notes{\voiceTwo \alto } - > - } - \context Staff=bottom { - \global \clef "F"; - \context Staff < - \notes{\voiceOne \tenor} - \notes{\voiceTwo \bass } - > - } - > -} diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly deleted file mode 100644 index 795eadba83..0000000000 --- a/mutopia/Hymns/maccabaeus.ly +++ /dev/null @@ -1,109 +0,0 @@ -\header { -filename = "maccabaeus.ly"; -enteredby = "Peter Chubb"; -composer = "G. F. Handel"; -date = "1680"; -title = "Maccabaeus"; -metre = "10 11. 11 11. and refrain"; -} - -\version "1.3.117"; - -sop=\notes \relative c'' { - b2 gis4. a8 |b2 e,2 | - [fis8 gis] [a b] a4 gis | - fis1 \bar "||"; - [gis8 a] [b cis] b4 b | - e2 b | - a4 [gis8 fis] fis4. e8 | - e1 \bar "||"; - [gis8 fis] [gis a] gis4 gis | - fis2 e | - a4 gis fis e | dis1 \bar "||"; - [e8 dis] [e fis] e4 e | cis'2 ais | - b4 [cis8 b] ais4. b8 | b1 \bar "||"; - - b2^"{\it Refrain}" gis4. a8 | b2 e, | - [fis8 gis] [a b] a4 gis | fis1 \bar "||"; - [gis8 a] [b cis] b4 b | e2 b | - a4 [gis8 fis] fis4. e8 | e1 \bar "|."; -} - -alt=\notes \relative c'{ - e2 e4. dis8 | e2 b | - [dis8 e] [fis gis] fis4 e | dis1 | - e4 e e dis | e2 e | - dis4 e e4. b8 | b1 | - [e8 dis] [e fis] e4 e | - dis2 cis | - bis4 cis cis cis | bis1 | - [cis8 bis] [cis dis] cis4 e4| - e2 e2 | - dis4 gis fis fis | fis1 | - gis2 e4. dis8 | e2 b2 | - [dis8 e] [fis gis] fis4 e | dis1 | - e4 e e dis | e2 e | dis4 e dis4. b8 | b1 | -} - -ten=\notes \relative c' { - gis2 b4. a8 | gis2 b | - b4 b b b | b1 | - b4 [b8 a] b4 a | b2 gis | - a4 b b4. gis8 | gis1 | - b4 b b b | a2 gis | fis4 gis a gis | gis1 | - gis4 gis cis cis | cis2 cis | - b4 gis cis cis | dis1 | - e2 b4. a8 | gis2 b2 | - b4 b b b | b1 | - b4 [b8 a] b4 a | b2 gis | - a4 [b8 cis] b4. gis8 | gis1| -} - -bass=\notes \relative c { - e2 gis4. fis8 | e2 gis | - b4 b dis, e | b1 \bar "||"; - [e8 fis] [gis a] gis4 fis | gis2 gis | - fis4 e b4. e8 | e1 \bar "||"; - e4 e e e | b2 cis | - dis4 e fis cis | - gis1 \bar "||"; - cis4 cis cis b' | ais2 fis | - gis4 e fis fis | b1 \bar "||"; - e,2 e4. fis8 | gis2 gis,2 | - b4 b dis e | b1 \bar "||"; - [e8 fis] [gis a] gis4 fis | gis2 gis | - fis4 [gis8 a] b4. e,8 | e1 \bar "|."; -} - -global = \notes { - \time 2/2; - \property Staff.timeSignatureStyle = "C" - \key e \major; -} - -upperStaff = \context Staff = upper { - \global - \clef "treble"; - \context Staff < - {\voiceOne \sop } - {\voiceTwo \alt } - > -} - -lowerStaff = \context Staff = lower { - \global - \clef "bass"; - \context Staff < - {\voiceOne \ten } - {\voiceTwo \bass } - > -} - -\score { - < - \upperStaff - \lowerStaff - > - \paper { - } -} diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly deleted file mode 100644 index c9b6ab6ead..0000000000 --- a/mutopia/Hymns/ode.ly +++ /dev/null @@ -1,76 +0,0 @@ -\header { - filename = "ode.ly"; - enteredby = "Peter Chubb"; - composer = "Beethoven"; - date = "circa. 1800"; - title = "Ode to Joy"; - metre = "8 7 8 7 D"; -} - -\version "1.3.117"; - -sop=\notes \relative c'' { - b4 b c d | d c b a | g g a b | b4. a8 a2 | - b4 b c d | d c b a | g g a b | a4. g8 g2 | - a4 a b g | a [b8( )c] b4 g | a [b8( )c] b4 a | g a d,2 | - b'4 b c d | d c b a | g g a b | a4. g8 g2 | -} - -alto=\notes \relative c'' { - g4 g a g | g4. a8 g4 fis | d d fis g| g4. fis8 fis2 | - g4 g a g | g4. a8 g4 fis | d d fis g| g4 fis d2 | - d4 d d d | d d d d | d d fis fis | e cis d2 | - d4 g a a b [g8( )a] g4 e | e d fis g |g fis g2 | -} - -tenor=\notes \relative c'{ - d4 d c b | e4. d8 d4 d | b b d d | d4. d8 d2 | - d4 d c b | e4. d8 d4 d | b b d d | d4 d b2 | - fis4 fis g e | fis [g8( )a8] g4 e | fis fis fis b | b a g( )fis | - g4 d' f, f | g4. d'8 d4 c | g g c c | d d b2 | -} - -bass= \notes \relative c' { - g4 g g g | e4. fis8 g4 d | b b a g | d'4. d8 d2 | - g4 g g g | e4. fis8 g4 d | b b a g | d' d g,2 | - d'4 d d d | d d d d | d d dis dis | e a, d2 | - g4 g f f | e4. fis8 g4 c, | c b a g | d' d g,2 | -} - - -global=\notes{ - \time 4/4; - \property Staff.timeSignatureStyle="C" - \key g \major; - \skip 1*4; \bar "||"; - \skip 1*4; \bar "||"; - \skip 1*4; \bar "||"; - \skip 1*4; \bar "|."; -} - -upperStaff = \context Staff = upper \notes { - \clef "G"; - \context Staff < - \global - {\voiceOne \sop} - {\voiceTwo \alto} - > -} - -lowerStaff = \context Staff = lower \notes { - \clef "F"; - \context Staff < - \global - {\voiceOne \tenor} - {\voiceTwo \bass } - > -} - -\score{ - < - \upperStaff - \lowerStaff - > - \paper { - } -} diff --git a/mutopia/Hymns/passion.ly b/mutopia/Hymns/passion.ly deleted file mode 100644 index fd09ae356e..0000000000 --- a/mutopia/Hymns/passion.ly +++ /dev/null @@ -1,85 +0,0 @@ -\header { -filename = "passion.ly"; -title = "Passion Chorale"; -composer = "J. S. Bach"; -enteredby = "Peter Chubb"; -} - -\version "1.3.117"; - -sop=\notes \transpose c'' { - \repeat "volta" 2 { - \partial 2; - e2 | a g f e | d1 e2 \breathe b | c' b4([c'8 - )d'] c'2 b4( )a4 | - a1. } - c'2 | b4( )a4 g2 a b | c'1 c'2\breathe g2 | - a g a4( )g f2 | e1. \breathe - c'2 | b4( )c'4 d'2 c' b | a1 b2\breathe - e2 | f e d g4( )f4 | e1. \bar "||"; -} - -alt=\notes \transpose c'' { - \repeat "volta" 2 { - \partial 2; - c2 | c4( )d4 e2 a,4( )b,4 c2 | c2( )b, c - e | e f e d4( )c4 | - c1. } - e2 | fis e f f | g( )f e - e2 e4( )d cis( )d e2 e4( - )d | d2( )cis1 - a2 | g g g4( )a b( )g | g2( )fis g - c2 | d c d e4( )d | d2( c )b, \bar "||"; -} - - -ten=\notes{ - \repeat "volta" 2 { - \partial 2; - a2 | a4( )b c'2 d' g | a( )g g b | - a a a gis | - e1. } - a2 | fis b c' d' | c'4( bes2 )aes4 g2 - c'4( )bes |a2 bes a a | a1. - d'2 | d' d'4( [e'8 )f'8] e'2 d' | e'2( )d' d' - g2 | g g g4( )a bes2 | b2( a )gis \bar "||"; -} - -bass=\notes{ - \repeat "volta" 2 { - \partial 2; - a4( )g | f2 e d c | fis,( )g, c - gis,2 | a, d e e | - a,1. } - a2 | dis e ees d | e( )f c - c | f e4( )d cis2 d | a,1. - fis2 | g4( )a b2 e4( )fis g2 | cis2( )d2 g, - c2 | b, c bes,4( )a, g,2 | gis,2( a, )e \bar "||"; -} - -global=\notes{ - \key c \major; - \time 4/2; - \property Staff.timeSignatureStyle="none" -} - -\score{ - < - \context Staff = "top" { - \clef "treble"; - \global - \context Staff <{\voiceOne \sop}{\voiceTwo \alt} > - } - \context Staff = "bottom" { - \clef "bass"; - \global - \context Staff < {\voiceOne \ten}{\voiceTwo \bass} > - } - > - - \paper { - linewidth= 140.\mm; - - gourlay_maxmeasures = 6.; - } -} diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly deleted file mode 100644 index aa8a13aa5b..0000000000 --- a/mutopia/Hymns/stille.ly +++ /dev/null @@ -1,225 +0,0 @@ -\header { - title = "Stille Nacht"; - subtitle = "(Silent Night)"; - filename = "stille.ly"; - enteredby = "Peter Chubb"; - composer = "Franz X. Gruber"; - poet = "Joseph Mohr"; -} - - -\version "1.3.117"; - -%{ - Note: there are other verses, but the three here seem to be - the most commonly sung ones. - I don't know who did the translation or the arrangement. -%} - -global=\notes { - \time 6/4; - \key bes \major; - \skip 1.*12; - \bar "|."; -} - -sop=\notes \relative f' { - \property Voice . articulationScriptVerticalDirection = \up -%1 - f4. ( ) g8 f4 d2. | - f4. ( ) g8 f4 d2 r4 | - c'2 c4 a2 r4 | - bes2 bes4 f2. | -%5 - g2 g4 bes4.( )a8 g4 | - f4.()g8 f4 d2 r4 | - g2 g4 bes4.( )a8 g4 | - f4.()g8 f4 d2 r4 | -%9 - c'2 c4 es4. c8 a4 | - bes2. ( < ~bes2-- )d2-- > r4 | - bes4 ( )f d f4.( )es8 c4 | - bes2. ~ bes2 r4 -} - -alt=\notes\relative c' { - \property Voice . articulationScriptVerticalDirection = \down -%1 - d4. es8 d4 bes2. | - d4. es8 d4 bes2 r4 | - es2 es4 ges2 r4 | - f2 es4 d2. | -%5 - es2 es4 es4. f8 es4 | - d4. es8 d4 bes2 r4 | - es2 es4 es4. f8 es4 | - d4. es8 d4 c( )bes r4 | -%9 - es4( )f g a4. a8 ges4| - f2.( )e!2-- r4 | - d2 bes4 d4. c8 c4 | - bes2. ~ bes2 r4 -} - -ten=\notes\relative c' { - \property Voice . articulationScriptVerticalDirection = \up - - bes2 bes4 f2. | - bes2 a4 f2 r4 | - a2 a4 c2 r4 | - bes2 a4 f2 ( ) bes4 | -%5 - bes2 bes4 g4. a8 bes4 | - bes4. bes8 bes4 f2 r4 | - bes2 bes4 g4. a8 bes4 | - bes4. bes8 bes4 f2 r4 | -%9 - g2 bes4 c4. c8 c4 | - bes2. ( ) g2-- r4 | - bes2 g4 a4. bes8 a4 | - bes2. ~ bes2 r4 -} - -bass=\notes\relative c { - \property Voice . articulationScriptVerticalDirection = \down -%1 - bes2 bes4 bes2. | - bes2 bes4 bes2 r4 | - f'2 f4 es2 r4 | - d2 c4 bes2. | -%5 - es2 es4 es2 es4 | - bes4. bes8 bes4 bes2 r4 | - es2 es4 es4. es8 es4 | - bes4. bes8 bes4 bes2 r4 | -%9 - c4 d es f4. f8 es4 | - d2. ( ) c2-- r4 | - f2 f4 f4. g8 a4 | - bes2. ~ bes2 r4 -} - -harm=\chords{ - \property Score.chordInversion = 1 - - bes1. | - bes-7+ | - f2.-7 es-dim | - bes2/d c4-m7 bes2. | - es1. | - bes1. | - es1. | - bes1. | - c4-m - g-m7.4/d % should be Gm7sus4 - c-m/es f2-7 es4-dim | - bes2./d c2.-9 | - bes2./f f-7 | - bes1. -} - -vB = \lyrics { - Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. - Al2 -- les4 schl\"aft,2. ein2 -- sam4 wacht2. - Nur2 das4 trau2 -- te,4 hoch4. -- heil8 ige4 Paar,2. - Hold2 -- er4 Knabe2 im4 lock4. -- i8 -- gen4 Haar2. - Schlaf2 in4 himm4. -- li8 -- scher4 Ruh'!1 __ ""2 - Schlaf2 in4 himm4. -- li8 -- scher4 Ruh'!1 __ ""2 -} - -vC = \lyrics { - Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. - Hir2 -- ten4 erst2. kund2 ge4 -- macht2. - Durch2 der4 En2 -- gel4 Ha4. -- lle8 -- lu4 ja2. - T\"ont2 es4 laut2 von4 fern2 und4 nah:2. - "``Christ,"2 der4 Ret4. -- ter,8 ist4 "da!''"1 __ ""2 - "``Christ,"2 der4 Ret4. -- ter,8 ist4 "da!''"1 __ ""2 -} - -vD = \lyrics { - Stil2 -- le4 Nacht,2. hei4. -- li8 -- ge4 Nacht,2. - Go2 -- ttes4 Sohn,2. o2 -- wie4 lacht2. - Lieb'2 aus4 dei2 -- nem4 g\"ott4. -- li8 -- chen4 Mund,2. - Da2 uns4 schlägt2 die4 ret2 -- tende4 Stund'.2. - Christ,2 in4 Dei4. -- ner8 Ge4 -- burt!1 __ ""2 - Christ,2 in4 Dei4. -- ner8 Ge4 -- burt!1 __ ""2 -} - -vBe = \lyrics { - Si2 -- lent4 night,2. Ho2 -- ly4 night,2. - All2 is4 calm,2. all2 is4 bright,2. - 'Round2 yon4 Vir2 -- gin4 Mo4. -- ther8 and4 Child2. - Ho2 -- ly4 In4. -- fant8 so4 ten4. -- der8 and4 mild,2. - Sleep4. __ ""8 in4 hea4. -- ven-8 ly4 peace,1 __ ""2 - Sleep4. __ ""8 in4 hea4. -- ven-8 ly4 peace.1 __ ""2 -} - -vCe = \lyrics { - Si2 -- lent4 night,2. Ho2 -- ly4 night,2. - Shep2 -- herds4 quake2. at2 the4 sight,2. - Glo2 -- ries4 stream4. __ ""8 from4 hea4. -- ven8 a4 -- far,2. - Hea2 -- v'nly4 hosts4. __ ""8 sing4 "``A"4. -- lle8 -- lu4 -- ia;2. - Christ4. __ ""8 the4 Sa4. -- viour8 is4 born,1 __ ""2 - Christ4. __ ""8 the4 Sa4. -- viour8 is4 "born.''"1 __ ""2 -} - -vDe = \lyrics { - Si2 -- lent4 night,2. Ho2 -- ly4 night,2. - Son2 of4 God,2. love's2 pure4 light2. - Ra2 -- diant4 beams4. from8 Thy4 ho2 -- ly4 face,2. - With2 the4 dawn4. __ ""8 of4 sa2 -- ving4 grace2. - Je2 -- sus,4 Lord,4. at8 Thy4 birth,1 __ ""2 - Je2 -- sus,4 Lord,4. at8 Thy4 birth.1 __ ""2 -} - - -upper= \notes { - \context Staff = upper { - \clef "treble"; - \context Staff < - \global - { \voiceOne \sop } - { \voiceTwo \alt } - > - } -} - -lower = \notes { - \context Staff = lower { - \clef "bass"; - \context Staff < - \global - { \voiceThree \ten } - { \voiceFour \bass } - > - } -} - -GermanWords=\context Lyrics=upper < - \v1 - \v2 - \v3 -> - -EnglishWords=\context Lyrics=upper < - \v1e - \v2e - \v3e -> - -\score { - \context ChoirStaff < - \context ChordNames \harm - \upper -% \EnglishWords - \GermanWords - \lower - > - \paper { % fit onto single A4 page - textheight=290.0\mm; - indent=0.0\mm; - } - \midi{ - } -} - diff --git a/mutopia/dummy.m4 b/mutopia/dummy.m4 deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly deleted file mode 100644 index d8a1295712..0000000000 --- a/mutopia/gallina.ly +++ /dev/null @@ -1,294 +0,0 @@ -\header{ -title = "La Gallina à 2 violini"; -date = "1637"; -source = "the manuscript of Canzoni overo Sonate Concertate " - + "libro terzo, opera duodecima "; -composer = "Tarquinio Merula (1594/95-1665)"; -enteredby = "Mats Bengtsson"; -copyright = "Public Domain "; -subtitle = "from Canzoni overo Sonate Concertate libro terzo, " - + "opera duodecima 1637"; -} - - -%{ -From mats.bengtsson@s3.kth.seThu Aug 14 02:11:19 1997 -Date: Wed, 13 Aug 1997 18:24:53 +0200 -From: Mats Bengtsson -To: Han-Wen Nienhuys -Subject: Re: brevis? - -[snip] - -Hopefully it could be useful input to future improvements. I've entered the -music directly from the 1637 manuscript and intend to publish it public -domain on for example ftp.gmd.de when finished. You could include it as an -example in the distribution, but in that case I could add a LaTeX title file. -There were no beams in the manuscript so I didn't use them in this edition -either. - - /Mats - -Tested Features: Note placement, multipart score, figured base, \breve, - time signature styles - -%} -%{ - -note: the sharp signs hoovering over the bass part are no mistake, but -part of the basso continuo --HWN - -Note also: The original score was printed without any beams, -they were added in this edition to increase the readability. -If you want the original beam-less layout, redefine the -Voice engraver by uncommenting the lines in the paper -definition below. --MB -%} - -\version "1.3.117"; - -global = \notes { - \property StaffGroup.timeSignatureStyle = "old" - \time 4/4; - \tempo 4=100; - \repeat "volta" 2 { - \skip 1*31; - } - \repeat "volta" 2 { - \property StaffGroup.timeSignatureStyle = "1" - \time 3/2; - \tempo 2=140; - \skip 1.*15; - \property StaffGroup.timeSignatureStyle = "old" - \time 4/4; - \tempo 4=100; - s1 - } - \repeat "volta" 2 { - \skip 1*12; - \cadenzaOn - s\breve - \cadenzaOff - } -} - -vi1=\context Staff = vi1 < -\global -\notes \relative c'' { -\property Staff.instrument = "Violin 1" -\property Staff.midiInstrument = "recorder" % The default midi violin is terrible - - \repeat "volta" 2 { - 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 | - 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! | - 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 | - 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 | - b4 c2 b4 | - c8 g g g16 f e4 d | - r8 g g g16 f e4 d | - r8 d16 a b8 b16 c a2 | - b1 | - } - - \repeat "volta" 2 { - r4 d d d d d | - e1. | - r4 c c c c c | - d1. | - r4 d8 c b4 c8 d g,4 a8 b | - e,1. | - 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 | - g,4 g' g g g g | - 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 | - b1 | - } - - \repeat "volta" 2 { - 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 | - 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 | - fis4 g2 fis!4 | - \cadenzaOn - g\breve - } -}> - -vi2=\context Staff = vi2 < -\global -\notes \relative c'' { -\property Staff.instrument = "Violin 2" -\property Staff.midiInstrument = "recorder" % The default midi violin is terrible - - \repeat "volta" 2 { - 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 | - 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 | - 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 | - c4 b a2 | - 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 | - 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 | - a4 g2 fis4 | - g1 | - } - - \repeat "volta" 2 { - r1. | - r4 g'8 f e4 f8 g c,4 d8 e | - a,1. | - 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 | - c,4 a a a a a | - b d8 c b4 c8 d d,4 e | - fis2 g fis! | - g1 | - } - - \repeat "volta" 2 { - 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 | - c2 r | - 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' | - \cadenzaOn - b\breve - } -}> - - -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 - - - \repeat "volta" 2 { - g,2 d^"4 3" | g,1 | - g2 c4 g, | d1^"3 4 3" | - g,1 | g2 c4 g, | - d1^"3 4 3" | g, | - g2 c4 d | g,1^"3 4 3" | - c1 | c2 f,4 c | - g,1^"3 4 3" | c | - c2 f,4 c | g,1^"3 4 3" | - c2 g, | g g, | - c4 g, d2^"3 4 3" | g, g | - fis g | d1^"3 4 3" | - g,2 b, | d1^"3 4 3" | - g,^"3 4 3" | c4 b, c2 | - g,1^"3 4 3" | c4 b, c g | - c b, c g, | d1^"3 4 3" | - g,1 | - } - - \repeat "volta" 2 { - g1. | c | - f | d^"\\textsharp" | - g | c | - a, | d^"\\textsharp" | - g, | c | - d^"\\textsharp" | e | - f | g1 b,2 | - d1.^"3 4 3" | - g,1 | - } - - \repeat "volta" 2 { - g2 fis | g g, | - g1^"3 4 3" | c | - g,^"3 4 3" | c2 g, | - d1^"3 4 3" | g,^"3 4 3" | - c2 g, | d1^"\\textsharp" ( | - ) d^"3 4 3" | - \cadenzaOn - g,\breve - } -}> - -\score{ - \context StaffGroup < - \vi1 - \vi2 - \bc - > - \paper{ - \translator { \VoiceContext - textScriptPadding = 3; -%% Uncomment to get the original layout without beams. - -% \remove "Beam_engraver"; -% \remove "Auto_beam_engraver"; - - } - } - \midi{ - } -} diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 920875a15b..8261fe0b3c 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -256,6 +256,7 @@ (define (pitch->note-name pitch) (cons (cadr pitch) (caddr pitch))) + (define (accidental->text acc) (if (= acc 0) @@ -269,7 +270,7 @@ (list (append '((raise . 0.6)) (list (string-append "accidentals-" - (number->string acc)))))))))))) + (number->string acc)))))))))))) ) (define (pitch->text pitch) diff --git a/scm/drums.scm b/scm/drums.scm new file mode 100644 index 0000000000..b1eff86751 --- /dev/null +++ b/scm/drums.scm @@ -0,0 +1,159 @@ +; drum-"hack". See input/tricks/drums.ly and ly/drumpitch.ly +; 2001/03/25 Rune Zedeler + +(define (seq-music-list elts) + (let* ( (ml (ly-make-music "Sequential_music")) ) + (ly-set-mus-property ml 'elements elts) + ml +)) + +(define (make-art-script x) + (let* ( (m (ly-make-music "Articulation_req")) + ) + (ly-set-mus-property m 'articulation-type x) + m + ) + ) + +;; adds the articulation script x to m if x is not #f. +(define (add-art-script m x) + (if x + (if (and x (equal? (ly-music-name m) "Request_chord")) + (ly-set-mus-property m 'elements + (cons (make-art-script x) (ly-get-mus-property m 'elements)) + ) + (let* ( (es (ly-get-mus-property m 'elements)) + (e (ly-get-mus-property m 'element)) ) + (map (lambda (y) (add-art-script y x)) es) + (if (music? e) + (add-art-script e x)) + ) + ) + ) + m + ) + +(define (make-head-type-elem t) + (let* ( (m (ly-make-music "Music")) + ) + (ly-set-mus-property m 'iterator-ctor Push_property_iterator::constructor) + (ly-set-mus-property m 'symbols 'NoteHead) + (ly-set-mus-property m 'grob-property 'style) + (ly-set-mus-property m 'grob-value t) + m + ) + ) + +(define (make-head-type t) + (let* ( (m (ly-make-music "Context_specced_music")) + (e (make-head-type-elem t)) + ) + (ly-set-mus-property m 'element e) + (ly-set-mus-property m 'context-type "Thread") + m + ) + ) + +(define (make-thread-context thread-name element) + (let* ( (m (ly-make-music "Context_specced_music"))) + (ly-set-mus-property m 'element element) + (ly-set-mus-property m 'context-type "Thread") + (ly-set-mus-property m 'context-id (symbol->string thread-name)) + m + ) + ) + +;; makes a sequential-music of thread-context, head-change and note +(define (make-drum-head kit req-ch ) + (let ((es (ly-get-mus-property req-ch 'elements))) + (if (equal? es '()) + req-ch + (let* ((fe (car es)) + (oldp (ly-get-mus-property fe 'pitch)) + ) + (if (not (pitch? oldp)) + req-ch + (let* ((pap ((pitch->paper kit) oldp )) + (style (car pap)) + (script (cadr pap)) + (pitch (caddr pap)) + (ht (make-head-type style)) + (seq (seq-music-list (list ht req-ch))) + ) + (add-art-script req-ch script) + (ly-set-mus-property fe 'pitch pitch) + (set! req-ch (make-thread-context style seq)) + req-ch + ) + ) + ) + ) + ) + ) + +;; whoa, hadn't head of "assoc" when I made this :) +(define ((pitch->paper kit) p) + (let p2p ((pitches drum-pitch-names)) + (cond ((eq? pitches '()) + (begin + (display p) ;; UGH. FIXME. pitch->string ??? + (ly-warn " unknown drumpitch.") + (cdar (eval kit)) + )) + ((eq? p (caddr (car pitches))) ((name->paper kit) (caar pitches)) ) + (else (p2p (cdr pitches) ) ) + ) + ) + ) +(define ((name->paper kit) n) + (let n2p ((pitches (eval kit))) + (cond ((eq? pitches '()) + (begin + (ly-warn (string-append "Kit `" (symbol->string kit) "' doesn't contain drum `" n + "'\nSee lily/drumpitch.ly for supported drums.")) + (cdar (eval kit)) + )) + ((eq? n (caar pitches)) (cdar pitches) ) + (else (n2p (cdr pitches) ) ) + ) + ) + ) + + +;; converts a midi-pitched (ly/drumpitch.ly) file to paper output. +(define ((drums->paper kit) music) + (begin + (if (equal? (ly-music-name music) "Request_chord") + (set! music (make-drum-head kit music)) + (let* ((es (ly-get-mus-property music 'elements)) + (e (ly-get-mus-property music 'element)) + (p (ly-get-mus-property music 'pitch)) + (body (ly-get-mus-property music 'body)) + (alts (ly-get-mus-property music 'alternatives))) + + (if (pair? es) + (ly-set-mus-property music 'elements (map (drums->paper kit) es) ) + ) + + (if (music? alts) + (ly-set-mus-property + music 'alternatives + ((drums->paper kit) alts))) + + (if (music? body) + (ly-set-mus-property + music 'body + ((drums->paper kit) body))) + + (if (music? e) + (begin + (ly-set-mus-property + music 'element + ((drums->paper kit) e)) + ) + ) + ) + ) + music + ) + ) diff --git a/scm/generic-property.scm b/scm/generic-property.scm index 81b181683d..740f0a641a 100644 --- a/scm/generic-property.scm +++ b/scm/generic-property.scm @@ -39,7 +39,6 @@ (list 'verticalDirection dir? 'direction) (list 'stemLength number? 'length) (list 'flagStyle string? 'flag-style) - (list 'stemCentered boolean? 'stem-centered) (list 'noStemExtend boolean? 'no-stem-extend) (list 'stemShorten number? 'shorten) )) diff --git a/scm/grob-description.scm b/scm/grob-description.scm index ea932de96c..e2bfae8305 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -178,6 +178,9 @@ (DynamicText . ( (Y-offset-callbacks . (,Side_position_interface::aligned_on_self)) (molecule-callback . ,Text_item::brew_molecule) +(X-offset-callbacks . (,Side_position_interface::aligned_on_self)) + (self-alignment-X . 0) + (no-spacing-rods . #t) (script-priority . 100) (font-series . bold) @@ -345,7 +348,8 @@ (style . default) (molecule-callback . ,Note_head::brew_molecule) (Y-offset-callbacks . (,Staff_symbol_referencer::callback)) - (attachment-slope . 0.17) + (stem-attachment-function + . ,note-head-style->attachment-coordinates) (meta . ,(grob-description "NoteHead" rhythmic-head-interface font-interface note-head-interface )) diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index b85ec0a97a..223ab00584 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -43,8 +43,10 @@ This procedure is called (using dependency resolution) after line breaking. Retu (grob-property-description 'arithmetic-multiplier number? "see @ref{spacing-spanner-interface}.") (grob-property-description 'attachment pair? "cons of symbols, '(LEFT-TYPE . RIGHT-TYPE), where both types may be alongside-stem, stem, head or loose-end.") -(grob-property-description 'attachment-slope number? "Where does the stem -attach to the notehead?") +(grob-property-description 'stem-attachment-function procedure? "Where +does the stem attach to the notehead? Function takes a symbol argument +being the style. It returns a (X . Y) pair, specifying location in +terms of note head bounding box.") (grob-property-description 'attachment-offset pair? "cons of offsets, '(LEFT-offset . RIGHT-offset). This offset is added to the attachments to prevent ugly slurs. [fixme: we need more documentation here]. @@ -267,7 +269,6 @@ itself. Return value is ignored.") (grob-property-description 'staff-symbol boolean? "the staff symbol grob that we're in.") (grob-property-description 'staffline-clearance number? "don't get closer than this to stafflines.") (grob-property-description 'stem ly-grob? "pointer to Stem object.") -(grob-property-description 'stem-centered boolean? "Center stems on note heads. Useful for mensural notation.") (grob-property-description 'stem-end-position number? "Where does the stem end (the end is opposite to the support-head.") (grob-property-description 'stem-length number? "length of stem.") (grob-property-description 'stem-shorten list? "shorten stems in forced directions given flag multiplicity.") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index ef657ad6a4..ee1b65a218 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -124,7 +124,6 @@ thickness beamed-lengths beamed-minimum-lengths - stem-centered lengths beam stem-shorten @@ -216,17 +215,13 @@ object." (lily-interface 'note-head-interface "Note head" - '( - style attachment-slope note-character - )) + '( style stem-attachment-function note-character )) (lily-interface 'note-name-interface "Note name" - '( - style - )) + '( style )) diff --git a/scm/lily.scm b/scm/lily.scm index f2b11acc73..1e6fab4f69 100644 --- a/scm/lily.scm +++ b/scm/lily.scm @@ -98,6 +98,7 @@ "chord-name.scm" "grob-description.scm" "script.scm" + "drums.scm" "midi.scm" ))) diff --git a/scm/midi.scm b/scm/midi.scm index c823dcb9f2..d44492d961 100644 --- a/scm/midi.scm +++ b/scm/midi.scm @@ -50,11 +50,225 @@ ) instrument-equaliser-alist)) +;; (name . program+32768*(channel10 ? 1 : 0) ) +(define instrument-names-alist '()) +(set! instrument-names-alist + (append + `( + ("acoustic grand" . ,(- 1 1)) + ("bright acoustic" . ,(- 2 1)) + ("electric grand" . ,(- 3 1)) + ("honky-tonk" . ,(- 4 1)) + ("electric piano 1" . ,(- 5 1)) + ("electric piano 2" . ,(- 6 1)) + ("harpsichord" . ,(- 7 1)) + ("clav" . ,(- 8 1)) + + ; (9-16 chrom percussion) + ("celesta" . ,(- 9 1)) + ("glockenspiel" . ,(- 10 1)) + ("music box" . ,(- 11 1)) + ("vibraphone" . ,(- 12 1)) + ("marimba" . ,(- 13 1)) + ("xylophone" . ,(- 14 1)) + ("tubular bells" . ,(- 15 1)) + ("dulcimer" . ,(- 16 1)) + + ; (17-24 organ) + ("drawbar organ" . ,(- 17 1)) + ("percussive organ" . ,(- 18 1)) + ("rock organ" . ,(- 19 1)) + ("church organ" . ,(- 20 1)) + ("reed organ" . ,(- 21 1)) + ("accordion" . ,(- 22 1)) + ("harmonica" . ,(- 23 1)) + ("concertina" . ,(- 24 1)) + + ; (25-32 guitar) + ("acoustic guitar (nylon)" . ,(- 25 1)) + ("acoustic guitar (steel)" . ,(- 26 1)) + ("electric guitar (jazz)" . ,(- 27 1)) + ("electric guitar (clean)" . ,(- 28 1)) + ("electric guitar (muted)" . ,(- 29 1)) + ("overdriven guitar" . ,(- 30 1)) + ("distorted guitar" . ,(- 31 1)) + ("guitar harmo(dinics" . ,(- 32 1)) + + ; (33-40 bass) + ("acoustic bass" . ,(- 33 1)) + ("electric bass (finger)" . ,(- 34 1)) + ("electric bass (pick)" . ,(- 35 1)) + ("fretless bass" . ,(- 36 1)) + ("slap bass 1" . ,(- 37 1)) + ("slap bass 2" . ,(- 38 1)) + ("synth bass 1" . ,(- 39 1)) + ("synth bass 2" . ,(- 40 1)) + + ; (41-48 strings) + ("violin" . ,(- 41 1)) + ("viola" . ,(- 42 1)) + ("cello" . ,(- 43 1)) + ("contrabass" . ,(- 44 1)) + ("tremolo strings" . ,(- 45 1)) + ("pizzicato strings" . ,(- 46 1)) + ("orchestral strings" . ,(- 47 1)) + ("timpani" . ,(- 48 1)) + + ; (49-56 ensemble) + ("string ensemble 1" . ,(- 49 1)) + ("string ensemble 2" . ,(- 50 1)) + ("synthstrings 1" . ,(- 51 1)) + ("synthstrings 2" . ,(- 52 1)) + ("choir aahs" . ,(- 53 1)) + ("voice oohs" . ,(- 54 1)) + ("synth voice" . ,(- 55 1)) + ("orchestra hit" . ,(- 56 1)) + + ; (57-64 brass) + ("trumpet" . ,(- 57 1)) + ("trombone" . ,(- 58 1)) + ("tuba" . ,(- 59 1)) + ("muted trumpet" . ,(- 60 1)) + ("french horn" . ,(- 61 1)) + ("brass section" . ,(- 62 1)) + ("synthbrass 1" . ,(- 63 1)) + ("synthbrass 2" . ,(- 64 1)) + + ; (65-72 reed) + ("soprano sax" . ,(- 65 1)) + ("alto sax" . ,(- 66 1)) + ("tenor sax" . ,(- 67 1)) + ("baritone sax" . ,(- 68 1)) + ("oboe" . ,(- 69 1)) + ("english horn" . ,(- 70 1)) + ("bassoon" . ,(- 71 1)) + ("clarinet" . ,(- 72 1)) + + ; (73-80 pipe) + ("piccolo" . ,(- 73 1)) + ("flute" . ,(- 74 1)) + ("recorder" . ,(- 75 1)) + ("pan flute" . ,(- 76 1)) + ("blown bottle" . ,(- 77 1)) + ("skakuhachi" . ,(- 78 1)) + ("whistle" . ,(- 79 1)) + ("ocarina" . ,(- 80 1)) + + ; (81-88 synth lead) + ("lead 1 (square)" . ,(- 81 1)) + ("lead 2 (sawtooth)" . ,(- 82 1)) + ("lead 3 (calliope)" . ,(- 83 1)) + ("lead 4 (chiff)" . ,(- 84 1)) + ("lead 5 (charang)" . ,(- 85 1)) + ("lead 6 (voice)" . ,(- 86 1)) + ("lead 7 (fifths)" . ,(- 87 1)) + ("lead 8 (bass+lead)" . ,(- 88 1)) + + ; (89-96 synth pad) + ("pad 1 (new age)" . ,(- 89 1)) + ("pad 2 (warm)" . ,(- 90 1)) + ("pad 3 (polysynth)" . ,(- 91 1)) + ("pad 4 (choir)" . ,(- 92 1)) + ("pad 5 (bowed)" . ,(- 93 1)) + ("pad 6 (metallic)" . ,(- 94 1)) + ("pad 7 (halo)" . ,(- 95 1)) + ("pad 8 (sweep)" . ,(- 96 1)) + + ; (97-104 synth effects) + ("fx 1 (rain)" . ,(- 97 1)) + ("fx 2 (soundtrack)" . ,(- 98 1)) + ("fx 3 (crystal)" . ,(- 99 1)) + ("fx 4 (atmosphere)" . ,(- 100 1)) + ("fx 5 (brightness)" . ,(- 101 1)) + ("fx 6 (goblins)" . ,(- 102 1)) + ("fx 7 (echoes)" . ,(- 103 1)) + ("fx 8 (sci-fi)" . ,(- 104 1)) + + ; (105-112 ethnic) + ("sitar" . ,(- 105 1)) + ("banjo" . ,(- 106 1)) + ("shamisen" . ,(- 107 1)) + ("koto" . ,(- 108 1)) + ("kalimba" . ,(- 109 1)) + ("bagpipe" . ,(- 110 1)) + ("fiddle" . ,(- 111 1)) + ("shanai" . ,(- 112 1)) + + ; (113-120 percussive) + ("tinkle bell" . ,(- 113 1)) + ("agogo" . ,(- 114 1)) + ("steel drums" . ,(- 115 1)) + ("woodblock" . ,(- 116 1)) + ("taiko drum" . ,(- 117 1)) + ("melodic tom" . ,(- 118 1)) + ("synth drum" . ,(- 119 1)) + ("reverse cymbal" . ,(- 120 1)) + + ; (121-128 sound effects) + ("guitar fret noise" . ,(- 121 1)) + ("breath noise" . ,(- 122 1)) + ("seashore" . ,(- 123 1)) + ("bird tweet" . ,(- 124 1)) + ("telephone ring" . ,(- 125 1)) + ("helicopter" . ,(- 126 1)) + ("applause" . ,(- 127 1)) + ("gunshot" . ,(- 128 1)) + + ; (channel 10 drum-kits - subtract 32768 to get program no.) + ("standard kit" . ,(+ 32768 0)) + ("standard drums" . ,(+ 32768 0)) + ("drums" . ,(+ 32768 0)) + ("room kit" . ,(+ 32768 8)) + ("room drums" . ,(+ 32768 8)) + ("power kit" . ,(+ 32768 16)) + ("power drums" . ,(+ 32768 16)) + ("rock drums" . ,(+ 32768 16)) + ("electronic kit" . ,(+ 32768 24)) + ("electronic drums" . ,(+ 32768 24)) + ("tr-808 kit" . ,(+ 32768 25)) + ("tr-808 drums" . ,(+ 32768 25)) + ("jazz kit" . ,(+ 32768 32)) + ("jazz drums" . ,(+ 32768 32)) + ("brush kit" . ,(+ 32768 40)) + ("brush drums" . ,(+ 32768 40)) + ("orchestra kit" . ,(+ 32768 48)) + ("orchestra drums" . ,(+ 32768 48)) + ("classical drums" . ,(+ 32768 48)) + ("sfx kit" . ,(+ 32768 56)) + ("sfx drums" . ,(+ 32768 56)) + ("mt-32 kit" . ,(+ 32768 127)) + ("mt-32 drums" . ,(+ 32768 127)) + ("cm-64 kit" . ,(+ 32768 127)) + ("cm-64 drums" . ,(+ 32768 127)) + ) + instrument-names-alist + ) +) + + (define (default-instrument-equaliser s) (let ((entry (assoc s instrument-equaliser-alist))) (if entry (cdr entry)))) +;; returns whether the instrument should use midi channel 9 +(define (percussion-p instrument) + (let* ((inst (symbol->string instrument)) + (entry (assoc inst instrument-names-alist)) + ) + (and entry (>= (cdr entry) 32768)) + ) +) + +;; returns the program of the instrument +(define (midi-program instrument) + (let* ((inst (symbol->string instrument)) + (entry (assoc inst instrument-names-alist)) + ) + (if entry (modulo (cdr entry) 32768) #f ) + ) +) + ;; 90 == 90/127 == 0.71 is supposed to be the default value ;; urg: we should set this at start of track (define dynamic-default-volume 0.71) diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 941eb94ee7..d6d57b3765 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -73,6 +73,23 @@ (string-append (number->string duration) (symbol->string style))))) +(define (note-head-style->attachment-coordinates style) + "Return pair (X . Y), containing multipliers for the note head +bounding box, where to attach the stem. e.g.: X==0 means horizontally +centered, X==1 is at the right, X == -1 is at the left." + + (case style + ((default) '(1.0 . 0.8)) + ((cross) '(1.0 . -1.0)) + ((mensural) '(0.0 . 1.0)) + ((diamond) '(1.0 . 0.8)) + ((transparent) '(1.0 . 1.0)) + ((slash) '(1.0 . 1.0)) + ((harmonic) '(1.0 0.0)) + (else + '(1.0 . 0.0) + ))) + (define (string-encode-integer i) (cond ((= i 0) "o") -- 2.39.2