summaryrefslogtreecommitdiff
path: root/input
diff options
context:
space:
mode:
authorHan-Wen Nienhuys <hanwen@xs4all.nl>1997-07-30 23:45:03 +0200
committerHan-Wen Nienhuys <hanwen@xs4all.nl>1997-07-30 23:45:03 +0200
commit6dc4e4d14a67f65f337ec1a06466e748c68dcad5 (patch)
tree47b3911fb8243b80006e3dbe8d55fa27e8d1824c /input
parent48bdd9154a32245a075494b403639181615864e2 (diff)
release: 0.0.78
Diffstat (limited to 'input')
-rw-r--r--input/beams.ly55
-rw-r--r--input/cadenza.ly7
-rw-r--r--input/collisions.ly30
-rw-r--r--input/coriolan-alto.ly1
-rw-r--r--input/error.ly39
-rw-r--r--input/multi.ly2
-rw-r--r--input/scsii-menuetto.ly12
-rw-r--r--input/slurs.ly4
-rw-r--r--input/standchen.ly24
-rw-r--r--input/toccata-fuga-E.ly34
-rw-r--r--input/wohltemperirt.ly8
11 files changed, 88 insertions, 128 deletions
diff --git a/input/beams.ly b/input/beams.ly
index 24753a131d..ff17863b40 100644
--- a/input/beams.ly
+++ b/input/beams.ly
@@ -12,58 +12,57 @@ EndMudelaHeader
%}
\score{
- \staff{ \inputregister{melodicregs}
- \melodic{ \octave c';
+ \melodic <\multi 3;
+ { \octave c';
\meter 8/4;
\duration8;
- \stem 1; [c c'' a' f']
+ \stem \up; [c c'' a' f']
\duration16;
- \stem 1; [c c'' a' f']
+ \stem \up; [c c'' a' f']
\duration32;
- \stem 1; [c c'' a' f']
+ \stem \up; [c c'' a' f']
\duration64;
- \stem 1; [c c'' a' f']
+ \stem \up; [c c'' a' f']
\duration128;
- \stem 1; [c c'' a' f']
+ \stem \up; [c c'' a' f']
\duration 8;
- \stem 1; ['g 'g 'g 'g]
+ \stem \up; ['g 'g 'g 'g]
\duration 16;
- \stem 1; ['g 'g 'g 'g]
+ \stem \up; ['g 'g 'g 'g]
\duration 32;
- \stem 1; ['g 'g 'g 'g]
+ \stem \up; ['g 'g 'g 'g]
\duration 64;
- \stem 1; ['g 'g 'g 'g]
+ \stem \up; ['g 'g 'g 'g]
\duration 128;
- \stem 1; ['g 'g 'g 'g]
+ \stem \up; ['g 'g 'g 'g]
}
- }
- \staff{ \inputregister{melodicregs}
- \melodic{ \octave c';
+
+ { \octave c';
\meter 8/4;
\duration8;
- \stem -1; [a' 'a c e]
+ \stem \down; [a' 'a c e]
\duration16;
- \stem -1; [a' 'a c e]
+ \stem \down; [a' 'a c e]
\duration32;
- \stem -1; [a' 'a c e]
+ \stem \down; [a' 'a c e]
\duration64;
- \stem -1; [a' 'a c e]
+ \stem \down; [a' 'a c e]
\duration128;
- \stem -1; [a' 'a c e]
+ \stem \down; [a' 'a c e]
\octave c;
\duration 8;
- \stem -1; [d'' d'' d'' d'']
+ \stem \down; [d'' d'' d'' d'']
\duration 16;
- \stem -1; [d'' d'' d'' d'']
+ \stem \down; [d'' d'' d'' d'']
\duration 32;
- \stem -1; [d'' d'' d'' d'']
+ \stem \down; [d'' d'' d'' d'']
\duration 64;
- \stem -1; [d'' d'' d'' d'']
+ \stem \down; [d'' d'' d'' d'']
\duration 128;
- \stem -1; [d'' d'' d'' d'']
+ \stem \down; [d'' d'' d'' d'']
}
- }
- \paper{}
-}
+ >}
+
+
diff --git a/input/cadenza.ly b/input/cadenza.ly
index a2110f3462..23b94fce90 100644
--- a/input/cadenza.ly
+++ b/input/cadenza.ly
@@ -13,7 +13,8 @@ EndMudelaHeader
\version "0.1.0";
-cad = \melodic {
+\score {
+ \melodic {\id "Staff" "french horn";
\cadenza 1;
\grouping 1*4;\duration 8;\octave c';
@@ -55,12 +56,10 @@ cad = \melodic {
c4
}
-\score {
- \melodic{ \cad }
\paper {
unitspace= 14.0\mm;
geometric= 1.4;
}
-% \midi { \tempo 4:90 }
+ \midi { \tempo 4:90; }
}
diff --git a/input/collisions.ly b/input/collisions.ly
index 9bde8122fb..d281dc0e74 100644
--- a/input/collisions.ly
+++ b/input/collisions.ly
@@ -16,41 +16,41 @@ EndMudelaHeader
two_voice = \melodic
< \multi 2;
- { \octave c'; \stem -1;
+ { \octave c'; \stem \down;
c4 d e f g2~ g4 a [c8 d e f] c2| }
- { \stem 1;
+ { \stem \up;
g4 f e g ~ g2 g2 c4 g4 g2 }
>
two_voice_steminvert = \melodic
< \multi 2;
- { \octave c'; \stem 1;
+ { \octave c'; \stem \up;
% the f and g on 4th beat are exceptionally ugh.
c4 d e f g2 g4 a | }
- { \stem -1;
+ { \stem \down;
g4 f e g g2 g2 }
>
three_voice = \melodic
< \multi 2;
- { \stem 1;
+ { \stem \up;
g4 f e f g a g2 }
- { \hshift 1; \stem 1;
+ { \hshift 1; \stem \up;
e2 e2 e2 e2 }
- { \stem -1;
+ { \stem \down;
c4 d e d c d es }
>
rests = \melodic
< \multi 2;
- { \stem 1;
+ { \stem \up;
| r8 r r r r r r r
[c' b a g] [f e d c]
}
- { \stem -1;
+ { \stem \down;
[c8 d e f] [g a b c']
r r r r r r r r
}
@@ -59,12 +59,12 @@ rests = \melodic
restsII = \melodic {
\octave c';
< \multi2;
- { \stem 1; g' f' e' d' c' b a g f e d c }
- { \stem -1; r r r r r r r r r r r r }
+ { \stem \up; g' f' e' d' c' b a g f e d c }
+ { \stem \down; r r r r r r r r r r r r }
>
< \multi2;
- { \stem 1; r r r r r r r r r r r r }
- { \stem -1; c d e f g a b c' d' e' f' g' }
+ { \stem \up; r r r r r r r r r r r r }
+ { \stem \down; c d e f g a b c' d' e' f' g' }
>
r8 r4
< \multi2; r8 r8 >
@@ -72,10 +72,10 @@ restsII = \melodic {
< \multi2; r8 r8 r8 r8 >
< \multi2; r r >
< \multi2; r r r >
- \stem 1;
+ \stem \up;
[c''8 r8 c''8 c''8]
[c8 r8 c8 c8]
- \stem -1;
+ \stem \down;
[c8 r8 c8 c8]
[c''8 r8 c''8 c''8]
}
diff --git a/input/coriolan-alto.ly b/input/coriolan-alto.ly
index 439ccfb0f6..ac772fdf9f 100644
--- a/input/coriolan-alto.ly
+++ b/input/coriolan-alto.ly
@@ -1,3 +1,4 @@
+% remark: still temporarily broken.
%{MudelaHeader
filename: coriolan-alto.ly
diff --git a/input/error.ly b/input/error.ly
deleted file mode 100644
index 118dba144d..0000000000
--- a/input/error.ly
+++ /dev/null
@@ -1,39 +0,0 @@
-\version "0.0.58";
-
-\include "this-is-hopefully-a-nonexisting-file"
-
-
-
-mwa = \melodic{
- \meter 3/4;
- [ a8 a8 a8 a8 a8 ] %
- [ a8 ] %
-% segfault
- < { [ bes^"1"~ a bes-. g-. ] a4-.^"4" } { [ e ] } { [ c ] } > |
- a ) b ] c % warning
- & % ok; error
- a b ) ] % ok; error
-% a......... % fatal error -- assert
- a b c
- |.| %
- abc % ok; print error, no \output
- \bla % STRING, reduced to lyric_elt.
- a [ b % warning, still \output
- < a( b > % warning, still \output
- a b ,c
- a b c-*
- a b c&
- < a-. b-. >
-
-}
-
-bla = \lyric{
- These Gates will open just like windows. % ok; warning
-}
-
-
-\include "this-is-hopefully-a-nonexisting-file"
-\score{
- \staff{ bla }
- \staff{ mwa }
-}
diff --git a/input/multi.ly b/input/multi.ly
index 7113cfb4a0..141d191a9e 100644
--- a/input/multi.ly
+++ b/input/multi.ly
@@ -18,7 +18,7 @@ EndMudelaHeader
\melodic
{ \octave c'; c4 c4
< \multi 1; { c2 c2 } { c'2 c'2 } >
- < \multi 2; { \stem -1; c2 c2 } { \stem 1; c'2 c'2 } >
+ < \multi 2; { \stem \down; c2 c2 } { \stem \up; c'2 c'2 } >
< \multi 3; { \clef "bass"; c2 c2 } { \meter 2/4;\bar "||"; \key fis cis gis; c'2 c'2 } >
c2 c1
c1 c1
diff --git a/input/scsii-menuetto.ly b/input/scsii-menuetto.ly
index 64e7a17ae0..1c69f21f99 100644
--- a/input/scsii-menuetto.ly
+++ b/input/scsii-menuetto.ly
@@ -60,15 +60,15 @@ IImenuetto = \melodic{
< [ e'8 g > d' cis'_"2" e' a~ g ] |
%%11
< \multi 2;
- {\stem 1; a4~ d'4 cis'4-. }
- { \stem -1; f2 e4 } > |
+ {\stem \up; a4~ d'4 cis'4-. }
+ { \stem \down; f2 e4 } > |
%%12
< [ g'8^"4" d > f' e' f' d'^"3"~ c' ] |
%%13
\clef "alto";
< \multi 2;
- { \stem 1; bes2 c'4 }
- { \stem -1; g4~ f4 e4 }% ugh
+ { \stem \up; bes2 c'4 }
+ { \stem \down; g4~ f4 e4 }% ugh
> |
%%14
< [ a8 f > g a f ] < d'4-\upbow e4 'bes4 > |
@@ -86,8 +86,8 @@ IImenuetto = \melodic{
< { [ c'8 ( bes a )bes g~ bes ] } { [ d ] } { [ g ] } > |
%%21
< \multi 2;
- {\stem 1; d'4 (\stem 1; ) cis'4 d'4 }
- { \stem -1; g2 f4 }
+ {\stem \up; d'4 (\stem \up; ) cis'4 d'4 }
+ { \stem \down; g2 f4 }
> |
%%22
< { [ g8 ~ f g e ] } { [ cis ] } > < f4 d4 > |
diff --git a/input/slurs.ly b/input/slurs.ly
index 107809130c..87223a1b04 100644
--- a/input/slurs.ly
+++ b/input/slurs.ly
@@ -29,8 +29,8 @@ EndMudelaHeader
{ e ~ f }
>
< \multi 2;
- { \stem 1; c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c }
- { \stem -1; c (e g )c'~( [b a g )d] r2 }
+ { \stem \up; c'8 ~g ~e( ~c~ [c'~ g' e' )c'] c'' ~ c'' c~c }
+ { \stem \down; c (e g )c'~( [b a g )d] r2 }
>
}
diff --git a/input/standchen.ly b/input/standchen.ly
index 34faff618c..1769e18564 100644
--- a/input/standchen.ly
+++ b/input/standchen.ly
@@ -152,8 +152,8 @@ melodie = \melodic{
%%48
\textstyle "italic";
<
- { fis2.~ \group "+1"; \stem -1; f2. }
- { d'2. ~ \stem 1; d'4 r4_"decresc." d'4 }
+ { fis2.~ \group "+1"; \stem \down; f2. }
+ { d'2. ~ \stem \up; d'4 r4_"decresc." d'4 }
>
\textstyle "roman"; |
%%50
@@ -199,13 +199,13 @@ begeleiding = \melodic{
''a r4 |
%%5
\duration 8;
- < \multi 2; { \stem 1;
+ < \multi 2; { \stem \up;
[ 'f 'a d 'a d 'a ]
[ 'd 'e 'g 'e 'g 'e ]
[ 'cis 'e 'g 'e 'g e ]
[ 'd 'a d 'a d 'a ]
}
- { \stem -1;
+ { \stem \down;
'd2 r4
''bes2 r4
''a2 r4
@@ -217,12 +217,12 @@ begeleiding = \melodic{
[ 'd 'a d 'a d 'a ] |
%%11
< \multi 2;
- { \stem 1;
+ { \stem \up;
[ 'f 'a d 'a d 'a ]
[ 'd 'e 'g 'e 'g 'e ]
[ 'e 'g 'bes 'g 'bes 'g ]
[ 'a c f c f c ]
- } { \stem -1;
+ } { \stem \down;
'd2 r4
''bes2 r4
'c2 r4
@@ -233,10 +233,10 @@ begeleiding = \melodic{
%%16
[ ''f 'c 'f 'c 'f 'c ] |
< \multi 2;
- { \stem 1;
+ { \stem \up;
[ ''a 'e 'g 'e 'g 'e ][ 'd 'a d 'a d 'a ]
[ ''bes 'f 'bes 'f 'bes 'f ][ ''f 'c 'f 'c 'f 'c ] }
- { \stem -1;
+ { \stem \down;
''a2 r4
'd2 r4
''bes2 r4
@@ -247,13 +247,13 @@ begeleiding = \melodic{
%%22
[ 'f 'a c 'a 'f 'c ] |
< \multi 2; {
- \stem 1;
+ \stem \up;
[ ''a 'e 'g 'e 'g 'e ]
[ 'd 'fis 'a 'fis 'a 'fis ]
[ ''g 'd 'b 'd 'b 'd ]
[ 'd 'a d 'a d 'a ]
}
- {\stem -1;
+ {\stem \down;
''a2 r4
'd2 r4
''g2 r4
@@ -298,11 +298,11 @@ begeleiding = \melodic{
%%44
< [ 'd ''b > 'fis 'b 'fis 'b 'fis ] |
%%45
- < \multi 2; { \stem 1;
+ < \multi 2; { \stem \up;
[ ''g 'd 'b 'd 'b 'd ]
[ 'd 'a d 'a d 'a ]
} {
- \stem -1;
+ \stem \down;
''g2 r4
'd2 r4
} >
diff --git a/input/toccata-fuga-E.ly b/input/toccata-fuga-E.ly
index 6e5746e725..a1d59b84c9 100644
--- a/input/toccata-fuga-E.ly
+++ b/input/toccata-fuga-E.ly
@@ -32,9 +32,9 @@ toccata_right = \melodic{
% 13 -- how to type -- where to split -- this more neatly ?
\octave c';
<\multi 2;
- { \stem 1; r4 dis'4 e'4.-. e'8( | \hshift 1; )e'4 [d'8 fis'8] \hshift 0; gis'4 [gis'8 fis'16 e'16] | fis'4~ [fis'8 e'16 dis'16] e'4 r8 e'8 }
- { \stem 1; \hshift 1; r4 bis4 cis'4-. cis'4 | \hshift 0; a'4~ [a'16 gis'16 a'16 b'16] \hshift 1; dis'4 cis'4~ [cis'8 dis'16 a16] bis4 cis'4 r8 b8 }
- { \stem -1; r4 < gis4 fis4 dis4 > gis4-. gis4 | a4. cis'8 gis2 | fis4 gis4 gis4 r8 e8 }
+ { \stem \up; r4 dis'4 e'4.-. e'8( | \hshift 1; )e'4 [d'8 fis'8] \hshift 0; gis'4 [gis'8 fis'16 e'16] | fis'4~ [fis'8 e'16 dis'16] e'4 r8 e'8 }
+ { \stem \up; \hshift 1; r4 bis4 cis'4-. cis'4 | \hshift 0; a'4~ [a'16 gis'16 a'16 b'16] \hshift 1; dis'4 cis'4~ [cis'8 dis'16 a16] bis4 cis'4 r8 b8 }
+ { \stem \down; r4 < gis4 fis4 dis4 > gis4-. gis4 | a4. cis'8 gis2 | fis4 gis4 gis4 r8 e8 }
> |
% 16
}
@@ -45,9 +45,9 @@ toccata_left = \melodic{
\clef bass;
% 13
<\multi 2;
- { \stem 1; bis2 cis'4-. cis'4~ [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 | dis'2 cis'4 r8 cis'8 }
- { \stem 1; \hshift 1; r4 gis4. gis8~ gis4 | \stem -1; \hshift 0; a4. fis8 gis4. a8~ a4 gis4-. gis4 r8 gis8 }
- { \stem -1; r4 < dis4 fis4 > < cis4 e4 > }
+ { \stem \up; bis2 cis'4-. cis'4~ [cis'8 a8 d'8 cis'8] [bis8 gis8] cis'4 | dis'2 cis'4 r8 cis'8 }
+ { \stem \up; \hshift 1; r4 gis4. gis8~ gis4 | \stem \down; \hshift 0; a4. fis8 gis4. a8~ a4 gis4-. gis4 r8 gis8 }
+ { \stem \down; r4 < dis4 fis4 > < cis4 e4 > }
> |
% 16
}
@@ -75,8 +75,8 @@ fuga2_right = \melodic{
% 15
\octave c';
<\multi 2;
- { \stem 1; [b8 fis8] b4 }
- { \stem -1; fis2 }
+ { \stem \up; [b8 fis8] b4 }
+ { \stem \down; fis2 }
>
%{ this chord is usually set like this:
|
@@ -87,16 +87,16 @@ fuga2_right = \melodic{
|
%}
< \multi 2;
- { \stem 1; \hshift 0; e'4 }
- { \stem 1; \hshift 1; cis'4 }
- { \stem 1; \hshift 2; ais4 }
- { \stem -1; fis4 }
+ { \stem \up; \hshift 0; e'4 }
+ { \stem \up; \hshift 1; cis'4 }
+ { \stem \up; \hshift 2; ais4 }
+ { \stem \down; fis4 }
> |
% 16
<\multi 2;
- { \stem 1; dis'2 dis'4 | cis'2 cis'4 | b4~ [b8 cis'8 dis'8 e'8] }
- { \stem 1; \hshift 1; [b8 fis8] b2~ [b8 a16 g16] a2 | a4 gis2 }
- { \stem -1; fis2.~ fis2.~ fis4 e2 }
+ { \stem \up; dis'2 dis'4 | cis'2 cis'4 | b4~ [b8 cis'8 dis'8 e'8] }
+ { \stem \up; \hshift 1; [b8 fis8] b2~ [b8 a16 g16] a2 | a4 gis2 }
+ { \stem \down; fis2.~ fis2.~ fis4 e2 }
> |
% 19
}
@@ -108,8 +108,8 @@ fuga2_left = \melodic{
% 15
b2
<\multi 2;
- { \stem 1; ais4 | bes2. }
- { \stem -1; e4 | fis2 fis4 }
+ { \stem \up; ais4 | bes2. }
+ { \stem \down; e4 | fis2 fis4 }
>
% 17
cis'2 e'4 |
diff --git a/input/wohltemperirt.ly b/input/wohltemperirt.ly
index 5fa5b63007..49d0062a91 100644
--- a/input/wohltemperirt.ly
+++ b/input/wohltemperirt.ly
@@ -25,7 +25,7 @@ dux =
\clef "violin";
\octave c';
- \stem -1;
+ \stem \down;
r8 [c'16 b] [c'8 g] [as c'16 b] [c'8 d'] |
[g c'16 b] [c'8 d'] [f16 g] as4 [g16 f] |
[es c' b a] [g f! es d] [c8 es' d' c'] |
@@ -71,7 +71,7 @@ dux =
comes =
\melodic {
\octave c'';
- \stem 1;
+ \stem \up;
r1 |
r1 |
r8 [g16 fis] [g8 c] [es g16 fis] [g8 a] |
@@ -153,8 +153,8 @@ bassdux =
[d c g G]
%% 30
< \multi 2;
- { \stem 1; c2~ | c1~ | c1 }
- { \stem -1; C2~ | C1~ | C1 }
+ { \stem \up; c2~ | c1~ | c1 }
+ { \stem \down; C2~ | C1~ | C1 }
>
}