From 194ef0e7e19c7a7c0836b6bd3ed2788a56220d2f Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Tue, 27 Apr 1999 11:48:51 +0200 Subject: [PATCH] release: 1.1.41 --- Documentation/tex/lilypond-overview.doc | 75 +++- Documentation/tex/lilypond-regtest.doc | 22 +- Documentation/tex/mudela-book-doc.doc | 4 +- Documentation/tex/refman.yo | 402 ++++++++++-------- Documentation/tex/tutorial.yo | 130 +++--- NEWS | 42 ++ TODO | 82 ++-- VERSION | 2 +- flower/include/hash-table.hh | 34 +- flower/offset.cc | 8 +- input/bugs/Overture.ly | 10 +- input/bugs/bar-space.ly | 6 +- input/bugs/slur-over-rest.ly | 4 + input/example-3.ly | 2 +- input/just-friends.ly | 4 +- input/keys.ly | 4 +- input/kortjakje.ly | 4 +- input/opus-130.ly | 14 +- input/part.ly | 2 +- input/pedal.ly | 2 +- input/praeludium-fuga-E.ly | 60 +-- input/rhythm.ly | 6 +- input/scales.ly | 2 +- input/scripts.ly | 6 +- input/star-spangled-banner.ly | 14 +- input/test/abbrev.ly | 2 +- input/test/alphabet.ly | 6 +- input/test/auto-staff-switch.ly | 8 +- input/test/bar-scripts.ly | 10 +- input/test/beam-chord.ly | 2 +- input/test/beam-interstaff.ly | 8 +- input/test/beam-isknee.ly | 8 +- input/test/beam-pos.ly | 2 +- input/test/beams.ly | 4 +- input/test/broken.ly | 2 +- input/test/chord-inversion.ly | 6 +- input/test/chord-table.ly | 52 +-- input/test/chords.ly | 6 +- input/test/clefs.ly | 2 +- input/test/coda-kludge.ly | 6 +- input/test/collisions.ly | 22 +- input/test/defaultbars.ly | 2 +- input/test/denneboom.ly | 8 +- input/test/dotted-slur.ly | 2 +- input/test/extender.ly | 6 +- input/test/extra-staff.ly | 13 +- input/test/find-quarts.ly | 2 +- input/test/font-body.ly | 10 +- input/test/font.ly | 2 +- input/test/font16.ly | 2 +- input/test/font20.ly | 4 +- input/test/gourlay.ly | 4 +- input/test/grace.ly | 8 +- input/test/hara-kiri.ly | 63 +-- input/test/incipit.ly | 10 +- input/test/keys.ly | 2 +- input/test/knee.ly | 2 +- input/test/mark.ly | 2 +- input/test/memory.ly | 4 +- input/test/multi-rest.ly | 4 +- input/test/noteheadstyle.ly | 9 +- input/test/notemode-chords.ly | 2 +- input/test/orchestscore.ly | 44 +- input/test/ossia.ly | 4 +- input/test/rep.ly | 4 +- input/test/repeat.ly | 6 +- input/test/rest-collision.ly | 20 +- input/test/score-bar-scripts.ly | 14 +- input/test/sleur.ly | 2 +- input/test/slur-bug.ly | 2 +- input/test/slur-damping.ly | 2 +- input/test/slur-interstaff.ly | 8 +- input/test/slur-swap.ly | 2 +- input/test/slurs.ly | 4 +- input/test/spacing-2.ly | 12 +- input/test/spacing.ly | 26 +- input/test/span-bars.ly | 14 +- input/test/staff-margin.ly | 18 + input/test/staff-side-slur.ly | 4 +- input/test/staff-size.fly | 6 +- input/test/stem.ly | 2 +- input/test/tchaikovsky.ly | 2 +- input/test/test-lyrics.ly | 10 +- input/test/thumb.ly | 2 +- input/test/tie-bug.ly | 2 +- input/test/tie.ly | 2 +- input/test/title.ly | 2 +- input/test/transposition.ly | 4 +- input/test/tup.ly | 4 +- input/test/unfold.ly | 4 +- input/test/updown.fly | 4 +- input/test/vertical-align.ly | 4 +- input/test/vertical-text.ly | 8 +- input/test/wtk-huh.ly | 12 +- input/tril.ly | 2 +- input/twinkle-pop.ly | 14 +- input/twinkle.ly | 14 +- lib/include/warn.hh | 3 +- lib/warn.cc | 6 + lily/axis-group-engraver.cc | 60 +++ lily/bar-script-engraver.cc | 14 +- lily/beam.cc | 4 +- lily/context-specced-music.cc | 14 + lily/g-script-engraver.cc | 5 +- lily/g-script.cc | 21 +- lily/g-staff-side.cc | 14 +- lily/hara-kiri-engraver.cc | 30 ++ lily/include/axis-group-element.hh | 3 +- lily/include/axis-group-engraver.hh | 37 ++ lily/include/context-specced-music.hh | 32 ++ lily/include/g-script.hh | 11 +- lily/include/hara-kiri-engraver.hh | 24 ++ lily/include/lily-guile.hh | 6 +- lily/include/lily-proto.hh | 2 + lily/include/line-group-group-engraver.hh | 2 - lily/include/lookup.hh | 6 +- lily/include/ly-symbols.hh | 1 + lily/include/music.hh | 9 - lily/include/repeated-music.hh | 5 + lily/include/translator-group.hh | 5 +- lily/include/vertical-align-engraver.hh | 3 +- lily/item.cc | 21 +- lily/lily-guile.cc | 194 +-------- lily/line-group-group-engraver.cc | 5 - lily/local-key-item.cc | 3 +- lily/lookup.cc | 82 ++-- lily/molecule.cc | 4 +- lily/music-iterator.cc | 6 +- lily/music.cc | 2 + lily/my-lily-lexer.cc | 4 +- lily/p-col.cc | 2 +- lily/p-score.cc | 3 +- lily/paper-outputter.cc | 2 +- lily/parser.yy | 42 +- lily/scm-bintree.cc | 212 +++++++++ lily/score-engraver.cc | 10 +- lily/simultaneous-music-iterator.cc | 3 + lily/slur.cc | 2 +- lily/staff-margin-engraver.cc | 8 +- lily/staff-sym.cc | 6 +- lily/translator-group.cc | 46 +- lily/vertical-align-engraver.cc | 18 +- ly/book-fragment.ly | 2 +- ly/book-init.ly | 2 +- ly/center-fragment.ly | 2 +- ly/center.ly | 2 +- ly/declarations.ly | 9 + ly/engraver.ly | 82 ++-- ly/fragment.ly | 2 +- ly/init.fly | 2 +- ly/init.ly | 2 +- ly/init.sly | 2 +- ly/paper16.ly | 2 +- ly/paper20.ly | 2 +- ly/property.ly | 21 +- ly/script.ly | 5 +- make/out/lelievijver.lsm | 8 +- make/out/lilypond.lsm | 8 +- make/out/lilypond.spec | 4 +- mf/feta-eindelijk.mf | 12 +- mf/feta-generic.mf | 4 +- mf/feta-ital-f.mf | 2 +- mf/feta-ital-m.mf | 4 +- mf/feta-ital-p.mf | 2 +- mf/feta-ital-r.mf | 2 +- mf/feta-ital-s.mf | 2 +- mudela-mode.el | 8 +- mutopia/Coriolan/bassi-part.ly | 6 +- mutopia/Coriolan/clarinetti-part.ly | 2 +- mutopia/Coriolan/clarinetti.ly | 6 +- mutopia/Coriolan/clarinetto-1.ly | 2 +- mutopia/Coriolan/clarinetto-2.ly | 2 +- mutopia/Coriolan/contrabasso-part.ly | 2 +- mutopia/Coriolan/contrabasso.ly | 6 +- mutopia/Coriolan/coriolan.ly | 18 +- mutopia/Coriolan/corni-part.ly | 2 +- mutopia/Coriolan/corni.ly | 6 +- mutopia/Coriolan/corno-1.ly | 2 +- mutopia/Coriolan/corno-2.ly | 2 +- mutopia/Coriolan/fagotti-part.ly | 2 +- mutopia/Coriolan/fagotti.ly | 6 +- mutopia/Coriolan/fagotto-1.ly | 2 +- mutopia/Coriolan/fagotto-2.ly | 2 +- mutopia/Coriolan/flauti-part.ly | 2 +- mutopia/Coriolan/flauti.ly | 6 +- mutopia/Coriolan/flauto-1.ly | 2 +- mutopia/Coriolan/flauto-2.ly | 2 +- mutopia/Coriolan/global.ly | 2 +- mutopia/Coriolan/oboe-1.ly | 2 +- mutopia/Coriolan/oboe-2.ly | 2 +- mutopia/Coriolan/oboi-part.ly | 2 +- mutopia/Coriolan/oboi.ly | 6 +- mutopia/Coriolan/timpani.ly | 4 +- mutopia/Coriolan/trombe-part.ly | 2 +- mutopia/Coriolan/trombe.ly | 6 +- mutopia/Coriolan/trombo-1.ly | 2 +- mutopia/Coriolan/trombo-2.ly | 2 +- mutopia/Coriolan/viola-1.ly | 10 +- mutopia/Coriolan/viola-2.ly | 10 +- mutopia/Coriolan/viola-part.ly | 6 +- mutopia/Coriolan/violino-1-part.ly | 2 +- mutopia/Coriolan/violino-1.ly | 4 +- mutopia/Coriolan/violino-2-part.ly | 2 +- mutopia/Coriolan/violino-2.ly | 4 +- mutopia/Coriolan/violoncello-part.ly | 2 +- mutopia/Coriolan/violoncello.ly | 6 +- mutopia/D.Scarlatti/progress.ly | 21 +- mutopia/D.Scarlatti/sonata-k1-l366.ly | 11 +- mutopia/D.Scarlatti/sonata-k2-l388.ly | 7 +- mutopia/D.Scarlatti/sonata-k3-l378.ly | 21 +- mutopia/D.Scarlatti/sonata-k4-l390.ly | 11 +- mutopia/D.Zipoli/verso_2.ly | 18 +- mutopia/E.Satie/gnossienne-4.ly | 30 +- mutopia/E.Satie/petite-ouverture-a-danser.ly | 20 +- mutopia/F.Schubert/AnSylvia.ly | 22 +- mutopia/F.Schubert/standchen-16.ly | 2 +- mutopia/F.Schubert/standchen-20.ly | 2 +- mutopia/F.Schubert/standchen.ly | 14 +- mutopia/Hymns/diademata.ly | 12 +- mutopia/Hymns/laudatedom.ly | 10 +- mutopia/Hymns/maccabaeus.ly | 10 +- mutopia/Hymns/ode.ly | 10 +- mutopia/Hymns/passion.ly | 10 +- mutopia/Hymns/stille.ly | 20 +- .../Cembalo-Partitas/Partita_II_Allemande.ly | 18 +- .../Cembalo-Partitas/Partita_II_Capriccio.ly | 20 +- .../Cembalo-Partitas/Partita_II_Sinfonia.ly | 26 +- .../J.S.Bach/Petites-Preludes/preludes-1.ly | 26 +- .../J.S.Bach/Petites-Preludes/preludes-2.ly | 34 +- .../J.S.Bach/Petites-Preludes/preludes-4.ly | 24 +- .../J.S.Bach/Petites-Preludes/preludes-5.ly | 24 +- .../J.S.Bach/Petites-Preludes/preludes-6.ly | 24 +- .../Solo-Cello-Suites/allemande-cello.ly | 4 +- .../Solo-Cello-Suites/allemande-urtext.ly | 9 +- .../Solo-Cello-Suites/allemande-viola.ly | 4 +- .../Solo-Cello-Suites/courante-cello.ly | 4 +- .../Solo-Cello-Suites/courante-urtext.ly | 9 +- .../Solo-Cello-Suites/courante-viola.ly | 4 +- .../J.S.Bach/Solo-Cello-Suites/gigue-cello.ly | 4 +- .../Solo-Cello-Suites/gigue-urtext.ly | 11 +- .../J.S.Bach/Solo-Cello-Suites/gigue-viola.ly | 4 +- .../Solo-Cello-Suites/menuetto-cello.ly | 8 +- .../Solo-Cello-Suites/menuetto-urtext.ly | 19 +- .../Solo-Cello-Suites/menuetto-viola.ly | 8 +- .../Solo-Cello-Suites/prelude-cello.ly | 4 +- .../Solo-Cello-Suites/prelude-urtext.ly | 11 +- .../Solo-Cello-Suites/prelude-viola.ly | 4 +- .../Solo-Cello-Suites/sarabande-cello.ly | 4 +- .../Solo-Cello-Suites/sarabande-urtext.ly | 11 +- .../Solo-Cello-Suites/sarabande-viola.ly | 4 +- mutopia/J.S.Bach/viola-i.ly | 3 +- mutopia/J.S.Bach/violino-i.ly | 3 +- mutopia/J.S.Bach/violino-viola.ly | 3 +- mutopia/J.S.Bach/violino-violoncello.ly | 3 +- mutopia/J.S.Bach/violoncello-i.ly | 3 +- mutopia/J.S.Bach/wtk1-fugue1.ly | 8 +- mutopia/J.S.Bach/wtk1-fugue2.ly | 18 +- mutopia/J.S.Bach/wtk1-prelude1.ly | 8 +- mutopia/L.Mozart/sinfonia.ly | 21 +- mutopia/N.W.Gade/brass.ly | 2 +- mutopia/N.W.Gade/parts.ly | 32 +- mutopia/N.W.Gade/score.ly | 70 +-- mutopia/N.W.Gade/strings.ly | 6 +- mutopia/N.W.Gade/wood.ly | 4 +- mutopia/W.A.Mozart/cadenza.ly | 4 +- mutopia/W.A.Mozart/horn-concerto-3.ly | 2 +- mutopia/gallina.ly | 10 +- mutopia/los-toros-oboe.ly | 4 +- scm/accordion-script.scm | 87 ++-- scm/script.scm | 53 +-- scripts/convert-mudela.py | 11 + scripts/ly2dvi.py | 5 +- scripts/mudela-book.py | 4 +- stepmake/bin/ls-latex.py | 4 +- 274 files changed, 2203 insertions(+), 1611 deletions(-) create mode 100644 input/bugs/slur-over-rest.ly create mode 100644 input/test/staff-margin.ly create mode 100644 lily/axis-group-engraver.cc create mode 100644 lily/context-specced-music.cc create mode 100644 lily/hara-kiri-engraver.cc create mode 100644 lily/include/axis-group-engraver.hh create mode 100644 lily/include/context-specced-music.hh create mode 100644 lily/include/hara-kiri-engraver.hh create mode 100644 lily/scm-bintree.cc diff --git a/Documentation/tex/lilypond-overview.doc b/Documentation/tex/lilypond-overview.doc index dbbd19d296..ccb5a7377b 100644 --- a/Documentation/tex/lilypond-overview.doc +++ b/Documentation/tex/lilypond-overview.doc @@ -92,10 +92,10 @@ input along with output in Figure~\ref{fig:intro-fig}. \begin{mudela}[verbatim] \score { \notes - \type GrandStaff < + \context GrandStaff < \transpose c'' { c4 c4 g4 g4 a4 a4 g2 } { \clef "bass"; c4 c'4 - \type Staff f'4 c'4 e'4 c'4 } + \context Staff f'4 c'4 e'4 c'4 } > \paper { linewidth = -1.0\cm ; @@ -188,10 +188,10 @@ score and in extracted parts. \begin{mudela} \score { \notes - \type GrandStaff < + \context GrandStaff < \transpose c'' { c4 c4 g4 g4 a4 a4 g2 } { \clef "bass"; c4 c'4 - \type Staff f'4 c'4 e'4 c'4 } + \context Staff f'4 c'4 e'4 c'4 } > \paper { linewidth = -1.0\cm ; @@ -329,7 +329,7 @@ linewidth = -1.; \end{mudela} \begin{mudela} \score { - \notes \transpose c''{ r\longa*1/4 r\breve*1/2 r1 r2 r4 r8 r16 r32 r64 } + \notes \transpose c''\context Staff { r\longa*1/4 r\breve*1/2 r1 r2 r4 r8 r16 r32 r64 } \paper { \translator { \StaffContext @@ -440,11 +440,11 @@ Figure~\ref{fig:simultaneous}. \begin{center} \begin{mudela} \relative c'' {\time 2/4; - \type Staff < \type Voice = VA{ + \context Staff < \context Voice = VA{ \stemdown c4 d b16 b b b b b b b } - \type Voice = VB { + \context Voice = VB { \stemup e4 f g8 g4 g8 } > } \end{mudela} @@ -525,10 +525,71 @@ Figure~\ref{fig:collision}. \section{Requirements} + \section{Approach} \subsection{Input} +The input format consists of combining a symbolic representation of +music with style sheet that describes how the symbolic presentation +can converted to notation. The symbolic representation is based on a +context free language called \textsf{music}. Music is a recursively +defined construction in the input language. It can be constructed by +combining lists of \textsf{music} sequentially or parallel or from +terminals like notes or lyrics. + +The grammar for \textsf{music} is listed below. It has been edited to +leave out the syntactic and ergonomic details. + +\begin{center} + \begin{tabular}{ll} +Music: & SimpleMusic\\ + & $|$ REPEATED int Music ALTERNATIVE MusicList\\ + & $|$ SIMULTANEOUS MusicList\\ + & $|$ SEQUENTIAL MusicList\\ + & $|$ CONTEXT STRING '=' STRING Music\\ + & $|$ TIMES int int Music \\ + & $|$ TRANSPOSE PITCH Music \\ +SimpleMusic: & $|$ Note\\ + & $|$ Lyric\\ + & $|$ Rest\\ + & $|$ Chord\\ + & $|$ Command\\ +Command: & METERCHANGE\\ + & $|$ CLEFCHANGE\\ + &$|$ PROPERTY STRING '=' STRING\\ +Chord: &PitchList DURATION\\ +Rest: &REST DURATION\\ +Lyric: &STRING DURATION\\ +Note: &PITCH DURATION\\ +\end{tabular} +\end{center} + +The terminals are both purely musical concepts that have a duration, +and take a non-zero amount of musical time, like notes and lyrics, and +commands that behave as if they have no duration.\footnote{The + PROPERTY command is a generic mechanism for controlling the + interpretation, i.e. the musical style sheets. See [forward ref]} + +The nonterminal productions can +\begin{itemize} +\item Some productions combine multiple elements: one can specify that + element are to be played in sequence, simultaneously or repetitively. +\item There are productions for transposing music, and for dilating + durations of music: the TIMES production can be used to encode a + triplet.\footnote{A triplet is a group of three notes marked by a + bracket, that are played 3/2 times faster.} +\item + There are productions that give directions to the interpretation + engine (the CONTEXT production) +\end{itemize} + + +\section{Context in notation} + +\section{Interpretation context} + + \section{Discussion} diff --git a/Documentation/tex/lilypond-regtest.doc b/Documentation/tex/lilypond-regtest.doc index 9b4cbde46d..aae1c80ea8 100644 --- a/Documentation/tex/lilypond-regtest.doc +++ b/Documentation/tex/lilypond-regtest.doc @@ -1,9 +1,9 @@ % -*-LaTeX-*- \documentclass{article} -\begin{document} \title{LilyPond feature test} \author{Han-Wen Nienhuys} +\begin{document} \maketitle This document tries give an brief overview of LilyPond features. When @@ -61,8 +61,8 @@ cases. \mudelafile{rest-collision.ly} -Normal collisions. We have limited support for four voice polyphony, -where the middle voices are horizontally shifted, sometimes. +Normal collisions. We have support for four voice polyphony, where the +middle voices are horizontally shifted in a limited number of cases. \mudelafile{collisions.ly} @@ -79,13 +79,21 @@ knowing it. Consequently, they fall over quite often. \mudelafile{bar-scripts.ly} +Staff margins are also markings attached to barlines. They should be +left otf the staff, and be centered vertically wrt the staff. They +may be on normal staffs, but also on compound staffs, like the +PianoStaff + +\mudelafile{staff-margin.ly} + \section{Clefs and Time Signatures} -For octaviated clefs, the ``8'' should appear closely above or below -the clef respectively. The transparent clef should not occupy any space -and with style \texttt{fullSizeChanges}, the changing clef should be -typeset in full size. +The transparent clef should not occupy any space and with style +\texttt{fullSizeChanges}, the changing clef should be typeset in full +size. For octaviated clefs, the ``8'' should appear closely above or +below the clef respectively. The ``8'' is processed in a rather +convoluted way, so this is fragile as well. \mudelafile{clefs.ly} diff --git a/Documentation/tex/mudela-book-doc.doc b/Documentation/tex/mudela-book-doc.doc index 6c5d7bb113..c4874f6b9d 100644 --- a/Documentation/tex/mudela-book-doc.doc +++ b/Documentation/tex/mudela-book-doc.doc @@ -202,7 +202,7 @@ file is a definition of a python dictionary: 'mudelaRhythm': r""" \begin{mudela}[eps \fontoptions] \score{ - \type RhythmicStaff{ + \context RhythmicStaff{ \notes{\stemup \maininput} } \paper{linewidth = -1.\cm;} @@ -217,7 +217,7 @@ send fontsize options to the defined commands. \verb|\mudelaRhythm[11pt]{c4 c8 [c16 c] c4 c}| produce this music: \begin{mudela}[eps, 11pt] \score{ - \type RhythmicStaff{ + \context RhythmicStaff{ \notes{ \stemup c4 r8 [c16 c] c4 c } } \paper{linewidth = -1.\cm;} diff --git a/Documentation/tex/refman.yo b/Documentation/tex/refman.yo index 1271a61daf..9778cbc9fe 100644 --- a/Documentation/tex/refman.yo +++ b/Documentation/tex/refman.yo @@ -10,45 +10,55 @@ redef(code)(1)(tt(ARG1)) COMMENT( +questions: + long lyrics don't get any space at the end + lyrics and scripts collide + \key b; \time 4/4; looks bad---no space between key sig and clef + \portato still DOES NOT WORK! + \cadenza vs. barNonAuto ? + not enough space for \key b; + I noticed that ledger lines in the previewer looked like they had + a double line (of different lengths). On printed output, I think + I can see a slight thickening of the ledger lines in the middle. + Is this supposed to happen? + restStyle=mensural doesn't seem to work (lots of characters not found + for rests.fly) + what happened to the Staff.textalignment and Lyrics.textalignment + properties? + + TODO: - the use of semicolons needs to be documented once it settles down + autobeamer paper size? + paper variables the explanation of how lyrics mode parses words seems ridiculous. - Is there a simple way to explain this, or is the behavior - too complicated for a reasonable explanation? - \relative and \tranpose and \times make it necessary to specify - an explicit \type staff, or bizarre things happen. - catalan.ly + Is there a simple way to explain this, or is the behavior + too complicated for a reasonable explanation? accordion symbols - extender* (see extender.ly) - \repeat & \alternative -> probably should have an example - properties: - unfoldRepeats - voltaVisibility - property: stemLeftBeamCount stemRightBeamCount interstaff beams (beam-interstaff.ly) interstaff slurs (see preludes-1.ly) - boolean property barAuto - property: noteheadStyle - harmonics: test/harmonics.fly - autobeamer - properties: beamAutoEndx ??? rational string "1/2" - beamAutoBegin - beamAutoEnd - beamAuto - ScriptPadding - Direction - chordNameStyle (banter) - chordInversionPreserve - createInitdefaultClef - dynamicStyle - singleStaffBracket - numberOfStaffLines - - - {Mark,BarNumber,Margin}{Direction,ScriptPadding} - - + + Current list of undocumented properties: + + "alignmentReference" to do with minVerticalAlign, etc? + "beamAuto" + "beamAutoBegin" + "beamAutoBegin" + type_str + "beamAutoEnd" + "beamAutoEnd" + type_str + "createInitdefaultClef" + "dynamicStyle" + "postBreakPadding" + "staffLineLeading" + "stemLeftBeamCount" + "stemRightBeamCount" + time_str + "beamAutoBegin" + time_str + "beamAutoBegin" + type_str + time_str + "beamAutoEnd" + time_str + "beamAutoEnd" + type_str + type_ + "Direction" + type_ + "HangOnClef" + type_ + "ScriptPadding" ) @@ -71,7 +81,7 @@ latexlayoutcmds( whentexinfo(notableofcontents()) -article(Mudela 1.0.14 / LilyPond 1.1.27 Reference Manual) +article(Mudela 1.0.14 / LilyPond 1.1.40 Reference Manual) (Adrian Mariano, Han-Wen Nienhuys and Jan Nieuwenhuizen) (nop()PIPETHROUGH(date "+%B %d, %Y")()()nop()) @@ -156,9 +166,10 @@ subsect(Basic Mudela) A Mudela file consists of keywords with arguments and identifier assignments separated by spaces, tabs or newlines. Semicolons are -used by some keywords but are not generally required. A one line -comment is introduced by a code(%) character. Block comments are -started by code(%{) and ended by code(%}). They cannot be nested. +used by some keywords and are inconsistantly required in other +circumstances. A one line comment is introduced by a code(%) +character. Block comments are started by code(%{) and ended by +code(%}). They cannot be nested. Mudela supports several types: @@ -222,17 +233,6 @@ mudela(fragment,verbatim,center)( ) -COMMENT( -Compound types are built up from the simple types. The compound types -are: arglist, assignlist and musiclist. An arglist is a -white space separated list of integers, reals and or strings surrounded -by braces code({) and code(}). An assignlist is a list of -identifier assignments, which have the form var(key)code(=)var(value). -A statement in Mudela has one of three forms: -verb(\keyword argument -\keyword argument1 argument2 ... ; -string=value) -) subsect(Identifiers) @@ -242,7 +242,9 @@ var(name)=var(value) and to refer to an identifier, you preceed its name with a backslash: code(\)var(name). It is legal to redefine an identifier in terms of its old value: code(foo = \foo * 2.0). Identifier assignments must appear at the top level in the Mudela -file. +file. Note that semicolons are forbidden after assignments appearing +at the top level but they are obligatory after assignments appearing +elsewhere. An identifier can be created with any string for its name, but you will only be able to refer to identifiers whose names begin with a @@ -254,7 +256,7 @@ accepts font midi pt spandynamic alternative grouping mm relative tempo bar header musicalpitch remove time cadenza in name repeat times -chordmodifier include notenames scm translator +chordmodifiers include notenames scm translator chords key notes scmfile transpose clef keysignature paper score type cm lyrics partial script version @@ -291,28 +293,6 @@ can only appear within code(\midi) or code(\paper) blocks. See Section ref(translators) for more information. -COMMENT( -subsect(Hierarchical structures) - -The general structure consists of declarations: -verb(IDENTIFIER = \TYPE{ - -}) -and instantiations: - -verb(\TYPE{ }) - -(Currently, code(\score) is the only type that can be instantiated -at top level.) - -Most instantiations that use an IDENTIFIER are specified as follows: - -verb(\TYPE{ \IDENTIFIER [...] }) - -Some exceptions on this rule have been made to prevent inputting -Mudela becoming tedious -) - subsect(Modes) label(modes) @@ -485,7 +465,7 @@ This happens because the Tuplet-engraver is in Voice and no Voice has been created yet. You must explicitly specify the Voice context in this situation mudela(fragment,verbatim,center)( -\type Voice { \times 2/3 {c'4 d' e'}} +\context Voice { \times 2/3 {c'4 d' e'}} ) A shorthand for code(\times) is to write code(*)var(fraction) after a @@ -536,9 +516,15 @@ mudela(fragment,verbatim,center)( f'()g'()a' [a'8 b'(] a'4 g' )f' ) -A tie connects two adjacent note heads. When used with chords, it -connects all of the note heads. Ties are indicated using the tilde symbol +A tie connects two adjacent note heads of the same pitch. +When used with chords, it +connects all of the note heads whose pitches match. +Ties are indicated using the tilde symbol code(~) by analogy with TeX()'s tie which connects words. +Note that if you try to tie together chords which have no common +pitches, then a warning message will appear and no tie will be created. +(Note that ties between different pitches can be enabled using the +property Voice.oldTieBehavior.) mudela(fragment,verbatim,center)( e' ~ e' ~ @@ -548,32 +534,28 @@ It is possible to create beams and slurs that cross staffs by switching the context: mudela(fragment,verbatim,center)( < -\type Staff=one \notes\relative c'{ +\context Staff=one \notes\relative c'{ \stemup [c8 c \translator Staff=two \stemup c c] \translator Staff=one d4( \translator Staff=two )a4 } -\type Staff=two \notes{ \clef bass;} +\context Staff=two \notes{ \clef bass;} > ) -COMMENT(!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!) - subsect(Note Ornaments) A variety of symbols can appear above and below notes to indicate -different characteristics of the performance. -These symbols can be -added to a note with `var(note)code(-\)var(name)'. Numerous different -symbols are defined in file(script.ly). Each symbol is defined using -the code(\script) keyword which specifies where symbols appear. -Symbols can be forced to appear above the note by writing +different characteristics of the performance. These symbols can be +added to a note with `var(note)code(-\)var(name)'. Numerous symbols +are defined in file(script.ly) and file(script.scm). Symbols can be +forced to appear above the note by writing `var(note)code(^\)var(name)', and they can be forced to appear below by writing `var(note)code(_\)var(name)'. Here is a chart showing symbols above notes, with the name of the corresponding symbol -appearing underneath. +appearing underneath. mudela()( \score{ @@ -584,22 +566,17 @@ mudela()( c''-\trill c''-\prall c''-\mordent c''-\prallprall c''-\prallmordent c''-\upprall c''-\downprall c''-\thumb } - \type Lyrics \lyrics{ - accent marcato staccatissimo fermata stopped - staccato tenuto upbow downbow lheel rheel ltoe rtoe turn - open flageolet reverseturn - trill prall - mordent prallprall prallmordent uprall downprall thumb } + \context Lyrics \lyrics{ + accent__ marcato__ staccatissimo__ fermata stopped__ + staccato__ tenuto__ upbow downbow__ lheel__ rheel__ ltoe + rtoe__ turn__ open__ flageolet reverseturn__ trill__ prall__ + mordent prallprall__ prallmordent__ uprall__ downprall thumb } > \paper{ linewidth = 5.875\in; indent = 0.0; } } ) -COMMENT( The following are defined in script.ly but do not work: - -portato lbheel rbheel lbtoe rbtoe lfheel rfheel lftoe rftoe ) - In addition, it is possible to place arbitrary strings of text or TeX() above or below notes by using a string instead of an identifier: `code(c^"text")'. Fingerings can be placed by simply using digits. @@ -610,7 +587,7 @@ To save typing, a few common symbols can be abbreviated with single characters: mudela()( \score{ \notes { - \property Voice.textstyle = typewriter + \property Voice.textStyle = typewriter c''4-._"c-." s4 c''4--_"c-{}-" s4 c''4-+_"c-+" s4 @@ -688,7 +665,8 @@ english.ly c d e f g a bf b -s/-sharp -f/-flat deutsch.ly c d e f g a b h -is -es norsk.ly c d e f g a b h -iss/-is -ess/-es svenska.ly c d e f g a b h -iss -ess -italiano.ly do re mi fa sol la sid si -d -b) +italiano.ly do re mi fa sol la sid si -d -b +catalan.ly do re mi fa sol la sid si -d/-s -b) subsect(Relative Pitch Specification) label(relative) @@ -722,7 +700,10 @@ surrounding code(\notes) keyword which does not appear in the fragments shown above. Also note that if the music passed to a code(\relative) keyword contains a code(\transpose) keyword, the tranposed music will not be processed in relative mode. An additional code(\relative) must be placed -inside the code(\transpose). +inside the code(\transpose). If code(\relative) will be used several +times, or if it will be used in the same music with code(\transpose), +then you may get bizarre effects. This can be fixed by using an +explicit code(Staff) context. subsect(Tranposition of Pitches) @@ -752,7 +733,9 @@ mudela(fragment,verbatim,center)( If you want to use both code(\transpose) and code(\relative), then you must use code(\transpose) first. Any code(\relative) keywords that are outside the code(\transpose) have no effect on notes that appear inside the -code(\transpose). +code(\transpose). As with code(\relative), using code(\transpose) +repeatedly can cause bizarre effects. An explicit code(Staff) context +will eliminate the problems. sect(Chords) @@ -818,8 +801,8 @@ The chords may be entered either using the notation described above, or directly using angle brackets. mudela(fragment,verbatim)( < - \type ChordNames { \chords{ a b c} \notes{ < d f g > < e g b > } } - \type Staff \notes{ a b c' d' e' } + \context ChordNames { \chords{ a b c} \notes{ < d f g > < e g b > } } + \context Staff \notes{ a b c' d' e' } > ) Lilypond examines chords specified as lists of notes to determine a @@ -827,26 +810,20 @@ name to give the chord. By default, LilyPond will not try to identify chord inversions: mudela(fragment,verbatim,center)( < - \type ChordNames { + \context ChordNames { \notes{ < e' g' c'' > } } - \type Staff \notes{ c' } + \context Staff \notes{ c' } >) If you want inversions to be recognized, you must set the property code(Score.chordInversion): mudela(fragment,verbatim,center)( < \property Score.chordInversion = 1 - \type ChordNames { + \context ChordNames { \notes{ < e' g' c'' > } } - \type Staff \notes{ c' } + \context Staff \notes{ c' } >) -COMMENT( - Two other properties - chordInversionPreserve - and chordNameStyle = Banter - exist. What do these do? -) sect(Lyrics) @@ -858,7 +835,7 @@ no special meaning for lyrics, and does not introduce special symbols. See Section ref(modes) for a description of what is interpreted as a lyric. In order to instruct LilyPond to write lyrics underneath the -staff, you must enter the lyrics context with code(\type Lyrics). +staff, you must enter the lyrics context with code(\context Lyrics). Lyrics should be entered in lyrics mode which is entered with code(\lyrics). Spaces can be introduced into a lyric either by using quotes (code(")) @@ -867,7 +844,7 @@ unquoted underscores are converted to spaces. Here is a full example: mudela(verbatim)(\score{ < \notes \transpose c'' {c d e c | c d e c | e f g'2 | e'4 f g'2 \bar "|."; } - \type Lyrics \lyrics { + \context Lyrics \lyrics { DOEXPAND(Fr\)`e-4 re Ja- que DOEXPAND(Fr\)`e- re Ja- que Dor- mez vous?2 Dor-4 mez vous?2 } > @@ -882,22 +859,20 @@ Why does this warrant an URG? When one word is attached to many notes, you may want a continuous line after the lyric to show this. To achieve -this effect, add a code(__) lyric after the lyric to be extended. +this effect, add a code(__) lyric as a separate word +after the lyric to be extended. This will create an extender, a line that extends over the entire duration of -the lyric. There must be a lyric after the code(__), so if you want -to extend the final lyric, you will have to end with a blank lyric. -mudela(verbatim,center)( -\score{ +the lyric. This line will run all the way to the start of the next +lyric, so you may want to shorten it by using a blank lyric. +mudela(verbatim)(\score{ < \notes \relative c''{ - a4()b()c()d c()d()b()a } - \type Lyrics \lyrics { - foo1 __ bar2. __ _ } + a4()b()c()d c()d()b()a c()d()b()a } + \context Lyrics \lyrics { + foo1 __ bar2. __ _4 baz1 __ } > }) -COMMENT(Broken!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!) - sect(Time) @@ -947,7 +922,7 @@ table(2)(lll)( row(cell()cell(code(|) code({) em(MusicList) code(}))) row(cell()cell(code(|) code(<) em(MusicList) code(>))) row(cell()cell(code(|) em(Command))) - row(cell()cell(code(|) code(\type) em(string) code(=) em(string) em(Music))) + row(cell()cell(code(|) code(\context) em(string) code(=) em(string) em(Music))) row(cell()cell(;)) row(cell(em(MusicList))cell(: em(empty))) row(cell()cell(code(|) em(MusicList) em(Music))) @@ -985,7 +960,7 @@ it()You can form music by transposing music: d % from c to the d that's almost one octave down { e4 f4 } % the horizontal music ) -it()verb(\type) +it()verb(\context) it()verb(\property) it()verb(\translator) it()verb(\relative) @@ -996,7 +971,7 @@ verb( { c } % 4 increasing chords ) -) +END OF COMMENT ) sect(Repeats) @@ -1014,13 +989,26 @@ c'1 \repeat 2 {c'4 d' e' f'} \alternative { {d'2 d'} {f' f} }) When the repeats involve partial measures, it will be necessary to use -code(\partial) keywords to indicate which measures are short. +code(\partial) keywords in a somewhat unexpected way +to indicate some measure lengths. mudela(fragment,verbatim)( -\type Staff { \relative c'{ +\context Staff { \relative c'{ \repeat 2 { \partial 4; e | c2 d2 | e2 f2 | } - \alternative { { g4 g g } {\partial 2.; a a a a | b1 } } + \alternative { { g4 g g } {\partial 1; a a a a | b1 } } +}}) +Repeats can be unfolded by setting the property Staff.unfoldRepeats. +Note also that if your music begins with code(\repeat), you must place +it in an explicit code(Staff) context or you will get bizarre results. + +If you don't give enough alternatives for all of the repeats, then the +first alternative is assumed to be repeated enough to equal to +specified number of repeats. +mudela(fragment,verbatim)( +\context Staff { \relative c'{ + \repeat 3 { \partial 4; e | c2 d2 | e2 f2 | } + \alternative { { g4 g g } {\partial 1; e4 e e } + {\partial 1; a a a a | b1 } } }}) -Repeats can be unfolded by setting the unfoldRepeats sect(Keywords) @@ -1074,7 +1062,7 @@ Here are the supported clef names with middle C shown in each clef: mudela(center)( \score{ \notes{ \cadenza 1; - %\property Voice.textstyle = typewriter + %\property Voice.textStyle = typewriter \clef subbass; c'4-"\kern-10mm subbass" \clef bass; c'4^"\kern -8mm bass" \clef baritone; c'4_"\kern -10mm baritone" @@ -1099,6 +1087,12 @@ mudela(center)( The treble clef can also be obtained using the names code(G) or code(violin). The bass clef is also available by code(\clef F). +dit(code(\chord) var(chordlist)) Parse var(chordlist) in chords mode. + +dit(code(\chordmodifiers) var(modifierlist)) Specify the text chord +modifiers that may appear after chord names. These are specified in +the file file(chord-modifiers.ly). + dit(code(\cm)) Specify a dimension in centimeters. dit(code(\consists) var(string)code(;)) This keyword can appear only within a @@ -1128,7 +1122,7 @@ multiple code(\score) blocks, then a header should appear in each score block describing its contents. Tools like code(ly2dvi) can use this information for generating titles. Key values that are used by ly2dvi are: title, subtitle, composer, opus, poet, instrument, -metre, arranger, and piece. +metre, arranger, piece and tagline. dit(code(\in)) Specify a dimension in inches. @@ -1141,10 +1135,12 @@ dit(code(\key) var(pitch) var(type) code(;)) Change the key signature. var(type) should be code(\major) or code(\minor) to get var(pitch)-major or var(pitch)-minor, respectively. The second argument is optional, the default is major keys. -The var(\type) argument can also be given as an integer, which tells +The var(\context) argument can also be given as an integer, which tells the number of semitones that should be added to the pitch given in the subsequent code(\key) commands to get the corresponding major key, -e.g. code(\minor) is defined as 3. +e.g. code(\minor) is defined as 3. The standard mode names +code(\ionian), code(\locrian), code(\aeolian), code(\mixolydian), +code(\lydian), code(\phrygian), and code(\dorian) are also defined. dit(code(\keysignature) var(pitchseq)code(;)) Specify an arbitrary key signature. The pitches from var(pitch) will @@ -1196,7 +1192,9 @@ The var(statmentlist) contains statements that change features of the output. See Section ref(paper). dit(code(\partial) var(duration)code(;)) Specify that the first measure of -the music lasts only for the specified duration. +the music lasts only for the specified duration. Use also to specify +the duration of the first measure of the argument to +code(\alternative). dit(code(\penalty) code(=) var(int)code(;)) Allowed only in music. Discourage or encourage line breaks. See identifiers code(\break) and @@ -1237,21 +1235,14 @@ dit(code(\score) var(statementlist)) Create a Score context. This is the top level notation context. COMMENT(this still needs work) -dit(code(\script) code({) var(name) var(instaff) var(withstem) -var(location) var(invertible) var(priority) code(})) This keyword is -used the initialization file(script.ly) to define the various symbols -that can appear above and below notes. The first argument is the name -of the symbol. The second argument var(instaff) is 1 if the symbol -follows the notehead into the staff and 0 if the symbol stays above or -below the staff lines. The third parameter var(withstem) is 0 if the -symbol's placement does not depend on the stem direction; it is 1 if -the symbol should be at the stem end of the note and it is -1 if the -symbol should be at the note head end of the note. The argument -var(location) is set to 1 for symbols that always appear above the -staff; it is -1 for symbols that appear below the staff. If -var(invertible) is set to 1 then the symbol can be inverted; otherwise -it cannot. The last argument var(priority) sets a priority for the -order of placement of several symbols on a single note. +dit(code(\script) var(alias)) Prints a symbol above or below a note. +The argument is a string which points into the script-alias table +defined in file(script.scm). The scheme definitions specify whether +the symbol follows notes into the staff, dependence of symbol +placement on staff direction, and a priority for placing several +symbols over one note. Usually the code(\script) keyword is not used +directly. Various helpful identifier definitions appear in +file(script.ly). dit(code(\shape) code(=) var(indent1) var(width1) var(indent2) var(width2) ... code(;)) Allowed only within code(\paper). Each pair @@ -1293,7 +1284,7 @@ dit(code(\translator) var(statements) or code(\translator) var(context) = var(name)) The first variant appears only within code(\paper) and specifies a translator for converting music to notation. The translator is specified with a -single code(\type) statement and a series of code(\accepts), and +single code(\context) statement and a series of code(\accepts), and code(\consists) statements. See Section ref(translators). The second variant appears in music. It specifies that the current the contexts @@ -1309,8 +1300,8 @@ and if it appears inside code(\relative), then any notes specified for transposition should be specified inside another code(\relative). See Section ref(transpose). -dit(code(\type) var(contexttype) [code(=) var(contextname)] -var(music) or code(\type) var(translatortype)code(;)) The first +dit(code(\context) var(contexttype) [code(=) var(contextname)] +var(music) or code(\context) var(translatortype)code(;)) The first variant is used only within music to create an instance of a context. The new context can optionally be given a name. The specified var(music) is processed in the new context. The second @@ -1329,7 +1320,7 @@ sect(Notation Contexts) Notation contexts provide information that appears in printed music but not in the music itself. A new musical context is created using -the code(\type) keyword: `code(\type) var(contexttype) [code(=) +the code(\context) keyword: `code(\context) var(contexttype) [code(=) var(contextname)] var(music)'. The following context types are allowed. @@ -1375,7 +1366,7 @@ dit(code(ChoirStaff)) Identical to code(StaffGroup) except that the contained staffs are not connected vertically. dit(code(Score)) This is the top level notation context. It is specified with -the code(\score) keyword rather than the code(\type) command. No +the code(\score) keyword rather than the code(\context) command. No other context can contain a code(Score) context. This context handles the administration of time signatures. It also makes sure that items such as clefs, time signatures, and key-signatures are aligned across @@ -1409,7 +1400,7 @@ subsubsubsect(Lyrics properties) description( -dit(code(textstyle)) Set the font for lyrics. The available font +dit(code(textStyle)) Set the font for lyrics. The available font choices are code(roman), code(italic), code(bold), code(large), code(Large), code(typewriter), and code(finger). The code(finger) font can only display numbers. Note also that you must be careful @@ -1417,7 +1408,7 @@ when using code(\property) in Lyrics mode. Because of the way strings are parsed, either put quotes around the arguments to code(\property) or be sure to leave a space on both sides of the dot. -dit(code(textalignment)) Controls alignment of lyrics. Set to code(\left) +GONE dit(code(textalignment)) Controls alignment of lyrics. Set to code(\left) to align the left end of the lyric with the note; set to code(\right) to align the right end of the lyric with the note. Set to code(\center) to align the center of the lyric with the note. @@ -1428,6 +1419,31 @@ subsubsubsect(Voice properties) description( +dit(code(textEmptyDimension)) If set to 1 then text placed above or +below the staff is assumed to have zero width. + +dit(code(noteheadStyle)) Selects type of note head. Choices are +code(cross), code(diamond), code(harmonic), code(transparent), and +code(""). They are shown in that order below. +mudela(center)( +\score{ + \notes{ + \property Staff.barNonAuto = 1 + \property Voice.noteHeadStyle = cross + a' + \property Voice.noteHeadStyle = diamond + a' + \property Voice.noteHeadStyle = harmonic + a' + \property Voice.noteHeadStyle = transparent + a' + \property Voice.noteHeadStyle = "" + a' + } + \paper{ linewidth = -1.;} +} +) + dit(code("midi_instrument")) Sets the instrument for MIDI output. This property name must be quoted because of the embedded underscore. If this property is not set then LilyPond will use the code(instrument) @@ -1438,6 +1454,9 @@ string which is not listed, LilyPond will silently substitute piano. dit(code(transposing)) Tranpose the MIDI output. Set this property to the number of half-steps to transpose by. +dit(code(oldTieBehavior)) Set to 1 in order to get old tie behavior +where ties would connect unequal pitches. + dit(code(ydirection)) Determines the direction of stems, subscripts, beams, slurs, and ties. Set to code(\down) to force them down, code(\up) to force them up, or code(\free) to let LilyPond decide. @@ -1468,34 +1487,25 @@ dit(code(dynamicDir)) Determines location of dynamic marks. Set to code(\up) to print marks above the staff; set to code(\down) to print marks below the staff. -dit(code(textalignment)) Controls alignment of superscripted and +GONE dit(code(textalignment)) Controls alignment of superscripted and subscripted text. Set to \left to align the left end of the text with the note; set to \right to align the right end of the text with the note. Set to \center to align the center of the text with the note. -dit(code(textstyle)) Set the text style for superscripts and +dit(code(textStyle)) Set the text style for superscripts and subscripts. See above for list of text styles. dit(code(textScriptPadding)) Determines the extra space added between super-/subscripted text and the closest staff line or note. -dit(code(textScriptPadding)) Determines the extra space added between -super-/subscripted text and the closest staff line or note. - dit(code(fontsize)) Can be used to select smaller font sizes for music. The normal font size is 0, and the two smaller sizes are -1 and -2. -dit(code(pletvisibility)) Determines whether tuplets of notes are -labelled. Setting to 0 shows nothing; setting to 1 shows a number; -setting to 2 shows a number and a bracket if there is no beam; setting -to 3 shows a number, and if there is no beam it adds a bracket; -setting to 4 shows both a number and a bracket unconditionally. - -dit(code(markScriptPadding)) Determines the extra space added between +GONE dit(code(markScriptPadding)) Determines the extra space added between the mark and the closest staff line or note. -dit(code(markDirection)) Determines if marks should be printed above +GONE dit(code(markDirection)) Determines if marks should be printed above or below the staff. Set to code(\up) to print marks above the staff; set to code(\down) to print marks below the staff. @@ -1504,11 +1514,32 @@ set to code(\down) to print marks below the staff. subsubsubsect(Staff properties) description( + +dit(code(barAtLineStart)) Set to 1 to produce a bar line after the +clef at the start of each line (but not at the beginning of the +music). + +dit(code(voltaVisibility)) Set to 0 to suppress the printing +of brackets over alternate endings specified by code(\alternative). + +dit(code(voltaSpannerDuration)) Set to an integer to control the size +of the brackets printed by code(\alternative). The integer specifies +the number of whole notes duration to use for the brackets. It seems +to be rounded to the nearest measure. This can be used to shrink the +length of brackets in the situation where one alternative is very +large. It may have odd effects if the specified duration is longer +than the music given in an code(\alternative). + +dit(code(barNonAuto)) If set to 1 then bar lines will not be printed +automatically; they must be explicitly created with code(\bar) keywords. + +dit(code(unfoldRepeats)) If set to 1 then repeats will be unfolded. +Otherwise, they will be printed using repeat symbols. dit(code(defaultClef)) Determines the default clef. See code(\clef) keyword. -dit(code(nolines)) Sets the number of lines that the staff has. +dit(code(nuberOfStaffLines)) Sets the number of lines that the staff has. dit(code(barAlways)) If set to 1 a bar line is drawn after each note. @@ -1557,7 +1588,7 @@ their names: mudela(center)( \score{ \notes\relative c'' { -\property Voice.textstyle = typewriter +\property Voice.textStyle = typewriter \property Staff.timeSignatureStyle = "C2/2" \time 2/2; a2^"C2/2" a2 \property Staff.timeSignatureStyle = "C4/4" @@ -1636,13 +1667,6 @@ to find inversions. The default is 0 which does not look for inversions. ) -COMMENT( - -Mystery properties: - -bar-number-engraver.cc: "barScriptPadding" vertical space for numbers -span-bar-engraver.cc: "singleStaffBracket" do single staffs get a bracket? -) sect(Pre-defined Identifiers) label(ident) @@ -1651,11 +1675,15 @@ Various identifiers are defined in the initialization files to provide shorthands for some settings. description( +dit(code(\aeolian)) Used as the second argument of the code(\key) +keyword to get an aeolian mode. dit(code(\break)) Force a line break in music by using a large argument for the keyword code(\penalty). dit(code(\center)) Used for setting textalignment property. Is set to 0. dit(code(\cr)) Start a crescendo. dit(code(\decr)) Start a decrescendo. +dit(code(\dorian)) Used as the second argument of the code(\key) +keyword to get a dorian mode. dit(code(\down)) Used for setting direction setting properties. Is equal to -1. dit(code(\f)) Print forte symbol on the preceeding note. @@ -1671,11 +1699,19 @@ dit(code(\Gourlay)) Used for setting the paper variable code(castingalgorithm). Is equal to 1.0. dit(code(\infinity)) Used for setting the Score.beamslopedamping property. Is actually equal to 10000. +dit(code(\ionian)) Used as the second argument of the code(\key) +keyword to get an ionian mode. dit(code(\left)) Used for setting textalignment property. Is equal to -1. +dit(code(\locrian)) Used as the second argument of the code(\key) +keyword to get a locrian mode. +dit(code(\lydian)) Used as the second argument of the code(\key) +keyword to get a lydian mode. dit(code(\major)) Used as the second argument of the code(\key) -command to get a major key. +keyword to get a major key. dit(code(\minor)) Used as the second argument of the code(\key) -command to get a minor key. +keyword to get a minor key. +dit(code(\mixolydian)) Used as the second argument of the code(\key) +keyword to get a mixolydian mode. dit(code(\mf)) Print mezzoforte symbol on preceeding note. dit(code(\mp)) Print mezzopiano symbol on preceeding note. dit(code(\nobreak)) Prevent a line break in music by using a large @@ -1687,6 +1723,8 @@ Score.beamquantisation properties. Is equal to 1. dit(code(\normalkey)) Select normal key signatures where each octave has the same key signature. This sets the Staff.keyoctaviation property. dit(code(\p)) Print a piano symbol on preceeding note. +dit(code(\phrygian)) Used as the second argument of the code(\key) +keyword to get a phrygian mode. dit(code(\pp)) Print pianissimo symbol on preceeding note. dit(code(\ppp)) Print pianississimo symbol on preceeding note. dit(code(\pppp)) Print pianissississimo symbol on preceeding note. diff --git a/Documentation/tex/tutorial.yo b/Documentation/tex/tutorial.yo index b8c65bdf4f..30966e4ba6 100644 --- a/Documentation/tex/tutorial.yo +++ b/Documentation/tex/tutorial.yo @@ -546,7 +546,7 @@ COMMENT( )mudela(verbatim,center)( \score{ - \type ChordNames { + \context ChordNames { \chords { c1 d-min e-maj5+.9 } \notes\relative c @@ -581,7 +581,7 @@ following example: COMMENT( )mudela()( \score{ < \property Score.textstyle = typewriter - \type Staff \notes { + \context Staff \notes { c''4-. c''4-- c''4-+ @@ -589,7 +589,7 @@ following example: COMMENT( c''4-> c''4-^ } - \type Lyrics\lyrics { + \context Lyrics\lyrics { "."4 "-" "+" "|" ">" "\^{ }" } > \paper { linewidth = -1.\cm; } @@ -948,7 +948,7 @@ We see that a staff forms context, and that context is needed to convert between notation and music. In LilyPond we turn around this reasoning: LilyPond has a notion of notation context, and the staff is just one example of a notation context. In fact, the arguments of the -code(\type) command (Staff, GrandStaff) were all names of different +code(\context) command (Staff, GrandStaff) were all names of different contexts. A notation context is a conversion between music and notation. @@ -1034,7 +1034,7 @@ Now we explain how to typeset music that runs in multiple staffs. Consider the following---somewhat unrealistic---example: mudela(fragment)( - \type GrandStaff + \context GrandStaff ) In this example the music consists of two notes. The above would @@ -1052,32 +1052,32 @@ does not represent notes stacked together, but staffs stacked together. If a piece of music is to be interpreted as a staff, then this can be -expressed with the code(\type) construct. The following input says +expressed with the code(\context) construct. The following input says ``the quarter note with pitch e should be put on a staff.'' verb( - \type Staff e'4 + \context Staff e'4 )COMMENT( ) The same can be done for the other note, i.e., verb( - \type Staff g4 + \context Staff g4 ) COMMENT( ) If you want to stack these staffs, you must create a chord of both: verb( - < \type Staff e'4 - \type Staff g4 + < \context Staff e'4 + \context Staff g4 > ) This looks reasonable, but the effect of this input is not what you might expect: mudela(fragment)( - < \type Staff e'4 - \type Staff g4 + < \context Staff e'4 + \context Staff g4 > )COMMENT( @@ -1089,8 +1089,8 @@ code(bassStaff). This makes LilyPond distinguish between them, and create two staffs: mudela(verbatim,fragment)( - < \type Staff = trebleStaff e'4 - \type Staff = bassStaff g4 + < \context Staff = trebleStaff e'4 + \context Staff = bassStaff g4 > )COMMENT( @@ -1098,13 +1098,13 @@ mudela(verbatim,fragment)( different. This is almost right, except for the brace at the left and the clef of the second staff. If you want a brace, then you have to tell LilyPond that the chord you just formed is to be interpreted as a -so-called grand staff. This is also done with the code(\type) +so-called grand staff. This is also done with the code(\context) command. The bass clef is made with a clef command: COMMENT( ) mudela(verbatim,fragment)( - \type GrandStaff < - \type Staff = treblestaff e'4 - \type Staff = bassstaff { \clef "bass"; g4 } + \context GrandStaff < + \context Staff = treblestaff e'4 + \context Staff = bassstaff { \clef "bass"; g4 } >)COMMENT( ) @@ -1127,9 +1127,9 @@ staffs stacked together. This suggests that the template to follow is this:COMMENT( )verb( - \type Staff < - \type Voice = one ... - \type Voice = two ... + \context Staff < + \context Voice = one ... + \context Voice = two ... > ) COMMENT( @@ -1137,9 +1137,9 @@ this:COMMENT( other words, notes enclosed in braces. Let us try the following counterpoint:COMMENT( )mudela(fragment,verbatim)( -\type "Staff" < - \type "Voice" = "one" { r4 as'4 () as'4 g'4 } - \type "Voice" = "two" { g'2 f'4 e'4 } +\context "Staff" < + \context "Voice" = "one" { r4 as'4 () as'4 g'4 } + \context "Voice" = "two" { g'2 f'4 e'4 } >) As you can see the result is not quite perfect. The notes on the last @@ -1171,11 +1171,11 @@ bind(Figure)ref(tutorial:multi-voice-fig). latexcommand(\begin{figure}[h]) mudela(fragment,verbatim,center)( - \type "Staff" < - \type "Voice" = "one" { + \context "Staff" < + \context "Voice" = "one" { \property Voice.ydirection = "1" r4 as'4 () as'4 g'4 } - \type "Voice" = "two" { + \context "Voice" = "two" { \property Voice.ydirection = "-1" g'2 f'4 e'4 } > @@ -1212,7 +1212,7 @@ Lyrics consist of syllables, which are strings together with durations. For entering lyrics we have to instruct LilyPond that what we enter are not note names but strings. This instruction is the keyword code(\lyrics). After entering this keyword you can enter a -musical construct---sequential music, simultaneous music, code(\type) +musical construct---sequential music, simultaneous music, code(\context) entries, etc.--- but with syllables instead of pitches. For example: COMMENT( @@ -1222,24 +1222,24 @@ COMMENT( out that lyrics need different treatment than notes. As a result, the default conversion will try to put the text you entered as note heads onto a staff, and this will fail. This default must be overridden -with a code(\type) keyword. Printing syllables of text in a line is +with a code(\context) keyword. Printing syllables of text in a line is done by a context called code(Lyrics). You can select this context -with the code(\type) keyword. Here is a simple example with output: +with the code(\context) keyword. Here is a simple example with output: COMMENT( )mudela(fragment,verbatim)( -\type Lyrics \lyrics { 'got8 me on my knees,4 Le-8 lie! })COMMENT( +\context Lyrics \lyrics { 'got8 me on my knees,4 Le-8 lie! })COMMENT( )The result is technically correct, but it needs a melody to make it perfor0mable: COMMENT( )mudela(fragment,verbatim)( < - \type Staff { + \context Staff { \property Voice.beamAuto = "0" % no beams in melody c''8. c''16 bes'8. a'16 g'4 f'8 g'4. } - \type Lyrics \lyrics { 'got8. me16 on8. my16 knees,4 Le-8 lie!4. } + \context Lyrics \lyrics { 'got8. me16 on8. my16 knees,4 Le-8 lie!4. } > ) COMMENT( @@ -1253,16 +1253,16 @@ These tricks are demonstrated in the following example: COMMENT( urg -\type Lyrics \lyrics { 'got8 m\textbf{e}8 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} -\type Lyrics \lyrics { 'got8 m{\bf e}4 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} +\context Lyrics \lyrics { 'got8 m\textbf{e}8 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} +\context Lyrics \lyrics { 'got8 m{\bf e}4 on8. m$\cal_Y$16 knees,4 Le-8 lie!4.} )COMMENT( )mudela(fragment,verbatim)(< - \type Staff { + \context Staff { \property Voice.beamAuto = "0" % no beams in melody c''8. c''16 bes'8. a'16 g'4 f'8 g'4. } - \type Lyrics \lyrics { 'got8 me8 on8. m$\cal_Y$16 "3s,"4 Le-8 lie!4.} + \context Lyrics \lyrics { 'got8 me8 on8. m$\cal_Y$16 "3s,"4 Le-8 lie!4.} > )COMMENT( @@ -1303,7 +1303,7 @@ with a backslash, i.e., code(\identifierName). For example: mudela(verbatim)( czerny = \notes { [c16 g e g] } \score { - \notes \type GrandStaff < + \notes \context GrandStaff < { c''2 g''2 } { \clef bass; \czerny \czerny \czerny \czerny} > @@ -1332,10 +1332,10 @@ stemup = \property Voice.ydirection = "1" stemdown = \property Voice.ydirection = "-1" shift = \property Voice.hshift = "1" \score { - \type "Staff" \notes < - \type "Voice" = "one" { \stemup r4 as'4 () as'4 g'4 } - \type "Voice" = "two" { \stemup \shift g'2 f'4 e'4 } - \type "Voice" = "three" { \stemdown [d'8 dis'] [d' cis'] [c' b] c'4 } > + \context "Staff" \notes < + \context "Voice" = "one" { \stemup r4 as'4 () as'4 g'4 } + \context "Voice" = "two" { \stemup \shift g'2 f'4 e'4 } + \context "Voice" = "three" { \stemdown [d'8 dis'] [d' cis'] [c' b] c'4 } > \paper{ linewidth = -1.0\pt; } }) @@ -1419,7 +1419,7 @@ The following definition shows a simplified Staff context: COMMENT( )verb( \translator { - \type "Line_group_engraver_group"; + \context "Line_group_engraver_group"; \name Staff ; \consists "Bar_engraver"; @@ -1464,8 +1464,8 @@ of code(\consists). mudela(verbatim)( \score { \notes < - \type Staff = one { \time 2/4; c'4 c'4 c'4 c'4 c'4 c'4 } - \type Staff = two { \time 3/4; c'4 c'4 c'4 c'4 c'4 c'4 } + \context Staff = one { \time 2/4; c'4 c'4 c'4 c'4 c'4 c'4 } + \context Staff = two { \time 3/4; c'4 c'4 c'4 c'4 c'4 c'4 } > \paper { linewidth = -1.; @@ -1502,8 +1502,8 @@ COMMENT( ) mudela(fragment,verbatim)( < - \type Staff = one { c''4 \type Staff = two { c4 c4 } c''4 } - \type Staff = two { \clef bass; g,4 g,4 g,4 g,4 } + \context Staff = one { c''4 \context Staff = two { c4 c4 } c''4 } + \context Staff = two { \clef bass; g,4 g,4 g,4 g,4 } > ) @@ -1537,14 +1537,14 @@ mudela(verbatim)( { < - \type Voice = celloVoice { \bach \bach} - \type Voice = celloVoice < { \slursOne \slursOne } + \context Voice = celloVoice { \bach \bach} + \context Voice = celloVoice < { \slursOne \slursOne } { \bachBeams \bachBeams } > \staffStuff > < - \type Voice = celloVoice { \bach \bach } - \type Voice = celloVoice < { \slursTwo \slursTwo } + \context Voice = celloVoice { \bach \bach } + \context Voice = celloVoice < { \slursTwo \slursTwo } { \bachBeams \bachBeams } > \staffStuff > @@ -1567,7 +1567,7 @@ One of the things that you can do with music is em(transposing) it. If you want to transpose a piece of music, then you should prefix it with the keyword code(\transpose) along with the pitch (relative to the central C, i.e., code(c')) for the transposition.footnote(the -code(\type Staff) is to make sure that no separate staffs are created +code(\context Staff) is to make sure that no separate staffs are created for the code(\scale) and code(\transpose cis' \scale) part.) @@ -1575,7 +1575,7 @@ mudela(verbatim)( scale = \notes \relative c' { [c8 d e f] } \score { \notes { - \type Staff { \scale \transpose cis' \scale } + \context Staff { \scale \transpose cis' \scale } } \paper { linewidth = -1.0; } }) @@ -1598,17 +1598,17 @@ which staff the music is printed. For example: mudela(verbatim)( % real music -aVoice = \type Voice = voiceA \notes { c''4 c4 c4 c''4 } -bVoice = \type Voice = voiceB \notes { g,4 g,4 g,4 g,4 } +aVoice = \context Voice = voiceA \notes { c''4 c4 c4 c''4 } +bVoice = \context Voice = voiceB \notes { g,4 g,4 g,4 g,4 } % staff switching stuff -switch = \type Voice = voiceA \notes { s4 \translator Staff = staffB s4 +switch = \context Voice = voiceA \notes { s4 \translator Staff = staffB s4 s4 \translator Staff = staffA s4 } \score { < - \type Staff = staffA < \aVoice \switch > - \type Staff = staffB < \bVoice \clef bass; > + \context Staff = staffA < \aVoice \switch > + \context Staff = staffB < \bVoice \clef bass; > > \paper { linewidth = -1.; } } @@ -1619,9 +1619,9 @@ beam, you should take special precautions. In the paper block, you must tell how far the staffs will be apart: mudela(verbatim,center)( \score{ - \type GrandStaff < - \type Staff=one \notes{ s2 } - \type Staff=two \notes\relative c{ + \context GrandStaff < + \context Staff=one \notes{ s2 } + \context Staff=two \notes\relative c{ \time 4/8; \clef "bass"; \stemup [c8( e @@ -1651,12 +1651,12 @@ for triplet in LilyPond reflects this. To make a triplet, you enter COMMENT( )mudela(verbatim,fragment,center)( - \type Voice \times 2/3 { c''4 c''4 c''4 } + \context Voice \times 2/3 { c''4 c''4 c''4 } )COMMENT( )Since tuplet brackets are printed by the Voice context, a Voice context must exist before code(\times) is interpreted. To ensure this, -a context is instantiated explicitly with code(\type Voice). You +a context is instantiated explicitly with code(\context Voice). You don't need this, if a Voice context is already instantiated, like in the following example: COMMENT( @@ -1674,7 +1674,7 @@ COMMENT( BROKEN lilypond: score-element.cc:134: class Paper_def * Score_element::paper() const: Assertion `pscore_l_' failed. mudela(fragment)( - \type Voice \times 4/5 { [c''8 c''16 c''16] r8 [g'8 g'8] } + \context Voice \times 4/5 { [c''8 c''16 c''16] r8 [g'8 g'8] } ) ) If you make a tuplet of beamed notes, where the beam is as wide as @@ -1704,7 +1704,7 @@ a couple alternatives, but nothing is repeated. The code(\repeat) command must be present, but it may specify an empty music list: COMMENT( )mudela(verbatim,fragment,center)( - \type Lyrics \lyrics { + \context Lyrics \lyrics { \repeat 2 { } \alternative < { Let's not sing diff --git a/NEWS b/NEWS index 5f04e3e2de..02a1840575 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,45 @@ +pl 40.uu2 + - rest ledger lines are dimensionless. + - Score_elements are added to the Paper_score directly when +announce_element () is called. This makes it possible to init +molecules from within engravers. + - changed \type to \context + - \context Contextname = ID Music is now a real separate production + * you can do + \context C1 \context C2 + + and C1 won't overwrite C2 + + * you need some extra explicit context specs, eg. if you start a +voice with a chord. + + \score { \notes { } } + + should be + + \score { \notes \context Voice { } + + - set staff margins on grandstaffs too. Center staffmargins vertically. + - \property values are not inherited anymore, i.e. setting +Score.minVerticalAlign does not set GrandStaff.minVerticalAlign, Staff.minVerticalAlign and Voice.minVerticalAlign as well. + - {Axis_spanner, Hara_kiri}_engraver which can be added at wish. +Hara_kiri should be working again. + - boilerplate for accordion stuff. + - some more paper writing. + - bf: substitute vertical refpoint as well for broken items. +(fixes clef^8) + - bf: translating molecule without elts but with dims. (bf: accidental +spacing.) + +pl 40.mb1 + - bf: ly2dvi set MFINPUTS so standard tree is found before lilypond + - bf: lilypond-regtest.doc, ls-latex.py; now finds author/title + +pl 40.uu1 + - large documentation patch by Adrian Mariano + +******** +pl 40 pl 39.mb2 - added more mensural style time signatures, old3/4, old6/8, old9/8 - redesigned old6/4, old9/4 diff --git a/TODO b/TODO index bf189ce4c1..e0301f8859 100644 --- a/TODO +++ b/TODO @@ -9,25 +9,14 @@ Most of the items are marked in the code as well Grep for TODO and ugh/ugr/urg. .* BUGS -. * header for PS enteredby = "bla " -. * Hash_table::remove (). -. * 1. With "lilypond -f ps": The black notes with ledger lines seem to -> have extra "blobs" over and to the left of them and all the ledger -> lines from the staff to the note will have a blob too. For example, -> with the note "a4" there will be a black note at the ledger line where -> "c" would be too. However, only the "a4" will have the extra blob. -. * clefs.ly -. * ps/lily.ps +. * rewrite context defs using Scheme +. * PostScript +. * header for PS enteredby = "bla " +. * ps/lily.ps see comments. . * devise standard for functioning of Vertical_align_element. -. * fix interstaff slurs & beams. . * staff size for post/prebreaks . * .ly files . * input/star-spangled-banner -. * input/scripts.ly -. * mutopia/J.S.Bach/wtk1-fugue2.ly -. * input/test/grace -. * fix: text on rests: ridiculous dims -. * clefs.ly . * m=\notes\relative c'''{ \time 2/4; @@ -56,9 +45,10 @@ Grep for TODO and ugh/ugr/urg. } } . * midi key. -. * P.P.S. It can be cool in mudela-book to distinguish in pre,postMudelaExample, -whether MudelaExample is epsed or not: ( if this fragment is floating eps, than 1, -otherwise 2). say preMudelaExample[eps]{}, and change it in document body sometimes. +. * P.P.S. It can be cool in mudela-book to distinguish in +pre,postMudelaExample, whether MudelaExample is epsed or not: ( if +this fragment is floating eps, than 1, otherwise 2). say +preMudelaExample[eps]{}, and change it in document body sometimes. . * fix singleStaffBracket . * declare performers in \midi . * fix MIDI @@ -66,18 +56,33 @@ otherwise 2). say preMudelaExample[eps]{}, and change it in document body someti . * turn slope-damping on/off . * tremolo stuff . * fix height of / collisions with lyrics (chords), - see input/test/vertical-text.ly; input/test/repeat.ly +see input/test/vertical-text.ly; input/test/repeat.ly . * We need feta-din*.mf files for more sizes than 10. -. * latex bla.tex broken (titles / \lilyfooter stuff? . * fix dynamics decently, ie. use kerning & ligatures. . * dots & rest collisions? . * mudela-book.py -. * \mudelafile{} to have decent functionality +. * fix \mudelafile{} to have decent functionality . * use less RE's . * support_l_arr_ empty in staff-margin's G_staff_side_item . * slurs colllide with lyrics. -. * minVerticalAlign for StaffGroups. -. * fix OrchestralScore and Hara-kiri (i.e., fix Coriolan) +. * Is there any reasonable way to do this: I would like to have one file +that can generate the same tune in two different modes without having +to go through and rewrite all the music in the other mode. + +Long lyrics don't get a space at the end. They just run right up +against the next lyric. (I don't think this used to be the case.) + +Lyrics and scripts collide. + +\key b; \time 4/4; looks bad. The clef and time signature are too close. + +I noticed that ledger lines in the previewer looked like they had a +double line (of different lengths). On printed output, I think I can +see a slight thickening of the ledger lines in the middle. Is this +supposed to happen? + +restStyle=mensural doesn't seem to work (lots of characters not found +for rests.fly) . * Phrasing: Indicating the textual underlay of a piece, or otherwise dividing a piece into phrases. @@ -85,26 +90,21 @@ There are distinct ways of specifying the first two (although at present, they're not properly distinguished) but no distinct way to specify the third. Should there be? . * spacing of mmrests. -. * mem leak: redo p-score object deletion. . * rest collision minimum dist. . * Matanya's tips: . * spacing for prefatory matter -. * Score does not use points to describe musical sizes. I think becaue the music -> symbols are not part of any PostScript font. The line length is 7.5 inch (19.05 +. * The line length is 7.5 inch (19.05 > cm) and the height of normal size is equivalent to the traditional raster 1 > size. (The Schott company sells Letraset sheets of musical symbols which are > measured in raster sizes). It is agreed among most engravers I know that the > standard size for adult readers in solo music should 70% of raster 1. Jeff's -> example was 75%, so I had to modify my file to match. Of course, the amount of +> example was 75%, so I had to modify my file to match. So that makes for a staff space of 4 2/3 point. I'll add the dimensions to the TODO file. - . * accidentals closer to note head -. * ledger line for rest dim less . * heavier beams? - .* Cleanups needed . * Beam . * Stem + Notehead @@ -122,6 +122,7 @@ dimensions to the TODO file. . * Remove mutopia ramblings. . * Remove non-free software links. . * Remove meta article LilyPond. +. * generic rest ledgers . * TODO: merge atom & molecule; make tree from molecule. . * break priority setting from SCM. . * Gade score @@ -239,6 +240,7 @@ and do y_direction? . * zip target for binary windows dist (JBR) . * junking \skip req in lyrics . * mi2mu empty staffs. +. * use Fourier transformation for rhythmic quantisation. . * horizontal centering of dynamics . * $DEPENDENCIES_OUTPUT support . * Xdvi zooming ?! Try to understand GS garbage collection. @@ -246,13 +248,6 @@ gs: Error: /undefined in draw_beam gs: Operand stack: . * fix vertical alignment and stafflines . * declaring Performers -. * GrandStaff needs more work -- I want a single word - `harpsichord' to the left of the grandstaff, not one on each - stave. (Organ staff -- with separate pedal -- but common - properties may be something to think about. Of course for - organ you want to be able to give stop indications on the way - through, so the \property Voice.Instrument would be a stop, - and \property GrandStaff.instrument would be PipeOrgan...) . * *.yo: fix pod manpage layout legacy . * text-items clash with stems/beams . * --include, -I option for ly2dvi (pass on to lily) @@ -306,6 +301,7 @@ touching it. .* FONT . * the bracket is ugly (wings are too parabolic, should be more circular) . * versioning for Feta +. * rewrite dynamic signs. They're kind of spaghetti now. . * The `3' in the meter key is a one or two pixels too thin (at 600dpi) in the middle: . * design macro for penstroke with rounded endings @@ -323,7 +319,6 @@ touching it. . * coda signs: Segno, O+ . * glissando, arpeggio . * lengthened trill -. * 128th flags . * include important spacing dims in fetalog .* 3RD PARTY BUGS . * GNU diff 2.7: diff -rN does not see a new directory with empty file @@ -341,7 +336,6 @@ touching it. thing is fixed .* PROJECTS . * Scripts: -. * fix position of bar number . * stack scripts in chords: % fingering: footing: < a-4 c-2 g-1 > < c-\ltoe e-\lheel > @@ -385,7 +379,7 @@ touching it. . * output header info to MIDI too. . * a musical dictionary. See Documentation/vocabulary-*, other - languages: +languages: . * explanations . * italian . * german @@ -561,7 +555,6 @@ hesitate to ask. .* INPUTLANGUAGE . * \rhythms 4 16 16 16 16; c c c c c -> c4 c16 etc. . * Language: -. * \type -> \context ? . * \translator -> ? . * fix \partial . * \bla {} vs \bla ; @@ -736,13 +729,6 @@ When writing new primitives, now just check foo_live_p(). I hope the above helps, --russ - - --- -"Even if you are on the right track, you'll get run over -if you just sit there." - --Will Rogers (1879-1935) * OUTLINE SETUP .* .EMACS diff --git a/VERSION b/VERSION index 74d42f8cfe..e1f975fa6e 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=1 -PATCH_LEVEL=40 +PATCH_LEVEL=41 MY_PATCH_LEVEL= # use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/flower/include/hash-table.hh b/flower/include/hash-table.hh index 3ce52c944c..569ff5143c 100644 --- a/flower/include/hash-table.hh +++ b/flower/include/hash-table.hh @@ -65,7 +65,7 @@ public: while (j <= sz/2) { if (dict_arr_[i].free_b_) return i; - + if (dict_arr_[i].key_ == s) return i; @@ -73,41 +73,15 @@ public: i = (i + j*j) % sz; } + return -1; } /// remove #s# from the hash table. V remove (K s, unsigned int initial_hash) { - int sz =dict_arr_.size (); - int i = initial_hash % sz; - int j = 0; - V retval; - - /* - duplicate with lookup, but we need value of j - */ - - while (j <= sz/2 && dict_arr_[i].key_ != s) - { - assert (!dict_arr_[i].free_b_); - - j ++; - i = (i + j*j) % sz; - } - - j++; - int nexti = (i + j*j) % sz; - - while (j <= sz/2 && !dict_arr_[i].free_b_) - { - dict_arr_[i] = dict_arr_[nexti]; - j++; - i = nexti; - nexti = (nexti + j*j)%sz; - } - - return retval; + // TODO + assert (false); } }; diff --git a/flower/offset.cc b/flower/offset.cc index 258cc1782c..4e4e1e3bb0 100644 --- a/flower/offset.cc +++ b/flower/offset.cc @@ -25,6 +25,12 @@ Offset::str () const #endif +bool +isinf_b (Real r) +{ + return (fabs (r) > 1e20); +} + /* free bsd fix by John Galbraith */ @@ -33,7 +39,7 @@ Offset complex_multiply (Offset z1, Offset z2) { Offset z; - if(!isinf(z2[Y_AXIS])) + if(!isinf_b(z2[Y_AXIS])) { z[X_AXIS] = z1[X_AXIS] * z2[X_AXIS] - z1[Y_AXIS]*z2[Y_AXIS]; z[Y_AXIS] = z1[X_AXIS] * z2[Y_AXIS] + z1[Y_AXIS] * z2[X_AXIS]; diff --git a/input/bugs/Overture.ly b/input/bugs/Overture.ly index 973a397df1..c7267f3ca2 100644 --- a/input/bugs/Overture.ly +++ b/input/bugs/Overture.ly @@ -4,7 +4,7 @@ composer = "Johann Christoph Faber"; piece = "1. Overture"; } -\version "1.0.14"; +\version "1.0.16"; global=\notes{ \time 2/2; @@ -221,18 +221,18 @@ bass=\notes\relative c' { \score{ - \type StaffGroup < - \type Staff =treble \notes { + \context StaffGroup < + \context Staff =treble \notes { \property Staff.Instrument = "Treble" \global \treble } - \type Staff =tenor \notes { + \context Staff =tenor \notes { \property Staff.Instrument = "Tenor" \global \tenor } - \type Staff =bass \notes { + \context Staff =bass \notes { \property Staff.Instrument = "Bass" \global \clef "bass"; \bass } diff --git a/input/bugs/bar-space.ly b/input/bugs/bar-space.ly index 8cc8adc456..ab96d52a77 100644 --- a/input/bugs/bar-space.ly +++ b/input/bugs/bar-space.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; scales = \notes\transpose c''{ f2 f f f f f f f f f\break @@ -10,7 +10,7 @@ keys = \notes{ \score{ < - \type ChordNames \scales - \type Staff < \scales \keys > + \context ChordNames \scales + \context Staff < \scales \keys > > } diff --git a/input/bugs/slur-over-rest.ly b/input/bugs/slur-over-rest.ly new file mode 100644 index 0000000000..48f3238901 --- /dev/null +++ b/input/bugs/slur-over-rest.ly @@ -0,0 +1,4 @@ + +\score{ +\notes \relative c{ r4-> r4-. r4^"foo" ( b'4 ) g''4 +}} diff --git a/input/example-3.ly b/input/example-3.ly index 102a594910..18ee3e4957 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; one = \notes\relative c{ c'' d e f diff --git a/input/just-friends.ly b/input/just-friends.ly index 8082c7b83e..faf096639d 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -30,7 +30,7 @@ of a certain tune (Jazz, Real Book, for example), like %} \score{ - \type ChordNames \chords{ + \context ChordNames \chords{ \property Score.chordInversion = 1 \property Score.barAtLineStart = 1 \repeat 2 { @@ -56,3 +56,5 @@ of a certain tune (Jazz, Real Book, for example), like } } } + +\version "1.0.16"; diff --git a/input/keys.ly b/input/keys.ly index bfdff32654..41733051b0 100644 --- a/input/keys.ly +++ b/input/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; blah = \notes { @@ -20,6 +20,6 @@ blah = \notes { } \score{ - \type Staff \blah + \context Staff \blah } diff --git a/input/kortjakje.ly b/input/kortjakje.ly index 238576810e..01512d288e 100644 --- a/input/kortjakje.ly +++ b/input/kortjakje.ly @@ -10,7 +10,7 @@ copyright = "public domain"; Tested Features: example file with comments %} -\version "1.0.14"; +\version "1.0.16"; % the % is a comment. @@ -54,7 +54,7 @@ begeleiding = \notes \relative c { } \score{ - \type GrandStaff < + \context GrandStaff < \melodie \begeleiding > diff --git a/input/opus-130.ly b/input/opus-130.ly index bd01cf52e2..d8763c7ca4 100644 --- a/input/opus-130.ly +++ b/input/opus-130.ly @@ -8,7 +8,7 @@ enteredby = "JCN"; copyright = "public domain"; } -% \version "1.0.14"; +% \version "1.0.16"; tempi = \notes { \property Voice.textstyle = "large" @@ -53,13 +53,13 @@ cello = \notes\relative c'{ } \score{ - \type StaffGroup < + \context StaffGroup < % broken, 1.1.23 -% \type Staff = i < \tempi \global \violinei > - \type Staff = i < \global \violinei > - \type Staff = ii < \global \violineii > - \type Staff = iii < \global \viola > - \type Staff = iv < \global \cello > +% \context Staff = i < \tempi \global \violinei > + \context Staff = i < \global \violinei > + \context Staff = ii < \global \violineii > + \context Staff = iii < \global \viola > + \context Staff = iv < \global \cello > > \paper{ \translator { \OrchestralScoreContext } diff --git a/input/part.ly b/input/part.ly index 7720acfab2..c6921626a3 100644 --- a/input/part.ly +++ b/input/part.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; part = \notes { c-1 c c c r1*3 diff --git a/input/pedal.ly b/input/pedal.ly index 3353dfe970..4a570badd2 100644 --- a/input/pedal.ly +++ b/input/pedal.ly @@ -28,7 +28,7 @@ % \lbheel \lbheel \lfheel \lftoe % \rbheel \rbtoe \rfheel \rftoe -\version "1.0.14"; +\version "1.0.16"; \score{ \notes { diff --git a/input/praeludium-fuga-E.ly b/input/praeludium-fuga-E.ly index f02724fd86..0ec40baa3f 100644 --- a/input/praeludium-fuga-E.ly +++ b/input/praeludium-fuga-E.ly @@ -23,7 +23,7 @@ * organ staff... %} -\version "1.0.14"; +\version "1.0.16"; @@ -37,14 +37,14 @@ praeludium_right = \notes { \clef violin; % 13 -- how to type -- where to split -- this more neatly? - \type Staff < - \type Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | + \context Staff < + \context Voice = I \relative c'' { \stemup r4 dis4 e4. e8 ~ | \shifton e4 [d8 fis8] \shiftoff gis4 ~ [gis8 fis16 e ] | fis4 ~ [fis8 e16 dis] e4 r8 e8 } - \type Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis | + \context Voice = III \relative c'' { \stemup \shifton r4 bis cis \shiftoff cis | a' ~ [a16 gis a b] \shifton dis,4 cis ~ | [cis8 dis16 ais] bis4 cis r8 b } - \type Voice = IV \relative c'' { + \context Voice = IV \relative c'' { %\stemup %{ @@ -54,7 +54,7 @@ praeludium_right = \notes { \stemdown \shifton s4 gis } - \type Voice = II \relative c' { \stemdown + \context Voice = II \relative c' { \stemdown % \shifton % idem r4 fis \shiftoff gis gis | @@ -69,19 +69,19 @@ praeludium_left = \notes \relative c { \clef bass; % 13 - \type Staff < - \type VoiceTwo { r4 } - \type VoiceOne { \stemup s4 dis' cis cis ~ | + \context Staff < + \context VoiceTwo { r4 } + \context VoiceOne { \stemup s4 dis' cis cis ~ | [cis8 a d cis] [bis gis] cis4 | dis2 cis4 r8 cis } - \type VoiceOne { \stemup bis2 } - \type VoiceThree { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 | + \context VoiceOne { \stemup bis2 } + \context VoiceThree { \stemup \shifton r4 gis ~ [gis8 gis] ~ \stemdown \shiftoff gis4 | a4. fis8 gis4. a8 ~ | a4 gis4 gis r8 gis } % { \stemup \shifton s4 fis4 e} % a quick hack to avoid some collisons - \type VoiceFour { \stemdown \shifton s4 fis4 e} - \type VoiceTwo { \stemdown s4 dis4 cis4 } + \context VoiceFour { \stemdown \shifton s4 fis4 e} + \context VoiceTwo { \stemdown s4 dis4 cis4 } > | %16 } @@ -108,9 +108,9 @@ fugaII_right = \notes \relative c'' { \clef violin; %15 - \type Staff < - \type Voice = VA { \stemup [b8 fis8] b4 } - \type Voice = VB { \stemdown fis2 } + \context Staff < + \context Voice = VA { \stemup [b8 fis8] b4 } + \context Voice = VB { \stemdown fis2 } > %{ this chord is usually set like this: | @@ -120,21 +120,21 @@ fugaII_right = \notes \relative c'' { |x | %} - \type Staff < + \context Staff < { \stemup \shiftoff e4 } { \stemup \shifton cis } { \stemup \shifton ais } { \stemdown fis } > | %16 - \type Staff < - \type VoiceOne { dis2 dis4 | + \context Staff < + \context VoiceOne { dis2 dis4 | cis2 cis4 | b4. [cis8 dis e] } - \type VoiceThree { \stemup \shifton [b8 fis] b2 ~ | + \context VoiceThree { \stemup \shifton [b8 fis] b2 ~ | [b8 a!16 gis] a2 ~ | a4 gis2 } - \type VoiceTwo { \stemdown fis2. ~ | + \context VoiceTwo { \stemdown fis2. ~ | fis ~ | fis4 e2 } > | @@ -146,10 +146,10 @@ fugaII_left = \notes { \clef bass; %15 - \type Staff < - \type VoiceTwo { \stemdown b2 \stemup ais4 | + \context Staff < + \context VoiceTwo { \stemdown b2 \stemup ais4 | b2 b4 } - \type VoiceTwo { \stemdown s2 e4 | + \context VoiceTwo { \stemdown s2 e4 | fis2 fis4 } > \stemdown cis2 e4 | @@ -177,14 +177,14 @@ breakmusic = \notes { % these should be two separate scores... \score{ - \type Score < - \type PianoStaff < - \type Staff = treble { + \context Score < + \context PianoStaff < + \context Staff = treble { \praeludium_right \breakmusic \fugaII_right } - \type Staff = bass { + \context Staff = bass { \praeludium_left \breakmusic \fugaII_left } > - \type Staff = pedal { + \context Staff = pedal { \praeludium_pedal \breakmusic \fugaII_pedal } > @@ -219,7 +219,7 @@ breakmusic = \notes { \accepts VoiceTwo; \accepts VoiceOne; } -% \translator { \OrchestralScoreContext } + \translator { \OrchestralScoreContext } } \midi { diff --git a/input/rhythm.ly b/input/rhythm.ly index 9798f32d06..5e159280bf 100644 --- a/input/rhythm.ly +++ b/input/rhythm.ly @@ -7,7 +7,7 @@ TestedFeatures = "multiple meters, beaming, unsynced bars, userdefd engravers"; -\version "1.0.14"; +\version "1.0.16"; ritme = \notes\transpose c'' { \time 4/4; @@ -52,10 +52,10 @@ yanother = \score{ - \type StaffGroup < + \context StaffGroup < \ritme \another - \type RhythmicStaff { + \context RhythmicStaff { \yanother } > diff --git a/input/scales.ly b/input/scales.ly index ae2eba39d1..f69f379188 100644 --- a/input/scales.ly +++ b/input/scales.ly @@ -16,7 +16,7 @@ copyright = "public domain"; % scales with accents. % -\version "1.0.14"; +\version "1.0.16"; blah = \notes { \time 6/8; \transpose c { diff --git a/input/scripts.ly b/input/scripts.ly index f2e1fc7398..1d9333bb1e 100644 --- a/input/scripts.ly +++ b/input/scripts.ly @@ -1,5 +1,5 @@ -\version "1.0.14"; +\version "1.0.16"; blah = \notes{ \transpose c'' { @@ -49,8 +49,8 @@ blah = \notes{ \transpose c'' { [c-^ \< d-^ e-^ \! f-^][d'-^ \> e'-^ f'-^ \! g'-^] [c-. \< d-. e-. \! f-.][d'-. \> e'-. f'-. \! g'-.] [c-- \< d-- e-- \! f--][d'-- \> e'-- f'-- \! g'--] - [c-\portato \< d-\portato e-\portato \! f-\portato] - [d'-\portato \> e'-\portato f'-\portato \! g'-\portato] + [c-\tenuto \< d-\tenuto e-\tenuto \! f-\tenuto] + [d'-\tenuto \> e'-\tenuto f'-\tenuto \! g'-\tenuto] [c-\upbow \< d-\upbow e-\upbow \! f-\upbow] [d'-\upbow \> e'-\upbow f'-\upbow \! g'-\upbow] [c-| \< d-| e-| \! f-|][d'-| \> e'-| f'-| \! g'-|] diff --git a/input/star-spangled-banner.ly b/input/star-spangled-banner.ly index 177e20b8e0..4cdf7f5837 100644 --- a/input/star-spangled-banner.ly +++ b/input/star-spangled-banner.ly @@ -58,13 +58,13 @@ $staff2_voice_2 = \notes { } text = \lyrics -\type LyricVoice { Oh4 __ \repeat 2 { } +\context LyricVoice { Oh4 __ \repeat 2 { } \alternative < { say. can you see,2 by8. the16 dawn's4 ear- ly light2 What8 so8 proud-4. ly8 we4 hailed,2 At8. the16 twi-4 light's last gleam- ing. Whose8. broad16 } - \type LyricVoice = LVB + \context LyricVoice = LVB { stripes4 and bright stars,2 through8. the16 per-4 il- ous fight,2 O'er8 the8 ram-4. parts8 we4 watched,2 were8. so16 gal-4 lant- ly } > @@ -89,14 +89,14 @@ global = \notes { \include "paper16.ly"; \score{ - \type GrandStaff < - \type Staff=staffA < + \context GrandStaff < + \context Staff=staffA < \global \notes \transpose c'' {\voiceone \$staff1_voice_1 } \notes \transpose c'' {\voicetwo \$staff1_voice_2 } > - \type Lyrics = one \text - \type Staff=staffB < + \context Lyrics = one \text + \context Staff=staffB < \global \clef bass; \property Staff.voltaVisibility = "0" @@ -118,3 +118,5 @@ global = \notes { } } + +\version "1.0.16"; diff --git a/input/test/abbrev.ly b/input/test/abbrev.ly index f9afb51bd0..864cdc4392 100644 --- a/input/test/abbrev.ly +++ b/input/test/abbrev.ly @@ -1,5 +1,5 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes \transpose c'''{ \stemup diff --git a/input/test/alphabet.ly b/input/test/alphabet.ly index 9c83ac98ca..1d0b4267f4 100644 --- a/input/test/alphabet.ly +++ b/input/test/alphabet.ly @@ -1,12 +1,12 @@ \score{ < - \type Staff \notes{ + \context Staff \notes{ \skip 4*27; \skip 4*27; \skip 4*27; \skip 4*27; } - \type Lyrics \lyrics{ + \context Lyrics \lyrics{ aaaaaaaaaaaaaaaaaaa xxx\break bbbbbbbbbbbbbbbbbbb @@ -120,3 +120,5 @@ xxx\break linewidth = 40.\mm; } } + +\version "1.0.16"; diff --git a/input/test/auto-staff-switch.ly b/input/test/auto-staff-switch.ly index dfb278193b..09f6393cd2 100644 --- a/input/test/auto-staff-switch.ly +++ b/input/test/auto-staff-switch.ly @@ -1,7 +1,7 @@ \score { \notes { - \type AutoSwitchGrandStaff \relative c' { + \context AutoSwitchGrandStaff \relative c' { c8^8 d^8 b^8 a^8 [a,^8 f'^8 g,^8 ~ g] } @@ -12,7 +12,7 @@ \accepts AutoSwitchGrandStaff; } \translator{ - \type "Line_group_engraver_group"; + \context "Line_group_engraver_group"; \name AutoSwitchGrandStaff; \consists "Span_bar_engraver"; \consists "Vertical_align_engraver"; @@ -24,9 +24,11 @@ \accepts "Staff"; } \translator { - \type "Engraver_group_engraver"; + \context "Engraver_group_engraver"; \name "AutoSwitchContext"; \consists "Staff_switching_translator"; } }} + +\version "1.0.16"; diff --git a/input/test/bar-scripts.ly b/input/test/bar-scripts.ly index 789a6e3aa9..8e49cd7e86 100644 --- a/input/test/bar-scripts.ly +++ b/input/test/bar-scripts.ly @@ -1,19 +1,19 @@ -\version "1.0.14"; +\version "1.0.16"; -onestaff = \type Staff = foo\notes { +onestaff = \context Staff = foo\notes { \property Staff.instr = instr \property Staff.instrument = instrument \mark "B"; c1 \mark "A"; \break c2 c2 \break } -grstaff = \notes \type GrandStaff < - \type Staff = bar { +grstaff = \notes \context GrandStaff < + \context Staff = bar { \property Staff.instr = instr \mark "B"; \break c1 \mark "A"; c2 } - \type Staff = bufl { c1 c2 } + \context Staff = bufl { c1 c2 } > scpaper = \paper {\translator {\OrchestralScoreContext}} diff --git a/input/test/beam-chord.ly b/input/test/beam-chord.ly index b6a7392164..4d993f2665 100644 --- a/input/test/beam-chord.ly +++ b/input/test/beam-chord.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes\transpose c'{ diff --git a/input/test/beam-interstaff.ly b/input/test/beam-interstaff.ly index 37a6368ab6..e30a5f7633 100644 --- a/input/test/beam-interstaff.ly +++ b/input/test/beam-interstaff.ly @@ -1,6 +1,6 @@ \score{ - \type GrandStaff < - \type Staff=one \notes\relative c'{ + \context GrandStaff < + \context Staff=one \notes\relative c'{ \stemup [c8 c \translator Staff=two \stemup c c] [c c c c] \translator Staff=one @@ -12,7 +12,7 @@ \stemup [c8 c \translator Staff=one \stemdown c c] r2 } - \type Staff=two \notes\relative c'{ + \context Staff=two \notes\relative c'{ \clef bass; s1 s1 @@ -29,3 +29,5 @@ % linewidth=-1.; } } + +\version "1.0.16"; diff --git a/input/test/beam-isknee.ly b/input/test/beam-isknee.ly index 45a5e4bf41..e22598d245 100644 --- a/input/test/beam-isknee.ly +++ b/input/test/beam-isknee.ly @@ -1,9 +1,9 @@ \score{ - \type GrandStaff < - \type Staff=one \notes\relative c'{ + \context GrandStaff < + \context Staff=one \notes\relative c'{ s1 } - \type Staff=two \notes\relative c'{ + \context Staff=two \notes\relative c'{ \clef bass; % no knee \stemup [c8 \translator Staff=one \stemdown g'16 f] @@ -20,3 +20,5 @@ linewidth=-1.; } } + +\version "1.0.16"; diff --git a/input/test/beam-pos.ly b/input/test/beam-pos.ly index 85cd581938..a3cdba917a 100644 --- a/input/test/beam-pos.ly +++ b/input/test/beam-pos.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes\transpose c''{ diff --git a/input/test/beams.ly b/input/test/beams.ly index 1216d624d3..9816938c03 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -6,12 +6,12 @@ copyright = "PD"; TestedFeatures = "beams and beamflags"; } -\version "1.0.14"; +\version "1.0.16"; \score{ < % \property Score.beamquantisation = \none - \type GrandStaff < + \context GrandStaff < \notes\transpose c' { \time 8/4; diff --git a/input/test/broken.ly b/input/test/broken.ly index adbc6417a4..9023a39b7d 100644 --- a/input/test/broken.ly +++ b/input/test/broken.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.14"; +\version "1.0.16"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/chord-inversion.ly b/input/test/chord-inversion.ly index 2e06840c5e..a5b1b330c5 100644 --- a/input/test/chord-inversion.ly +++ b/input/test/chord-inversion.ly @@ -17,7 +17,9 @@ inversions = \notes\transpose c''\chords{ \score{ < - \type ChordNames \inversions - \type Staff \inversions + \context ChordNames \inversions + \context Staff \inversions > } + +\version "1.0.16"; diff --git a/input/test/chord-table.ly b/input/test/chord-table.ly index 98174f1cf7..c50102f93b 100644 --- a/input/test/chord-table.ly +++ b/input/test/chord-table.ly @@ -9,34 +9,36 @@ tab = \notes\transpose c'''\chords{ } \score{ - \type StaffGroup < - \type Staff=c \notes\transpose c\tab - \type ChordNames=c \notes\transpose c\tab - \type Staff=cis \notes\transpose cis\tab - \type ChordNames=cis \notes\transpose cis\tab - \type Staff=des \notes\transpose des\tab - \type ChordNames=des \notes\transpose des\tab - \type Staff=d \notes\transpose d\tab - \type ChordNames=d \notes\transpose d\tab - \type Staff=es \notes\transpose es\tab - \type ChordNames=es \notes\transpose es\tab - \type Staff=e \notes\transpose e\tab - \type ChordNames=e \notes\transpose e\tab - \type Staff=fis \notes\transpose fis\tab - \type ChordNames=fis \notes\transpose fis\tab - \type Staff=g \notes\transpose g\tab - \type ChordNames=g \notes\transpose g\tab - \type Staff=as \notes\transpose as\tab - \type ChordNames=as \notes\transpose as\tab - \type Staff=a \notes\transpose a\tab - \type ChordNames=a \notes\transpose a\tab - \type Staff=bes \notes\transpose bes,\tab - \type ChordNames=bes \notes\transpose bes,\tab - \type Staff=b \notes\transpose b,\tab - \type ChordNames=b \notes\transpose b,\tab + \context StaffGroup < + \context Staff=c \notes\transpose c\tab + \context ChordNames=c \notes\transpose c\tab + \context Staff=cis \notes\transpose cis\tab + \context ChordNames=cis \notes\transpose cis\tab + \context Staff=des \notes\transpose des\tab + \context ChordNames=des \notes\transpose des\tab + \context Staff=d \notes\transpose d\tab + \context ChordNames=d \notes\transpose d\tab + \context Staff=es \notes\transpose es\tab + \context ChordNames=es \notes\transpose es\tab + \context Staff=e \notes\transpose e\tab + \context ChordNames=e \notes\transpose e\tab + \context Staff=fis \notes\transpose fis\tab + \context ChordNames=fis \notes\transpose fis\tab + \context Staff=g \notes\transpose g\tab + \context ChordNames=g \notes\transpose g\tab + \context Staff=as \notes\transpose as\tab + \context ChordNames=as \notes\transpose as\tab + \context Staff=a \notes\transpose a\tab + \context ChordNames=a \notes\transpose a\tab + \context Staff=bes \notes\transpose bes,\tab + \context ChordNames=bes \notes\transpose bes,\tab + \context Staff=b \notes\transpose b,\tab + \context ChordNames=b \notes\transpose b,\tab > \paper{ textheight = \vsize - 4.0 * \staffheight; } } + +\version "1.0.16"; diff --git a/input/test/chords.ly b/input/test/chords.ly index 973faf1923..76dea54093 100644 --- a/input/test/chords.ly +++ b/input/test/chords.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; %{ Would this be acceptable/good enough/convenient for entry? @@ -54,7 +54,7 @@ keys = \notes{ \score{ < - \type ChordNames \scales - \type Staff < \scales \keys > + \context ChordNames \scales + \context Staff < \scales \keys > > } diff --git a/input/test/clefs.ly b/input/test/clefs.ly index 3874a441c0..a0b101780d 100644 --- a/input/test/clefs.ly +++ b/input/test/clefs.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score { \notes{ diff --git a/input/test/coda-kludge.ly b/input/test/coda-kludge.ly index 982a815aa8..e68029ae2a 100644 --- a/input/test/coda-kludge.ly +++ b/input/test/coda-kludge.ly @@ -28,7 +28,7 @@ Hi, \score{ < - \type Staff \notes\relative c''{ + \context Staff \notes\relative c''{ c c c c % coda-klugde: let volta span only one bar \property Staff.voltaSpannerDuration = "1" @@ -36,7 +36,7 @@ Hi, \alternative { { e e e e f f f f } { g g g g } } } - \type Lyrics \lyrics{ + \context Lyrics \lyrics{ intro1 \repeat 5 {} \alternative < @@ -50,3 +50,5 @@ Hi, > } + +\version "1.0.16"; diff --git a/input/test/collisions.ly b/input/test/collisions.ly index 1077b3d852..89bb44d449 100644 --- a/input/test/collisions.ly +++ b/input/test/collisions.ly @@ -5,23 +5,23 @@ enteredby = "HWN,JCN"; copyright = "public domain"; Tested = "test the Collision resolution "; } -\version "1.0.14"; +\version "1.0.16"; -twovoice = \type Staff \notes < - \type Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } - \type Voice=ii { \stemup g4 f e g ~ g2 g2 c4 g4 g2 } +twovoice = \context Staff \notes < + \context Voice=i { \stemdown c4 d e f g2~ g4 a [c8 d e f] c2| } + \context Voice=ii { \stemup g4 f e g ~ g2 g2 c4 g4 g2 } > -twovoicesteminvert = \type Staff \notes < +twovoicesteminvert = \context Staff \notes < % the f and g on 4th beat are exceptionally ugh. - \type Voice=i { \stemup c4 d e f g2 g4 a | } - \type Voice=ii { \stemdown g4 f e g g2 g2 } + \context Voice=i { \stemup c4 d e f g2 g4 a | } + \context Voice=ii { \stemdown g4 f e g g2 g2 } > -threevoice = \type Staff \notes < - \type Voice=i { \stemup g4 f e f g a g2 } - \type Voice=ii { \stemup \property Voice.hshift = 1 e2 e2 e2 e2 } - \type Voice=iii { \stemdown c4 d e d c d es } +threevoice = \context Staff \notes < + \context Voice=i { \stemup g4 f e f g a g2 } + \context Voice=ii { \stemup \property Voice.hshift = 1 e2 e2 e2 e2 } + \context Voice=iii { \stemdown c4 d e d c d es } > \score{ diff --git a/input/test/defaultbars.ly b/input/test/defaultbars.ly index d952926b61..4fc3dbbf8b 100644 --- a/input/test/defaultbars.ly +++ b/input/test/defaultbars.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score { diff --git a/input/test/denneboom.ly b/input/test/denneboom.ly index 42cf2d59f1..f0b210ecbd 100644 --- a/input/test/denneboom.ly +++ b/input/test/denneboom.ly @@ -7,7 +7,7 @@ TestedFeatures = "This file tests silly line shapes"; \include "paper20.ly" -\version "1.0.14"; +\version "1.0.16"; oden = \lyrics{ O8 | @@ -62,7 +62,7 @@ melody = \notes{ \oboom } -$melody_staff = \type Staff = melody < +$melody_staff = \context Staff = melody < \global \melody > @@ -74,7 +74,7 @@ $verse_one = \notes{ \oden } -$verse_one_staff = \type Lyrics = one < +$verse_one_staff = \context Lyrics = one < \global \$verse_one > @@ -86,7 +86,7 @@ $verse_two = \notes{ \oden } -$verse_two_staff = \type Lyrics = two < +$verse_two_staff = \context Lyrics = two < \global \$verse_two > diff --git a/input/test/dotted-slur.ly b/input/test/dotted-slur.ly index 10dc35283a..797b3f7024 100644 --- a/input/test/dotted-slur.ly +++ b/input/test/dotted-slur.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes{ diff --git a/input/test/extender.ly b/input/test/extender.ly index ed33ea2913..19f3ade990 100644 --- a/input/test/extender.ly +++ b/input/test/extender.ly @@ -1,6 +1,8 @@ \score{ < - \type Staff \notes { c () c () c c } - \type Lyrics \lyrics { bla __ alb xxx __ yyy } + \context Staff \notes { c () c () c c } + \context Lyrics \lyrics { bla __ alb xxx __ yyy } > } + +\version "1.0.16"; diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index 49a0e0e908..9c60a54135 100644 --- a/input/test/extra-staff.ly +++ b/input/test/extra-staff.ly @@ -24,11 +24,11 @@ extra-staff.ly: \score { < - \type Staff=i \notes\relative c''{ c1 c c c c } - \type StaffGroup=ii \notes\relative c''{ - \type Staff=ii + \context Staff=i \notes\relative c''{ c1 c c c c } + \context StaffGroup=ii \notes\relative c''{ + \context Staff=ii c1 c - < \type Staff=ii { c1 } \type Staff=iii { c1 } > + < \context Staff=ii { c1 } \context Staff=iii { c1 } > c } > @@ -36,9 +36,10 @@ extra-staff.ly: linewidth = -1.; \translator{ \ScoreContext - minVerticalAlign = 2.0*\staffheight; - maxVerticalAlign = 2.0*\staffheight; + } } } + +\version "1.0.16"; diff --git a/input/test/find-quarts.ly b/input/test/find-quarts.ly index f419286288..24f56d82ef 100644 --- a/input/test/find-quarts.ly +++ b/input/test/find-quarts.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes \relative c { diff --git a/input/test/font-body.ly b/input/test/font-body.ly index 8578815cf7..54c397c26b 100644 --- a/input/test/font-body.ly +++ b/input/test/font-body.ly @@ -1,10 +1,10 @@ -\version "1.0.14"; +\version "1.0.16"; FontBody= \notes\transpose c''{ \bar "|:"; \time 4/4; - \type Staff < \type Voice = VB { \stemup e'\longa a\breve | } - \type Voice = VA { \stemdown + \context Staff < \context Voice = VB { \stemup e'\longa a\breve | } + \context Voice = VA { \stemdown c1 \clef "bass"; b,, \clef "violin"; c' a' c2 \clef "alto"; g c' \clef "violin"; a' } > @@ -20,8 +20,8 @@ FontBody= \notes\transpose c''{ \clef "bass"; r\longa * 1/4 r\breve *1/2 r1 r2 r4 r8 r16 r32 r64 r128 r128 | - \type Staff < \type Voice = VA { \stemup r2 c'2 c,,,1 } - \type Voice = VB {\stemdown r2 c2 r1 }> + \context Staff < \context Voice = VA { \stemup r2 c'2 c,,,1 } + \context Voice = VB {\stemdown r2 c2 r1 }> \stemboth \clef "violin"; e8_. g'8-> e16^^ g'16_^ diff --git a/input/test/font.ly b/input/test/font.ly index 66c061eb8c..48e6956caf 100644 --- a/input/test/font.ly +++ b/input/test/font.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.14"; +\version "1.0.16"; \include "font-body.ly" \score{ diff --git a/input/test/font16.ly b/input/test/font16.ly index 0a742345a7..62fc3e0d1c 100644 --- a/input/test/font16.ly +++ b/input/test/font16.ly @@ -7,7 +7,7 @@ description = "This file tests the Feta music font"; % "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.14"; +\version "1.0.16"; \include "paper16.ly" \include "font-body.ly" diff --git a/input/test/font20.ly b/input/test/font20.ly index d0884925a7..b3bb7db4aa 100644 --- a/input/test/font20.ly +++ b/input/test/font20.ly @@ -11,9 +11,11 @@ TestedFeatures = \include "font-body.ly" \score{ - \type Staff { \FontBody} + \context Staff { \FontBody} \paper{ linewidth = 17.5 \cm; gourlay_maxmeasures =5.; } } +\version "1.0.16"; + diff --git a/input/test/gourlay.ly b/input/test/gourlay.ly index 004ab010ec..23ffb2f685 100644 --- a/input/test/gourlay.ly +++ b/input/test/gourlay.ly @@ -4,7 +4,7 @@ copyright = "PD"; TestedFeatures = "This file tests some nasty Gourlay spacings"; } -\version "1.0.14"; +\version "1.0.16"; %{ @@ -13,7 +13,7 @@ This is taken from [Gourlay]'s paper on breaking lines %} \score{ - \notes \type Staff \transpose c''< + \notes \context Staff \transpose c''< { \stemup d2 d | d d | d4 d2. | \break c1 } \transpose c, { \stemdown g4 g g g | \times 2/3 { g2 g2 g2 } | g4. g8 g2 | c1 } > diff --git a/input/test/grace.ly b/input/test/grace.ly index 5d625966ca..99421486de 100644 --- a/input/test/grace.ly +++ b/input/test/grace.ly @@ -1,17 +1,17 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ < - \type Staff = a \notes\relative c < + \context Staff = a \notes\relative c < % {\grace b''8 \graceat a4 \ecarg g fis2 | a2 a } {\tiny b''8*1/16 \normalsize a4*31/32 g fis2 | a2 a } > - \type Staff = b \notes\relative c < + \context Staff = b \notes\relative c < % {\grace g''16 b16 \graceat a4 \ecarg g fis2 | } {\tiny g''16*1/16 b16*1/16 \normalsize a4*31/32 g fis2 | a1 } > - \type Staff = c \notes\relative c < + \context Staff = c \notes\relative c < % {\grace \times 2/48 { [ g''16 b g] } \graceat a4 \ecarg g fis2 | a1 } {\tiny \times 2/48 { [ g''16 b g] } \normalsize a4*31/32 g fis2 | a1 } > diff --git a/input/test/hara-kiri.ly b/input/test/hara-kiri.ly index bdfbe78404..c60527d80e 100644 --- a/input/test/hara-kiri.ly +++ b/input/test/hara-kiri.ly @@ -1,36 +1,40 @@ -\version "1.0.14"; +\version "1.0.16"; + +toeter_i = \notes\relative c <{ + \property Staff.instrument = "Toeters" + \property Staff.instr = "Ttr." } + \context Voice = lower { \stemdown s1*6 } + \context Voice = upper { \stemup s1*6 } + \context Voice = together { -toeter_i = \notes\relative c { - \property Staff.instrument = "Toeters" - \property Staff.instr = "Ttr." c'''4 c c c \break d d d d \break - R1 \break - \voiceone - e4 e e e \break - \onevoice + R1 \break + \context Voice = upper { + e4 e e e \break } f f f f \break - g g g g -} + g g g g +}> -toeter_ii = \notes \relative c { +toeter_ii = \notes \relative c \context Voice = together { c''4 c c c \break d d d d \break R1 \break - \voicetwo - e4 e e e \break - \onevoice + \context Voice = lower { + \stemdown + e4 e e e \break + } f f f f \break g g g g } -toeters = \type Staff = toeters < +toeters = \context Staff = toeters < \toeter_i \toeter_ii > -zager = \type Staff = zager \notes \relative c'' { - \clef bass; +zager = \context Staff = zager \notes \relative c'' { + \clef treble; \property Staff.instrument = "Zager" \property Staff.instr = "Zag." c4 d e f \break @@ -38,47 +42,46 @@ zager = \type Staff = zager \notes \relative c'' { f e d c \break c d e f \break \property Staff.instr = "Zag." - \voiceone + \stemup f e d c \break - \onevoice c d e f \break f e d c } -zoger = \type Staff = zoger \notes \relative c'' { - \clef bass; +zoger = \context Staff = zoger \notes \relative c'' { + \clef treble; \property Staff.instrument = "Zoger" \property Staff.instr = "Zog." c4 d e f \break \skip 1*2; -% \staffone + \translator Staff=zager - \voicetwo - c2 g2\break - \onevoice + \stemdown + c2 g2 + a4 b c d \break \skip 1*1; } -zagers = \type GrandStaff < +zagers = \context GrandStaff < \zager \zoger > \score{ < - \type StaffGroup = toeters < + \context StaffGroup = toeters < \toeters > - \type StaffGroup = zagers < + \context StaffGroup = zagers < \zagers > > \paper{ linewidth = 40.0\mm; -% \translator { \HaraKiriStaffContext } + \translator { \HaraKiriStaffContext } %uh? -% \translator { \OrchestralScoreContext } + \translator { \OrchestralScoreContext } % \translator { \OrchestralPartStaffContext } } } diff --git a/input/test/incipit.ly b/input/test/incipit.ly index 9b8f5c8438..3bf893b992 100644 --- a/input/test/incipit.ly +++ b/input/test/incipit.ly @@ -6,7 +6,7 @@ /Mats B %} -\version "1.0.14"; +\version "1.0.16"; incipit = \notes\relative c'{ @@ -17,7 +17,7 @@ violin = \notes\relative c''{ \time 2/2; a4. b8 c4 fis | - gis~ gis8 fis16^\trill ()e b8 c \type Staff<{\voiceone a d}{\voicetwo es,4}>| + gis~ gis8 fis16^\trill ()e b8 c \context Staff<{\voiceone a d}{\voicetwo es,4}>| } BC = \notes\relative c{ @@ -31,13 +31,13 @@ BC = \notes\relative c{ \score{ \notes{ - \type Staff=violin + \context Staff=violin \property Staff.clefStyle = "transparent" \incipit - < \type Staff=violin { + < \context Staff=violin { \bar ".|"; \endincipit \violin} - \type Staff=cb { \property Staff.clefStyle = "transparent" + \context Staff=cb { \property Staff.clefStyle = "transparent" \bar ".|"; \endincipit \BC}> } diff --git a/input/test/keys.ly b/input/test/keys.ly index f8c7ed7424..47d7eff5b0 100644 --- a/input/test/keys.ly +++ b/input/test/keys.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; %{ test key itemv breaking diff --git a/input/test/knee.ly b/input/test/knee.ly index 34e1b9668d..fb289ff63b 100644 --- a/input/test/knee.ly +++ b/input/test/knee.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes\relative c'{ [c16 \stemdown c'' \stemboth c,, d] diff --git a/input/test/mark.ly b/input/test/mark.ly index 160e6c05fe..692115ee7c 100644 --- a/input/test/mark.ly +++ b/input/test/mark.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; global = \notes { s1 | \mark "A"; diff --git a/input/test/memory.ly b/input/test/memory.ly index fad3f4e313..edcd4f8092 100644 --- a/input/test/memory.ly +++ b/input/test/memory.ly @@ -6,8 +6,10 @@ do a memory stress test. bla = \notes { c1(((( c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break c1 \break ))))c1} -\score { \type Score < +\score { \context Score < \bla \bla \bla \bla \bla \bla \bla > \paper { Gourlay_maxmeaures = 2.; } } +\version "1.0.16"; + diff --git a/input/test/multi-rest.ly b/input/test/multi-rest.ly index 2755cfffda..e0f1d41d0c 100644 --- a/input/test/multi-rest.ly +++ b/input/test/multi-rest.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; voice_one = \notes\transpose c''{ \stemup R1 * 2 | f'4-. r r2 | R1 * 3 | @@ -23,7 +23,7 @@ voice_two = \notes }} \score { \notes - \type Staff < + \context Staff < \$voice_two \$voice_one > diff --git a/input/test/noteheadstyle.ly b/input/test/noteheadstyle.ly index 47755da84e..df11fef63f 100644 --- a/input/test/noteheadstyle.ly +++ b/input/test/noteheadstyle.ly @@ -9,14 +9,14 @@ c4 c2 c8 c16 c16 c1 \property Voice.noteHeadStyle = "harmonic" c4 c2 c8 c16 c16 c1 - \type ThreadedVoice < - \type Thread = TA + \context ThreadedVoice < + \context Thread = TA { \property Thread.noteHeadStyle = "cross" \property ThreadedVoice.ydirection = \up c16} - \type Thread = TB + \context Thread = TB { \property Thread.noteHeadStyle = "" a16 } - \type Thread = TC + \context Thread = TC { \property Thread.noteHeadStyle = "harmonic" d16 } > @@ -40,3 +40,4 @@ c4 c2 c8 c16 c16 c1 } } } +\version "1.0.16"; diff --git a/input/test/notemode-chords.ly b/input/test/notemode-chords.ly index 6ccc59d69d..61afddc932 100644 --- a/input/test/notemode-chords.ly +++ b/input/test/notemode-chords.ly @@ -1,4 +1,4 @@ -\version "1.0.15"; +\version "1.0.16"; \score{ \notes \transpose c''{ diff --git a/input/test/orchestscore.ly b/input/test/orchestscore.ly index 16fd3fb077..46806afd50 100644 --- a/input/test/orchestscore.ly +++ b/input/test/orchestscore.ly @@ -1,81 +1,81 @@ -\version "1.0.14"; +\version "1.0.16"; m = \notes \relative c''{ c1 | c2 c | c c | c c | c c | c c | c c | c c | } \score{ < - \type StaffGroup = wood < - \type Staff = flauto < + \context StaffGroup = wood < + \context Staff = flauto < \property Staff.instrument = "Flauto" \property Staff.instr = "Fl." \m > - \type Staff = oboe < + \context Staff = oboe < \property Staff.instrument = "Oboe" \property Staff.instr = "Ob." \m > - \type Staff = clarI < + \context Staff = clarI < \property Staff.instrument = "Clarinetto I" \property Staff.instr = "Cl. I" \m > - \type Staff = clarII < + \context Staff = clarII < \property Staff.instrument = "Clarinetto II" \property Staff.instr = "Cl. II" \m > - \type Staff = fagotto < + \context Staff = fagotto < \property Staff.instrument = "Fagotto" \property Staff.instr = "Fg." \m > > - \type StaffGroup = brass < - \type Staff = cor < + \context StaffGroup = brass < + \context Staff = cor < \property Staff.instrument = "2 Corni in F" \property Staff.instr = "Cor." - \type Voice = corI { \stemup \m } - \type Voice = corII { \stemdown \m } + \context Voice = corI { \stemup \m } + \context Voice = corII { \stemdown \m } > - \type Staff = trp < + \context Staff = trp < \property Staff.instrument = "2 Trp. in B\\textflat " \property Staff.instr = "Trp." - \type Voice = trpI { \stemup \m } - \type Voice = trpII { \stemdown \m } + \context Voice = trpI { \stemup \m } + \context Voice = trpII { \stemdown \m } > > - \type StaffGroup = percussion <\type Staff = timpani < + \context StaffGroup = percussion <\context Staff = timpani < \property Staff.instrument = "Timpani" \property Staff.instr = "Timp." \m > > - \type StaffGroup = strings < -% \type GrandStaff = violins < - \type Staff = viI < + \context StaffGroup = strings < +% \context GrandStaff = violins < + \context Staff = viI < \property Staff.instrument = "Violin I" \property Staff.instr = "Vi. I" \m > - \type Staff = viII < + \context Staff = viII < \property Staff.instrument = "Violin II" \property Staff.instr = "Vi. II" \m > % > - \type Staff = vla < + \context Staff = vla < \property Staff.instrument = "Viola" \property Staff.instr = "Vla." \m > - \type Staff = vlc < + \context Staff = vlc < \property Staff.instrument = "Violoncello" \property Staff.instr = "Vlc" \m > - \type Staff = cb < + \context Staff = cb < \property Staff.instrument = "Contrabasso" \property Staff.instr = "C.B." \m diff --git a/input/test/ossia.ly b/input/test/ossia.ly index 053b737440..ace006c6d6 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -1,6 +1,6 @@ -\version "1.0.14"; +\version "1.0.16"; \score { -\notes { c1 c1 < {\clef "treble"; c1 c1 } \type Staff=stb{ c1 c1}>} +\notes { c1 c1 < {\clef "treble"; c1 c1 } \context Staff=stb{ c1 c1}>} } diff --git a/input/test/rep.ly b/input/test/rep.ly index 1275606bb0..c799c7bf16 100644 --- a/input/test/rep.ly +++ b/input/test/rep.ly @@ -1,6 +1,6 @@ \score{ < - \type Staff \notes\relative c'{ + \context Staff \notes\relative c'{ c4 d e f \repeat 3 { g a b c } % \alternative { { c b a g } { f e d c } } c c c c @@ -12,3 +12,5 @@ } > } + +\version "1.0.16"; diff --git a/input/test/repeat.ly b/input/test/repeat.ly index 914b665f96..cb1c8616be 100644 --- a/input/test/repeat.ly +++ b/input/test/repeat.ly @@ -1,11 +1,11 @@ \score{ < - \type Staff \notes\relative c'{ + \context Staff \notes\relative c'{ c d e f \repeat 2 { g a b c } \alternative { { c b a g } { f e d c } } } - \type Lyrics \lyrics { + \context Lyrics \lyrics { De eer- ste < { maat } { moet } > \repeat 2 { } \alternative < @@ -16,3 +16,5 @@ } > } + +\version "1.0.16"; diff --git a/input/test/rest-collision.ly b/input/test/rest-collision.ly index d34df43f90..1b9d1e2a14 100644 --- a/input/test/rest-collision.ly +++ b/input/test/rest-collision.ly @@ -7,18 +7,18 @@ rests = \notes { r r r r r r r r r r r r r r r r } -scales = \type Staff \notes < - \type Voice=i { \stemup r1 r2 r2 \scale c''1 c'2 a'2 \rests } - \type Voice = ii { \stemdown a'1 a'2 d'2 \rests r1 r2 r2 \scale } +scales = \context Staff \notes < + \context Voice=i { \stemup r1 r2 r2 \scale c''1 c'2 a'2 \rests } + \context Voice = ii { \stemdown a'1 a'2 d'2 \rests r1 r2 r2 \scale } > -restsII = \type Staff \notes { +restsII = \context Staff \notes { r4 r8 - \type Staff < { \stemup r8 } { \stemdown r8} > - \type Staff < {\stemup r8} r8 { \stemdown r8} > - \type Staff < {\stemup r8} r8 r8 { \stemdown r8} > - \type Staff < {\stemup r} { \stemdown r} > - \type Staff < {\stemup r} r { \stemdown r} > + \context Staff < { \stemup r8 } { \stemdown r8} > + \context Staff < {\stemup r8} r8 { \stemdown r8} > + \context Staff < {\stemup r8} r8 r8 { \stemdown r8} > + \context Staff < {\stemup r} { \stemdown r} > + \context Staff < {\stemup r} r { \stemdown r} > \stemup \transpose c'' { [c''8 r8 c''8 c''8] [c8 r8 c8 c8] @@ -33,3 +33,5 @@ restsII = \type Staff \notes { \restsII } } + +\version "1.0.16"; diff --git a/input/test/score-bar-scripts.ly b/input/test/score-bar-scripts.ly index e5c3d7bded..5761183b7d 100644 --- a/input/test/score-bar-scripts.ly +++ b/input/test/score-bar-scripts.ly @@ -1,22 +1,22 @@ -\version "1.0.14"; +\version "1.0.16"; -onestaff = \type Staff = foo\notes { +onestaff = \context Staff = foo\notes { \property Staff.instr = instr \property Staff.instrument = instrument \mark "B"; c1 \mark "A"; \break c2 c2 \break } -grstaff = \notes \type GrandStaff < - \type Staff = bar { +grstaff = \notes \context GrandStaff < + \context Staff = bar { \property Staff.instr = instr \mark "B"; \break c1 \mark "A"; c2 } - \type Staff = bufl { c1 c2 } > + \context Staff = bufl { c1 c2 } > scpaper = \paper {Score = \translator { - \type Score_engraver; + \context Score_engraver; barScriptPadding = "2.0"; % dimension \pt markScriptPadding = "4.0"; barColumnPriority = "-4"; @@ -42,7 +42,7 @@ scpaper = \paper {Score = \translator { stpaper =\paper{ Staff = \translator { - \type "Line_group_engraver_group"; + \context "Line_group_engraver_group"; defaultclef = violin; barColumnPriority = "0"; diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 0f0490c502..44671d8697 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests Feta embedded slurs" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.14"; +\version "1.0.16"; shortlong = \notes{ c4()c( c c | diff --git a/input/test/slur-bug.ly b/input/test/slur-bug.ly index 2c8847044a..8cd78c967f 100644 --- a/input/test/slur-bug.ly +++ b/input/test/slur-bug.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; % bug % excentric slur can't handle this ... diff --git a/input/test/slur-damping.ly b/input/test/slur-damping.ly index c5502cffcb..420093a9a9 100644 --- a/input/test/slur-damping.ly +++ b/input/test/slur-damping.ly @@ -1,5 +1,5 @@ % test damping -\version "1.0.14"; +\version "1.0.16"; \score{ \notes\relative c'{ diff --git a/input/test/slur-interstaff.ly b/input/test/slur-interstaff.ly index 87c0df5374..30c46c2ec9 100644 --- a/input/test/slur-interstaff.ly +++ b/input/test/slur-interstaff.ly @@ -1,6 +1,6 @@ \score{ - \type GrandStaff < - \type Staff=one \notes\relative c'{ + \context GrandStaff < + \context Staff=one \notes\relative c'{ \stemup c4( c \translator Staff=two c )c | \translator Staff=one \stemup c4( c \translator Staff=two c )c | @@ -21,7 +21,7 @@ \stemup c4( \translator Staff=one c c \translator Staff=two )c r1 } - \type Staff=two \notes\relative c'{ + \context Staff=two \notes\relative c'{ \clef bass; s1 s1 s1 s1 s1 s1 s1 s1 s1 s1 } @@ -37,3 +37,5 @@ %linewidth=100.\mm; } } + +\version "1.0.16"; diff --git a/input/test/slur-swap.ly b/input/test/slur-swap.ly index f4ae8923f3..88e3a44c35 100644 --- a/input/test/slur-swap.ly +++ b/input/test/slur-swap.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; % urg, the direction of the slur gets swapped! \score{ diff --git a/input/test/slurs.ly b/input/test/slurs.ly index 3367ec6380..d4673750a5 100644 --- a/input/test/slurs.ly +++ b/input/test/slurs.ly @@ -1,5 +1,5 @@ -\version "1.0.14"; +\version "1.0.16"; \score{ \notes\transpose c'{ @@ -16,7 +16,7 @@ < { c ~ d } { e ~ f } > -% \type Staff < +% \context Staff < % { \stemup c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c } % { \stemdown c (e g )c'~( [b a g )d] r2 } % > diff --git a/input/test/spacing-2.ly b/input/test/spacing-2.ly index 8e1becef07..5c6d15bb4b 100644 --- a/input/test/spacing-2.ly +++ b/input/test/spacing-2.ly @@ -12,15 +12,15 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; \score { \notes \relative c'' - \type GrandStaff < - \type Staff = SA < - \type Voice = VA { \property Voice.ydirection= 1 + \context GrandStaff < + \context Staff = SA < + \context Voice = VA { \property Voice.ydirection= 1 e4 dis4 e2 } - \type Voice = VB { \property Voice.ydirection= -1 + \context Voice = VB { \property Voice.ydirection= -1 [cis8 a] [fis b] gis2 } {\key e; } > - \type Staff = SB { \clef "bass"; \key e; + \context Staff = SB { \clef "bass"; \key e; [a,,16 e dis e] [b'8 b,] [e16 e, gis b] e4 } > @@ -34,3 +34,5 @@ source = "Petits Preludes et Fugues. Urtext. Editions Henry Lemoine, Paris."; linewidth = 8.0 \cm; } } + +\version "1.0.16"; diff --git a/input/test/spacing.ly b/input/test/spacing.ly index fbe02806b1..5161bef5d2 100644 --- a/input/test/spacing.ly +++ b/input/test/spacing.ly @@ -6,65 +6,65 @@ copyright = "public domain"; TestedFeatures = "This file tests various spacings"; } -\version "1.0.14"; +\version "1.0.16"; multipart = \notes \relative c'{ - \type StaffGroup < - \type Staff = one { + \context StaffGroup < + \context Staff = one { c4 c c c } - \type Staff = two { + \context Staff = two { [c8 c] [c c] [c c] [c c] } - \type Staff = three { + \context Staff = three { \times 2/3 { [c8 c c] } \times 2/3 { [c c c] } \times 2/3 { [c c c] } \times 2/3 { [c c c] } } - \type Staff = four { + \context Staff = four { \times 2/4 { [c8 c c c] } \times 2/4 { [c c c c] } \times 2/4 { [c c c c] } \times 2/4 { [c c c c] } } - \type Staff = five { + \context Staff = five { \times 2/5 { [c8 c c c c] } \times 2/5 { [c c c c c] } \times 2/5 { [c c c c c] } \times 2/5 { [c c c c c] } } - \type Staff = six { + \context Staff = six { \times 2/6 { [c8 c c c c c] } \times 2/6 { [c c c c c c] } \times 2/6 { [c c c c c c] } \times 2/6 { [c c c c c c] } } - \type Staff = seven { + \context Staff = seven { \times 2/7 { [c8 c c c c c c] } \times 2/7 { [c c c c c c c] } \times 2/7 { [c c c c c c c] } \times 2/7 { [c c c c c c c] } } - \type Staff = eight { + \context Staff = eight { \times 2/8 { [c8 c c c c c c c] } \times 2/8 { [c c c c c c c c] } \times 2/8 { [c c c c c c c c] } \times 2/8 { [c c c c c c c c] } } - \type Staff = nine { + \context Staff = nine { \times 2/9 { [c8 c c c c c c c c] } \times 2/9 { [c c c c c c c c c] } \times 2/9 { [c c c c c c c c c] } \times 2/9 { [c c c c c c c c c] } } - \type Staff = ten { + \context Staff = ten { \times 2/10 { [c8 c c c c c c c c c] } \times 2/10 { [c c c c c c c c c c] } \times 2/10 { [c c c c c c c c c c] } \times 2/10 { [c c c c c c c c c c] } } - \type Staff = eleven { + \context Staff = eleven { \times 2/11 { [c8 c c c c c c c c c c] } \times 2/11 { [c c c c c c c c c c c] } \times 2/11 { [c c c c c c c c c c c] } diff --git a/input/test/span-bars.ly b/input/test/span-bars.ly index 5c7fb2c324..b67017bc6f 100644 --- a/input/test/span-bars.ly +++ b/input/test/span-bars.ly @@ -1,23 +1,23 @@ -\version "1.0.14"; +\version "1.0.16"; nt = \notes { c1 \break c1 c1 } stuff = \notes \relative c'' < - \type Staff = stone { \nt } - \type Staff = sttwo { \nt } + \context Staff = stone { \nt } + \context Staff = sttwo { \nt } > \score{ - \type StaffGroup \stuff + \context StaffGroup \stuff } \score{ - \type StaffGroup < \type GrandStaff \stuff - \type Staff = stthree \nt + \context StaffGroup < \context GrandStaff \stuff + \context Staff = stthree \nt > } \score{ - \type ChoirStaff \stuff + \context ChoirStaff \stuff } diff --git a/input/test/staff-margin.ly b/input/test/staff-margin.ly new file mode 100644 index 0000000000..176e387f64 --- /dev/null +++ b/input/test/staff-margin.ly @@ -0,0 +1,18 @@ + + +\version "1.0.16"; + +\score { + + \notes \context PianoStaff < + + \context Staff = treble { + \property PianoStaff.instrument = "Piano " + \property Staff.instrument = "Right " { c''4 }} + \context Staff = bass { \property Staff.instrument = "Left " \clef bass; c4 }> + +\paper { +\translator { \StaffContext \consists "Staff_margin_engraver"; } +\translator { \PianoStaffContext \consists "Staff_margin_engraver"; } +}} + diff --git a/input/test/staff-side-slur.ly b/input/test/staff-side-slur.ly index d099cf6116..d0c57aa4b6 100644 --- a/input/test/staff-side-slur.ly +++ b/input/test/staff-side-slur.ly @@ -1,5 +1,5 @@ \score{ - \type Staff \notes\relative c''{ + \context Staff \notes\relative c''{ \property Staff.instrument = "Toeters" c c c c(\break )c c c c ~\break @@ -17,3 +17,5 @@ } } + +\version "1.0.16"; diff --git a/input/test/staff-size.fly b/input/test/staff-size.fly index a9f063dc26..08c1bb8c41 100644 --- a/input/test/staff-size.fly +++ b/input/test/staff-size.fly @@ -1,10 +1,12 @@ -< \type Staff = VA { +< \context Staff = VA { \property Staff.staffLineLeading = "4" \property Staff.fontsize = "-2" \property Voice . dynamicDir = \up \stemdown \key gis; c8 d [e f g a] b c \ff } -\type Staff = VB { \property Voice . dynamicDir = \down c,,4 \ff} +\context Staff = VB { \property Voice . dynamicDir = \down c,,4 \ff} > + +\version "1.0.16"; diff --git a/input/test/stem.ly b/input/test/stem.ly index 992b5f7307..22b42ba004 100644 --- a/input/test/stem.ly +++ b/input/test/stem.ly @@ -8,7 +8,7 @@ of beams"; } -\version "1.0.14"; +\version "1.0.16"; beamintervals = \notes{ \time 7/4; diff --git a/input/test/tchaikovsky.ly b/input/test/tchaikovsky.ly index 78afbe96ed..3a6941eeea 100644 --- a/input/test/tchaikovsky.ly +++ b/input/test/tchaikovsky.ly @@ -7,7 +7,7 @@ enteredby = "Maarten Storm"; instrument= "Violoncello"; } -\version "1.0.14"; +\version "1.0.16"; % this is an example of extreme dynamics diff --git a/input/test/test-lyrics.ly b/input/test/test-lyrics.ly index 3ef1f47c4f..e55ef647a5 100644 --- a/input/test/test-lyrics.ly +++ b/input/test/test-lyrics.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; $somewhat_long = \lyrics{ \property Lyrics . textstyle = "roman" @@ -30,15 +30,15 @@ $quite_long = \lyrics{ Syyyyyyyyyyyyylllllllaaaaaabbble2 } -$somewhat_long_lyrics_staff = \type Lyrics = somewhat < +$somewhat_long_lyrics_staff = \context Lyrics = somewhat < \$somewhat_long > -$rather_long_lyrics_staff = \type Lyrics = rather < +$rather_long_lyrics_staff = \context Lyrics = rather < \$rather_long > -$quite_long_lyrics_staff = \type Lyrics = quite < +$quite_long_lyrics_staff = \context Lyrics = quite < \$quite_long > @@ -48,7 +48,7 @@ melody = \notes c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 c4 e4 g4 e4 } -$melodic_staff = \type Staff = mel < +$melodic_staff = \context Staff = mel < \melody > diff --git a/input/test/thumb.ly b/input/test/thumb.ly index db218ab9b1..f4baaeaf3c 100644 --- a/input/test/thumb.ly +++ b/input/test/thumb.ly @@ -7,7 +7,7 @@ % the thumb-script is used in cello music to indicate a note that should % be played with your thumb. -\version "1.0.14"; +\version "1.0.16"; \score { \notes \relative c'' { [ <)b_\thumb b'-3> diff --git a/input/test/tie-bug.ly b/input/test/tie-bug.ly index 991f964f5a..35f2ede208 100644 --- a/input/test/tie-bug.ly +++ b/input/test/tie-bug.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; % middle tie is wrong diff --git a/input/test/tie.ly b/input/test/tie.ly index fd5c83fb43..aa965b7706 100644 --- a/input/test/tie.ly +++ b/input/test/tie.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; tie = \notes\transpose c''{ diff --git a/input/test/title.ly b/input/test/title.ly index 00679b3926..6d53178990 100644 --- a/input/test/title.ly +++ b/input/test/title.ly @@ -10,7 +10,7 @@ source = "urtext"; instrument= "Instrument"; } -\version "1.0.14"; +\version "1.0.16"; \score{ \notes diff --git a/input/test/transposition.ly b/input/test/transposition.ly index 0b42cfca53..142eb64492 100644 --- a/input/test/transposition.ly +++ b/input/test/transposition.ly @@ -22,7 +22,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; vOne = \notes \relative c''{ \clef"violin"; @@ -51,7 +51,7 @@ vThree = \notes \relative c''{ vFour = \notes \transpose d' \vThree \score { - \type StaffGroup < + \context StaffGroup < \vOne \vTwo \vThree diff --git a/input/test/tup.ly b/input/test/tup.ly index f9dd57debb..3a8f9d0e16 100644 --- a/input/test/tup.ly +++ b/input/test/tup.ly @@ -1,5 +1,5 @@ \score{ - \notes \type Voice { + \notes \context Voice { \times 2/3 { \times 2/3 { a8 b c} c } \times 3/4 { c4 c4 c4 c4 } \time 6/8; @@ -7,3 +7,5 @@ } } + +\version "1.0.16"; diff --git a/input/test/unfold.ly b/input/test/unfold.ly index 20ae55429f..4664cfc09f 100644 --- a/input/test/unfold.ly +++ b/input/test/unfold.ly @@ -1,8 +1,10 @@ \score{ - \type Staff \notes\relative c'' { + \context Staff \notes\relative c'' { % doesn't quite work yet % \property Staff.unfoldRepeats = 1 \repeat 3 { a b c d } \alternative { { d c b a } { a b c d } } d d d d } } + +\version "1.0.16"; diff --git a/input/test/updown.fly b/input/test/updown.fly index dfac8a1cf6..eba99a194a 100644 --- a/input/test/updown.fly +++ b/input/test/updown.fly @@ -3,7 +3,9 @@ % {\voicetwo c}> % now we need: -\type Staff +\context Staff <{\voiceone e} {\voicetwo c}> + +\version "1.0.16"; diff --git a/input/test/vertical-align.ly b/input/test/vertical-align.ly index 0df66e2fd6..cb2664d47b 100644 --- a/input/test/vertical-align.ly +++ b/input/test/vertical-align.ly @@ -1,9 +1,9 @@ -\version "1.0.14"; +\version "1.0.16"; \score { \notes < - \type GrandStaff < { + \context GrandStaff < { \property GrandStaff . maxVerticalAlign = "60." \property GrandStaff . minVerticalAlign = "35." diff --git a/input/test/vertical-text.ly b/input/test/vertical-text.ly index b69c4e8921..49a22a946c 100644 --- a/input/test/vertical-text.ly +++ b/input/test/vertical-text.ly @@ -1,12 +1,12 @@ \score{ < - \type Staff = o \notes\relative c,,, { + \context Staff = o \notes\relative c,,, { \stemdown [c8 c c c] c4 c4 \break [c8 c c c] c4 c4 } - \type Lyrics \lyrics{ + \context Lyrics \lyrics{ BLA gag _2 < { BLA gag } { BLA gag la } > _2 } - \type Staff = t \notes\relative c''''' { + \context Staff = t \notes\relative c''''' { \stemup [c8 c c c] c4 c [c8 c c c] c4 c } > @@ -14,3 +14,5 @@ castingalgorithm = \Wordwrap; } } + +\version "1.0.16"; diff --git a/input/test/wtk-huh.ly b/input/test/wtk-huh.ly index 3d49c18a50..64c4d07a83 100644 --- a/input/test/wtk-huh.ly +++ b/input/test/wtk-huh.ly @@ -1,11 +1,15 @@ + +%{ +What's supposed to be demonstrated here? +%} \score{ - \type Staff \notes\relative c'''{ - < \type Voice = one { + \context Staff \notes\relative c'''{ + < \context Voice = one { \stemup \voiceone [g8 a g f] } - \type Voice=two + \context Voice=two { \stemdown \voicetwo @@ -16,3 +20,5 @@ linewidth=-1.; } } + +\version "1.0.16"; diff --git a/input/tril.ly b/input/tril.ly index 088dd25b62..c6cf0f962e 100644 --- a/input/tril.ly +++ b/input/tril.ly @@ -5,7 +5,7 @@ TestedFeatures = "This file tests trills" + "(Feta definitively is not an abbreviation of Font-En-TjA)"; } -\version "1.0.14"; +\version "1.0.16"; \score{ \notes{ diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index 80c38ee46c..4c605f54ac 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -11,7 +11,7 @@ copyright = "public domain"; Tested Features lyrics and chords %} -\version "1.0.14"; +\version "1.0.16"; melodie = \notes\relative c'' { \clef "violin"; @@ -51,9 +51,9 @@ text = \lyrics{ \score { < - \type ChordNames \acc - \type Staff=melody \melodie - \type Lyrics \text + \context ChordNames \acc + \context Staff=melody \melodie + \context Lyrics \text > \header{ title = "Ah, vous dirais-je, maman "; @@ -63,9 +63,9 @@ text = \lyrics{ \score { < - \chords \type ChordNames \transpose bes\acc - \notes \type Staff=melody \transpose bes\melodie - \lyrics \type Lyrics \text + \chords \context ChordNames \transpose d'\acc + \notes \context Staff=melody \transpose d'\melodie + \lyrics \context Lyrics \text > \header{ piece = "clarinet in B\\textflat"; diff --git a/input/twinkle.ly b/input/twinkle.ly index 82a509a8a1..069e82e830 100644 --- a/input/twinkle.ly +++ b/input/twinkle.ly @@ -19,7 +19,7 @@ traditional song in various languages. Tested Features: lyrics, interleaving lyrics and staffs, repeats %} -\version "1.0.14"; +\version "1.0.16"; melody = \notes \relative c'' { \clef violin; @@ -117,13 +117,13 @@ textiii = \lyrics{ \score{ < - \type Staff=i \repeat 2 < \global\melody > - \type Lyrics=top \repeat 2 {} \alternative < \tekst \texte > - \type GrandStaff < - \type Staff=ii \repeat 2 < \global\melody > - \type Staff=iii \repeat 2 < \global\accompany > + \context Staff=i \repeat 2 < \global\melody > + \context Lyrics=top \repeat 2 {} \alternative < \tekst \texte > + \context GrandStaff < + \context Staff=ii \repeat 2 < \global\melody > + \context Staff=iii \repeat 2 < \global\accompany > > - \type Lyrics=bottom \repeat 3 {} + \context Lyrics=bottom \repeat 3 {} \alternative < \texti \textii \textiii > > \paper{ diff --git a/lib/include/warn.hh b/lib/include/warn.hh index 3bed6a0433..cb369d2c32 100644 --- a/lib/include/warn.hh +++ b/lib/include/warn.hh @@ -12,7 +12,8 @@ #include "string.hh" -void warning (String message_str ); +void programming_error (String s); +void warning (String message_str); void error (String message_str); void non_fatal_error (String); #endif // WARN_HH diff --git a/lib/warn.cc b/lib/warn.cc index ecb97a5f75..16e7e82fde 100644 --- a/lib/warn.cc +++ b/lib/warn.cc @@ -27,3 +27,9 @@ message (String m) { cerr << m< + */ + +#include "axis-group-engraver.hh" +#include "axis-group-spanner.hh" +#include "p-col.hh" + +Axis_group_engraver::Axis_group_engraver () +{ + staffline_p_ = 0; +} + +void +Axis_group_engraver::do_creation_processing () +{ + staffline_p_ = get_spanner_p (); + staffline_p_->set_axes (Y_AXIS, Y_AXIS); + staffline_p_->set_bounds(LEFT,get_staff_info().command_pcol_l ()); + announce_element (Score_element_info (staffline_p_, 0)); +} + +Axis_group_spanner* +Axis_group_engraver::get_spanner_p () const +{ + return new Axis_group_spanner; +} +void +Axis_group_engraver::do_removal_processing () +{ + staffline_p_->set_bounds(RIGHT,get_staff_info().command_pcol_l ()); + typeset_element (staffline_p_); + staffline_p_ = 0; +} + +void +Axis_group_engraver::acknowledge_element (Score_element_info i) +{ + if (!i.elem_l_->parent_l (Y_AXIS)) + { + elts_.push (i.elem_l_); + } +} + +void +Axis_group_engraver::process_acknowledged () +{ + for (int i=0; i < elts_.size (); i++) + { + if (!elts_[i]->parent_l (Y_AXIS)) + staffline_p_->add_element (elts_[i]); + } + elts_.clear (); +} + +ADD_THIS_TRANSLATOR(Axis_group_engraver); diff --git a/lily/bar-script-engraver.cc b/lily/bar-script-engraver.cc index 7897404c65..f466e1bc86 100644 --- a/lily/bar-script-engraver.cc +++ b/lily/bar-script-engraver.cc @@ -14,6 +14,7 @@ #include "g-text-item.hh" #include "lily-guile.hh" #include "p-col.hh" +#include "paper-def.hh" Bar_script_engraver::Bar_script_engraver () { @@ -50,13 +51,15 @@ Bar_script_engraver::do_acknowledge_element (Item *i) /* How do we make sure that staff_side_p_ has a dependency from - someone else? We can't use i for that, + someone else? We can't use i for that, so we use some other element. */ get_staff_info ().command_pcol_l ()->add_dependency (staff_side_p_); } } - +/* + URG. + */ Item* Bar_script_engraver::cast_to_interesting_item (Score_element *e) { @@ -146,7 +149,12 @@ Bar_script_engraver::create_items (Request *rq) { staff_side_p_->set_elt_property (padding_scm_sym, gh_double2scm(Real(padding))); } - + else + { + staff_side_p_ + ->set_elt_property (padding_scm_sym, + gh_double2scm(paper_l ()->get_realvar (interline_scm_sym))); + } staff_side_p_->set_elt_property (visibility_lambda_scm_sym, visibility_lambda_); diff --git a/lily/beam.cc b/lily/beam.cc index 3f96a5996e..fdf2ef5d08 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -203,12 +203,12 @@ Beam::get_default_dir () const beamdir = (count[UP] > count[DOWN]) ? UP : DOWN; break; case MEAN: - // mean centre distance + // mean center distance beamdir = (total[UP] > total[DOWN]) ? UP : DOWN; break; default: case MEDIAN: - // median centre distance + // median center distance if (!count[UP]) beamdir = DOWN; else if (!count[DOWN]) diff --git a/lily/context-specced-music.cc b/lily/context-specced-music.cc new file mode 100644 index 0000000000..138de63631 --- /dev/null +++ b/lily/context-specced-music.cc @@ -0,0 +1,14 @@ +/* + context-specced-music.cc -- implement Context_specced_music + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ +#include "context-specced-music.hh" + +Context_specced_music::Context_specced_music(Music *m) + : Music_wrapper (m) +{ +} diff --git a/lily/g-script-engraver.cc b/lily/g-script-engraver.cc index 7ddb4f7028..aa167cb3bc 100644 --- a/lily/g-script-engraver.cc +++ b/lily/g-script-engraver.cc @@ -53,8 +53,9 @@ G_script_engraver::do_process_requests() G_stem_staff_side_item * ss =new G_stem_staff_side_item; list = SCM_CDR (list); - p->indices_drul_[LEFT] = ly_scm2string(SCM_CAAR (list)); - p->indices_drul_[RIGHT] = ly_scm2string(SCM_CDAR (list)); + p->set_elt_property (molecule_scm_sym, + SCM_CAR(list)); + list = SCM_CDR(list); bool follow_staff = gh_scm2bool (SCM_CAR(list)); list = SCM_CDR(list); diff --git a/lily/g-script.cc b/lily/g-script.cc index 867bcf7dd5..cf3c595b77 100644 --- a/lily/g-script.cc +++ b/lily/g-script.cc @@ -34,7 +34,24 @@ G_script::do_substitute_element_pointer (Score_element*o, Score_element*n) Molecule G_script::get_molecule(Direction d) const { - return lookup_l ()->afm_find ("scripts-" + indices_drul_[d]); + SCM s = get_elt_property (molecule_scm_sym); + assert (s != SCM_BOOL_F); + + s = SCM_CDR(s); + SCM key = SCM_CAR (s); + if (key == ly_symbol ("feta")) + { + return lookup_l ()->afm_find ("scripts-" + + ly_scm2string (index_cell (SCM_CDR (s), d))); + } + else if (key == ly_symbol ("accordion")) + { + return lookup_l ()->accordion (SCM_CDR(s)); + } + + else assert (false); + + return Molecule (); } @@ -71,5 +88,5 @@ G_script::do_brew_molecule_p () const void G_script::do_print () const { - DOUT << "Indices: " << indices_drul_[LEFT] << ", " << indices_drul_[RIGHT]; + } diff --git a/lily/g-staff-side.cc b/lily/g-staff-side.cc index 4d74c16628..865eb478ad 100644 --- a/lily/g-staff-side.cc +++ b/lily/g-staff-side.cc @@ -10,6 +10,8 @@ #include "g-staff-side.hh" #include "staff-symbol.hh" #include "debug.hh" +#include "warn.hh" +#include "dimensions.hh" G_staff_side_item::G_staff_side_item () { @@ -68,6 +70,9 @@ G_staff_side_item::do_substitute_element_pointer (Score_element*o, Score_element void G_staff_side_item::position_self () { + if (to_position_l_ && + to_position_l_->get_elt_property (transparent_scm_sym) != SCM_BOOL_F) + return; Interval dim; Dimension_cache *common = 0; @@ -84,9 +89,11 @@ G_staff_side_item::position_self () } } else + common = dim_cache_[axis_].parent_l_; + + if (dim.empty_b ()) { dim = Interval(0,0); - common = dim_cache_[axis_].parent_l_; } @@ -102,7 +109,10 @@ G_staff_side_item::position_self () { off += gh_scm2double (SCM_CDR(pad)) * dir_; } - dim_cache_[axis_].set_offset (dim[dir_] - sym_dim[-dir_] + off); + Real total_off = dim[dir_] - sym_dim[-dir_] + off; + dim_cache_[axis_].set_offset (total_off); + if (fabs (total_off) > 100 CM) + programming_error ("Huh ? Improbable staff side dim."); } void diff --git a/lily/hara-kiri-engraver.cc b/lily/hara-kiri-engraver.cc new file mode 100644 index 0000000000..0761b36ce3 --- /dev/null +++ b/lily/hara-kiri-engraver.cc @@ -0,0 +1,30 @@ +/* + hara-kiri-engraver.cc -- implement Hara_kiri_engraver + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ +#include "hara-kiri-vertical-group-spanner.hh" +#include "hara-kiri-engraver.hh" +#include "rhythmic-head.hh" + +Axis_group_spanner* +Hara_kiri_engraver::get_spanner_p () const +{ + return new Hara_kiri_group_spanner; +} + +void +Hara_kiri_engraver::acknowledge_element (Score_element_info i) +{ + Axis_group_engraver::acknowledge_element (i); + if (Rhythmic_head *h = dynamic_cast (i.elem_l_)) + { + dynamic_cast (staffline_p_) + ->add_interesting_item (h); + } + +} +ADD_THIS_TRANSLATOR(Hara_kiri_engraver); diff --git a/lily/include/axis-group-element.hh b/lily/include/axis-group-element.hh index d38c0d1960..d57069b256 100644 --- a/lily/include/axis-group-element.hh +++ b/lily/include/axis-group-element.hh @@ -18,7 +18,8 @@ This is a wrapper around Axis_group_administration */ class Axis_group_element : public virtual Score_element, - public virtual Graphical_axis_group { + public virtual Graphical_axis_group +{ protected: virtual void do_print() const; virtual Link_array get_extra_dependencies() const; diff --git a/lily/include/axis-group-engraver.hh b/lily/include/axis-group-engraver.hh new file mode 100644 index 0000000000..ee745cc345 --- /dev/null +++ b/lily/include/axis-group-engraver.hh @@ -0,0 +1,37 @@ +/* + axis-group-engraver.hh -- declare Axis_group_engraver + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#ifndef AXIS_GROUP_ENGRAVER_HH +#define AXIS_GROUP_ENGRAVER_HH + + +#include "engraver.hh" + +/** + Put stuff in a Axis_group_spanner. Use as last element of a context. + */ +class Axis_group_engraver : public Engraver +{ +protected: + Axis_group_spanner *staffline_p_; + Link_array elts_; + + virtual void do_creation_processing(); + virtual void do_removal_processing(); + virtual void acknowledge_element (Score_element_info); + virtual void process_acknowledged (); + virtual Axis_group_spanner* get_spanner_p () const; +public: + VIRTUAL_COPY_CONS(Translator); + + Axis_group_engraver (); +}; + +#endif /* AXIS_GROUP_ENGRAVER_HH */ + diff --git a/lily/include/context-specced-music.hh b/lily/include/context-specced-music.hh new file mode 100644 index 0000000000..8aadd3398d --- /dev/null +++ b/lily/include/context-specced-music.hh @@ -0,0 +1,32 @@ +/* + context-specced-music.hh -- declare Context_specced_music + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#ifndef CONTEXT_SPECCED_MUSIC_HH +#define CONTEXT_SPECCED_MUSIC_HH + +#include "music-wrapper.hh" + +class Context_specced_music : public Music_wrapper +{ +public: + /** The kind of translation needed for this music. This doesn't + make sense for simple (ie non-list) music, but it does no harm + here. Yes, it did harm Music_sequence: you can forget to copy it. + + */ + String translator_type_str_; + + /// what identification for the translation unit + String translator_id_str_; + Context_specced_music (Music*); + VIRTUAL_COPY_CONS(Music); + +}; +#endif /* CONTEXT_SPECCED_MUSIC_HH */ + diff --git a/lily/include/g-script.hh b/lily/include/g-script.hh index cbc5f6ee1b..3ee811f3fe 100644 --- a/lily/include/g-script.hh +++ b/lily/include/g-script.hh @@ -14,21 +14,22 @@ #include "drul-array.hh" /** - articulation marks (and the like) that are attached to notes/stems. - Needs support from G_staff_side for proper operation. - */ + Articulation marks (and the like) that are attached to notes/stems. + Needs support from G_staff_side for proper operation. G_staff_side + handles the positioning. + +*/ class G_script : public Item { G_staff_side_item * staff_side_l_; Molecule get_molecule (Direction d) const; public: - Drul_array indices_drul_; G_script (); void set_staff_side (G_staff_side_item*); protected: -virtual void do_print () const; + virtual void do_print () const; virtual void do_substitute_element_pointer (Score_element*o, Score_element*n); virtual void do_pre_processing (); diff --git a/lily/include/hara-kiri-engraver.hh b/lily/include/hara-kiri-engraver.hh new file mode 100644 index 0000000000..0d88b3d847 --- /dev/null +++ b/lily/include/hara-kiri-engraver.hh @@ -0,0 +1,24 @@ +/* + hara-kiri-engraver.hh -- declare Hara_kiri_engraver + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#ifndef HARA_KIRI_ENGRAVER_HH +#define HARA_KIRI_ENGRAVER_HH + +#include "axis-group-engraver.hh" + +class Hara_kiri_engraver : public Axis_group_engraver +{ +protected: + virtual Axis_group_spanner*get_spanner_p ()const; + virtual void acknowledge_element (Score_element_info); +public: + VIRTUAL_COPY_CONS(Translator); +}; + +#endif /* HARA_KIRI_ENGRAVER_HH */ diff --git a/lily/include/lily-guile.hh b/lily/include/lily-guile.hh index ec45c65d02..b7eea3d2f5 100644 --- a/lily/include/lily-guile.hh +++ b/lily/include/lily-guile.hh @@ -8,12 +8,13 @@ #ifndef LILY_GUILE_HH #define LILY_GUILE_HH - +// order of includes important? #include "config.hh" #include "string.hh" #include #include +#include "direction.hh" SCM ly_symbol (String name); String symbol_to_string (SCM); @@ -25,6 +26,8 @@ SCM ly_func_o (char const* name); SCM ly_quote_scm (SCM s); void ly_display_scm (SCM s); String ly_scm2string (SCM s); +SCM array_to_list (SCM *a , int l); + #include "array.hh" #include "scalar.hh" @@ -41,5 +44,6 @@ SCM ly_protect_scm (SCM s); SCM ly_unprotect_scm (SCM s); void init_ly_protection (); +SCM index_cell (SCM cellp, Direction d); #endif // LILY_GUILE_HH diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index cbc8a7a021..37d9bce72b 100644 --- a/lily/include/lily-proto.hh +++ b/lily/include/lily-proto.hh @@ -32,6 +32,8 @@ struct Audio_staff; struct Audio_tempo; struct Auto_beam_engraver; struct Axis_group_element; +struct Axis_group_spanner; +struct Axis_group_item; struct Axis_group; struct Bar; struct Bar_column_engraver; diff --git a/lily/include/line-group-group-engraver.hh b/lily/include/line-group-group-engraver.hh index 93e917310b..1feaa57f97 100644 --- a/lily/include/line-group-group-engraver.hh +++ b/lily/include/line-group-group-engraver.hh @@ -24,8 +24,6 @@ protected: virtual void do_creation_processing(); virtual void do_removal_processing(); virtual void typeset_element (Score_element*); -virtual void do_announces (); - public: VIRTUAL_COPY_CONS(Translator); diff --git a/lily/include/lookup.hh b/lily/include/lookup.hh index 827e094f03..a4f60b00e1 100644 --- a/lily/include/lookup.hh +++ b/lily/include/lookup.hh @@ -10,6 +10,7 @@ #ifndef LOOKUP_HH #define LOOKUP_HH +#include "lily-guile.hh" #include "molecule.hh" #include "fproto.hh" #include "direction.hh" @@ -27,7 +28,6 @@ public: Molecule accidental (int, bool cautionary) const; Molecule afm_find (String, bool warn=true) const; Molecule notehead (int, String) const; - Molecule bar (String, Real height) const; Molecule beam (Real, Real, Real) const; Molecule clef (String) const; @@ -40,11 +40,9 @@ public: Molecule hairpin (Real width, bool decresc, bool continued) const; Molecule plet (Real dy, Real dx, Direction dir) const; Molecule rest (int, bool outside, String) const; - Molecule rule_symbol (Real height, Real width) const; - + Molecule accordion (SCM arg) const; Molecule stem (Real y1_pos, Real y2_pos) const; Molecule slur (Array controls) const; - Molecule streepje (int type) const; Molecule text (String style, String text) const; Molecule staff_brace (Real dy) const; Molecule staff_bracket (Real dy) const; diff --git a/lily/include/ly-symbols.hh b/lily/include/ly-symbols.hh index 322d4ab8cb..7d94aa2ceb 100644 --- a/lily/include/ly-symbols.hh +++ b/lily/include/ly-symbols.hh @@ -38,6 +38,7 @@ DECLARE_LY_SYMBOL(interbeam); DECLARE_LY_SYMBOL(interbeam4); DECLARE_LY_SYMBOL(interline); DECLARE_LY_SYMBOL(linewidth); +DECLARE_LY_SYMBOL(molecule); DECLARE_LY_SYMBOL(notewidth); DECLARE_LY_SYMBOL(non_default); DECLARE_LY_SYMBOL(octave_dir); diff --git a/lily/include/music.hh b/lily/include/music.hh index ad8dca599f..0bd1e966d0 100644 --- a/lily/include/music.hh +++ b/lily/include/music.hh @@ -31,15 +31,6 @@ class Music:public Input { public: - /** The kind of translation needed for this music. This doesn't - make sense for simple (ie non-list) music, but it does no harm - here. Yes, it did harm Music_sequence: you can forget to copy it. - - */ - String translator_type_str_; - - /// what identification for the translation unit - String translator_id_str_; virtual Musical_pitch to_relative_octave (Musical_pitch); diff --git a/lily/include/repeated-music.hh b/lily/include/repeated-music.hh index c2b435eb59..1b85706da8 100644 --- a/lily/include/repeated-music.hh +++ b/lily/include/repeated-music.hh @@ -21,6 +21,11 @@ public: int repeats_i_; bool unfold_b_; Music* repeat_p_; + /* + UGH FIXME: this should be: + + Music_list * alternative_p_; + */ Music_sequence* alternative_p_; Repeated_music (Music*, int n, Music_sequence*); diff --git a/lily/include/translator-group.hh b/lily/include/translator-group.hh index ab4f2eeca4..bb9996fbd6 100644 --- a/lily/include/translator-group.hh +++ b/lily/include/translator-group.hh @@ -26,6 +26,7 @@ typedef void (Translator::*Const_method_pointer)(void) const; */ class Translator_group : public virtual Translator { Array consists_str_arr_; + Array consists_end_str_arr_; Array accepts_str_arr_; Dictionary properties_dict_; @@ -44,8 +45,8 @@ public: void set_acceptor (String accepts, bool add); - void set_element (String accepts, bool add); - + void set_element (String elt, bool add); + void add_last_element (String elt); Translator_group(Translator_group const &); Translator_group(); diff --git a/lily/include/vertical-align-engraver.hh b/lily/include/vertical-align-engraver.hh index 4115bc66dd..98e7ed5495 100644 --- a/lily/include/vertical-align-engraver.hh +++ b/lily/include/vertical-align-engraver.hh @@ -14,12 +14,13 @@ class Axis_align_spanner; class Vertical_align_engraver : public Engraver { Axis_align_spanner * valign_p_; - + bool qualifies_b (Score_element_info) const; public: VIRTUAL_COPY_CONS(Translator); Vertical_align_engraver(); protected: + virtual void acknowledge_element (Score_element_info); virtual void do_creation_processing(); virtual void do_removal_processing(); diff --git a/lily/item.cc b/lily/item.cc index c1a8812ce8..525e1e1e2a 100644 --- a/lily/item.cc +++ b/lily/item.cc @@ -175,7 +175,7 @@ Item::Item (Item const &s) void Item::handle_prebroken_dependents () { - Item * parent = dynamic_cast (parent_l( X_AXIS)); + Item * parent = dynamic_cast (parent_l (X_AXIS)); if (breakable_b () && parent) { if(!(broken_to_drul_[LEFT] || broken_to_drul_[RIGHT])) @@ -189,6 +189,25 @@ Item::handle_prebroken_dependents () broken_self->dim_cache_[X_AXIS].parent_l_ = &broken_parent->dim_cache_[X_AXIS]; + + /* + ugh. Should do this is after breaking? + */ + if (!broken_self->parent_l (Y_AXIS)) + { + Score_element * yparent =dynamic_cast(parent_l (Y_AXIS)); + Item *yparenti = dynamic_cast (yparent); + Item *broken_yparent = yparenti ? + yparenti->find_prebroken_piece (d) : 0; + + if (!yparent) + programming_error ("Vertical refpoint lost!"); + else if (yparenti) + { + broken_self->dim_cache_[Y_AXIS].parent_l_ = + &broken_yparent->dim_cache_[Y_AXIS]; + } + } } while ((flip (&d))!=LEFT); } diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 31b9f497be..bec431671e 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -17,6 +17,8 @@ #include "debug.hh" + + /* scm_m_quote doesn't use any env, but needs one for a good signature in GUILE. @@ -100,196 +102,22 @@ ly_scm2string (SCM s) return r; } -/* - Layout of nodes: - - (key . (left_child . right_child)) - - SCM_EOL is the nil-pointer (should use SCM_NIMP() ?) - */ - -#define left_child(s) SCM_CADR((s)) -#define right_child(s) SCM_CDDR((s)) -#define key(s) SCM_CAR((s)) - -/* - Garble pointers, to prevent unbalanced tree due to ordered inserts. - */ - -unsigned int -munge (SCM s) -{ - const int SHIFT = 18; - return (unsigned int)(s << (32-SHIFT) | s >> SHIFT ); -} - SCM -ly_new_bintree_node (SCM val) +index_cell (SCM s, Direction d) { - return gh_cons (val, gh_cons (SCM_EOL, SCM_EOL)); + assert (d); + return (d == LEFT) ? SCM_CAR (s) : SCM_CDR (s); } - -/* - add VAL to TREE. TREE must be non-nil - */ -void -ly_addto_bintree (SCM *tree, SCM val) -{ - while(*tree != SCM_EOL) - { - if (munge (val) <= munge (key (*tree))) - tree = &left_child (*tree); - else - tree = &right_child (*tree); - } - - *tree = ly_new_bintree_node (val); -} - - -/* - find the address of a node in the tree represented by *NODE with key VAL - */ -SCM * -ly_find_in_bintree (SCM *node, SCM val) -{ - while (*node != SCM_EOL) - { - if (munge (val) < munge (key(*node) )) - node = &left_child(*node); - else if (munge (val) > munge (key (*node))) - node = &right_child (*node); - else - return node; - } - return node; -} - -void -ly_remove_from_bintree (SCM *node) -{ - SCM r = right_child (*node); - SCM l = left_child (*node); - if (r == SCM_EOL) - { - *node = l; - } - else if (l == SCM_EOL) - { - *node = r; - } - else - { - /*deleting from binary trees. See Knuth's TAOCP. - */ - SCM *t = node; - SCM *left_t = &left_child (*t); - - /* - INV: LEFT_T is the left child of T - */ - while (*left_t != SCM_EOL) - { - t = left_t; - left_t = &left_child (*t); - } - - /* - POST: T is the leftmost right child of NODE which has no left child, - - leftchild (LASTT) == T - */ - key(*node) = key(*t); - *left_t = right_child (*t); - } -} - - -static SCM protect_tree_root; - -SCM -ly_protect_scm (SCM s) -{ - ly_addto_bintree (&protect_tree_root, s); - return s; -} - SCM -ly_unprotect_scm (SCM s) -{ - SCM *to_remove = ly_find_in_bintree (&protect_tree_root, s); - - /* - this shouldn't happen, according to me. But it does. - */ - if (*to_remove != SCM_EOL) - ly_remove_from_bintree (to_remove); - return s; -} - -void -ly_init_protection () +array_to_list (SCM *a , int l) { - protect_tree_root = scm_protect_object (ly_new_bintree_node(SCM_EOL)); - key (protect_tree_root) = protect_tree_root; -} - - -int -ly_count_elements (SCM tree) -{ - if (tree == SCM_EOL) - return 0; - else - return 1 + ly_count_elements (left_child (tree)) + ly_count_elements (right_child( tree)); -} - -int -ly_tree_depth (SCM tree) -{ - if (tree == SCM_EOL) - return 0; - else - return 1 + (ly_tree_depth (left_child (tree)) >? ly_tree_depth (right_child(tree))); -} - -void -ly_print_bintree (SCM node) -{ -#ifndef NPRINT - if (node == SCM_EOL) - return; - DOUT << "{val = " << key(node) << " \nleft = "; - ly_print_bintree (left_child (node)); - DOUT << "\n right ="; - ly_print_bintree (right_child (node)); - DOUT << "}"; -#endif -} - - -struct Imbalance { int imbalance; int total; }; - -Imbalance -ly_calc_imbalance (SCM node) -{ - Imbalance t; - if (node == SCM_EOL) + SCM list = SCM_EOL; + for (int i= l; i--; ) { - t.imbalance = 0; - t.total = 0; - return t; + list = gh_cons (a[i], list); } - - Imbalance l = ly_calc_imbalance (left_child (node)); - Imbalance r = ly_calc_imbalance (right_child (node)); - - t.total = l.total + r.total + 1; - int dif = l.total - r.total; - if (dif < 0) - dif = -dif; - t.imbalance = l.imbalance + r.imbalance + dif; - return t; + return list; } + diff --git a/lily/line-group-group-engraver.cc b/lily/line-group-group-engraver.cc index 606fa918b9..e269689cc8 100644 --- a/lily/line-group-group-engraver.cc +++ b/lily/line-group-group-engraver.cc @@ -55,11 +55,6 @@ Line_group_engraver_group::create_line_spanner () staffline_p_->set_axes (Y_AXIS,Y_AXIS); } -void -Line_group_engraver_group::do_announces () -{ - Engraver_group_engraver::do_announces (); -} diff --git a/lily/local-key-item.cc b/lily/local-key-item.cc index 4f64886489..a04237bd95 100644 --- a/lily/local-key-item.cc +++ b/lily/local-key-item.cc @@ -92,7 +92,7 @@ Local_key_item::do_brew_molecule_p() const if (accidental_arr_.size()) { - Box b(Interval (0, note_distance), Interval (0,0)); + Box b(Interval (0, 0.6 * note_distance), Interval (0,0)); Molecule m (lookup_l ()->fill (b)); output->add_at_edge (X_AXIS, RIGHT, m, 0); } @@ -108,6 +108,7 @@ Local_key_item::do_brew_molecule_p() const x_int.unite (x + support_items_[i]->extent (X_AXIS)); } + if (x_int.empty_b ()) x_int = Interval(0,0); diff --git a/lily/lookup.cc b/lily/lookup.cc index 42b78d69af..efe249977a 100644 --- a/lily/lookup.cc +++ b/lily/lookup.cc @@ -9,8 +9,6 @@ TODO Glissando - - merge rulesym and filledbox. */ #include @@ -30,17 +28,6 @@ #include "atom.hh" #include "lily-guile.hh" -SCM -array_to_list (SCM *a , int l) -{ - SCM list = SCM_EOL; - for (int i= l; i--; ) - { - list = gh_cons (a[i], list); - } - return list; -} - Lookup::Lookup () { @@ -56,24 +43,37 @@ Lookup::Lookup (Lookup const& s) } +/* + build a ledger line for small pieces. + */ Molecule Lookup::ledger_line (Interval xwid) const { - Molecule end (afm_find ("noteheads-ledgerending")); - Interval ed = end.dim_[X_AXIS]; - xwid = Interval (xwid[LEFT] - ed[LEFT], - xwid[RIGHT] - ed[RIGHT]); - Molecule mid = filledbox (Box (xwid, end.dim_[Y_AXIS])); - Molecule l (mid); - - Molecule e2 = end; - Molecule e1 = end; - e1.translate_axis (xwid[RIGHT], X_AXIS); - e2.translate_axis (xwid[LEFT], X_AXIS); - - l.add_molecule (e1); - l.add_molecule (e2); - return l; + Drul_array endings; + endings[LEFT] = afm_find ("noteheads-ledgerending"); + Molecule * e = &endings[LEFT]; + endings[RIGHT] = *e; + + Real thick = e->dim_[Y_AXIS].length(); + Real len = e->dim_[X_AXIS].length () - thick; + + Molecule total; + Direction d = LEFT; + do { + endings[d].translate_axis (xwid[d] - endings[d].dim_[X_AXIS][d], X_AXIS); + total.add_molecule (endings[d]); + } while ((flip(&d)) != LEFT); + + Real xpos = xwid [LEFT] + len; + + while (xpos + len + thick /2 <= xwid[RIGHT]) + { + e->translate_axis (len, X_AXIS); + total.add_molecule (*e); + xpos += len; + } + + return total; } @@ -318,22 +318,6 @@ Lookup::rest (int j, bool o, String style) const return afm_find (String ("rests-") + to_str (j) + (o ? "o" : "") + style); } -Molecule -Lookup::rule_symbol (Real height, Real width) const -{ - Atom at (gh_list (rulesym_scm_sym, - gh_double2scm (height), - gh_double2scm (width), - SCM_UNDEFINED)); - - Molecule m; - m.dim_.x () = Interval (0, width); - m.dim_.y () = Interval (0, height); - - m.add_atom (&at); - - return m; -} Molecule Lookup::special_time_signature (String s, int n, int d) const @@ -612,4 +596,14 @@ Lookup::volta (Real w, bool last_b) const return m; } +Molecule +Lookup::accordion (SCM s) const +{ + Molecule m; + /* + Tom: go ahead. + */ + return m; + +} diff --git a/lily/molecule.cc b/lily/molecule.cc index 6e979b68b9..4e6cd44f62 100644 --- a/lily/molecule.cc +++ b/lily/molecule.cc @@ -61,7 +61,7 @@ Molecule::translate_axis (Real x,Axis a) for (CELLTYPE ptr = atom_list_; ptr != MOL_EOL; ptr = NEXT_CELL(ptr)) UNBOX_ATOM (UNBOX_PTR(ptr))->off_[a] += x; - if (!empty_b ()) + if (!dim_[a].empty_b ()) dim_[a] += x; } @@ -165,7 +165,7 @@ Molecule::add_at_edge (Axis a, Direction d, Molecule const &m, Real padding) Real my_extent= empty_b () ? 0.0 : dim_[a][d]; Interval i (m.extent ()[a]); if (i.empty_b ()) - warning ("Molecule::add_at_edge: adding empty molecule. [PROGRAMMING ERROR]"); + programming_error ("Molecule::add_at_edge: adding empty molecule."); Real his_extent = i[-d]; Real offset = my_extent - his_extent; diff --git a/lily/music-iterator.cc b/lily/music-iterator.cc index 3741d74f08..b9c5e74c24 100644 --- a/lily/music-iterator.cc +++ b/lily/music-iterator.cc @@ -22,6 +22,7 @@ #include "time-scaled-music.hh" #include "repeated-music.hh" #include "repeated-music-iterator.hh" +#include "context-specced-music.hh" void Music_iterator::do_print() const @@ -129,10 +130,11 @@ Music_iterator::static_get_iterator_p (Music const *m, Translator_group *report_ assert (0); p->music_l_ = m; - if (m->translator_type_str_.length_i ()) + + if (Context_specced_music const * csm =dynamic_cast(m)) { Translator_group* a =report_l-> - find_create_translator_l (m->translator_type_str_, m->translator_id_str_); + find_create_translator_l (csm->translator_type_str_, csm->translator_id_str_); p->set_translator (a); } diff --git a/lily/music.cc b/lily/music.cc index 1c2deb2797..c7bd75a435 100644 --- a/lily/music.cc +++ b/lily/music.cc @@ -39,8 +39,10 @@ Music::print() const if (! check_debug) return ; DOUT << classname(this) << "{"; + /* if (translator_type_str_.length_i ()) DOUT << translator_type_str_ << " = " << translator_id_str_; + */ do_print(); DOUT << "}\n"; #endif diff --git a/lily/my-lily-lexer.cc b/lily/my-lily-lexer.cc index 309602f469..4d5a2a024c 100644 --- a/lily/my-lily-lexer.cc +++ b/lily/my-lily-lexer.cc @@ -31,6 +31,8 @@ static Keyword_ent the_key_tab[]={ {"clef", CLEF}, {"cm", CM_T}, {"consists", CONSISTS}, + {"consistsend", CONSISTSEND}, + {"context", CONTEXT}, {"duration", DURATION}, {"font", FONT}, {"grouping", GROUPING}, @@ -65,8 +67,8 @@ static Keyword_ent the_key_tab[]={ {"spandynamic", SPANDYNAMIC}, {"tempo", TEMPO}, {"translator", TRANSLATOR}, - {"type", TYPE}, {"transpose", TRANSPOSE}, + {"type", TYPE}, {"version", VERSION}, {0,0} }; diff --git a/lily/p-col.cc b/lily/p-col.cc index 19f82c1b1f..8378a68f7a 100644 --- a/lily/p-col.cc +++ b/lily/p-col.cc @@ -17,7 +17,7 @@ Paper_column::add_rod (Paper_column * p, Real d) if (!dir) { - warning ("Must set minimum distance between differing columns. [PROGRAMMING ERROR]"); + warning ("Must set minimum distance between differing columns."); return; } diff --git a/lily/p-score.cc b/lily/p-score.cc index abd0ed5bf0..a3194757f2 100644 --- a/lily/p-score.cc +++ b/lily/p-score.cc @@ -52,7 +52,7 @@ Paper_score::typeset_element (Score_element * elem_p) { elem_p_arr_.push (elem_p); elem_p->pscore_l_ = this; - elem_p->add_processing (); + SCM p = elem_p->remove_elt_property (break_helper_only_scm_sym); if (p != SCM_BOOL_F) @@ -65,7 +65,6 @@ Paper_score::typeset_unbroken_spanner (Spanner*span_p) { span_p_arr_.push (span_p); span_p->pscore_l_=this; - span_p->add_processing (); SCM p = span_p->remove_elt_property (break_helper_only_scm_sym); if (p != SCM_BOOL_F) diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 308c07734d..4337ad92d6 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -111,7 +111,7 @@ Paper_outputter::output_molecule (Molecule const*m, Offset o, char const *nm) if (a_off.length () > 100 CM) { - warning (_f("Improbable dimension for object type `%s\'", nm)); + warning (_f("Improbable offset for object type `%s\'", nm)); Axis a =X_AXIS; while (a < NO_AXES) { diff --git a/lily/parser.yy b/lily/parser.yy index 300834a248..64850abe4f 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -29,7 +29,7 @@ #include "command-request.hh" #include "musical-request.hh" #include "my-lily-parser.hh" - +#include "context-specced-music.hh" #include "translator-group.hh" #include "score.hh" #include "music-list.hh" @@ -44,8 +44,8 @@ #include "repeated-music.hh" // mmm -Mudela_version oldest_version ("1.0.14"); -Mudela_version version ("1.0.15"); +Mudela_version oldest_version ("1.0.16"); +Mudela_version version ("1.0.16"); // needed for bison.simple's malloc() and free() @@ -148,6 +148,7 @@ yylex (YYSTYPE *s, void * v_l) %token CLEF %token CM_T %token CONSISTS +%token CONSISTSEND %token DURATION %token EXTENDER %token FONT @@ -186,6 +187,7 @@ yylex (YYSTYPE *s, void * v_l) %token TRANSLATOR %token TRANSPOSE %token TYPE +%token CONTEXT %token VERSION /* escaped */ @@ -481,6 +483,10 @@ translator_spec_body: dynamic_cast ($$)-> set_element (*$3, true); delete $3; } + | translator_spec_body CONSISTSEND STRING semicolon { + dynamic_cast ($$)-> set_element (*$3, true); + delete $3; + } | translator_spec_body ACCEPTS STRING semicolon { dynamic_cast ($$)-> set_acceptor (*$3, true); delete $3; @@ -754,17 +760,24 @@ Simple_music: Composite_music: - TYPE STRING Music { - $$ = $3; - $$->translator_type_str_ = *$2; + CONTEXT STRING Music { + Context_specced_music *csm = new Context_specced_music ($3); + + csm->translator_type_str_ = *$2; + csm->translator_id_str_ = ""; delete $2; + + $$ = csm; } - | TYPE STRING '=' STRING Music { - $$ = $5; - $$->translator_type_str_ = *$2; - $$->translator_id_str_ = *$4; + | CONTEXT STRING '=' STRING Music { + Context_specced_music *csm = new Context_specced_music ($5); + + csm->translator_type_str_ = *$2; + csm->translator_id_str_ = *$4; delete $2; delete $4; + + $$ = csm; } | TIMES { THIS->remember_spot (); @@ -833,11 +846,16 @@ translator_change: property_def: PROPERTY STRING '.' STRING '=' scalar { Translation_property *t = new Translation_property; - t-> translator_type_str_ = *$2; + t-> var_str_ = *$4; t-> value_ = *$6; - $$ = t; + + Context_specced_music *csm = new Context_specced_music (t); + $$ = csm; $$->set_spot (THIS->here_input ()); + + csm-> translator_type_str_ = *$2; + delete $2; delete $4; delete $6; diff --git a/lily/scm-bintree.cc b/lily/scm-bintree.cc new file mode 100644 index 0000000000..7477c1b2d4 --- /dev/null +++ b/lily/scm-bintree.cc @@ -0,0 +1,212 @@ +/* + scm-bintree.cc -- implement binary trees, an experiment in GC. + + source file of the GNU LilyPond music typesetter + + (c) 1999 Han-Wen Nienhuys + + */ + +#include +#include "libc-extension.hh" +#include "lily-guile.hh" +#include "main.hh" +#include "debug.hh" + + + + +/* + Layout of nodes: + + (key . (left_child . right_child)) + + SCM_EOL is the nil-pointer (should use SCM_NIMP() ?) + */ + +#define left_child(s) SCM_CADR((s)) +#define right_child(s) SCM_CDDR((s)) +#define key(s) SCM_CAR((s)) + +/* + Garble pointers, to prevent unbalanced tree due to ordered inserts. + */ + +unsigned int +munge (SCM s) +{ + const int SHIFT = 18; + return (unsigned int)(s << (32-SHIFT) | s >> SHIFT ); +} + +SCM +ly_new_bintree_node (SCM val) +{ + return gh_cons (val, gh_cons (SCM_EOL, SCM_EOL)); +} + + +/* + add VAL to TREE. TREE must be non-nil + */ +void +ly_addto_bintree (SCM *tree, SCM val) +{ + while(*tree != SCM_EOL) + { + if (munge (val) <= munge (key (*tree))) + tree = &left_child (*tree); + else + tree = &right_child (*tree); + } + + *tree = ly_new_bintree_node (val); +} + + +/* + find the address of a node in the tree represented by *NODE with key VAL + */ +SCM * +ly_find_in_bintree (SCM *node, SCM val) +{ + while (*node != SCM_EOL) + { + if (munge (val) < munge (key(*node) )) + node = &left_child(*node); + else if (munge (val) > munge (key (*node))) + node = &right_child (*node); + else + return node; + } + return node; +} + +void +ly_remove_from_bintree (SCM *node) +{ + SCM r = right_child (*node); + SCM l = left_child (*node); + + if (r == SCM_EOL) + { + *node = l; + } + else if (l == SCM_EOL) + { + *node = r; + } + else + { + /*deleting from binary trees. See Knuth's TAOCP. + */ + SCM *t = node; + SCM *left_t = &left_child (*t); + + /* + INV: LEFT_T is the left child of T + */ + while (*left_t != SCM_EOL) + { + t = left_t; + left_t = &left_child (*t); + } + + /* + POST: T is the leftmost right child of NODE which has no left child, + + leftchild (LASTT) == T + */ + key(*node) = key(*t); + *left_t = right_child (*t); + } +} + + +static SCM protect_tree_root; + +SCM +ly_protect_scm (SCM s) +{ + ly_addto_bintree (&protect_tree_root, s); + return s; +} + +SCM +ly_unprotect_scm (SCM s) +{ + SCM *to_remove = ly_find_in_bintree (&protect_tree_root, s); + + /* + this shouldn't happen, according to me. But it does. + */ + if (*to_remove != SCM_EOL) + ly_remove_from_bintree (to_remove); + return s; +} + +void +ly_init_protection () +{ + protect_tree_root = scm_protect_object (ly_new_bintree_node(SCM_EOL)); + key (protect_tree_root) = protect_tree_root; +} + + +int +ly_count_elements (SCM tree) +{ + if (tree == SCM_EOL) + return 0; + else + return 1 + ly_count_elements (left_child (tree)) + ly_count_elements (right_child( tree)); +} + +int +ly_tree_depth (SCM tree) +{ + if (tree == SCM_EOL) + return 0; + else + return 1 + (ly_tree_depth (left_child (tree)) >? ly_tree_depth (right_child(tree))); +} + +void +ly_print_bintree (SCM node) +{ +#ifndef NPRINT + if (node == SCM_EOL) + return; + DOUT << "{val = " << key(node) << " \nleft = "; + ly_print_bintree (left_child (node)); + DOUT << "\n right ="; + ly_print_bintree (right_child (node)); + DOUT << "}"; +#endif +} + + +struct Imbalance { int imbalance; int total; }; + +Imbalance +ly_calc_imbalance (SCM node) +{ + Imbalance t; + if (node == SCM_EOL) + { + t.imbalance = 0; + t.total = 0; + return t; + } + + Imbalance l = ly_calc_imbalance (left_child (node)); + Imbalance r = ly_calc_imbalance (right_child (node)); + + t.total = l.total + r.total + 1; + int dif = l.total - r.total; + if (dif < 0) + dif = -dif; + t.imbalance = l.imbalance + r.imbalance + dif; + return t; +} + diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index f2db1d0f1e..90fb553a55 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -83,6 +83,11 @@ Score_engraver::announce_element (Score_element_info info) { announce_info_arr_.push (info); info.origin_grav_l_arr_.push (this); + + if (Spanner *s = dynamic_cast (info.elem_l_)) + pscore_p_->typeset_unbroken_spanner (s); + else if (Item *i = dynamic_cast (info.elem_l_)) + pscore_p_->typeset_element (i); } /* All elements are propagated to the top upon announcement. If @@ -111,10 +116,9 @@ Score_engraver::typeset_all() for (int i =0; i < elem_p_arr_.size(); i++) { Score_element * elem_p = elem_p_arr_[i]; + elem_p->add_processing (); if (Spanner *s = dynamic_cast (elem_p)) { - pscore_p_->typeset_unbroken_spanner (s); - /* do something sensible if spanner not spanned on 2 items. @@ -131,7 +135,7 @@ Score_engraver::typeset_all() else { Item *item_p = dynamic_cast (elem_p); - pscore_p_->typeset_element (item_p); + if (!item_p->parent_l (X_AXIS)) { bool br = (item_p->remove_elt_property (breakable_scm_sym) != SCM_BOOL_F); diff --git a/lily/simultaneous-music-iterator.cc b/lily/simultaneous-music-iterator.cc index b83e5eaee8..45fd7cae7b 100644 --- a/lily/simultaneous-music-iterator.cc +++ b/lily/simultaneous-music-iterator.cc @@ -32,8 +32,11 @@ Simultaneous_music_iterator::construct_children() Music_iterator * mi = get_iterator_p (i->car_); if (mi->ok()) { +#if 0 if (sim->translator_type_str_.empty_b ()) set_translator (mi->report_to_l()->ancestor_l (0)); // huh? +#endif + children_p_list_.append (new Killing_cons (mi,0)); } else diff --git a/lily/slur.cc b/lily/slur.cc index 789f0aac8c..5d04e5fae8 100644 --- a/lily/slur.cc +++ b/lily/slur.cc @@ -138,7 +138,7 @@ Slur::do_post_processing () [OSU]: slur and tie placement slurs: - * x = centre of head (upside-down: inner raakpunt stem) - d * gap + * x = center of head (upside-down: inner raakpunt stem) - d * gap * y = length < 5ss : horizontal raakpunt + d * 0.25 ss y = length >= 5ss : y next interline - d * 0.25 ss diff --git a/lily/staff-margin-engraver.cc b/lily/staff-margin-engraver.cc index ce66cb5265..2d352365f6 100644 --- a/lily/staff-margin-engraver.cc +++ b/lily/staff-margin-engraver.cc @@ -26,7 +26,7 @@ Staff_margin_engraver::Staff_margin_engraver () /* TODO - should be able to set whole paragraph (multiple lines, centre) to + should be able to set whole paragraph (multiple lines, center) to left (right?) of staff, e.g.: ______ |_______ @@ -54,6 +54,12 @@ Staff_margin_engraver::acknowledge_element (Score_element_info inf) text_p_->text_str_ = long_str; staff_side_p_->dir_ = LEFT; Bar_script_engraver::do_acknowledge_element (i); + + /* + UGH. ignores font size settings. + */ + Interval iv(text_p_->extent (Y_AXIS)); + text_p_->translate_axis (- iv.center (), Y_AXIS); } diff --git a/lily/staff-sym.cc b/lily/staff-sym.cc index 351b747dee..2065ef5d42 100644 --- a/lily/staff-sym.cc +++ b/lily/staff-sym.cc @@ -42,8 +42,10 @@ Staff_symbol::do_brew_molecule_p() const { Real w = extent (X_AXIS).length (); Paper_def * p = paper_l (); - Molecule rule = lookup_l ()->rule_symbol (p->get_var ("rulethickness"), - w); + Real t = p->get_var ("rulethickness"); + Molecule rule = lookup_l ()->filledbox (Box (Interval (0,w), + Interval (-t/2, t/2))); + Real height = (no_lines_i_-1) * staff_line_leading_f_ /2; Molecule * m = new Molecule; for (int i=0; i < no_lines_i_; i++) diff --git a/lily/translator-group.cc b/lily/translator-group.cc index 009f7b9e95..bd451be2b9 100644 --- a/lily/translator-group.cc +++ b/lily/translator-group.cc @@ -19,6 +19,7 @@ Translator_group::Translator_group (Translator_group const&s) : Translator(s) { consists_str_arr_ = s.consists_str_arr_; + consists_end_str_arr_ = s.consists_end_str_arr_; accepts_str_arr_ = s.accepts_str_arr_; iterator_count_ =0; properties_dict_ = s.properties_dict_; @@ -74,6 +75,19 @@ Translator_group::set_acceptor (String accepts, bool add) accepts_str_arr_.del (i); } +void +Translator_group::add_last_element (String s) +{ + if (!get_translator_l (s)) + error ("Program has no such type"); + + for (int i=consists_end_str_arr_.size (); i--; ) + if (consists_end_str_arr_[i] == s) + warning (_f("Already contains a `%s\'", s)); + + consists_end_str_arr_.push (s); +} + void Translator_group::set_element (String s, bool add) { @@ -89,11 +103,15 @@ Translator_group::set_element (String s, bool add) consists_str_arr_.push (s); } else - for (int i=consists_str_arr_.size (); i--; ) - if (consists_str_arr_[i] == s) - consists_str_arr_.del (i); + { + for (int i=consists_str_arr_.size (); i--; ) + if (consists_str_arr_[i] == s) + consists_str_arr_.del (i); + for (int i=consists_end_str_arr_.size (); i--; ) + if (consists_end_str_arr_[i] == s) + consists_end_str_arr_.del (i); + } } - bool Translator_group::removable_b() const { @@ -410,12 +428,22 @@ Translator_group::do_add_processing () { for (int i=0; i < consists_str_arr_.size(); i++) { - Translator * t = output_def_l ()->find_translator_l (consists_str_arr_[i]); + String s = consists_str_arr_[i]; + Translator * t = output_def_l ()->find_translator_l (s); if (!t) - warning (_f ("can't find `%s\'", consists_str_arr_[i])); + warning (_f ("can't find `%s\'", s)); else add_translator (t->clone ()); } + for (int i=0; i-- < consists_end_str_arr_.size (); i++) + { + String s = consists_end_str_arr_[i]; + Translator * t = output_def_l ()->find_translator_l (s); + if (!t) + warning (_f ("can't find `%s\'", s)); + else + add_translator (t->clone ()); + } } Scalar @@ -428,10 +456,12 @@ Translator_group::get_property (String id, *where_l = (Translator_group*) this; // ugh return properties_dict_[id]; } - + +#if 0 if (daddy_trans_l_) return daddy_trans_l_->get_property (id, where_l); - +#endif + if (where_l) *where_l = 0; return ""; diff --git a/lily/vertical-align-engraver.cc b/lily/vertical-align-engraver.cc index 036cb8d5d8..69f2978520 100644 --- a/lily/vertical-align-engraver.cc +++ b/lily/vertical-align-engraver.cc @@ -5,7 +5,8 @@ (c) 1997--1999 Han-Wen Nienhuys */ - +#include "translator-group.hh" +#include "axis-group-engraver.hh" #include "p-col.hh" #include "vertical-align-engraver.hh" #include "axis-align-spanner.hh" @@ -52,12 +53,21 @@ Vertical_align_engraver::do_removal_processing() valign_p_ =0; } + +bool +Vertical_align_engraver::qualifies_b (Score_element_info i) const +{ + Translator * t = i.origin_grav_l_arr_[0]; + int sz = i.origin_grav_l_arr_.size() ; + + return (sz == 1 && dynamic_cast (t)) + || (sz == 2 && dynamic_cast (t)); +} + void Vertical_align_engraver::acknowledge_element (Score_element_info i) { - if (i.origin_grav_l_arr_.size() == 1 && - dynamic_cast (i.elem_l_) - && !i.elem_l_->parent_l (Y_AXIS)) + if (qualifies_b (i)) { valign_p_->add_element (i.elem_l_); } diff --git a/ly/book-fragment.ly b/ly/book-fragment.ly index 46fd731997..68c497d4ee 100644 --- a/ly/book-fragment.ly +++ b/ly/book-fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly" diff --git a/ly/book-init.ly b/ly/book-init.ly index 7cb2e6b12b..ce8bcabc70 100644 --- a/ly/book-init.ly +++ b/ly/book-init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly"; diff --git a/ly/center-fragment.ly b/ly/center-fragment.ly index 72be0acd36..08b7fbc43a 100644 --- a/ly/center-fragment.ly +++ b/ly/center-fragment.ly @@ -1,7 +1,7 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly" diff --git a/ly/center.ly b/ly/center.ly index 3cebe3647c..48a1303fde 100644 --- a/ly/center.ly +++ b/ly/center.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly" diff --git a/ly/declarations.ly b/ly/declarations.ly index 15764317c0..28bcabd43e 100644 --- a/ly/declarations.ly +++ b/ly/declarations.ly @@ -28,6 +28,15 @@ nobreak = \penalty -10000; major = 0 minor = 3 +ionian = 0 +locrian = 1 +aeolian = 3 +mixolydian = 5 +lydian = 7 +phrygian = 8 +dorian = 10 + + papersize = "a4" diff --git a/ly/engraver.ly b/ly/engraver.ly index 6bfa8744e7..123d8fb627 100644 --- a/ly/engraver.ly +++ b/ly/engraver.ly @@ -3,20 +3,11 @@ % StaffContext=\translator { - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; \name Staff ; barAuto = "1"; voltaVisibility = "1"; -%{ - The Hara_kiri_line_group_engraver is a Line_group_engraver - that will not typeset an empty line of staff, i.e., a line - of staff with only rests in it. This is needed for orchestral - scores. Comment-out Line_group_engraver_group, and uncomment - Hara_kiri_line_group_engraver. -%} -% \type "Hara_kiri_line_group_engraver"; - \consists "Multi_measure_rest_engraver"; \consists "Repeat_engraver"; \consists "Bar_engraver"; @@ -27,6 +18,7 @@ StaffContext=\translator { \consists "Staff_symbol_engraver"; \consists "Collision_engraver"; \consists "Rest_collision_engraver"; + \consistsend "Axis_group_engraver"; %{ Uncomment to get bar numbers on single staff systems: @@ -43,18 +35,20 @@ StaffContext=\translator { %{ \consists "Bar_number_engraver"; %} + %{ The Staff_margin_engraver puts the name of the instrument (\property Staff.instrument; Staff.instr for subsequent lines) to the left of a staff. +%} +%{ + \consists "Staff_margin_engraver"; %} defaultClef = treble; marginBreakPriority = "-5"; -%{ - \consists "Staff_margin_engraver"; -%} + \consists "Separating_line_group_engraver"; \accepts "Voice"; @@ -63,11 +57,12 @@ StaffContext=\translator { \translator{\StaffContext } \translator { - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; \name ChoirStaff; \consists "Vertical_align_engraver"; alignmentReference = \center; \consists "Staff_group_bar_engraver"; + \consistsend "Axis_group_engraver"; \accepts "Staff"; \accepts "RhythmicStaff"; \accepts "GrandStaff"; @@ -79,7 +74,7 @@ StaffContext=\translator { RhythmicStaffContext=\translator{ - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; numberOfStaffLines = "1"; \consists "Pitch_squash_engraver"; \consists "Separating_line_group_engraver"; @@ -89,6 +84,7 @@ RhythmicStaffContext=\translator{ \consists "Bar_engraver"; \consists "Time_signature_engraver"; \consists "Staff_symbol_engraver"; + \consistsend "Axis_group_engraver"; \accepts "Voice"; }; \translator{\RhythmicStaffContext} @@ -123,7 +119,7 @@ VoiceContext = \translator { \translator {\VoiceContext} GrandStaffContext=\translator{ - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; \name GrandStaff; \consists "Span_bar_engraver"; \consists "Vertical_align_engraver"; @@ -131,20 +127,21 @@ GrandStaffContext=\translator{ alignmentReference = \center; minVerticalAlign = 1.5*\staffheight; + \consistsend "Axis_group_engraver"; \accepts "Staff"; + }; \translator{\GrandStaffContext} -\translator{\GrandStaffContext + +PianoStaffContext = \translator{\GrandStaffContext minVerticalAlign = 3.0*\staffheight; maxVerticalAlign = 3.0*\staffheight; \name "PianoStaff"; -} - +}; +\translator{\PianoStaffContext} StaffGroupContext= \translator { -% \type "Hara_kiri_line_group_engraver"; -% \type "Line_group_engraver_group"; \type "Engraver_group_engraver"; \consists "Span_bar_engraver"; \consists "Vertical_align_engraver"; @@ -159,11 +156,14 @@ StaffGroupContext= \translator { \accepts "Lyrics"; \accepts "ChordNames"; + \consistsend "Axis_group_engraver"; + }; \translator { \StaffGroupContext } \translator{ - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; + \consistsend "Axis_group_engraver"; \name LyricVoice ; \consists "Separating_line_group_engraver"; @@ -173,15 +173,18 @@ StaffGroupContext= \translator { } \translator { - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; \name Lyrics; \consists "Vertical_align_engraver"; + \consistsend "Axis_group_engraver"; + \accepts "LyricVoice"; } \translator{ - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; + \consistsend "Axis_group_engraver"; \name ChordNameVoice ; \consists "Separating_line_group_engraver"; \consists "Chord_name_engraver"; @@ -189,11 +192,12 @@ StaffGroupContext= \translator { ChordNameContext = \translator { - \type "Line_group_engraver_group"; + \type "Engraver_group_engraver"; \name ChordNames; \consists "Vertical_align_engraver"; \accepts "ChordNameVoice"; -}; + \consistsend "Axis_group_engraver"; + }; \translator { \ChordNameContext } @@ -202,7 +206,6 @@ ScoreWithNumbers = \translator { % uncomment to bar numbers on a whole system. \consists "Bar_number_engraver"; - }; StupidScore = \translator { @@ -219,27 +222,12 @@ BarNumberingStaffContext = \translator { marginBreakPriority = "-4"; \consists "Mark_engraver"; \consists "Bar_number_engraver"; - }; HaraKiriStaffContext = \translator { - \type "Hara_kiri_line_group_engraver"; - \name Staff; - barColumnPriority = "0"; - marginBreakPriority = "-4"; - - \consists "Repeat_engraver"; - \consists "Bar_engraver"; - \consists "Clef_engraver"; - \consists "Key_engraver"; - \consists "Time_signature_engraver"; - \consists "Local_key_engraver"; - \consists "Staff_symbol_engraver"; - \consists "Collision_engraver"; - \consists "Rest_collision_engraver"; - \consists "Staff_margin_engraver"; - \consists "Separating_line_group_engraver"; - + \StaffContext + \remove "Axis_group_engraver"; + \consistsend "Hara_kiri_engraver"; \accepts "Voice"; }; @@ -251,13 +239,11 @@ OrchestralPartStaffContext = \translator { \consists "Bar_number_engraver"; }; - ScoreContext = \translator { \type Score_engraver; \name Score; \consists "Timing_engraver"; - \consists "Span_score_bar_engraver"; \consists "Score_priority_engraver"; \consists "Spacing_engraver"; @@ -282,8 +268,6 @@ OrchestralScoreContext= \translator { barScriptPadding = "2.0"; % dimension \pt markScriptPadding = "4.0"; - - \consists "Bar_number_engraver"; \consists "Mark_engraver"; diff --git a/ly/fragment.ly b/ly/fragment.ly index 3ddb7de69a..6715f97705 100644 --- a/ly/fragment.ly +++ b/ly/fragment.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly" diff --git a/ly/init.fly b/ly/init.fly index cacdd4b865..9714db87a0 100644 --- a/ly/init.fly +++ b/ly/init.fly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.15"; \include "declarations.ly" diff --git a/ly/init.ly b/ly/init.ly index c01291c340..d4b1857f6b 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.16"; \include "declarations.ly"; diff --git a/ly/init.sly b/ly/init.sly index e2ebe1905d..3b7c183d70 100644 --- a/ly/init.sly +++ b/ly/init.sly @@ -1,6 +1,6 @@ % Toplevel initialisation file. -\version "1.0.14"; +\version "1.0.15"; \include "declarations.ly" diff --git a/ly/paper16.ly b/ly/paper16.ly index 37f9b0fabc..2e1f00139d 100644 --- a/ly/paper16.ly +++ b/ly/paper16.ly @@ -2,7 +2,7 @@ -\version "1.0.14"; +\version "1.0.16"; paper_sixteen = \paper { staffheight = 16.0\pt; diff --git a/ly/paper20.ly b/ly/paper20.ly index f26068d0e6..92662e2ad4 100644 --- a/ly/paper20.ly +++ b/ly/paper20.ly @@ -1,7 +1,7 @@ % paper20.ly -\version "1.0.14"; +\version "1.0.16"; paper_twenty = \paper { staffheight = 20.0\pt; diff --git a/ly/property.ly b/ly/property.ly index 2c7bcbae1d..9d98c77b4a 100644 --- a/ly/property.ly +++ b/ly/property.ly @@ -103,8 +103,7 @@ chordInversion 0/1 Find and display chord with inversion? %hmm, (these) abbrevs suck, imo % i guess they're meant as some form of doco % that's what i use them for... -stemup = - \property Voice.ydirection = \up +stemup = \property Voice.ydirection = \up stemboth= \property Voice.ydirection = \center stemdown = \property Voice.ydirection = \down @@ -128,24 +127,24 @@ onevoice = { \stemboth \shiftoff } -voiceone = { - \type Voice = one +voiceone = + \context Voice = one { \stemup } -voicetwo = { - \type Voice = two +voicetwo = + \context Voice = two { \stemdown } -voicethree = { - \type Voice = three +voicethree = + \context Voice = three { \stemup } -voicefour = { - \type Voice = four +voicefour = + \context Voice = four { \stemdown \shifton } @@ -179,6 +178,8 @@ stafffour = { } % ugh, cluttering global namespace... + +% ugh2. none=0 free=0 normal=1 diff --git a/ly/script.ly b/ly/script.ly index 3ff6986bd8..c96f3e588a 100644 --- a/ly/script.ly +++ b/ly/script.ly @@ -13,7 +13,10 @@ thumb = \script "thumb" accent = \script "accent" marcato = \script "marcato" staccatissimo = \script "staccatissimo" -portato = \script "portato" + +% portato is indicated by slurred & dotted notes. Not really supported. +% portato = \script "portato" + fermata = \script "fermata" stopped = \script "stopped" staccato = \script "staccato" diff --git a/make/out/lelievijver.lsm b/make/out/lelievijver.lsm index 01126f78fe..aaf527c8e9 100644 --- a/make/out/lelievijver.lsm +++ b/make/out/lelievijver.lsm @@ -1,15 +1,15 @@ Begin3 Titel: LilyPond -Versie: 1.1.40 -Inschrijf datum: 19APR99 +Versie: 1.1.41 +Inschrijf datum: 27APR99 Beschrijving: @FLAPTEKST@ Trefwoorden: muziek typezetten midi notatie Auteur: hanwen@stack.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Onderhouden door: hanwen@cs.ruu.nl (Han-Wen Nienhuys) Voornaamste plek: sunsite.unc.edu /pub/Linux/apps - 770k lilypond-1.1.40.tar.gz + 770k lilypond-1.1.41.tar.gz Oorspronkelijke plek: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.40.tar.gz + 770k lilypond-1.1.41.tar.gz Copi-eer voorwaarden: GPL End diff --git a/make/out/lilypond.lsm b/make/out/lilypond.lsm index 6ef8af95cd..53b1a516c9 100644 --- a/make/out/lilypond.lsm +++ b/make/out/lilypond.lsm @@ -1,7 +1,7 @@ Begin3 Title: LilyPond -Version: 1.1.40 -Entered-date: 19APR99 +Version: 1.1.41 +Entered-date: 27APR99 Description: LilyPond is the GNU Project music typesetter. This program can print beautiful sheet music from a music definition file. It can also play @@ -14,8 +14,8 @@ Author: hanwen@cs.ruu.nl (Han-Wen Nienhuys) janneke@gnu.org (Jan Nieuwenhuizen) Maintained-by: hanwen@stack.nl (Han-Wen Nienhuys) Primary-site: sunsite.unc.edu /pub/Linux/apps/sound/convert - 770k lilypond-1.1.40.tar.gz + 770k lilypond-1.1.41.tar.gz Original-site: ftp.cs.uu.nl /pub/GNU/LilyPond/development/ - 770k lilypond-1.1.40.tar.gz + 770k lilypond-1.1.41.tar.gz Copying-policy: GPL End diff --git a/make/out/lilypond.spec b/make/out/lilypond.spec index 7ce8706b26..31d806e60d 100644 --- a/make/out/lilypond.spec +++ b/make/out/lilypond.spec @@ -1,9 +1,9 @@ Name: lilypond -Version: 1.1.40 +Version: 1.1.41 Release: 1 Copyright: GPL Group: Applications/Publishing -Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.40.tar.gz +Source0: ftp.cs.uu.nl:/pub/GNU/LilyPond/development/lilypond-1.1.41.tar.gz Summary: A program for printing sheet music. URL: http://www.cs.uu.nl/~hanwen/lilypond Packager: Han-Wen Nienhuys diff --git a/mf/feta-eindelijk.mf b/mf/feta-eindelijk.mf index 578e4cbf03..fc2996b1ae 100644 --- a/mf/feta-eindelijk.mf +++ b/mf/feta-eindelijk.mf @@ -64,26 +64,26 @@ fet_endchar; % should use ledgerline thickness? % fet_beginchar( "whole rest (outside staff)", "0o", "outsidewholerest"); - set_char_box(block_rest_y#, block_rest_x# + block_rest_y#, + set_char_box(0, block_rest_x#, block_rest_y#, ledgerlinethickness#/2); block_rest; currentpicture := currentpicture shifted (0, - block_rest_y); pickup pencircle scaled ledgerlinethickness; y5 = y6 = 0; - lft x5 = - b; - rt x6 = w; + lft x5 = - b - block_rest_y; + rt x6 = w + block_rest_y; draw z5 .. z6; fet_endchar; fet_beginchar("half rest (outside staff)", "1o", "outsidehalfrest"); - set_char_box(block_rest_y#, block_rest_x#+ block_rest_y#, + set_char_box(0, block_rest_x#, ledgerlinethickness#/2, block_rest_y#); block_rest; pickup pencircle scaled ledgerlinethickness; y5 = y6 = 0; - lft x5 = - b; - rt x6 = w; + lft x5 = - b - block_rest_y ; + rt x6 = w + block_rest_y; draw z5 .. z6; fet_endchar; diff --git a/mf/feta-generic.mf b/mf/feta-generic.mf index 397628db30..58be0e4576 100644 --- a/mf/feta-generic.mf +++ b/mf/feta-generic.mf @@ -37,11 +37,11 @@ if test = 0: else: % input feta-bolletjes; % input feta-banier; -% input feta-eindelijk; + input feta-eindelijk; % input feta-klef; % input feta-toevallig; % input feta-schrift; % input feta-schrift; % input feta-haak; - input feta-timesig; +% input feta-timesig; fi diff --git a/mf/feta-ital-f.mf b/mf/feta-ital-f.mf index 0272371e23..a0800cf0f0 100644 --- a/mf/feta-ital-f.mf +++ b/mf/feta-ital-f.mf @@ -11,7 +11,7 @@ % cmchar "Italic letter f"; % beginchar("f",max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); -\"Dynamic letter f"; +"Dynamic letter f"; beginchar(fcode ,max(1.5u#,stem#)+max(3.5u#,2flare#),asc_height#,desc_depth#); italcorr asc_height#*slant+.75u#; diff --git a/mf/feta-ital-m.mf b/mf/feta-ital-m.mf index 7b59000b69..73f1a8abc8 100644 --- a/mf/feta-ital-m.mf +++ b/mf/feta-ital-m.mf @@ -11,9 +11,9 @@ % cmchar "Italic letter m"; % beginchar("m",15u#,x_height#,0); -\"Dynamic letter m"; +\"Dynamic letter m\"; % beginchar(incr num,15u#,x_height#,0); -beginchar( 109 ,12u#,x_height#,0); +beginchar( 109 ,12u#, asc_height#,0); italcorr 1/3x_height#*slant+.5hair#+.5u#; adjust_fit(if monospace:-1.5u#,-2u# else: 0,0 fi); pickup fine.nib; diff --git a/mf/feta-ital-p.mf b/mf/feta-ital-p.mf index 54b42997fe..a1320364fe 100644 --- a/mf/feta-ital-p.mf +++ b/mf/feta-ital-p.mf @@ -11,7 +11,7 @@ % cmchar "Italic letter p"; % beginchar("p",9u#,x_height#,desc_depth#); -\"Dynamic letter p"; +"Dynamic letter p"; beginchar(112, 9u#,x_height#,desc_depth#); italcorr .7x_height#*slant+.5curve#-u# if math_fitting:-.5u# fi; adjust_fit(0,0); pickup fine.nib; diff --git a/mf/feta-ital-r.mf b/mf/feta-ital-r.mf index 2256905086..b5a5e67a53 100644 --- a/mf/feta-ital-r.mf +++ b/mf/feta-ital-r.mf @@ -11,7 +11,7 @@ % cmchar "Italic letter r"; % beginchar("r",5.5u#+max(1.75u#,flare#),x_height#,0); -\"Dynamic letter r"; +"Dynamic letter r"; beginchar( 114 ,5.5u#+max(1.75u#,flare#),x_height#,0); italcorr x_height#*slant; diff --git a/mf/feta-ital-s.mf b/mf/feta-ital-s.mf index b0d14d3316..31bbe575c1 100644 --- a/mf/feta-ital-s.mf +++ b/mf/feta-ital-s.mf @@ -11,7 +11,7 @@ % cmchar "Italic letter s"; % beginchar("s",5.25u#+max(1.75u#,flare#),x_height#,0); -\"Dynamic letter s"; +"Dynamic letter s"; beginchar(115 ,5.25u#+max(1.75u#,flare#),x_height#,0); italcorr x_height#*slant-.5u#; adjust_fit(0,0); pickup fine.nib; diff --git a/mudela-mode.el b/mudela-mode.el index 6565db77fd..e78e43ae17 100644 --- a/mudela-mode.el +++ b/mudela-mode.el @@ -33,15 +33,15 @@ (defconst mudela-font-lock-keywords (let* ((keywords '("alternative" "repeat" "accepts" "accidentals" "break" "bar" "cadenza" - "clef" "cm" "consists" "contains" "duration" + "clef" "cm" "consists" "consistsend" "contains" "duration" "absdynamic" "scmfile" "lyrics" - "in" "translator" "type" "key" "maininput" "notes" + "in" "translator" "context" "key" "maininput" "notes" "musical_pitch" "time" "midi" "mm" "header" "notenames" "octave" "output" "partial" "paper" "plet" "name" "property" "pt" "shape" "relative" "include" "score" "scm" "scmfile" - "script" "skip" "table" "times" "spandynamic" "symboltables" - "tempo" "texid" "textstyle" "transpose" "version" "grouping" + "script" "skip" "table" "times" "spandynamic" "symboltables" "type" + "tempo" "transpose" "version" "grouping" )) (kwregex (mapconcat (lambda (x) (concat "\\\\" x)) keywords "\\|"))) diff --git a/mutopia/Coriolan/bassi-part.ly b/mutopia/Coriolan/bassi-part.ly index 14fac641d3..f3e771414e 100644 --- a/mutopia/Coriolan/bassi-part.ly +++ b/mutopia/Coriolan/bassi-part.ly @@ -7,19 +7,19 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "violoncello.ly" \include "contrabasso.ly" -$bassi = \type GrandStaff = bassi_group < +$bassi = \context GrandStaff = bassi_group < \$violoncello_staff \$contrabasso_staff > -$bassi = \type GrandStaff = bassi_group < +$bassi = \context GrandStaff = bassi_group < \$violoncello_staff \$contrabasso_staff > diff --git a/mutopia/Coriolan/clarinetti-part.ly b/mutopia/Coriolan/clarinetti-part.ly index c62420360f..a2c61557c7 100644 --- a/mutopia/Coriolan/clarinetti-part.ly +++ b/mutopia/Coriolan/clarinetti-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "clarinetti.ly" diff --git a/mutopia/Coriolan/clarinetti.ly b/mutopia/Coriolan/clarinetti.ly index ea3d37a1a5..2ba9a145a8 100644 --- a/mutopia/Coriolan/clarinetti.ly +++ b/mutopia/Coriolan/clarinetti.ly @@ -9,19 +9,19 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "clarinetto-1.ly" \include "clarinetto-2.ly" -$clarinetti_staff = \type Staff = clarinetti < +$clarinetti_staff = \context Staff = clarinetti < \property Staff.midi_instrument = "clarinet" \property Staff.instrument = "2 Clarinetti (B\\textflat)" \property Staff.instr = "Cl. (B\\textflat)" % urg: can't; only My_midi_lexer: () parses pitch? %\property Staff.transposing = "bes" \property Staff.transposing = -3 - \notes \type Voice=one < + \notes \context Voice=one < \time 4/4; \key F; \$clarinetto1 diff --git a/mutopia/Coriolan/clarinetto-1.ly b/mutopia/Coriolan/clarinetto-1.ly index 7aec16dcf7..29ecb9c21c 100644 --- a/mutopia/Coriolan/clarinetto-1.ly +++ b/mutopia/Coriolan/clarinetto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; clarinetto1 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | e4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/clarinetto-2.ly b/mutopia/Coriolan/clarinetto-2.ly index 31738f0b25..2308751488 100644 --- a/mutopia/Coriolan/clarinetto-2.ly +++ b/mutopia/Coriolan/clarinetto-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; clarinetto2 = \notes \relative c { R1*2 bes''4-.\ff r r2 | R1*3 | cis4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/contrabasso-part.ly b/mutopia/Coriolan/contrabasso-part.ly index 91ae1e5763..224f28298f 100644 --- a/mutopia/Coriolan/contrabasso-part.ly +++ b/mutopia/Coriolan/contrabasso-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "contrabasso.ly" diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 86ff955b71..cb879ccfe2 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; contrabasso = \notes \relative c { % \translator Staff=violoncello @@ -139,12 +139,12 @@ contrabasso = \notes \relative c { c4 r r2 | } -$contrabasso_staff = \type Staff = contrabasso < +$contrabasso_staff = \context Staff = contrabasso < \property Staff.midi_instrument = "contrabass" \property Staff.instrument = "Contrabasso" \property Staff.instr = "Cb." \clef "bass"; - \notes \type Voice=one< + \notes \context Voice=one< \global \$contrabasso > diff --git a/mutopia/Coriolan/coriolan.ly b/mutopia/Coriolan/coriolan.ly index 6ad5f01e98..5779e199c1 100644 --- a/mutopia/Coriolan/coriolan.ly +++ b/mutopia/Coriolan/coriolan.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" @@ -25,39 +25,39 @@ copyright = "public domain"; \include "violino-2.ly" \include "violoncello.ly" -legno = \type StaffGroup = legno_group < +legno = \context StaffGroup = legno_group < \$flauti_staff \$oboi_staff \$clarinetti_staff \$fagotti_staff > -koper = \type StaffGroup = koper_group < +koper = \context StaffGroup = koper_group < \$corni_staff \$trombe_staff > -$timpani_g = \type StaffGroup = timpani_group < +$timpani_g = \context StaffGroup = timpani_group < \$timpani_staff - \type Staff = urgtimpany \notes{ \skip 1*34; } + \context Staff = urgtimpany \notes{ \skip 1*34; } > -$violini = \type GrandStaff = violini_group < +$violini = \context GrandStaff = violini_group < \$violino1_staff \$violino2_staff > -$violi = \type GrandStaff = violi_group < +$violi = \context GrandStaff = violi_group < \$viola1_staff \$viola2_staff > -$bassi = \type GrandStaff = bassi_group < +$bassi = \context GrandStaff = bassi_group < \$violoncello_staff \$contrabasso_staff > -strijkers = \type StaffGroup = strijkers_group < +strijkers = \context StaffGroup = strijkers_group < \$violini \$violi \$bassi diff --git a/mutopia/Coriolan/corni-part.ly b/mutopia/Coriolan/corni-part.ly index 6ee7f94c24..b2e537037c 100644 --- a/mutopia/Coriolan/corni-part.ly +++ b/mutopia/Coriolan/corni-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "corni.ly" diff --git a/mutopia/Coriolan/corni.ly b/mutopia/Coriolan/corni.ly index 35ae851869..3c418520e3 100644 --- a/mutopia/Coriolan/corni.ly +++ b/mutopia/Coriolan/corni.ly @@ -9,19 +9,19 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "corno-1.ly" \include "corno-2.ly" -$corni_staff = \type Staff = corni < +$corni_staff = \context Staff = corni < \property Staff.midi_instrument = "french horn" \property Staff.instrument = "2 Corni (E\\textflat)" \property Staff.instr = "Cor. (E\\textflat)" % urg: can't; only My_midi_lexer: () parses pitch? %\property Staff.transposing = "es" \property Staff.transposing = 3 - \notes \type Voice=corni < + \notes \context Voice=corni < \time 4/4; \$corno1 \$corno2 diff --git a/mutopia/Coriolan/corno-1.ly b/mutopia/Coriolan/corno-1.ly index 7313cf617a..573ba15ba6 100644 --- a/mutopia/Coriolan/corno-1.ly +++ b/mutopia/Coriolan/corno-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; corno1 = \notes \relative c { R1 *2 | f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/corno-2.ly b/mutopia/Coriolan/corno-2.ly index e24bed021a..41aed2d76a 100644 --- a/mutopia/Coriolan/corno-2.ly +++ b/mutopia/Coriolan/corno-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; corno2 = \notes \relative c { R1 *2 | d''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotti-part.ly b/mutopia/Coriolan/fagotti-part.ly index 20d56dfd29..20e8d5ca23 100644 --- a/mutopia/Coriolan/fagotti-part.ly +++ b/mutopia/Coriolan/fagotti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "fagotti.ly" diff --git a/mutopia/Coriolan/fagotti.ly b/mutopia/Coriolan/fagotti.ly index 016f3a59cb..c37d189ad8 100644 --- a/mutopia/Coriolan/fagotti.ly +++ b/mutopia/Coriolan/fagotti.ly @@ -9,17 +9,17 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "fagotto-1.ly" \include "fagotto-2.ly" -$fagotti_staff = \type Staff = fagotti < +$fagotti_staff = \context Staff = fagotti < \property Staff.midi_instrument = "bassoon" \property Staff.instrument = "2 Fagotti" \property Staff.instr = "Fg." \clef "bass"; - \notes \type Voice=fagotti < + \notes \context Voice=fagotti < \global \$fagotto1 \$fagotto2 diff --git a/mutopia/Coriolan/fagotto-1.ly b/mutopia/Coriolan/fagotto-1.ly index 3111902d5e..5f49713a57 100644 --- a/mutopia/Coriolan/fagotto-1.ly +++ b/mutopia/Coriolan/fagotto-1.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; fagotto1 = \notes \relative c { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/fagotto-2.ly b/mutopia/Coriolan/fagotto-2.ly index 12f7c68b14..f822ed283d 100644 --- a/mutopia/Coriolan/fagotto-2.ly +++ b/mutopia/Coriolan/fagotto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; fagotto2 = \notes \relative c { R1 *2 | f4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauti-part.ly b/mutopia/Coriolan/flauti-part.ly index d50c1abae5..8cc6432018 100644 --- a/mutopia/Coriolan/flauti-part.ly +++ b/mutopia/Coriolan/flauti-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "flauti.ly" diff --git a/mutopia/Coriolan/flauti.ly b/mutopia/Coriolan/flauti.ly index db56765385..a8ffaf7f09 100644 --- a/mutopia/Coriolan/flauti.ly +++ b/mutopia/Coriolan/flauti.ly @@ -9,16 +9,16 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "flauto-1.ly" \include "flauto-2.ly" -$flauti_staff = \type Staff = flauti < +$flauti_staff = \context Staff = flauti < \property Staff.midi_instrument = "flute" \property Staff.instrument = "2 Flauti" \property Staff.instr = "Fl." - \notes \type Voice=flauti < + \notes \context Voice=flauti < \global \$flauto1 \$flauto2 diff --git a/mutopia/Coriolan/flauto-1.ly b/mutopia/Coriolan/flauto-1.ly index 4af6b54a64..dfe2529d6b 100644 --- a/mutopia/Coriolan/flauto-1.ly +++ b/mutopia/Coriolan/flauto-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; flauto1 = \notes \relative c { R1 *2 | c'''4-.\ff r r2 | R1 *3 | d4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/flauto-2.ly b/mutopia/Coriolan/flauto-2.ly index f7d266083c..4dc61cc10a 100644 --- a/mutopia/Coriolan/flauto-2.ly +++ b/mutopia/Coriolan/flauto-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; flauto2 = \notes \relative c { R1 *2 | as'''4-.\ff r r2 | R1 *3 | b4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/global.ly b/mutopia/Coriolan/global.ly index 37c80a8298..946a86e8a9 100644 --- a/mutopia/Coriolan/global.ly +++ b/mutopia/Coriolan/global.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; global = \notes { \time 4/4; diff --git a/mutopia/Coriolan/oboe-1.ly b/mutopia/Coriolan/oboe-1.ly index ae7073b1e6..7464da33a6 100644 --- a/mutopia/Coriolan/oboe-1.ly +++ b/mutopia/Coriolan/oboe-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; oboe1 = \notes \relative c'' { R1 *2 | as'4-.\ff r r2 | R1 *3 | as4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboe-2.ly b/mutopia/Coriolan/oboe-2.ly index 4c3e5c141b..1fd042fb15 100644 --- a/mutopia/Coriolan/oboe-2.ly +++ b/mutopia/Coriolan/oboe-2.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; oboe2 = \notes \relative c{ R1 *2| f''4-.\ff r r2 | R1 *3 | f4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/oboi-part.ly b/mutopia/Coriolan/oboi-part.ly index 967010b981..9d605f1b97 100644 --- a/mutopia/Coriolan/oboi-part.ly +++ b/mutopia/Coriolan/oboi-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "oboi.ly" diff --git a/mutopia/Coriolan/oboi.ly b/mutopia/Coriolan/oboi.ly index 57ed1985f0..cfff9dd963 100644 --- a/mutopia/Coriolan/oboi.ly +++ b/mutopia/Coriolan/oboi.ly @@ -9,16 +9,16 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "oboe-1.ly" \include "oboe-2.ly" -$oboi_staff = \type Staff = oboi < +$oboi_staff = \context Staff = oboi < \property Staff.midi_instrument = "oboe" \property Staff.instrument = "2 Oboi" \property Staff.instr = "Ob." - \notes \type Voice=oboi < + \notes \context Voice=oboi < \global \$oboe1 \$oboe2 diff --git a/mutopia/Coriolan/timpani.ly b/mutopia/Coriolan/timpani.ly index 74374f04b0..60b4ca0a40 100644 --- a/mutopia/Coriolan/timpani.ly +++ b/mutopia/Coriolan/timpani.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; timpani = \notes \relative c { R1 *2 | c4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | @@ -20,7 +20,7 @@ timpani = \notes \relative c { %35 } -$timpani_staff = \type Staff = timpani < +$timpani_staff = \context Staff = timpani < \property Staff.midi_instrument = "timpani" \property Staff.instrument = "2 Timpani (C-G)" \property Staff.instr = "Timp." diff --git a/mutopia/Coriolan/trombe-part.ly b/mutopia/Coriolan/trombe-part.ly index 818d668d91..d055518315 100644 --- a/mutopia/Coriolan/trombe-part.ly +++ b/mutopia/Coriolan/trombe-part.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "trombe.ly" diff --git a/mutopia/Coriolan/trombe.ly b/mutopia/Coriolan/trombe.ly index d8fc0b91b4..07ac2bce1d 100644 --- a/mutopia/Coriolan/trombe.ly +++ b/mutopia/Coriolan/trombe.ly @@ -9,16 +9,16 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "trombo-1.ly" \include "trombo-2.ly" -$trombe_staff = \type Staff = trombe < +$trombe_staff = \context Staff = trombe < \property Staff.midi_instrument = "trumpet" \property Staff.instrument = "2 Trombe (C)" \property Staff.instr = "Tbe." - \notes \type Voice=trombe < + \notes \context Voice=trombe < % \global \time 4/4; \$trombo1 diff --git a/mutopia/Coriolan/trombo-1.ly b/mutopia/Coriolan/trombo-1.ly index fb52b473e5..888ea5807c 100644 --- a/mutopia/Coriolan/trombo-1.ly +++ b/mutopia/Coriolan/trombo-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; trombo1 = \notes \relative c { R1 *2 | c''4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/trombo-2.ly b/mutopia/Coriolan/trombo-2.ly index 0788561f0c..e4b3ec8ca4 100644 --- a/mutopia/Coriolan/trombo-2.ly +++ b/mutopia/Coriolan/trombo-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; trombo2 = \notes \relative c { R1 *2 | c'4-.\ff r r2 | R1 *3 | c4-. r r2 | R1 *3 | diff --git a/mutopia/Coriolan/viola-1.ly b/mutopia/Coriolan/viola-1.ly index 155c8b5b53..b9d80bde3f 100644 --- a/mutopia/Coriolan/viola-1.ly +++ b/mutopia/Coriolan/viola-1.ly @@ -7,10 +7,10 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; viola1 = \notes \relative c { - \type Voice=one + \context Voice=one c'1\ff ~ | c | f,4-. r r2 | r1 | % copied 3 bars from three back... %5 @@ -290,13 +290,13 @@ viola1 = \notes \relative c { \include "viola-2.ly"; -% $viola1_staff = \type Staff = viola1 < -$viola1_staff = \type Staff = violai < +% $viola1_staff = \context Staff = viola1 < +$viola1_staff = \context Staff = violai < \property Staff.midi_instrument = "viola" \property Staff.instrument = "Viola" \property Staff.instr = "Vla." \clef "alto"; - \notes \type Voice=one < + \notes \context Voice=one < \global \$viola1 > diff --git a/mutopia/Coriolan/viola-2.ly b/mutopia/Coriolan/viola-2.ly index edfa67e706..78137f47fb 100644 --- a/mutopia/Coriolan/viola-2.ly +++ b/mutopia/Coriolan/viola-2.ly @@ -7,14 +7,14 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; viola2 = \notes \relative c { % starts on (actualy, most part is on) same staff as viola1 %urg, parse error %urg \translator Staff=viola1 \translator Staff=violai - \type Voice=one + \context Voice=one c1 ~ | c | s1*2 | % copied 3 bars from three back... c ~ | c | s1*2 % | @@ -30,13 +30,13 @@ viola2 = \notes \relative c { [as'16\ff as a as][as as as as]as2:16 | } -% $viola2_staff = \type Staff = viola_2 < -$viola2_staff = \type Staff = violaii < +% $viola2_staff = \context Staff = viola_2 < +$viola2_staff = \context Staff = violaii < \property Staff.midi_instrument = "viola" \property Staff.instrument = "Viola II" \property Staff.instr = "Vla. II" \clef "alto"; - \notes \type Voice=one< + \notes \context Voice=one< \global \$viola2 > diff --git a/mutopia/Coriolan/viola-part.ly b/mutopia/Coriolan/viola-part.ly index 94a0f7e882..cb8cdbaf18 100644 --- a/mutopia/Coriolan/viola-part.ly +++ b/mutopia/Coriolan/viola-part.ly @@ -7,18 +7,18 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "viola-1.ly" \include "viola-2.ly" -$viola_staff = \type Staff = violai < +$viola_staff = \context Staff = violai < \property Staff.midi_instrument = "viola" \property Staff.instrument = "Viola" \property Staff.instr = "Vla." \clef "alto"; - \notes \type Voice=one < + \notes \context Voice=one < \global \$viola1 \$viola2 diff --git a/mutopia/Coriolan/violino-1-part.ly b/mutopia/Coriolan/violino-1-part.ly index 7b6c9bd1a7..5bb957b4fd 100644 --- a/mutopia/Coriolan/violino-1-part.ly +++ b/mutopia/Coriolan/violino-1-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "violino-1.ly" diff --git a/mutopia/Coriolan/violino-1.ly b/mutopia/Coriolan/violino-1.ly index ab12d3ca95..e3eb7ce8d3 100644 --- a/mutopia/Coriolan/violino-1.ly +++ b/mutopia/Coriolan/violino-1.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; violino1 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | @@ -272,7 +272,7 @@ violino1 = \notes \relative c { c4 r r2 | } -$violino1_staff = \type Staff = violino1 < +$violino1_staff = \context Staff = violino1 < \property Staff.midi_instrument = "violin" \property Staff.instrument = "Violino I" \property Staff.instr = "Vl. I" diff --git a/mutopia/Coriolan/violino-2-part.ly b/mutopia/Coriolan/violino-2-part.ly index efa657dbd6..820bebbdbc 100644 --- a/mutopia/Coriolan/violino-2-part.ly +++ b/mutopia/Coriolan/violino-2-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "violino-2.ly" diff --git a/mutopia/Coriolan/violino-2.ly b/mutopia/Coriolan/violino-2.ly index 44dbc39647..4c81193676 100644 --- a/mutopia/Coriolan/violino-2.ly +++ b/mutopia/Coriolan/violino-2.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; violino2 = \notes \relative c { c'1\ff ~ | c | r r2 | R1 | @@ -290,7 +290,7 @@ violino2 = \notes \relative c { c4 r r2 | } -$violino2_staff = \type Staff = violino2 < +$violino2_staff = \context Staff = violino2 < % MIDI hoort geeneens verschil tussen een % eerste en tweede viool ;-) \property Staff.midi_instrument = "violin" diff --git a/mutopia/Coriolan/violoncello-part.ly b/mutopia/Coriolan/violoncello-part.ly index 8ff1afdfcd..d92816b4ec 100644 --- a/mutopia/Coriolan/violoncello-part.ly +++ b/mutopia/Coriolan/violoncello-part.ly @@ -7,7 +7,7 @@ enteredby = "JCN"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "violoncello.ly" diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index 7c5a1eb278..f35c3d7769 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; violoncello = \notes \relative c { c1\ff ~ | c | f,4-. r r2 | r1 | c'1\ff ~ | c | f,4-. r r2 | @@ -299,12 +299,12 @@ violoncello = \notes \relative c { c4 r r2 | } -$violoncello_staff = \type Staff = violoncello < +$violoncello_staff = \context Staff = violoncello < \property Staff.midi_instrument = "cello" \property Staff.instrument = "Violoncello" \property Staff.instr = "Vc." \clef "bass"; - \notes \type Voice=one< + \notes \context Voice=one< \global \$violoncello > diff --git a/mutopia/D.Scarlatti/progress.ly b/mutopia/D.Scarlatti/progress.ly index fe16c92147..b61ec33a3e 100644 --- a/mutopia/D.Scarlatti/progress.ly +++ b/mutopia/D.Scarlatti/progress.ly @@ -48,12 +48,12 @@ John % vOne is right hand outside part, vTwo r.h. inside part, % vThree left hand outside, vFour l.h. inside. \notes { - \type Staff=staffOne < + \context Staff=staffOne < \property Staff.nolines=11 \property Voice.pletvisibility=0 \time 2/2; \clef alto; - \type Voice=vOne <{ + \context Voice=vOne <{ % 1 \stemup s1 % 2 @@ -285,11 +285,11 @@ s2. f'4 | % 94 e'2 e'2 }> - \type Voice=vTwo < + \context Voice=vTwo < { %- right hand unchorded notes - }> - \type Voice=vThree <{ + \context Voice=vThree <{ % 1 \stemdown s2. [e''16 d'' c'' b'] | % 2 @@ -481,7 +481,7 @@ s1 s s s s s s s s s s s s s s s s s s s s s s s s s s s s % 90 b2 a4 } > - \type Voice=vFour < + \context Voice=vFour < { %- left hand unchorded notes - } @@ -498,12 +498,12 @@ Bar_number_engraver;}} % vOne is right hand outside part, vTwo r.h. inside part, % vThree left hand outside, vFour l.h. inside. \notes { - \type Staff=staffOne < + \context Staff=staffOne < \property Staff.nolines=11 \keysignature bes; \time 4/4; \clef alto; - \type Voice=vOne < + \context Voice=vOne < { % 1 \stemup \skip 4..*15/7; g'16 | @@ -622,7 +622,7 @@ s1 s s s4. c'8 s4 ees'16 } > - \type Voice=vTwo < + \context Voice=vTwo < { s1 s s s s s s s s s % 11 @@ -658,7 +658,7 @@ fis'4~fis'16 \skip 4..*27/7; | % 40 [fis'16 a' bes' g']~[g' c'' a'd'] } > - \type Voice=vThree < + \context Voice=vThree < { % 1 \stemdown \skip 4..*23/7; @@ -768,7 +768,7 @@ s4. g'8} % 29 b'16} > - \type Voice=vFour < + \context Voice=vFour < { \stemdown \skip 4..*74/7; % 5 @@ -807,3 +807,4 @@ Bar_number_engraver;}} ---------------------------------------------------- +\version "1.0.16"; diff --git a/mutopia/D.Scarlatti/sonata-k1-l366.ly b/mutopia/D.Scarlatti/sonata-k1-l366.ly index 1da1230281..13ce839c8c 100644 --- a/mutopia/D.Scarlatti/sonata-k1-l366.ly +++ b/mutopia/D.Scarlatti/sonata-k1-l366.ly @@ -31,12 +31,12 @@ John % vOne is right hand outside part, vTwo r.h. inside part, % vThree left hand outside, vFour l.h. inside. \notes { -\type Staff = staffOne < +\context Staff = staffOne < \property Staff.nolines=11 \keysignature bes; \time 4/4; \clef alto; -\type Voice = vOne < +\context Voice = vOne < { % 1 \stemup [d''16 e'' f'' g''] [a'' a' cis'' a'] d''4. e''8 | @@ -142,7 +142,7 @@ s8 f'' s e'' s2 | % 29 s8 f'' s cis'' } > -\type Voice = vTwo < +\context Voice = vTwo < {s1 s s s s %6 \stemdown s2 d'16 s s4. | @@ -155,7 +155,7 @@ s1 %29 s2 d''8} > -\type Voice = vThree < +\context Voice = vThree < { % 1 \stemdown s2 [d'16 e' f' g'] [a' a cis' a] | @@ -244,7 +244,7 @@ s1 % 28 s2 s8 f'' s cis'' | } > -\type Voice = vFour < +\context Voice = vFour < {s1 s s s s s s s s %10 \stemdown d''16 s s4. a'16 s s4. | @@ -266,3 +266,4 @@ s1 \paper{barsize=50.0; \translator {\StaffContext \consists Bar_number_engraver;}} } +\version "1.0.16"; diff --git a/mutopia/D.Scarlatti/sonata-k2-l388.ly b/mutopia/D.Scarlatti/sonata-k2-l388.ly index e7e77332dc..03df3984fe 100644 --- a/mutopia/D.Scarlatti/sonata-k2-l388.ly +++ b/mutopia/D.Scarlatti/sonata-k2-l388.ly @@ -6,13 +6,13 @@ % vOne is right hand outside part, vTwo r.h. inside part, % vThree left hand outside, vFour l.h. inside. \notes { - \type Staff=staffOne < + \context Staff=staffOne < \property Staff.nolines=11 \property Voice.pletvisibility=0 \keysignature fis; \time 3/8; \clef alto; - \type Voice=vOne <{ + \context Voice=vOne <{ %1 \stemup [g''8 g' g'] | % 2 @@ -173,7 +173,7 @@ g'4. |} %6 d4 }> - \type Voice=vThree <{ + \context Voice=vThree <{ % 1 \stemdown s4. | % 2 @@ -336,3 +336,4 @@ g,4. | Bar_number_engraver;}} } +\version "1.0.16"; diff --git a/mutopia/D.Scarlatti/sonata-k3-l378.ly b/mutopia/D.Scarlatti/sonata-k3-l378.ly index 47f49c89de..bfda05aac7 100644 --- a/mutopia/D.Scarlatti/sonata-k3-l378.ly +++ b/mutopia/D.Scarlatti/sonata-k3-l378.ly @@ -16,8 +16,8 @@ LHtoL = { \tolower \stemdown } \score { \notes - \type PianoStaff < - \type Staff = upper <\type Voice = mainV <{ + \context PianoStaff < + \context Staff = upper <\context Voice = mainV <{ % 1 \stemup s1 s4 [e'16 d' c' b] a4 s | @@ -75,14 +75,14 @@ LHtoL = { \tolower \stemdown } s4 c'' g' < { f''4 e'' c'' d'' b' c''2. } - \type Voice = anotherV { a'4 g'2 f'2 e'2. } + \context Voice = anotherV { a'4 g'2 f'2 e'2. } > s4 | s4 [g'16 f' e' d'] c'4 s | s4 c'' g' ees'' ~ < { ees'' d''2 c''4 } - \type Voice = anotherV { \stemdown g'2 fis'2 } + \context Voice = anotherV { \stemdown g'2 fis'2 } > | bes'4 s2 [d'16 c' bes a] | @@ -93,7 +93,7 @@ LHtoL = { \tolower \stemdown } s4 d'' a' f'' | < { f''4 e'' e'' d'' } - \type Voice = anotherV { \stemdown bes'2 bes'2 } + \context Voice = anotherV { \stemdown bes'2 bes'2 } > | < a'4 cis''> s2. | \RHtoL s4 a' gis' g' | @@ -120,16 +120,16 @@ LHtoL = { \tolower \stemdown } f'4 gis' a' b' | c''4 d'' e'' f'' | gis'4 [a'8 b'] e'4 d'' | - < \type Voice = mainV { c''4 d'' s2 } - \type Voice = anotherV { \stemdown a'2 } + < \context Voice = mainV { c''4 d'' s2 } + \context Voice = anotherV { \stemdown a'2 } > a'4 a'' gis'' g'' | fis''4 f''2 e''4~e'' d''2 c''4~c'' b'2 a'4~a' gis'4 a' d'' | - < \type Voice = mainV { c''4 d'' s2 } - \type Voice = anotherV { \stemdown } | + < \context Voice = mainV { c''4 d'' s2 } + \context Voice = anotherV { \stemdown } | > a'4 s2 [e'16 d' c' b] | a4 s2 | %% added some chording. @@ -138,7 +138,7 @@ LHtoL = { \tolower \stemdown } }>> - \type Staff = lower <{ + \context Staff = lower <{ \stemdown s2. [e''16 d'' c'' b'] | @@ -251,3 +251,4 @@ LHtoL = { \tolower \stemdown } } +\version "1.0.16"; diff --git a/mutopia/D.Scarlatti/sonata-k4-l390.ly b/mutopia/D.Scarlatti/sonata-k4-l390.ly index 9e3c788094..4d1dab4d53 100644 --- a/mutopia/D.Scarlatti/sonata-k4-l390.ly +++ b/mutopia/D.Scarlatti/sonata-k4-l390.ly @@ -5,12 +5,12 @@ % vOne is right hand outside part, vTwo r.h. inside part, % vThree left hand outside, vFour l.h. inside. \notes { - \type Staff=staffOne < + \context Staff=staffOne < \property Staff.nolines=11 \keysignature bes; \time 4/4; \clef alto; - \type Voice=vOne < + \context Voice=vOne < { % 1 \stemup \skip 4..*15/7; g'16 | @@ -129,7 +129,7 @@ s1 s s s4. c'8 s4 ees'16 } > - \type Voice=vTwo < + \context Voice=vTwo < { s1 s s s s s s s s s % 11 @@ -165,7 +165,7 @@ fis'4~fis'16 \skip 4..*27/7; | % 40 [fis'16 a' bes' g']~[g' c'' a'd'] } > - \type Voice=vThree < + \context Voice=vThree < { % 1 \stemdown \skip 4..*23/7; @@ -275,7 +275,7 @@ s4. g'8} % 29 b'16} > - \type Voice=vFour < + \context Voice=vFour < { \stemdown \skip 4..*74/7; % 5 @@ -311,3 +311,4 @@ s8 [c''16 g'8 fis'16] [bes'' g' f' ees'] | \paper{barsize=50.0; \translator {\StaffContext \consists Bar_number_engraver;}} } +\version "1.0.16"; diff --git a/mutopia/D.Zipoli/verso_2.ly b/mutopia/D.Zipoli/verso_2.ly index d8f3dbd6a4..50f75d7dc0 100644 --- a/mutopia/D.Zipoli/verso_2.ly +++ b/mutopia/D.Zipoli/verso_2.ly @@ -17,7 +17,7 @@ title = "Verso II"; under the Gnu Public Licence. %} -\version "1.0.14"; +\version "1.0.16"; $voice_one = \notes \relative c' { a'2 bes4. [c16 bes] | a4 d ~ d c ~ | c b ~ [b8 a] a4 ~| @@ -51,21 +51,21 @@ global=\notes { recorder= { % For three recorders. % - \type StaffGroup + \context StaffGroup < - \type Staff = descant { + \context Staff = descant { \property Staff.Instrument = "Descant" \clef "G^8"; \notes \transpose bes' {\global \$voice_one } } - \type Staff = treble { + \context Staff = treble { \property Staff.Instrument = "Treble" \clef "G"; \notes \transpose bes' {\global \$voice_two } } - \type Staff = lower { + \context Staff = lower { \property Staff.Instrument = "Tenor or Treble II" \clef "G"; \notes \transpose bes'' {\global \$voice_three } @@ -80,17 +80,17 @@ recorder= { % Try to make parts cross staves as apropriate. % organ={ - \type GrandStaff + \context GrandStaff < - \type Staff = treble { + \context Staff = treble { \clef "G"; \global - \type Staff < + \context Staff < { \voiceone \$voice_one } { \voicetwo \$voice_two } > } - \type Staff = bass { + \context Staff = bass { \clef "F"; \global \$voice_three } > diff --git a/mutopia/E.Satie/gnossienne-4.ly b/mutopia/E.Satie/gnossienne-4.ly index f0c9e553a2..7cc91b517a 100644 --- a/mutopia/E.Satie/gnossienne-4.ly +++ b/mutopia/E.Satie/gnossienne-4.ly @@ -12,7 +12,7 @@ Tested Features: cross staff beams and slurs, grace notes, no bars %} -\version "1.0.14"; +\version "1.0.16"; \include "nederlands.ly" @@ -24,43 +24,43 @@ global = \notes { \bar ".|"; } -upper = \type Staff=treble \notes\relative c''{ +upper = \context Staff=treble \notes\relative c''{ \clef violin; \stemup - \type Voice=one + \context Voice=one r2 r r r2 r r r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e] % grace hack - < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r + < { [es8 )c] } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r r2 r r r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e] - < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r + < { [es8 )c] } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2 r4 [g16( a bes a] [g a bes a g a bes a] [g a bes a g fis es fis] )d4 \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ gis8 r r4 r2 \tiny a8*1/2 ~ \normalsize f4*3/4 ~ f8 r r2 r r2 r4 [a8( b][c d c b] \tiny b8*1/2 ~ \normalsize - < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r + < { [e8*1/2 )g,8] } \context Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r r2 r4 [a8( b][c d c b] [a b c d][c b a b][c d c b] \tiny b8*1/2 ~ \normalsize - < { [e8*1/2 )g,8] } \type Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r + < { [e8*1/2 )g,8] } \context Voice=x { \stemup s8*1/4 \tiny a8*1/2 ~ } > r4 r2 r a2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2 r2 r r fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r \tiny b'8*1/2 ~ \normalsize - < { [a8*1/2 a8] } \type Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > r4 r2 r + < { [a8*1/2 a8] } \context Voice=x { \stemup s8*1/4 \tiny b8*1/2 ~ } > r4 r2 r r4 [a'8--(\< a--] [a-- a-- c-- \!b--] [a--\> gis f \!e] - < { [es8 )c] } \type Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r + < { [es8 )c] } \context Voice=x { \stemup s8*1/2 \tiny b8*1/2 ~ } > r4 r2 r d,4( \tiny fis8*1/2 ~ \normalsize gis4*3/4 ~ )gis8 r r4 r2 f4 ~ f8 r r2 r [f'8( g a b][a g f g][a b a g] \tiny f8*1/2 ~ \normalsize - < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r + < { [g8*1/2 )e8] } \context Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r [f8( g a b][a g f g][a b a g] \tiny f8*1/2 ~ \normalsize - < { [g8*1/2 )e8] } \type Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r + < { [g8*1/2 )e8] } \context Voice=x { \stemup s8*1/4 \tiny d8*1/2 ~ } > r4 r2 r a,2( \tiny e'8*1/2 ~ \normalsize f4*3/4 ~ )f8 r r2 r2 r r fis,4( \tiny dis8*1/2 \normalsize <)cis4*3/4 ais> r2 r @@ -76,7 +76,7 @@ bassbeam = \notes{ % [s2] [s2] [s2] } -lower = \type Voice=two \notes \relative c{ +lower = \context Voice=two \notes \relative c{ \stemdown \property Staff.slurydirection = 1 @@ -118,12 +118,12 @@ lower = \type Voice=two \notes \relative c{ } \score { - \type GrandStaff < - \type Staff = treble < + \context GrandStaff < + \context Staff = treble < \global \upper > - \type Staff = bass < + \context Staff = bass < \global \clef bass; \lower diff --git a/mutopia/E.Satie/petite-ouverture-a-danser.ly b/mutopia/E.Satie/petite-ouverture-a-danser.ly index 67b645ef54..010aedb0b1 100644 --- a/mutopia/E.Satie/petite-ouverture-a-danser.ly +++ b/mutopia/E.Satie/petite-ouverture-a-danser.ly @@ -12,7 +12,7 @@ Tested Features: %} -\version "1.0.14"; +\version "1.0.16"; \include "nederlands.ly" @@ -37,8 +37,8 @@ global = \notes { \bar ".|"; } -i = \type Staff \notes\relative c''{ - \type Voice=i +i = \context Staff \notes\relative c''{ + \context Voice=i \stemup c8.( es16 bes4 ~ | )bes8 r c8.( bes16 | des4 c8. bes16 | c4 ~ ) c8 r | @@ -65,8 +65,8 @@ i = \type Staff \notes\relative c''{ } -ii = \type Staff \notes\relative c'{ - \type Voice=ii +ii = \context Staff \notes\relative c'{ + \context Voice=ii \stemdown r8 r | r r | r r | @@ -103,8 +103,8 @@ ii = \type Staff \notes\relative c'{ } -lower = \type Staff \notes \relative c{ - \type Voice=iii +lower = \context Staff \notes \relative c{ + \context Voice=iii | r | | r | | r | | @@ -132,14 +132,14 @@ lower = \type Staff \notes \relative c{ } \score { - \type GrandStaff < - \type Staff = treble < + \context GrandStaff < + \context Staff = treble < \global \clef violin; \i \ii > - \type Staff = bass < + \context Staff = bass < \global \clef bass; \lower diff --git a/mutopia/F.Schubert/AnSylvia.ly b/mutopia/F.Schubert/AnSylvia.ly index b9f51c010f..5c6687cd6b 100644 --- a/mutopia/F.Schubert/AnSylvia.ly +++ b/mutopia/F.Schubert/AnSylvia.ly @@ -10,7 +10,7 @@ title = "An Sylvia"; } -\version "1.0.14"; +\version "1.0.16"; \include "paper16.ly"; \include "paper13.ly"; @@ -210,7 +210,7 @@ tune=\notes \relative c'' { %5 b2. g4 | %6 - g( )fis \type Staff < {\voiceone r2}{\voicetwo r4 a4}> | + g( )fis \context Staff < {\voiceone r2}{\voicetwo r4 a4}> | %7 g2. e4 | %8 @@ -236,15 +236,15 @@ tune=\notes \relative c'' { %18 r1 | %19 - d2. \type Staff < {\voiceone b8 ~ g8} {\voicetwo [b8 g8]} > | + d2. \context Staff < {\voiceone b8 ~ g8} {\voicetwo [b8 g8]} > | %20 \property Voice.slurdash = 2 fis4( )e \property Voice.slurdash = "" - \type Staff < {\voiceone r2}{\voicetwo r4 e4} > | + \context Staff < {\voiceone r2}{\voicetwo r4 e4} > | %21 c'2. [b16( a g )fis] | %22 - e4( )d \type Staff <{\voiceone r2} {\voicetwo r4 d4}> | + e4( )d \context Staff <{\voiceone r2} {\voicetwo r4 d4}> | %23 d2 d'2 | %24 @@ -350,11 +350,11 @@ global=\notes { \property Staff.timeSignatureStyle = "C" } -Piano=\type GrandStaff = piano { +Piano=\context GrandStaff = piano { \property GrandStaff.instrument="Piano" < - \type Staff=RH {\global \pianoRH } - \type Staff=LH {\global \pianoLH } + \context Staff=RH {\global \pianoRH } + \context Staff=LH {\global \pianoLH } > } @@ -373,10 +373,10 @@ GermanWords = \lyrics< > Vocals= < - \type Staff = vocal < + \context Staff = vocal < \notes \transpose c {\clef "F"; \global\tune} -% {\type Lyrics = vocal \EnglishWords} - {\type Lyrics = vocal \GermanWords} +% {\context Lyrics = vocal \EnglishWords} + {\context Lyrics = vocal \GermanWords} > > diff --git a/mutopia/F.Schubert/standchen-16.ly b/mutopia/F.Schubert/standchen-16.ly index 971e9f5c81..abbf68a230 100644 --- a/mutopia/F.Schubert/standchen-16.ly +++ b/mutopia/F.Schubert/standchen-16.ly @@ -9,6 +9,6 @@ description = "A schubert song in 16 pt"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; \include "standchen.ly" diff --git a/mutopia/F.Schubert/standchen-20.ly b/mutopia/F.Schubert/standchen-20.ly index daaed0bbca..8d0d5d468a 100644 --- a/mutopia/F.Schubert/standchen-20.ly +++ b/mutopia/F.Schubert/standchen-20.ly @@ -9,7 +9,7 @@ copyright = "public domain"; description = "A schubert song in 20 pt"; } -\version "1.0.14"; +\version "1.0.16"; % fool make-website % \include "standchen.ly"; diff --git a/mutopia/F.Schubert/standchen.ly b/mutopia/F.Schubert/standchen.ly index 3a9d9a039f..16ad602cd5 100644 --- a/mutopia/F.Schubert/standchen.ly +++ b/mutopia/F.Schubert/standchen.ly @@ -16,7 +16,7 @@ multiple \paper{}s in one \score Note: Original key F. %} -\version "1.0.14"; +\version "1.0.16"; $vocal_verse1 = \notes\relative c''{ % ugh: treble/bass @@ -239,7 +239,7 @@ $treble_through = \notes \relative c'{ % ugh ugh: connecting chords %65 < { d,2.\f a'2} { e2. ~ e2 } { b'2. c,2 }> r4 | - \type Staff < + \context Staff < { \voiceone [a8. b16] c4-> ~ a8 r | @@ -394,7 +394,7 @@ allLyrics = { \$lyric_through } -$lyric_staff = \type Lyrics = lyric< +$lyric_staff = \context Lyrics = lyric< \allLyrics > @@ -407,7 +407,7 @@ vocals = \notes{ \$vocal_through } -$vocal_staff = \type Staff = vocal< +$vocal_staff = \context Staff = vocal< \property Staff.instrument = "alto sax" \global \$vocals @@ -421,7 +421,7 @@ treble = { \$treble_through } -$treble_staff = \type Staff = treble< +$treble_staff = \context Staff = treble< \global \treble > @@ -434,12 +434,12 @@ bass = { \$bass_through } -$bass_staff = \type Staff = bass< +$bass_staff = \context Staff = bass< \global \bass > -$grand_staff = \type GrandStaff< +$grand_staff = \context GrandStaff< \$treble_staff \$bass_staff > diff --git a/mutopia/Hymns/diademata.ly b/mutopia/Hymns/diademata.ly index a4c7cea417..57735bf984 100644 --- a/mutopia/Hymns/diademata.ly +++ b/mutopia/Hymns/diademata.ly @@ -6,7 +6,7 @@ date = "1868"; title = "Diademata"; metre = "6 6. 8 6. D"; } -\version "1.0.14"; +\version "1.0.16"; sop=\notes \transpose c''{ ees2 | ees4 ees4 g2 g2 | c'1. \bar "||"; @@ -60,26 +60,26 @@ global = \notes{ \key ees; } -$upper_staff = \type Staff = upper { +$upper_staff = \context Staff = upper { \global \clef "treble"; - \type Staff < + \context Staff < { \voiceone \sop } { \voicetwo \alt } > } -$lower_staff = \type Staff = lower { +$lower_staff = \context Staff = lower { \global \clef "bass"; - \type Staff < + \context Staff < { \voiceone \ten } { \voicetwo \bass } > } \score{ - \type ChoirStaff\notes < + \context ChoirStaff\notes < \$upper_staff \$lower_staff > diff --git a/mutopia/Hymns/laudatedom.ly b/mutopia/Hymns/laudatedom.ly index ff97300514..1541d103e1 100644 --- a/mutopia/Hymns/laudatedom.ly +++ b/mutopia/Hymns/laudatedom.ly @@ -4,7 +4,7 @@ composer = "Parry"; metre = "10 10 . 11 11"; } -\version "1.0.14"; +\version "1.0.16"; sop = \notes \transpose c''{ f4 | d' bes c' | f2 \bar "||"; @@ -58,16 +58,16 @@ global = \notes { \score { < - \type Staff=top { + \context Staff=top { \global \clef "G"; - \type Staff < + \context Staff < \notes{\voiceone \sop } \notes{\voicetwo \alto } > } - \type Staff=bottom { + \context Staff=bottom { \global \clef "F"; - \type Staff < + \context Staff < \notes{\voiceone \tenor} \notes{\voicetwo \bass } > diff --git a/mutopia/Hymns/maccabaeus.ly b/mutopia/Hymns/maccabaeus.ly index 6e83b1adc9..52e100e958 100644 --- a/mutopia/Hymns/maccabaeus.ly +++ b/mutopia/Hymns/maccabaeus.ly @@ -7,7 +7,7 @@ title = "Maccabaeus"; metre = "10 11. 11 11. and refrain"; } -\version "1.0.14"; +\version "1.0.16"; sop=\notes \relative c'' { b2 gis4. a8 |b2 e,2 | @@ -81,19 +81,19 @@ global = \notes { \key E; } -$upper_staff = \type Staff = upper { +$upper_staff = \context Staff = upper { \global \clef "treble"; - \type Staff < + \context Staff < {\voiceone \sop } {\voicetwo \alt } > } -$lower_staff = \type Staff = lower { +$lower_staff = \context Staff = lower { \global \clef "bass"; - \type Staff < + \context Staff < {\voiceone \ten } {\voicetwo \bass } > diff --git a/mutopia/Hymns/ode.ly b/mutopia/Hymns/ode.ly index a7b8937d11..38116d4b34 100644 --- a/mutopia/Hymns/ode.ly +++ b/mutopia/Hymns/ode.ly @@ -7,7 +7,7 @@ title = "Ode to Joy"; metre = "8 7 8 7 D"; } -\version "1.0.14"; +\version "1.0.16"; sop=\notes \relative c'' { b4 b c d | d c b a | g g a b | b4. a8 a2 \bar "||"; @@ -44,20 +44,20 @@ global=\notes{ \key G; } -$upper_staff = \type Staff = upper \notes { +$upper_staff = \context Staff = upper \notes { \global \clef "G"; - \type Staff < + \context Staff < {\voiceone \sop} {\voicetwo \alto} > \bar "|."; } -$lower_staff = \type Staff = lower \notes { +$lower_staff = \context Staff = lower \notes { \global \clef "F"; - \type Staff < + \context Staff < {\voiceone \tenor} {\voicetwo \bass } > diff --git a/mutopia/Hymns/passion.ly b/mutopia/Hymns/passion.ly index 5ac3f7ab38..be7e855c7a 100644 --- a/mutopia/Hymns/passion.ly +++ b/mutopia/Hymns/passion.ly @@ -5,7 +5,7 @@ composer = "J. S. Bach"; enteredby = "Peter Chubb"; } -\version "1.0.14"; +\version "1.0.16"; sop=\notes \transpose c'' { \repeat 2 { @@ -65,15 +65,15 @@ global=\notes{ \score{ < - \type Staff = "top" { + \context Staff = "top" { \clef "treble"; \global - \type Staff <{\voiceone \sop}{\voicetwo \alt} > + \context Staff <{\voiceone \sop}{\voicetwo \alt} > } - \type Staff = "bottom" { + \context Staff = "bottom" { \clef "bass"; \global - \type Staff < {\voiceone \ten}{\voicetwo \bass} > + \context Staff < {\voiceone \ten}{\voicetwo \bass} > } > diff --git a/mutopia/Hymns/stille.ly b/mutopia/Hymns/stille.ly index 96708ca2dd..825dfc202a 100644 --- a/mutopia/Hymns/stille.ly +++ b/mutopia/Hymns/stille.ly @@ -8,7 +8,7 @@ poet = "Joseph Mohr"; } -\version "1.0.14"; +\version "1.0.16"; global=\notes { \time 6/4; @@ -155,9 +155,9 @@ v3e = \lyrics { upper= \notes { - \type Staff = upper { + \context Staff = upper { \clef "treble"; \global - \type Staff < + \context Staff < { \voiceone \sop } { \voicetwo \alt } > @@ -165,9 +165,9 @@ upper= \notes { } lower = \notes { - \type Staff = lower { + \context Staff = lower { \clef "bass"; \global - \type Staff < + \context Staff < { \voicethree \ten } { \voicefour \bass } > @@ -175,13 +175,13 @@ lower = \notes { } \score { - \type ChoirStaff + \context ChoirStaff < - { \type Lyrics = top \chords } + { \context Lyrics = top \chords } \upper - { \type Lyrics = upper \v1 } - { \type Lyrics = upper \v2 } - { \type Lyrics = upper \v3 } + { \context Lyrics = upper \v1 } + { \context Lyrics = upper \v2 } + { \context Lyrics = upper \v3 } \lower > } diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index 810712d226..99c3c005c4 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -4,7 +4,7 @@ piece = "Allemande"; } -\version "1.0.14"; +\version "1.0.16"; global = \notes{ \time 4/4; @@ -27,7 +27,7 @@ hoyreEn = \notes\relative c'''{ [c16 d es8][f,16 es' d c][d es f8][g,16 f' es d] | [es16 f g8][as,16 g' f es][f g as8][b,16 as' g f] | %5 - \type Staff < { + \context Staff < { \stemup es4~ [es8. c16] d4~ [d8. b16] | c4.~ [c16 b] c4~ [c16 c bes as] | \stemboth [g c32 d es16 c][g8 as] \stemup bes4~ [bes8 g'~] | @@ -49,7 +49,7 @@ hoyreEn = \notes\relative c'''{ [bes d g bes~][bes fis g bes,][c es g bes~][bes fis g c,] | [d fis g bes~][bes fis g d][es fis g bes~][bes fis g bes] | [e a, bes fis][g bes a g][fis d es bes][c es d c] | - \type Staff < + \context Staff < { \stemup [bes8 d'][bes a16 g] g4~ g16 } { \stemup s2 s16 d8.~ d16 } { \stemdown r8 <[g d>] r16 [d16 b8~] b16 } @@ -73,7 +73,7 @@ hoyreEn = \notes\relative c'''{ [c8 es'( as, )g][d f'( as, )g] | [es g'( as, )g][f as'16( g][as g fis )g] | fis4.~ [fis16 e32 fis][g16 d f es][d c b a] | - \type Staff < + \context Staff < { \stemup [g8 g'][es d16 c] c4. } { \stemdown r8 <[g c> ] } > s8 @@ -90,7 +90,7 @@ venstreEn = \notes\relative c{ %5 [c8 es][f, as][b, d][es, g] | [as f][g g'][c, g'] - \type Staff < + \context Staff < { \stemup [c8 d] | es4 } { \stemdown c4 ~ | [c8. g32 f] } > @@ -107,7 +107,7 @@ venstreEn = \notes\relative c{ r8 cis8 [d a][fis d] | %16 [g16 a bes c][d8 d,] - \type Staff < + \context Staff < { \stemup r8 r16 d' g } { \stemdown g,4~ g16 } > @@ -134,12 +134,12 @@ venstreEn = \notes\relative c{ } \score{ - \type GrandStaff < - \type Staff = treble < + \context GrandStaff < + \context Staff = treble < \global \hoyreEn > - \type Staff = bass < + \context Staff = bass < \global \venstreEn > diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index d121ae998c..87bc4fdc06 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -10,7 +10,7 @@ %% %% Noe liknende skjer også i mellom andre og tredje stemme i takt 28 -\version "1.0.14"; +\version "1.0.16"; global = \notes{ \time 2/4; @@ -21,7 +21,7 @@ global = \notes{ \bar "|."; } -vOne = \type Voice = voiceOne \notes\relative c''{ +vOne = \context Voice = voiceOne \notes\relative c''{ r8 g c4~ | [c8 d16 c][b a g f] | [es8 g' d, f'] | @@ -142,7 +142,7 @@ vOne = \type Voice = voiceOne \notes\relative c''{ } -vTwo = \type Voice = voiceTwo \notes\relative c{ +vTwo = \context Voice = voiceTwo \notes\relative c{ es4 r8 es | f4 r8 bes | c4. b8 | @@ -263,7 +263,7 @@ vTwo = \type Voice = voiceTwo \notes\relative c{ \property Voice.hshift = 0 c4 b8 | } -vThree = \type Voice = voiceThree \notes\relative c{ +vThree = \context Voice = voiceThree \notes\relative c{ \stemdown c4 r8 c | d4 r | @@ -386,7 +386,7 @@ vThree = \type Voice = voiceThree \notes\relative c{ } -vOneSwitch = \type Voice = voiceOne \notes{ +vOneSwitch = \context Voice = voiceOne \notes{ s2*4 %5 \stemup s2*17 @@ -414,7 +414,7 @@ vOneSwitch = \type Voice = voiceOne \notes{ \stemboth } -vTwoSwitch = \type Voice = voiceTwo \notes{ +vTwoSwitch = \context Voice = voiceTwo \notes{ \stemup s2*4 %5 \stemdown \translator Staff = treble s2*17 @@ -449,7 +449,7 @@ vTwoSwitch = \type Voice = voiceTwo \notes{ \translator Staff = treble \stemdown s2*35 } -vThreeSwitch = \type Voice = voiceThree \notes{ +vThreeSwitch = \context Voice = voiceThree \notes{ \stemdown s2*6 %7 \stemboth s2*21 @@ -477,13 +477,13 @@ vThreeSwitch = \type Voice = voiceThree \notes{ } \score{ - \type GrandStaff< - \type Staff = treble < + \context GrandStaff< + \context Staff = treble < \global \vOneSwitch \vOne > - \type Staff = bass < + \context Staff = bass < \clef bass; \global \vTwoSwitch diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 891ff5acfe..7bd1dd7b5f 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -10,7 +10,7 @@ copyright = "Public Domain"; } -\version "1.0.14"; +\version "1.0.16"; global = \notes { \time 4/4; @@ -29,7 +29,7 @@ hoyreOpp = \notes\relative c'' { [as8. as16] [as16 g32 f g16. d32] es4 r16 [g g. as32] | %3 bes4 r16 [bes,16 bes. c32] [des8. des16] - \type Staff < + \context Staff < { \stemup e4 } { \stemup \property Voice.hshift = 1 [des16 c32 bes c16. g32] } > @@ -38,7 +38,7 @@ hoyreOpp = \notes\relative c'' { c4 ~ [c32 es des c des16. f32] [b,16. c32 b16. c32] d4 ~ | d2 ~ [d16. g,32 a16. b32] [c16. ] | <[es8. c> ] - \type Staff < + \context Staff < { \stemup fis4 } { \stemup \property Voice.hshift = 1 [es16 d32 c d16. a32] } > g2 @@ -66,7 +66,7 @@ venstreOpp = \notes\relative c' { r r16 <[as d,>] | %5 r16 <[g c,>] - \type Staff < + \context Staff < {\stemup f4~ f} {\stemup c4 d} > r16 [f f. g32] | @@ -79,7 +79,7 @@ venstreNed = \notes\relative c{ \stemdown c4 r c r | r c c r | c r r c | c r r16 [c c. bes32] bes4 | r16 [bes bes. as32] as4_"tr" g r16 [d' d. es32] | - \type Staff < + \context Staff < { \stemdown \property Voice.hshift = 1 [f8. f16] [b,8. b16] g4 r | } { \stemdown s4 g} > @@ -134,7 +134,7 @@ andanteEn = \notes\relative c''{ [bes'8-\fermata~ bes32 a g fis] [g bes a g fis e d c] [bes d c es d g fis e] [d c bes a bes d bes g] | r16 [e'32 fis fis16.-\prall \times 2/3 { e64 fis g] } - \type Staff < + \context Staff < { \stemup [bes,32 a g fis g32 bes16.~] [bes16 c32 bes a bes c a] [fis8. g16] } { \stemdown s8 g8 ~ g4 d} @@ -168,10 +168,10 @@ andanteTo = \notes\relative c{ %26 [c16 d32 es f g as bes] [c16 c, c'8~] [c32 c, d es f g as bes][c16 c, c'8~]| [c c,] [bes bes'] [fis d] [g es] | - \type Staff < + \context Staff < { \stemup r | cis4~ [cis8. cis16] [d8 c16 bes] - \type Staff < + \context Staff < { \stemup [a bes c8] } { \stemdown a4 } > | } @@ -248,7 +248,7 @@ allegroEn = \notes\relative c''{ [c g' c, bes] [c d e f] [es g c, bes] | [c g' f e] [f c f g] [as bes c d] | [es d c d] [es8 f16 g] [as8 des,] | [f b,] [d g,] [g'16 f es d] | - \type Staff < + \context Staff < { \stemup [es8. c16] c4 ~ [b8.-\prall c16] | c2-\fermata } { \stemdown r8 r16 | } > @@ -256,7 +256,7 @@ allegroEn = \notes\relative c''{ allegroTo = \notes\relative c'{ \clef bass; %30 - \type Staff < + \context Staff < { \stemup r r4 r } { \stemdown g,8 r8 r4 r } > @@ -320,13 +320,13 @@ allegroTo = \notes\relative c'{ } \score { - \type GrandStaff < - \type Staff = treble < + \context GrandStaff < + \context Staff = treble < \global { \hoyreOpp \andanteEn \allegroEn } \hoyreNed > - \type Staff = bass < + \context Staff = bass < \global { \venstreOpp \andanteTo \allegroTo } \venstreNed diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index 757db58c92..9659b5d23b 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -12,11 +12,11 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; -% upper = \type Staff \notes\relative c { -upper = \type Staff=upper \notes\relative c { - \type Voice=i +% upper = \context Staff \notes\relative c { +upper = \context Staff=upper \notes\relative c { + \context Voice=i \property Voice . textstyle = "italic" % rediculous dim... % r16\p_"legato"\< g''-1( c-3 )e-5 r g,-1( c )e @@ -41,7 +41,7 @@ upper = \type Staff=upper \notes\relative c { % ugh arpeggio < { \stemup f4 r } - \type Voice=ii { \stemdown r } + \context Voice=ii { \stemdown r } > \stemboth \translator Staff=lower\stemup @@ -78,16 +78,16 @@ upper = \type Staff=upper \notes\relative c { es-2 fis-3 a-4 c-5 < { \stemup r c8 b16 } - \type Voice=ii { \stemdown d,8 f-2 } + \context Voice=ii { \stemdown d,8 f-2 } > \stemboth | \bar "|."; } -% lower = \type Staff \notes\relative c{ -lower = \type Staff=lower \notes\relative c{ - \type Voice=i +% lower = \context Staff \notes\relative c{ +lower = \context Staff=lower \notes\relative c{ + \context Voice=i \property Voice . textstyle = "roman" c4-5 e-3 g-\mordent^"(\\textsharp)" g,4 | d'4-\mordent-5 f-3 a-\mordent^"(\\textsharp)" a,4 | @@ -100,7 +100,7 @@ lower = \type Staff=lower \notes\relative c{ g' r s s | s s s s \clef "bass"; | < { \stemup g1 ~ g ~ g ~ g ~ g ~ g ~ g } - \type Voice=ii { \stemdown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } + \context Voice=ii { \stemdown g,1 ~ g ~ g ~ g ~ g ~ g ~ g } > \bar "|."; @@ -112,12 +112,12 @@ global = \notes{ \score{ % Moderato - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \upper > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \lower diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 91b3d1eab8..1b6a870fd1 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -10,37 +10,37 @@ enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; -upper = \type Staff \notes\relative c{ - \type Voice=i +\version "1.0.16"; +upper = \context Staff \notes\relative c{ + \context Voice=i \property Voice . textstyle = "italic" r8\mf c'-1( e-2 g-4 e-2 c-1 bes'-5 g-3 | )a-4\< c,-1( f-2 a-4 f c c'-5 a-3 | )b-4 g-1( b-2 d-4 b-2 g f'-5 \!d-3 | < {\stemup )e2-4\f r4 e-5 } - \type Voice = ii {\stemdown r4 } + \context Voice = ii {\stemdown r4 } > \stemboth | < { \stemup d2-4 r4 d-4 } - \type Voice = ii { \stemdown r4 } + \context Voice = ii { \stemdown r4 } > \stemboth | < { \stemup d8 } - \type Voice = ii { \stemdown } + \context Voice = ii { \stemdown } > \stemboth g, 8-1\mf( b-2 d-4 < { \stemup )b 4 e-5 } - \type Voice = ii { \stemdown g, 4 b } + \context Voice = ii { \stemdown g, 4 b } > \stemboth | < { \stemup c2 r4 < {c-5 ~ c8} {a 4 ~ a 8} > } - \type Voice=ii { \stemdown c2 r4 e, 4 ~ e 8 } + \context Voice=ii { \stemdown c2 r4 e, 4 ~ e 8 } > \stemboth d,-1\p( fis-2 a-4 fis-2 d-1 c'-5 a-3 | @@ -49,7 +49,7 @@ upper = \type Staff \notes\relative c{ )fis-4 a,-1( c-2 fis-4 c a a'-5 \!fis-3 | < { \stemup )g2-5\f } - \type Voice = ii { \stemdown } + \context Voice = ii { \stemdown } > \stemboth r4 b4-2( | @@ -59,22 +59,22 @@ upper = \type Staff \notes\relative c{ g4-5\ff < { \stemup c,2-5 b 4-4 } - \type Voice=ii { \stemdown g 2-2 d 4-1 } + \context Voice=ii { \stemdown g 2-2 d 4-1 } > \stemboth < { \stemup c1^5 } - \type Voice=ii { \stemdown e, 1_1} + \context Voice=ii { \stemdown e, 1_1} > \stemboth \bar "|."; } -lower = \type Staff \notes\relative c{ - \type Voice=i +lower = \context Staff \notes\relative c{ + \context Voice=i < { \stemup c1 ~ | c ~ | c } - \type Voice=ii { \stemdown c,1 ~ | c ~ | c } + \context Voice=ii { \stemdown c,1 ~ | c ~ | c } > \stemboth | r8 c-5( e-3 g-1 e-3 c-5 c' e,-4 | @@ -100,12 +100,12 @@ global = \notes{ } \score{ - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \upper > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \lower diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 757de5889b..9e8c5b9bb2 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -8,10 +8,10 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; -one = \type Staff \notes\relative c { - \type Voice=i +one = \context Staff \notes\relative c { + \context Voice=i \property Voice . textstyle = "italic" % r16\p_"legato" r16\p @@ -69,8 +69,8 @@ one = \type Staff \notes\relative c { \bar "|."; } -two = \type Staff \notes\relative c{ - \type Voice=ii +two = \context Staff \notes\relative c{ + \context Voice=ii \stemup \property Voice . textstyle = "finger" fis4-1( e8-2 a4 a4 gis8-2 | @@ -116,7 +116,7 @@ two = \type Staff \notes\relative c{ \translator Staff=lower \stemup < { \stemup d8-2 a~ a4 } - \type Voice=ii { \stemdown a8-1 g fis16-2 e-1 fis-2 d-1 } + \context Voice=ii { \stemdown a8-1 g fis16-2 e-1 fis-2 d-1 } > \stemup g-1 fis-2 g-1 a-2 g-1 b-3 a-2 g-1 ~ | @@ -125,7 +125,7 @@ two = \type Staff \notes\relative c{ } three = \notes\relative c{ - \type Voice=iii + \context Voice=iii \stemdown d4-3 c-4 b e-3 | a16 a,-5\mf( cis-3 a-5 d-2 e-1 fis-2 d-4 @@ -161,9 +161,9 @@ three = \notes\relative c{ d a-2~ a16 a-2 b cis-2 d2 | } -four = \type Staff \notes\relative c{ +four = \context Staff \notes\relative c{ \skip 1*9; - \type Voice=iv + \context Voice=iv \stemup \property Voice.hshift = 1 %10 @@ -189,13 +189,13 @@ global = \notes{ \score{ % Allegretto - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \one \four > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \two diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 7073930a1e..30d30a0bde 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -8,12 +8,12 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; -upper = \type Staff \notes\relative c{ +upper = \context Staff \notes\relative c{ \property Voice . textstyle = "italic" - \type Voice=i + \context Voice=i % d'8-1\p a'-5-"legato" f-3 d-1 a'-5 f-3 | d'8-1\p a'-5 f-3 d-1 a'-5 f-3 | d-1 a'-5 f-3 d-1 a'-5 f-3 | @@ -35,7 +35,7 @@ upper = \type Staff \notes\relative c{ c4-\mordent^"(\\textsharp)" r r \property Voice . textstyle = "italic" } - \type Voice=ii { \stemdown a4 r r | a4 r r } + \context Voice=ii { \stemdown a4 r r | a4 r r } > | \stemboth a'8\mf( es-3\> d c bes!-3 a | @@ -55,7 +55,7 @@ upper = \type Staff \notes\relative c{ % cis8-\prall e8-5-"poco cresc." cis-3 a e' cis cis8-\prall e8-5 cis-3 a e' cis } - \type Voice=ii { \stemdown a4 } + \context Voice=ii { \stemdown a4 } > \stemboth a8 e'-5 cis a bes!-3 a | @@ -94,7 +94,7 @@ upper = \type Staff \notes\relative c{ \stemup f4-4\> ~ | [\!f8 e] [e32-4 f e8.] ~ [e8 d-3] } - \type Voice=ii { \stemdown r4 cis-2 } + \context Voice=ii { \stemdown r4 cis-2 } > | \stemboth d8-4 c!-3 a-1 d-4 bes-2 g-1 | @@ -104,14 +104,14 @@ upper = \type Staff \notes\relative c{ a-5 fis d g-5 e cis-2 | < { \stemup } - \type Voice=ii { \stemdown [d32( cis d8.] ~ ) d2 } + \context Voice=ii { \stemdown [d32( cis d8.] ~ ) d2 } > | \bar "|."; } -lower = \type Staff \notes\relative c{ - \type Voice=i +lower = \context Staff \notes\relative c{ + \context Voice=i % d32( cis )d8. r4 r | d4-\mordent r r | d,4 r r | @@ -186,12 +186,12 @@ global = \notes{ \score{ % Moderato - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \upper > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \lower diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index dd1472ae6a..040a27c6a2 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -8,11 +8,11 @@ composer = "Johann Sebastian Bach (1685-1750)"; enteredby = "jcn"; copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; -one = \type Staff \notes\relative c{ - \type Voice=i +one = \context Staff \notes\relative c{ + \context Voice=i \skip 1; | \stemup r4 d''2-5( cis4-4 | @@ -33,8 +33,8 @@ one = \type Staff \notes\relative c{ \bar "|."; } -two = \type Staff \notes\relative c{ - \type Voice=ii +two = \context Staff \notes\relative c{ + \context Voice=ii r16\p d''-5( c-4 bes-3 a-2 bes-3 f-1 g-2 a8.-\mordent bes16-1 g8.-\prall f16-1 | \stemdown @@ -53,8 +53,8 @@ two = \type Staff \notes\relative c{ fis1-2 } -three = \type Staff \notes\relative c{ - \type Voice=iii +three = \context Staff \notes\relative c{ + \context Voice=iii \stemup f2-1( e-2 | \stemboth @@ -76,8 +76,8 @@ three = \type Staff \notes\relative c{ \bar "|."; } -four = \type Staff \notes\relative c{ - \type Voice=iv +four = \context Staff \notes\relative c{ + \context Voice=iv \stemdown d2-3 cis-4 | \skip 1*3; | @@ -103,13 +103,13 @@ global = \notes{ \score{ % Allegretto - \type GrandStaff < - \type Staff = upper < + \context GrandStaff < + \context Staff = upper < \global \one \two > - \type Staff = lower < + \context Staff = lower < \global \clef "bass"; \three diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly index 40ba14ccd4..229585501f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "allemande-urtext.ly"; @@ -42,7 +42,7 @@ allemande_cello_global = \notes{ allemande_cello_scripts = \notes{ } -allemande_cello_staff = \type Staff < +allemande_cello_staff = \context Staff < \$allemande \$allemande_cello_global \$allemande_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly index 401eccfdc4..f6e37ada8c 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-urtext.ly @@ -11,8 +11,8 @@ n = { \slurnormal } d = { \slurdotted } comma = "\\sethuge\\ \\ ," -allemande_a = \type Staff \notes \relative c { - \type Voice=i +allemande_a = \context Staff \notes \relative c { + \context Voice=i \stemup a'16 | a8 bes16()a \stemboth @@ -70,7 +70,7 @@ allemande_a = \type Staff \notes \relative c { } allemande_b = \notes \relative c { - \type Voice=ii + \context Voice=ii \stemdown s16 | % s8 s2. | @@ -98,9 +98,10 @@ allemande_b = \notes \relative c { % } } -allemande = \type Staff \notes< +allemande = \context Staff \notes< \$allemande_a \$allemande_b > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly index f7474f22d7..e59035d9a8 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/allemande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "allemande-urtext.ly"; @@ -42,7 +42,7 @@ allemande_viola_global = \notes{ allemande_viola_scripts = \notes{ } -allemande_viola_staff = \type Staff < +allemande_viola_staff = \context Staff < \notes \transpose c'' \$allemande \$allemande_viola_global \$allemande_viola_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly index 9b29acde14..4ef6fb8f48 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "courante-urtext.ly"; @@ -43,7 +43,7 @@ courante_cello_global = \notes{ courante_cello_scripts = \notes{ } -courante_cello_staff = \type Staff < +courante_cello_staff = \context Staff < \$courante \$courante_cello_global \$courante_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly index e665ec7b1b..25d8b797f2 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-urtext.ly @@ -10,8 +10,8 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts). n = { \slurnormal } d = { \slurdotted } -courante_a = \type Staff \notes \relative c { - \type Voice=i +courante_a = \context Staff \notes \relative c { + \context Voice=i d'16 | d a f a d, f g a \d bes()a bes()g | \stemup s4 \stemboth \d g16()f g()e | @@ -62,7 +62,7 @@ courante_a = \type Staff \notes \relative c { } courante_b = \notes \relative c { - \type Voice=ii + \context Voice=ii \stemdown s16 | s2. | @@ -86,8 +86,9 @@ courante_b = \notes \relative c { s2 s8. } -courante = \type Staff \notes< +courante = \context Staff \notes< \$courante_a \$courante_b > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly index ee0f6c4f9e..3205773dcb 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/courante-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "courante-urtext.ly"; @@ -43,7 +43,7 @@ courante_viola_global = \notes{ courante_viola_scripts = \notes{ } -courante_viola_staff = \type Staff < +courante_viola_staff = \context Staff < \notes \transpose c' \$courante \$courante_viola_global \$courante_viola_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly index a60db7abd6..439eed58ab 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "gigue-urtext.ly"; @@ -41,7 +41,7 @@ gigue_cello_global = \notes{ gigue_cello_scripts = \notes{ } -gigue_cello_staff = \type Staff < +gigue_cello_staff = \context Staff < \$gigue \$gigue_cello_global \$gigue_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly index 87aa2b5553..ebffb4bbbf 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-urtext.ly @@ -16,8 +16,8 @@ d = { \slurdotted } % * slurs/ties in two different threads (like beams): urtext, and additionals % -gigue_notes = \type Staff \notes \relative c { - \type Voice=i +gigue_notes = \context Staff \notes \relative c { + \context Voice=i a'8 | d,4 bes'8 | cis,4 g'8 | f16 e f g a8 | d,4 d'8 | e,16(f)g8 bes | c,16(d)e8 c' | a16 g a bes c a | @@ -72,8 +72,8 @@ gigue_notes = \type Staff \notes \relative c { d4 } -gigue_b = \type Staff \notes \relative c { - \type Voice=ii +gigue_b = \context Staff \notes \relative c { + \context Voice=ii \stemdown s8 s4.*14 @@ -97,7 +97,7 @@ gigue_b = \type Staff \notes \relative c { } -gigue_a = \type Voice \notes< +gigue_a = \context Voice \notes< \$gigue_notes > @@ -106,3 +106,4 @@ gigue = \notes< \$gigue_b > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly index ab4becc7b8..72be38e830 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/gigue-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "gigue-urtext.ly"; @@ -41,7 +41,7 @@ gigue_viola_global = \notes{ gigue_viola_scripts = \notes{ } -gigue_viola_staff = \type Staff < +gigue_viola_staff = \context Staff < \notes \transpose c' \$gigue \$gigue_viola_global \$gigue_viola_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly index 94da30920d..d7003409d4 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-cello.ly @@ -16,7 +16,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "menuetto-urtext.ly"; @@ -35,7 +35,7 @@ menuetto_i_cello_global = \notes{ } menuetto_i_cello_scripts = \notes{ - \type Voice=i + \context Voice=i s2. s8^"~"^1_2_4 s8 s4 s^4 s4^0_1 s_4 s @@ -55,7 +55,7 @@ menuetto_i_cello_scripts = \notes{ s8^2_3 s s s^1 s4^1 } -menuetto_i_cello_staff = \type Staff < +menuetto_i_cello_staff = \context Staff < \$menuetto_i \$menuetto_i_cello_global % \$menuetto_i_cello_scripts @@ -90,7 +90,7 @@ menuetto_ii_cello_global = \notes{ } -menuetto_ii_cello_staff = \type Staff < +menuetto_ii_cello_staff = \context Staff < \$menuetto_ii \$menuetto_ii_cello_global % \$menuetto_ii_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly index 7786b53df7..e351e611f4 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-urtext.ly @@ -7,8 +7,8 @@ Well, there are still some scripts in this "urtext". But merging melodic and scripts doen't work too well yet (see viola_scripts). %} -menuetto_i_a = \type Staff \notes \relative c { - \type Voice=i +menuetto_i_a = \context Staff \notes \relative c { + \context Voice=i bes'4 | bes8 a bes g a4 | g f8 e | @@ -41,8 +41,8 @@ menuetto_i_a = \type Staff \notes \relative c { | } -menuetto_i_b = \type Staff \notes \relative c { - \type Voice = ii +menuetto_i_b = \context Staff \notes \relative c { + \context Voice = ii \stemdown \slurdotted \skip 2.*1; | @@ -72,7 +72,7 @@ menuetto_i_b = \type Staff \notes \relative c { % UGH, fix this like in sarabande menuetto_i_a_voice_urg = \notes{ - \type Voice = i + \context Voice = i \skip 2.*1; \stemup \skip 2.*1; \stemboth \skip 2.*1; \stemup @@ -100,7 +100,7 @@ menuetto_i_a_voice_urg_urg = \notes< > menuetto_i_b_voice_urg = \notes{ - \type Voice=ii + \context Voice=ii \stemdown % urg urg, huh? \skip 2.*8; \stemdown @@ -111,13 +111,13 @@ menuetto_i_b_voice_urg_urg = \notes< \$menuetto_i_b > -menuetto_i = \type Staff \notes< +menuetto_i = \context Staff \notes< { \$menuetto_i_a_voice_urg_urg } { \$menuetto_i_b_voice_urg_urg } > -menuetto_ii = \type Staff\notes \relative c { - \type Voice=i +menuetto_ii = \context Staff\notes \relative c { + \context Voice=i \slurdotted fis4^\trill d8( e fis )g | a4 fis, a' | @@ -156,3 +156,4 @@ menuetto_ii = \type Staff\notes \relative c { d2. } +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly index a1ff358dd3..8a2e3de470 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/menuetto-viola.ly @@ -17,7 +17,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "menuetto-urtext.ly"; @@ -39,7 +39,7 @@ menuetto_i_viola_global = \notes{ } menuetto_i_viola_scripts = \notes{ - \type Voice=i + \context Voice=i s2. s8^"~"^1_2_4 s8*5 s2.*5 @@ -54,7 +54,7 @@ menuetto_i_viola_scripts = \notes{ s4-\downbow s4-\upbow } -menuetto_i_viola_staff = \type Staff < +menuetto_i_viola_staff = \context Staff < \notes \transpose c' \$menuetto_i \$menuetto_i_viola_global % \$menuetto_i_viola_scripts @@ -88,7 +88,7 @@ menuetto_ii_viola_global = \notes{ } } -menuetto_ii_viola_staff = \type Staff < +menuetto_ii_viola_staff = \context Staff < \notes \transpose c' \$menuetto_ii \$menuetto_ii_viola_global % \$menuetto_ii_viola_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly index 11eea31cc5..858a55d4ae 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "prelude-urtext.ly"; @@ -30,7 +30,7 @@ prelude_cello_global = \notes{ prelude_cello_scripts = \notes{ } -prelude_cello_staff = \type Staff < +prelude_cello_staff = \context Staff < \$prelude \$prelude_cello_global \$prelude_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly index 36cd78f859..e03d4d7030 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-urtext.ly @@ -8,7 +8,7 @@ But merging melodic and scripts doen't work too well yet see viola_scripts . %} prelude_notes = \notes \relative c { - \type Voice=i + \context Voice=i d8 f a4 ~ a16 f e d | cis e g a bes4 ~ bes16 a g f | e g bes cis e8. bes16 a16 g f e | @@ -89,7 +89,7 @@ prelude_notes = \notes \relative c { } prelude_b = \notes \relative c { - \type Voice=ii + \context Voice=ii \stemdown s2.*47 %48 @@ -118,7 +118,7 @@ fig5 = \notes{ \slurnormal s8.()s16 } % of course, i just type fig1, and add the \ and the silly $ later prelude_slurs = \notes{ - \type Voice=i + \context Voice=i s4 s4 \$fig3 | \$fig1 s4 \$fig3 | \$fig1 s4 \$fig3 | @@ -200,7 +200,7 @@ fig5 = \notes{ \slurdotted s8.()s16 } fig6 = \notes{ \slurdotted s16()s \slurdotted s()s } prelude_suggested_slurs = \notes{ - \type Voice=i + \context Voice=i \slurdotted s2. | s2. | @@ -275,8 +275,9 @@ prelude_a = \notes< \$prelude_suggested_slurs > -prelude = \type Staff \notes< +prelude = \context Staff \notes< \$prelude_a \$prelude_b > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly index 542888a99b..47816c7ac6 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/prelude-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "prelude-urtext.ly"; @@ -30,7 +30,7 @@ prelude_viola_global = \notes{ prelude_viola_scripts = \notes{ } -prelude_viola_staff = \type Staff < +prelude_viola_staff = \context Staff < \notes \transpose c' \$prelude \$prelude_viola_global \$prelude_viola_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly index 9abe3b887e..e7e8cd846f 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-cello.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "sarabande-urtext.ly"; @@ -33,7 +33,7 @@ sarabande_cello_global = \notes{ sarabande_cello_scripts = \notes{ } -sarabande_cello_staff = \type Staff < +sarabande_cello_staff = \context Staff < \$sarabande \$sarabande_cello_global \$sarabande_cello_scripts diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly index 0ff1a86066..2cf94f0089 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-urtext.ly @@ -10,8 +10,8 @@ But merging melodic and scripts doen't work too well yet (see viola_scripts). n = { \slurnormal } d = { \slurdotted } -sarabande_a = \type Staff \notes \relative c { - \type Voice=i +sarabande_a = \context Staff \notes \relative c { + \context Voice=i \stemup \d d8.()e16 e4.-\trill( d16 )e | f4. \stemboth e8(d)c | bes g' \n f e16(f g a bes)d, | @@ -49,8 +49,8 @@ sarabande_a = \type Staff \notes \relative c { d4 d,,2 | } -sarabande_b = \type Staff \notes \relative c { - \type Voice=ii +sarabande_b = \context Staff \notes \relative c { + \context Voice=ii \stemdown % dispute % d4 a2 | @@ -87,8 +87,9 @@ sarabande_b = \type Staff \notes \relative c { } -sarabande = \type Staff \notes< +sarabande = \context Staff \notes< \$sarabande_a \$sarabande_b > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly index 9c1cea87a6..cdefd2bacc 100644 --- a/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly +++ b/mutopia/J.S.Bach/Solo-Cello-Suites/sarabande-viola.ly @@ -15,7 +15,7 @@ copyright = "public domain"; dotted slurs %} -\version "1.0.14"; +\version "1.0.16"; \include "sarabande-urtext.ly"; @@ -33,7 +33,7 @@ sarabande_viola_global = \notes{ sarabande_viola_scripts = \notes{ } -sarabande_viola_staff = \type Staff < +sarabande_viola_staff = \context Staff < \notes \transpose c' \$sarabande \$sarabande_viola_global \$sarabande_viola_scripts diff --git a/mutopia/J.S.Bach/viola-i.ly b/mutopia/J.S.Bach/viola-i.ly index e36eb7a01b..9d6ea2e36f 100644 --- a/mutopia/J.S.Bach/viola-i.ly +++ b/mutopia/J.S.Bach/viola-i.ly @@ -11,8 +11,9 @@ copyright = "Public Domain"; \include "global-i.ly" \include "violoncello-i.ly"; -$viola_i_staff = \type Staff = viola < +$viola_i_staff = \context Staff = viola < \notes\transpose c'' \$violoncello_i \clef alto; \$global_i > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/violino-i.ly b/mutopia/J.S.Bach/violino-i.ly index f365d06a7b..c6791b7e2e 100644 --- a/mutopia/J.S.Bach/violino-i.ly +++ b/mutopia/J.S.Bach/violino-i.ly @@ -28,7 +28,7 @@ $violino_i = \notes\relative c'' { \include "global-i.ly" -$violino_i_staff = \type Staff = violino < +$violino_i_staff = \context Staff = violino < < %urg % \notes\property Voice.textstyle = "large" s4^"Moderato" @@ -37,3 +37,4 @@ $violino_i_staff = \type Staff = violino < > \$global_i > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/violino-viola.ly b/mutopia/J.S.Bach/violino-viola.ly index c6cb61238f..81f1c35556 100644 --- a/mutopia/J.S.Bach/violino-viola.ly +++ b/mutopia/J.S.Bach/violino-viola.ly @@ -12,7 +12,7 @@ copyright = "Public Domain"; \include "viola-i.ly"; \score{ - \type GrandStaff < + \context GrandStaff < \$violino_i_staff \$viola_i_staff > @@ -30,3 +30,4 @@ copyright = "Public Domain"; } } +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/violino-violoncello.ly b/mutopia/J.S.Bach/violino-violoncello.ly index 0f8791a743..5d0fb5931b 100644 --- a/mutopia/J.S.Bach/violino-violoncello.ly +++ b/mutopia/J.S.Bach/violino-violoncello.ly @@ -12,7 +12,7 @@ copyright = "Public Domain"; \include "violoncello-i.ly"; \score{ - \type GrandStaff < + \context GrandStaff < \$violino_i_staff \$violoncello_i_staff > @@ -30,3 +30,4 @@ copyright = "Public Domain"; } } +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/violoncello-i.ly b/mutopia/J.S.Bach/violoncello-i.ly index d0c82d60a5..c886a77fa3 100644 --- a/mutopia/J.S.Bach/violoncello-i.ly +++ b/mutopia/J.S.Bach/violoncello-i.ly @@ -23,8 +23,9 @@ $violoncello_i = \notes\relative c{ \include "global-i.ly" -$violoncello_i_staff = \type Staff = violoncello < +$violoncello_i_staff = \context Staff = violoncello < \$violoncello_i \clef bass; \$global_i > +\version "1.0.16"; diff --git a/mutopia/J.S.Bach/wtk1-fugue1.ly b/mutopia/J.S.Bach/wtk1-fugue1.ly index 229e4165cd..811c309f50 100644 --- a/mutopia/J.S.Bach/wtk1-fugue1.ly +++ b/mutopia/J.S.Bach/wtk1-fugue1.ly @@ -11,7 +11,7 @@ copyright = "Public Domain"; %{ %} -\version "1.0.14"; +\version "1.0.16"; global = @@ -183,13 +183,13 @@ bass = \score { - \notes \type GrandStaff < - \type Staff = one < + \notes \context GrandStaff < + \context Staff = one < \global \soprane \tenor > - \type Staff = two < + \context Staff = two < \global \alt \bass diff --git a/mutopia/J.S.Bach/wtk1-fugue2.ly b/mutopia/J.S.Bach/wtk1-fugue2.ly index 187bb83512..c8a4f036bf 100644 --- a/mutopia/J.S.Bach/wtk1-fugue2.ly +++ b/mutopia/J.S.Bach/wtk1-fugue2.ly @@ -19,7 +19,7 @@ * auto beaming %} -\version "1.0.14"; +\version "1.0.16"; \include "nederlands.ly" % for correct parsing of note names @@ -31,7 +31,7 @@ global = \notes { \bar "|."; | } -dux = \type Voice=two \notes \relative c''{ +dux = \context Voice=two \notes \relative c''{ \voicetwo \clef violin; @@ -83,7 +83,7 @@ dux = \type Voice=two \notes \relative c''{ } -comes = \type Voice=one \notes \relative c'' { +comes = \context Voice=one \notes \relative c'' { \voiceone R1 | R1 | @@ -124,7 +124,7 @@ comes = \type Voice=one \notes \relative c'' { f,16 g as4 g16 f e2 | } -bassdux = \type Voice=three \notes \relative c' { +bassdux = \context Voice=three \notes \relative c' { \clef bass; R1 | R | @@ -163,21 +163,21 @@ bassdux = \type Voice=three \notes \relative c' { f,16 g as4 g16 f es4 r8 es' | d c g' g, %%30 - \type Staff=bass < + \context Staff=bass < {\stemup c2 ~ | c1 ~ | c1 } - \type Voice=four {\stemdown c,2 ~ | c1 ~ | c1 } + \context Voice=four {\stemdown c,2 ~ | c1 ~ | c1 } > } \score { - \type PianoStaff < - \type Staff = treble < + \context PianoStaff < + \context Staff = treble < \global \dux \comes > - \type Staff = bass < + \context Staff = bass < \global \bassdux > diff --git a/mutopia/J.S.Bach/wtk1-prelude1.ly b/mutopia/J.S.Bach/wtk1-prelude1.ly index 0070af7015..de30f92b85 100644 --- a/mutopia/J.S.Bach/wtk1-prelude1.ly +++ b/mutopia/J.S.Bach/wtk1-prelude1.ly @@ -8,7 +8,7 @@ enteredby = "Shay Rojansky"; copyright = "Public Domain"; } -\version "1.0.14"; +\version "1.0.16"; global = \notes { @@ -22,7 +22,7 @@ soprane = \notes \transpose c'' { \clef "violin"; - \type Staff < + \context Staff < % Real soprane {\stemup r8 [g16 c'] [e' g c' e'] r8 [g16 c'] [e' g c' e'] | @@ -93,7 +93,7 @@ bass = b b | a a | %% 10 - \type Staff < + \context Staff < % Alt {\stemup r16 a8. ~ a4 r16 a8. ~ a4 | @@ -161,7 +161,7 @@ bass = \score { - \notes \type GrandStaff < + \notes \context GrandStaff < < \global \soprane diff --git a/mutopia/L.Mozart/sinfonia.ly b/mutopia/L.Mozart/sinfonia.ly index f7d2ed9589..a95eefa960 100644 --- a/mutopia/L.Mozart/sinfonia.ly +++ b/mutopia/L.Mozart/sinfonia.ly @@ -47,7 +47,7 @@ tempi = \notes{ } dynamics = \notes{ - \type Voice=i + \context Voice=i s16\f s8. s4 | s2*17 s8\p s4. | s8\f s4. | s2*4 s8\p s4. | s8\f s4. | s2*29 @@ -61,7 +61,7 @@ dynamics = \notes{ violinoi = \notes \relative c'{ - \type Voice=i + \context Voice=i \clef "violin"; \stemup [ g'' g g] \stemboth | [g16 a b a] [g a b a] | @@ -156,7 +156,7 @@ violinoi = \notes \relative c'{ } violinoii = \notes \relative c'{ - \type Voice=i + \context Voice=i \clef "violin"; \stemup [ g'' g g] \stemboth | [b,16 c d c] [b c d c] | \stemup [ g'' g g] \stemboth | [b,16 c d c] [b c d c] | @@ -250,7 +250,7 @@ violinoii = \notes \relative c'{ } viola = \notes \relative c'{ - \type Voice=i + \context Voice=i \clef "alto"; [b16 c d c] [b c d c] | [b8 b b b] | [b16 c d c] [b c d c] | [b8 b b b] | @@ -312,7 +312,7 @@ viola = \notes \relative c'{ } bassocontinuo = \notes \relative c'{ - \type Voice=i + \context Voice=i \clef "bass"; [g16 a b a] [g a b a] | [g8 g, g g'] | [g16 a b a] [g a b a] | [g8 g, g g'] | @@ -367,12 +367,12 @@ bassocontinuo = \notes \relative c'{ \score{ - \type StaffGroup < - \type Staff = i < %\tempi + \context StaffGroup < + \context Staff = i < %\tempi \global \dynamics \violinoi > - \type Staff = ii < \global \dynamics \violinoii > - \type Staff = iii < \global \dynamics \viola > - \type Staff = iv < \global \dynamics \bassocontinuo > + \context Staff = ii < \global \dynamics \violinoii > + \context Staff = iii < \global \dynamics \viola > + \context Staff = iv < \global \dynamics \bassocontinuo > > \header{ piece="I. Allegro"; @@ -383,3 +383,4 @@ bassocontinuo = \notes \relative c'{ \midi{ \tempo 4 = 100; } } +\version "1.0.16"; diff --git a/mutopia/N.W.Gade/brass.ly b/mutopia/N.W.Gade/brass.ly index 53fadb17a9..6c16906799 100644 --- a/mutopia/N.W.Gade/brass.ly +++ b/mutopia/N.W.Gade/brass.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; corI=\notes\relative c'' { \key c; diff --git a/mutopia/N.W.Gade/parts.ly b/mutopia/N.W.Gade/parts.ly index 70e425f0a5..f505db6842 100644 --- a/mutopia/N.W.Gade/parts.ly +++ b/mutopia/N.W.Gade/parts.ly @@ -8,7 +8,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + "Statens Musikbibliotek, Stockholm, Sweden"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "wood.ly" @@ -35,7 +35,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \oboe @@ -54,7 +54,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \flauto @@ -73,7 +73,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \clarI @@ -91,7 +91,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \clarII @@ -109,7 +109,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \fagotto @@ -127,7 +127,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \corI @@ -146,7 +146,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \corII @@ -165,7 +165,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \trpI @@ -184,7 +184,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \trpII @@ -203,7 +203,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \globalNoKey \marks \timpani @@ -222,7 +222,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \viI @@ -240,7 +240,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \viII @@ -258,7 +258,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \notes{s2.*32 s2*142 \break} @@ -277,7 +277,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \vlc @@ -295,7 +295,7 @@ my_paper = \paper { } \score{ - \type Staff < + \context Staff < \global \marks \cb diff --git a/mutopia/N.W.Gade/score.ly b/mutopia/N.W.Gade/score.ly index 46e22ec750..fc2c96224d 100644 --- a/mutopia/N.W.Gade/score.ly +++ b/mutopia/N.W.Gade/score.ly @@ -8,7 +8,7 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + "Statens Musikbibliotek, Stockholm, Sweden"; } -\version "1.0.14"; +\version "1.0.16"; \include "global.ly" \include "wood.ly" @@ -18,90 +18,90 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + \score{ < - \type StaffGroup = wood < - \type Staff = flauto < + \context StaffGroup = wood < + \context Staff = flauto < \property Staff.instrument = "Flauto" \property Staff.instr = "Fl." \global \flauto > - \type Staff = oboe < + \context Staff = oboe < \property Staff.instrument = "Oboe" \property Staff.instr = "Ob." \global \marks \oboe > - \type Staff = clarI < + \context Staff = clarI < \property Staff.instrument = "Clarinetto I" \property Staff.instr = "Cl. I" \globalNoKey \clarI > - \type Staff = clarII < + \context Staff = clarII < \property Staff.instrument = "Clarinetto II" \property Staff.instr = "Cl. II" \globalNoKey \clarII > - \type Staff = fagotto < + \context Staff = fagotto < \property Staff.instrument = "Fagotto" \property Staff.instr = "Fg." \global \fagotto > > - \type StaffGroup = brass < - \type Staff = cor < + \context StaffGroup = brass < + \context Staff = cor < \globalNoKey \property Staff.instrument = "2 Corni in F" \property Staff.instr = "Cor." - \type Voice = corI { \stemup \corI } - \type Voice = corII { \stemdown \corII } + \context Voice = corI { \stemup \corI } + \context Voice = corII { \stemdown \corII } > - \type Staff = trp < + \context Staff = trp < \globalNoKey \property Staff.instrument = "2 Trp. in B\\textflat " \property Staff.instr = "Trp." - \type Voice = trpI { \stemup \trpI } - \type Voice = trpII { \stemdown \trpII } + \context Voice = trpI { \stemup \trpI } + \context Voice = trpII { \stemdown \trpII } > > - \type StaffGroup = percussion <\type Staff = timpani < + \context StaffGroup = percussion <\context Staff = timpani < \property Staff.instrument = "Timpani" \property Staff.instr = "Timp." \global \timpani > > - \type StaffGroup = strings < -% \type GrandStaff = violins < - \type Staff = viI < + \context StaffGroup = strings < +% \context GrandStaff = violins < + \context Staff = viI < \property Staff.instrument = "Violin I" \property Staff.instr = "Vi. I" \global \viI > - \type Staff = viII < + \context Staff = viII < \property Staff.instrument = "Violin II" \property Staff.instr = "Vi. II" \global \viII > % > - \type Staff = vla < + \context Staff = vla < \property Staff.instrument = "Viola" \property Staff.instr = "Vla." \global \vla > - \type Staff = vlc < + \context Staff = vlc < \property Staff.instrument = "Violoncello" \property Staff.instr = "Vlc" \global \vlc > - \type Staff = cb < + \context Staff = cb < \property Staff.instrument = "Contrabasso" \property Staff.instr = "C.B." \global @@ -133,19 +133,19 @@ copyright = "Mats Bengtsson, 1999. Free circulation permitted and " + } \score{ - \type StaffGroup < - \type Staff = oboe \oboe - \type Staff = flauto \flauto - \type Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >} - \type Staff = fagotto \fagotto - \type Staff = corniInF {\notes \transpose f <\corI \corII >} - \type Staff = trumpetsInBes {\notes \transpose bes <\trpI \trpII >} - \type Staff = timpani \timpani - \type Staff = violinoi \viI - \type Staff = violinoii \viII - \type Staff = viola \vla - \type Staff = violoncello \vlc - \type Staff = contrabass \cb + \context StaffGroup < + \context Staff = oboe \oboe + \context Staff = flauto \flauto + \context Staff = clarinetsInBes {\notes \transpose bes <\clarI \clarII >} + \context Staff = fagotto \fagotto + \context Staff = corniInF {\notes \transpose f <\corI \corII >} + \context Staff = trumpetsInBes {\notes \transpose bes <\trpI \trpII >} + \context Staff = timpani \timpani + \context Staff = violinoi \viI + \context Staff = violinoii \viII + \context Staff = viola \vla + \context Staff = violoncello \vlc + \context Staff = contrabass \cb > \midi { \tempo 4=120; diff --git a/mutopia/N.W.Gade/strings.ly b/mutopia/N.W.Gade/strings.ly index 31a6655e2b..94d79324b9 100644 --- a/mutopia/N.W.Gade/strings.ly +++ b/mutopia/N.W.Gade/strings.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; viI=\notes\relative c'' { @@ -67,7 +67,7 @@ a4 \> ) g | \! a2 ( | [a8_"dim." g f d] | <{[b g ][a ) g ] |} - \type Voice=x {s8.. \tiny b8}> + \context Voice=x {s8.. \tiny b8}> R2 | r4 r8 a'-. \mf | [a-. \< a-. a-. \! a-. ] | @@ -567,7 +567,7 @@ vla=\notes\relative c' { \property Staff."midi_instrument" = "viola" [c8. \f ( d16 ] ) c2_"dim." | -\type Staff <{\voiceone s4 c2 | +\context Staff <{\voiceone s4 c2 | c2. ~ | c2. ~ | c2. ~ | diff --git a/mutopia/N.W.Gade/wood.ly b/mutopia/N.W.Gade/wood.ly index ee1af5bc73..6907277f2b 100644 --- a/mutopia/N.W.Gade/wood.ly +++ b/mutopia/N.W.Gade/wood.ly @@ -1,4 +1,4 @@ -\version "1.0.14"; +\version "1.0.16"; oboe=\notes\relative c'' { \clef "treble"; @@ -429,7 +429,7 @@ b4 a | b2 ~ | [b8_"dim." a g ) e ] | <{[cis ( a ) b a-. ] | } - \type Voice = x {s8.. \tiny cis8 } > + \context Voice = x {s8.. \tiny cis8 } > [fis''-. f-. f-. e-. ] | [e-. \< dis-. dis-. \! d-. ] | d r b4 \f ~ | diff --git a/mutopia/W.A.Mozart/cadenza.ly b/mutopia/W.A.Mozart/cadenza.ly index 6f32f626cd..12f88e3f50 100644 --- a/mutopia/W.A.Mozart/cadenza.ly +++ b/mutopia/W.A.Mozart/cadenza.ly @@ -13,12 +13,12 @@ Tested Features: cadenza mode Ugh.. Wish we had grace notes.... It adds another dimension to this piece of music. %} -\version "1.0.14"; +\version "1.0.16"; cad = \notes \relative c' { \property Score.instrument = "french horn" - \type Staff { + \context Staff { \cadenza 1; \grouping 1*4; diff --git a/mutopia/W.A.Mozart/horn-concerto-3.ly b/mutopia/W.A.Mozart/horn-concerto-3.ly index b7068d337a..9df0fa7a3e 100644 --- a/mutopia/W.A.Mozart/horn-concerto-3.ly +++ b/mutopia/W.A.Mozart/horn-concerto-3.ly @@ -9,7 +9,7 @@ copyright = "public domain"; } -\version "1.0.14"; +\version "1.0.16"; allegro = \notes diff --git a/mutopia/gallina.ly b/mutopia/gallina.ly index 14ca956127..e1821b98a4 100644 --- a/mutopia/gallina.ly +++ b/mutopia/gallina.ly @@ -45,7 +45,7 @@ Voice engraver by uncommenting the lines in the paper definition below. --MB %} -\version "1.0.14"; +\version "1.0.16"; global = \notes { \property StaffGroup.timeSignatureStyle = "old" @@ -61,7 +61,7 @@ global = \notes { \tempo 4=80; } -vi1=\type Staff = vi1 < +vi1=\context Staff = vi1 < \global \notes \relative c'' { @@ -133,7 +133,7 @@ vi1=\type Staff = vi1 < } }> -vi2=\type Staff = vi2 < +vi2=\context Staff = vi2 < \global \notes \relative c'' { @@ -203,7 +203,7 @@ vi2=\type Staff = vi2 < }> -bc=\type Staff = bc < +bc=\context Staff = bc < \global \notes\transpose c'{ \clef "bass"; @@ -250,7 +250,7 @@ bc=\type Staff = bc < }> \score{ - \type StaffGroup < + \context StaffGroup < \vi1 \vi2 \bc diff --git a/mutopia/los-toros-oboe.ly b/mutopia/los-toros-oboe.ly index e9a9decec7..504de633a3 100644 --- a/mutopia/los-toros-oboe.ly +++ b/mutopia/los-toros-oboe.ly @@ -8,7 +8,7 @@ enteredby = "jcn"; copyright = "public domain"; latexheaders= "headers"; } -\version "1.0.14"; +\version "1.0.16"; %{ Silly latex file dropped; use ly2dvi @@ -295,7 +295,7 @@ global = \notes{ } -$staff_hoboone = \type Staff = hoboonestaff < +$staff_hoboone = \context Staff = hoboonestaff < \global \property Staff.instrument = "oboe" % don't expand multi-bar rest diff --git a/scm/accordion-script.scm b/scm/accordion-script.scm index 2252c25d52..388d3e6c96 100644 --- a/scm/accordion-script.scm +++ b/scm/accordion-script.scm @@ -7,48 +7,49 @@ (set! script-alist (append - '(("accDiscant" . (("accDiscant" . "accDiscant") #f 0 1 0)) - ("accDiscantF" . (("accDiscantF" . "accDiscantF") #f 0 1 0)) - ("accDiscantE" . (("accDiscantE" . "accDiscantE") #f 0 1 0)) - ("accDiscantEh" . (("accDiscantEh" . "accDiscantEh") #f 0 1 0)) - ("accDiscantFE" . (("accDiscantFE" . "accDiscantFE") #f 0 1 0)) - ("accDiscantFEh" . (("accDiscantFEh" . "accDiscantFEh") #f 0 1 0)) - ("accDiscantEE" . (("accDiscantEE" . "accDiscantEE") #f 0 1 0)) - ("accDiscantFEE" . (("accDiscantFEE" . "accDiscantFEE") #f 0 1 0)) - ("accDiscantEEE" . (("accDiscantEEE" . "accDiscantEEE") #f 0 1 0)) - ("accDiscantFEEE" . (("accDiscantFEEE" . "accDiscantFEEE") #f 0 1 0)) - ("accDiscantS" . (("accDiscantS" . "accDiscantS") #f 0 1 0)) - ("accDiscantFS" . (("accDiscantFS" . "accDiscantFS") #f 0 1 0)) - ("accDiscantES" . (("accDiscantES" . "accDiscantES") #f 0 1 0)) - ("accDiscantEhS" . (("accDiscantEhS" . "accDiscantEhS") #f 0 1 0)) - ("accDiscantFES" . (("accDiscantFES" . "accDiscantFES") #f 0 1 0)) - ("accDiscantFEhS" . (("accDiscantFEhS" . "accDiscantFEhS") #f 0 1 0)) - ("accDiscantEES" . (("accDiscantEES" . "accDiscantEES") #f 0 1 0)) - ("accDiscantFEES" . (("accDiscantFEES" . "accDiscantFEES") #f 0 1 0)) - ("accDiscantEEES" . (("accDiscantEEES" . "accDiscantEEES") #f 0 1 0)) - ("accDiscantFEEES" . (("accDiscantFEEES" . "accDiscantFEEES") #f 0 1 0)) - ("accDiscantSS" . (("accDiscantSS" . "accDiscantSS") #f 0 1 0)) - ("accDiscantESS" . (("accDiscantESS" . "accDiscantESS") #f 0 1 0)) - ("accDiscantEESS" . (("accDiscantEESS" . "accDiscantEESS") #f 0 1 0)) - ("accDiscantEEESS" . (("accDiscantEEESS" . "accDiscantEEESS") #f 0 1 0)) - ("accFreebase" . (("accFreebase" . "accFreebase") #f 0 1 0)) - ("accFreebaseF" . (("accFreebaseF" . "accFreebaseF") #f 0 1 0)) - ("accFreebaseE" . (("accFreebaseE" . "accFreebaseE") #f 0 1 0)) - ("accFreebaseFE" . (("accFreebaseFE" . "accFreebaseFE") #f 0 1 0)) - ("accBayanbase" . (("accBayanbase" . "accBayanbase") #f 0 1 0)) - ("accBayanbaseT" . (("accBayanbaseT" . "accBayanbaseT") #f 0 1 0)) - ("accBayanbaseE" . (("accBayanbaseE" . "accBayanbaseE") #f 0 1 0)) - ("accBayanbaseTE" . (("accBayanbaseTE" . "accBayanbaseTE") #f 0 1 0)) - ("accBayanbaseEE" . (("accBayanbaseEE" . "accBayanbaseEE") #f 0 1 0)) - ("accBayanbaseTEE" . (("accBayanbaseTEE" . "accBayanbaseTEE") #f 0 1 0)) - ("accStdbase" . (("accStdbase" . "accStdbase") #f 0 1 0)) - ("accStdbaseTp" . (("accStdbaseTp" . "accStdbaseTp") #f 0 1 0)) - ("accStdbaseT" . (("accStdbaseT" . "accStdbaseT") #f 0 1 0)) - ("accStdbaseBp" . (("accStdbaseBp" . "accStdbaseBp") #f 0 1 0)) - ("accStdbaseM" . (("accStdbaseM" . "accStdbaseM") #f 0 1 0)) - ("accSB" . (("accSB" . "accSB") #f 0 1 0)) - ("accBB" . (("accBB" . "accBB") #f 0 1 0)) - ("accOldEE" . (("accOldEE" . "accOldEE") #f 0 1 0)) - ("accOldEES" . (("accOldEES" . "accOldEES") #f 0 1 0))) + '(("accDiscant" . ((accordion ("accDiscant" . "accDiscant")) #f 0 1 0)) + ("accDiscantF" . ((accordion ("accDiscantF" . "accDiscantF")) #f 0 1 0)) + ("accDiscantE" . ((accordion ("accDiscantE" . "accDiscantE")) #f 0 1 0)) + ("accDiscantEh" . ((accordion ("accDiscantEh" . "accDiscantEh")) #f 0 1 0)) + ("accDiscantFE" . ((accordion ("accDiscantFE" . "accDiscantFE")) #f 0 1 0)) + ("accDiscantFEh" . ((accordion ("accDiscantFEh" . "accDiscantFEh")) #f 0 1 0)) + ("accDiscantEE" . ((accordion ("accDiscantEE" . "accDiscantEE")) #f 0 1 0)) + ("accDiscantFEE" . ((accordion ("accDiscantFEE" . "accDiscantFEE")) #f 0 1 0)) + ("accDiscantEEE" . ((accordion ("accDiscantEEE" . "accDiscantEEE")) #f 0 1 0)) + ("accDiscantFEEE" . ((accordion ("accDiscantFEEE" . "accDiscantFEEE")) #f 0 1 0)) + ("accDiscantS" . ((accordion ("accDiscantS" . "accDiscantS")) #f 0 1 0)) + ("accDiscantFS" . ((accordion ("accDiscantFS" . "accDiscantFS")) #f 0 1 0)) + ("accDiscantES" . ((accordion ("accDiscantES" . "accDiscantES")) #f 0 1 0)) + ("accDiscantEhS" . ((accordion ("accDiscantEhS" . "accDiscantEhS")) #f 0 1 0)) + ("accDiscantFES" . ((accordion ("accDiscantFES" . "accDiscantFES")) #f 0 1 0)) + ("accDiscantFEhS" . ((accordion ("accDiscantFEhS" . "accDiscantFEhS")) #f 0 1 0)) + ("accDiscantEES" . ((accordion ("accDiscantEES" . "accDiscantEES")) #f 0 1 0)) + ("accDiscantFEES" . ((accordion ("accDiscantFEES" . "accDiscantFEES")) #f 0 1 0)) + ("accDiscantEEES" . ((accordion ("accDiscantEEES" . "accDiscantEEES")) #f 0 1 0)) + ("accDiscantFEEES" . ((accordion ("accDiscantFEEES" . "accDiscantFEEES")) #f 0 1 0)) + ("accDiscantSS" . ((accordion ("accDiscantSS" . "accDiscantSS")) #f 0 1 0)) + ("accDiscantESS" . ((accordion ("accDiscantESS" . "accDiscantESS")) #f 0 1 0)) + ("accDiscantEESS" . ((accordion ("accDiscantEESS" . "accDiscantEESS")) #f 0 1 0)) + ("accDiscantEEESS" . ((accordion ("accDiscantEEESS" . "accDiscantEEESS")) #f 0 1 0)) + ("accFreebase" . ((accordion ("accFreebase" . "accFreebase")) #f 0 1 0)) + ("accFreebaseF" . ((accordion ("accFreebaseF" . "accFreebaseF")) #f 0 1 0)) + ("accFreebaseE" . ((accordion ("accFreebaseE" . "accFreebaseE")) #f 0 1 0)) + ("accFreebaseFE" . ((accordion ("accFreebaseFE" . "accFreebaseFE")) #f 0 1 0)) + ("accBayanbase" . ((accordion ("accBayanbase" . "accBayanbase")) #f 0 1 0)) + ("accBayanbaseT" . ((accordion ("accBayanbaseT" . "accBayanbaseT")) #f 0 1 0)) + ("accBayanbaseE" . ((accordion ("accBayanbaseE" . "accBayanbaseE")) #f 0 1 0)) + ("accBayanbaseTE" . ((accordion ("accBayanbaseTE" . "accBayanbaseTE")) #f 0 1 0)) + ("accBayanbaseEE" . ((accordion ("accBayanbaseEE" . "accBayanbaseEE")) #f 0 1 0)) + ("accBayanbaseTEE" . ((accordion ("accBayanbaseTEE" . "accBayanbaseTEE")) #f 0 1 0)) + ("accStdbase" . ((accordion ("accStdbase" . "accStdbase")) #f 0 1 0)) + ("accStdbaseTp" . ((accordion ("accStdbaseTp" . "accStdbaseTp")) #f 0 1 0)) + ("accStdbaseT" . ((accordion ("accStdbaseT" . "accStdbaseT")) #f 0 1 0)) + ("accStdbaseBp" . ((accordion ("accStdbaseBp" . "accStdbaseBp")) #f 0 1 0)) + ("accStdbaseM" . ((accordion ("accStdbaseM" . "accStdbaseM")) #f 0 1 0)) + ("accSB" . ((accordion ("accSB" . "accSB")) #f 0 1 0)) + ("accBB" . ((accordion ("accBB" . "accBB")) #f 0 1 0)) + ("accOldEE" . ((accordion ("accOldEE" . "accOldEE")) #f 0 1 0)) + ("accOldEES" . ((accordion ("accOldEES" . "accOldEES")) #f 0 1 0))) script-alist) ) + diff --git a/scm/script.scm b/scm/script.scm index c1c209f572..3ab041ac90 100644 --- a/scm/script.scm +++ b/scm/script.scm @@ -8,31 +8,32 @@ (set! script-alist (append - '(("thumb" . (("thumb" . "thumb") #f 0 1 0)) - ("accent" . (("sforzato" . "sforzato") #f -1 0 0)) - ("marcato" . (("dmarcato" . "umarcato") #f -1 0 0)) - ("staccatissimo" . (("dstaccatissimo" . "ustaccatissimo") #f -1 0 0 0)) - ("portato" . (("dportato" . "uportato") #f -1 0 0)) - ("fermata" . (("dfermata" . "ufermata") #f 1 0 0)) - ("stopped" . (("stopped" . "stopped") #f 0 1 0)) - ("staccato" . (("staccato" . "staccato") #t -1 0 -100)) - ("tenuto" . (("tenuto" . "tenuto") 1 -1 0 0)) - ("upbow" . (("upbow" . "upbow") #f 0 1 0)) - ("downbow" . (("downbow" . "downbow") #f 0 1 0)) - ("lheel" . (("upedalheel" . "upedalheel") #f 0 -1 0)) - ("rheel" . (("dpedalheel" . "dpedalheel") #f 0 1 0)) - ("ltoe" . (("upedaltoe" . "upedaltoe") #f 0 -1 0)) - ("rtoe" . (("dpedaltoe" . "dpedaltoe") #f 0 1 0)) - ("turn" . (("turn" . "turn") #f 0 1 0)) - ("open" . (("open" . "open") #f 0 1 0)) - ("flageolet" . (("flageolet" . "flageolet") 0 0 1 0)) - ("reverseturn" . (("reverseturn" . "reverseturn") 0 0 1 0)) - ("trill" . (("trill" . "trill") #f 0 1 2000)) - ("prall" . (("prall" . "prall") #f 0 1 0)) - ("mordent" . (("mordent" . "mordent") #f 0 1 0)) - ("prallprall" . (("prallprall" . "prallprall") #f 0 1 0)) - ("prallmordent" . (("prallmordent" . "prallmordent") #f 0 1 0)) - ("upprall" . (("upprall" . "upprall") #f 0 1 0)) - ("downprall" . (("downprall" . "downprall") #f 0 1 0))) + '(("thumb" . ((feta . ("thumb" . "thumb")) #f 0 1 0)) + ("accent" . ((feta . ("sforzato" . "sforzato")) #f -1 0 0)) + ("marcato" . ((feta . ("dmarcato" . "umarcato")) #f -1 0 0)) + ("staccatissimo" . ((feta . ("dstaccatissimo" . "ustaccatissimo")) #f -1 0 0)) + ("portato" . ((feta . ("dportato" . "uportato")) #f -1 0 0)) + ("fermata" . ((feta . ("dfermata" . "ufermata")) #f 1 0 0)) + ("stopped" . ((feta . ("stopped" . "stopped")) #f 0 1 0)) + ("staccato" . ((feta . ("staccato" . "staccato")) #t -1 0 -100)) + ("tenuto" . ((feta . ("tenuto" . "tenuto")) #t -1 0 0)) + ("upbow" . ((feta . ("upbow" . "upbow")) #f 0 1 0)) + ("downbow" . ((feta . ("downbow" . "downbow")) #f 0 1 0)) + ("lheel" . ((feta . ("upedalheel" . "upedalheel")) #f 0 -1 0)) + ("rheel" . ((feta . ("dpedalheel" . "dpedalheel")) #f 0 1 0)) + ("ltoe" . ((feta . ("upedaltoe" . "upedaltoe")) #f 0 -1 0)) + ("rtoe" . ((feta . ("dpedaltoe" . "dpedaltoe")) #f 0 1 0)) + ("turn" . ((feta . ("turn" . "turn")) #f 0 1 0)) + ("open" . ((feta . ("open" . "open")) #f 0 1 0)) + ("flageolet" . ((feta . ("flageolet" . "flageolet")) #f 0 1 0)) + ("reverseturn" . ((feta . ("reverseturn" . "reverseturn")) #f 0 1 0)) + ("trill" . ((feta . ("trill" . "trill")) #f 0 1 2000)) + ("prall" . ((feta . ("prall" . "prall")) #f 0 1 0)) + ("mordent" . ((feta . ("mordent" . "mordent")) #f 0 1 0)) + ("prallprall" . ((feta . ("prallprall" . "prallprall")) #f 0 1 0)) + ("prallmordent" . ((feta . ("prallmordent" . "prallmordent")) #f 0 1 0)) + ("upprall" . ((feta . ("upprall" . "upprall")) #f 0 1 0)) + ("downprall" . ((feta . ("downprall" . "downprall")) #f 0 1 0))) script-alist) ) + diff --git a/scripts/convert-mudela.py b/scripts/convert-mudela.py index d3c89edec7..48a2ad709b 100644 --- a/scripts/convert-mudela.py +++ b/scripts/convert-mudela.py @@ -282,6 +282,17 @@ if 1: conversions.append ((1,0,14), conv, '<[a b> c -> [ ]') +if 1: + def conv(lines): + newlines =[] + for x in lines: + x = re.sub ('\\\\type','\\\\context', x) + newlines.append (x) + return newlines + + conversions.append ((1,0,16), conv, '\\type -> \\context') + + ############################ diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 417533310a..53e020c5bb 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -452,8 +452,9 @@ class Properties: t='' if os.environ.has_key ('MFINPUTS'): - t = os.environ['MFINPUTS'] + os.pathsep - os.environ['MFINPUTS'] = t + os.path.join(this.get('root'), 'mf' ) + t = os.environ['MFINPUTS'] + os.environ['MFINPUTS'] = os.pathsep + t + \ + os.path.join(this.get('root'), 'mf') if os.environ.has_key('TMP'): this.__set('tmp',os.environ['TMP'],'environment') diff --git a/scripts/mudela-book.py b/scripts/mudela-book.py index 4ef55ba488..2c93948d71 100644 --- a/scripts/mudela-book.py +++ b/scripts/mudela-book.py @@ -731,8 +731,8 @@ def main(): # r""" ... """ means: leave escape seqs alone. defined_mudela_cmd = {'mudela': r""" \begin{mudela}[eps \fontoptions] - \type Staff < - \type Voice{ + \context Staff < + \context Voice{ \maininput } > diff --git a/stepmake/bin/ls-latex.py b/stepmake/bin/ls-latex.py index e1995fc4cf..d9542c2ae1 100644 --- a/stepmake/bin/ls-latex.py +++ b/stepmake/bin/ls-latex.py @@ -13,8 +13,8 @@ import __main__ import glob import regex -latex_author_re = regex.compile('\\author{\([^}]+\)}') -latex_title_re = regex.compile('\\title{\([^}]+\)}') +latex_author_re = regex.compile(r'\\author{\([^}]+\)}') +latex_title_re = regex.compile(r'\\title{\([^}]+\)}') class Latex_head: def __init__ (self): -- 2.39.2