Skip to content

Commit

Permalink
Checks done on percussion and plucked strings
Browse files Browse the repository at this point in the history
Removed any nonsensical dynamics and added some chords on the harp to
the final section.
  • Loading branch information
adammccartney committed Jun 29, 2022
1 parent 075e3a8 commit 0961f73
Show file tree
Hide file tree
Showing 5 changed files with 174 additions and 96 deletions.
26 changes: 12 additions & 14 deletions morch/score/score.ly
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
\flOne_segment_chorale
\piccoloChange
\fluteOne_segment_IYGH_A
\fiveBarPause

\fluteOne_segment_IYGH_B
} % end of flute voice one
>>
Expand All @@ -77,7 +77,7 @@
\flTwo_segment_chorale
\piccoloChange
\fluteTwo_segment_IYGH_A
\fiveBarPause

\fluteTwo_segment_IYGH_B
} % end of flute voice two
>> %% end of flute staff
Expand All @@ -95,7 +95,7 @@
\obOne_segment_strings
\obOne_segment_chorale
\obOne_segment_IYGH_A
\fiveBarPause

\obOne_segment_IYGH_B
} %% end of oboe notes
>> %% end of oboe staff
Expand All @@ -113,7 +113,7 @@
\obTwo_segment_strings
\obTwo_segment_chorale
\obTwo_segment_IYGH_A
\fiveBarPause

\obTwo_segment_IYGH_B
} %% end of oboe notes
>> %% end of oboe two staff
Expand All @@ -131,7 +131,7 @@
\clOne_segment_strings
\clOne_segment_chorale
\clOne_segment_IYGH_A
\fiveBarPause

\clOne_segment_IYGH_B
} % end of clarinet 1, 2 voice one
>>
Expand All @@ -144,7 +144,7 @@
\clTwo_segment_strings
\clTwo_segment_chorale
\clTwo_segment_IYGH_A
\fiveBarPause

\clTwo_segment_IYGH_B
} % end of clarinet 1, 2 voice two
>> %% end clarinets
Expand All @@ -163,7 +163,7 @@
\bsn_segment_strings
\bsn_segment_chorale
\bsn_segment_IYGH_A
\fiveBarPause

\bsn_segment_IYGH_B
} %% end of bsn notes
>> %% end of bsn staff
Expand Down Expand Up @@ -310,7 +310,6 @@
\vibes_segment_strings
\wwindChoraleGP
\vibes_segment_IYGH_A
\fiveBarPause
\vibes_segment_IYGH_B
}

Expand All @@ -325,7 +324,6 @@
\tmp_segment_strings
\wwindChoraleGP
\tmp_segment_IYGH_A
\fiveBarPause
\tmp_segment_IYGH_B
}
>> %% end perc
Expand Down Expand Up @@ -359,7 +357,7 @@
\violinOne_segment_strings
\wwindChoraleGP
\vnone_segment_IYGH_A
\fiveBarPause

\vnone_segment_IYGH_B
}

Expand All @@ -374,7 +372,7 @@
\violinTwo_segment_strings
\wwindChoraleGP
\vntwo_segment_IYGH_A
\fiveBarPause

\vntwo_segment_IYGH_B
} %% end of vln two notes

Expand All @@ -390,7 +388,7 @@
\viola_segment_strings
\viola_segment_chorale
\va_segment_IYGH_A
\fiveBarPause

\va_segment_IYGH_B
} %% end of vla notes

Expand All @@ -406,7 +404,7 @@
\cello_segment_strings
\cello_segment_chorale
\vc_segment_IYGH_A
\fiveBarPause

\vc_segment_IYGH_B
} %% end of cello notes

Expand All @@ -422,7 +420,7 @@
\contrabass_segment_strings
\wwindChoraleGP
\kb_segment_IYGH_A
\fiveBarPause

\kb_segment_IYGH_B
} %% end of bsn notes

Expand Down
162 changes: 117 additions & 45 deletions morch/src/brassIYGH_A.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,10 @@
from stringcanon import printmacros

CALL_ROOTS = ["bf", "bf", "bf", "f"]
RESP_ROOTS = ["bf,", "bf,", "bf,", "f,", "d"]
RESP_ROOTS = ["<bf,, bf, d>", "<bf,, bf, d>", "<bf,, bf, d>", "<f,, f, a,>",
"<d, d fs>"]
HARP_ROOTS = ["<bf,, bf, f>", "<bf,, bf, f>", "<bf,, bf, f>", "<f,, f, c>",
"<d, d a>"]


# we're going to create a pitch map for each of the tones we want to
Expand All @@ -42,7 +45,8 @@
create_pitch_map("fluteOne", CALL_ROOTS, "1-1/7"),# seventh
create_pitch_map("fluteTwo", CALL_ROOTS, "1-1/3"),
create_pitch_map("bsn", CALL_ROOTS, "16"),
create_pitch_map("vibes", CALL_ROOTS, "1-3/5"), # third
create_pitch_map("vibes", RESP_ROOTS, "1-3/5"), # third
create_pitch_map("harp", HARP_ROOTS, "2-2/3"),
create_pitch_map("vnone", CALL_ROOTS, "1-1/7"),
create_pitch_map("vntwo", CALL_ROOTS, "1-1/3"),
]
Expand Down Expand Up @@ -77,11 +81,11 @@
r4 {3}2\\fp {3}4\\ppp
r1
""",
"tmp": """r4 {0}8-.\\f r8 r2
r4 {1}8-.\\f r8 r2
r4 {2}8-.\\f r8 r2
r4 {3}8-.\\f r8 r2
r1
"tmp": """r4 {0}8-.\\f r8 r8 {0}8-. r4
r4 {1}8-. r8 r8 {1}8-. r4
r4 {2}8-. r8 r8 {2}8-. r4
r4 {3}8-. r8 r8 {3}8-. r4
r1
""",
"va": """r4 {0}2.\\fp ~
{0}4\\ppp {1}2.\\fp ~
Expand All @@ -96,34 +100,40 @@
{3}1\\ppp
""",
"kb": """r4 {0}2.\\fp ~
{0}4\\ppp {1}2.\\fp ~
{1}4\\ppp {2}2.\\fp ~
{2}4\\ppp {3}2.\\fp ~
{3}1\\ppp
{0}4 {1}2.\\fp ~
{1}4 {2}2.\\fp ~
{2}4 {3}2.\\fp ~
{3}1
""",
"fluteOne": """r8 {0}8\\fp ~ {0}4~
{0}4\\ppp r4 r8 {1}8\\fp ~ {1}4~
{1}4\\ppp r4 r8 {2}8\\fp ~ {2}4~
{2}4\\ppp r4 r8 {3}8\\fp ~ {3}4~
{3}4\\ppp r2.
{0}4 r4 r8 {1}8\\fp ~ {1}4~
{1}4 r4 r8 {2}8\\fp ~ {2}4~
{2}4 r4 r8 {3}8\\fp ~ {3}4~
{3}4 r2.
""",
"fluteTwo": """r8 {0}8\\fp ~ {0}4~
{0}4\\ppp r4 r8 {1}8\\fp ~ {1}4~
{1}4\\ppp r4 r8 {2}8\\fp ~ {2}4~
{2}4\\ppp r4 r8 {3}8\\fp ~ {3}4~
{3}4\\ppp r2.
{0}4 r4 r8 {1}8\\fp ~ {1}4~
{1}4 r4 r8 {2}8\\fp ~ {2}4~
{2}4 r4 r8 {3}8\\fp ~ {3}4~
{3}4 r2.
""",
"bsn": """r2 r8 {0}8\\fp ~ {0}4~
{0}2\\ppp r8 {1}8\\fp ~ {1}4~
{1}2\\ppp r8 {2}8\\fp ~ {2}4~
{2}2\\ppp r8 {3}8\\fp ~ {3}4~
{3}4\\ppp r2.
{0}2 r8 {1}8\\fp ~ {1}4~
{1}2 r8 {2}8\\fp ~ {2}4~
{2}2 r8 {3}8\\fp ~ {3}4~
{3}4 r2.
""",
"vibes": """r2^\\ord^\\mmallets r8 {0}8\\p ~ {0}4~
{0}2 r8 {1}8 ~ {1}4~
{1}2 r8 {2}8 ~ {2}4~
{2}2 r8 {3}8 ~ {3}4~
{3}4 r2.
""",
"vibes": """r2 r8 {0}8\\fp ~ {0}4~
{0}2\\ppp r8 {1}8\\fp ~ {1}4~
{1}2\\ppp r8 {2}8\\fp ~ {2}4~
{2}2\\ppp r8 {3}8\\fp ~ {3}4~
{3}4\\ppp r2.
"harp": """r2 r8 {0}8\\f ~ {0}4~
{0}2 r8 {1}8 ~ {1}4~
{1}2 r8 {2}8 ~ {2}4~
{2}2 r8 {3}8 ~ {3}4~
{3}4 r2.
""",
"vnone": """r2 r8 {0}8\\fp ~ {0}4~
{0}2\\ppp ~ {0}8 {1}8\\fp ~ {1}4~
Expand All @@ -140,7 +150,10 @@
}


MACROS = {"VIA_SORD": "viaSord = \\markup \"via sord.\""}
MACROS = {"VIA_SORD": "viaSord = \\markup \"via sord.\"",
"ORD": "ord = \\markup { ord. }",
"MEDMALLETS": "mmallets = \\markup { med. mallets }",
}

CALLS = [
"r16 bf8 d'8-.\\sfp bf8 f2--",
Expand Down Expand Up @@ -386,18 +399,40 @@ def get_brass_section() -> dict:
"fluteOne": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"instr": PICCOLO,
"resp": resp_phrases["fluteOne"]
"resp": resp_phrases["fluteOne"],
"rest": FIVE_BAR_REST,
},
"fluteTwo": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"instr": PICCOLO,
"resp": resp_phrases["fluteTwo"]
"resp": resp_phrases["fluteTwo"],
"rest": FIVE_BAR_REST,
},
"clOne": {"tempo_fast": TEMPO_FAST, "rmark": rmark, "call": call_phrases["clOne"]},
"clTwo": {"tempo_fast": TEMPO_FAST, "rmark": rmark, "call": call_phrases["clTwo"]},
"obOne": {"tempo_fast": TEMPO_FAST, "rmark": rmark, "call": call_phrases["obOne"]},
"obTwo": {"tempo_fast": TEMPO_FAST, "rmark": rmark, "call": call_phrases["obTwo"]},
"bsn": {"tempo_fast": TEMPO_FAST, "rmark": rmark, "resp": resp_phrases["bsn"]},
"clOne": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"call": call_phrases["clOne"],
"rest": FIVE_BAR_REST,
},
"clTwo": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"call": call_phrases["clTwo"],
"rest": FIVE_BAR_REST,
},
"obOne": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"call": call_phrases["obOne"],
"rest": FIVE_BAR_REST,
},
"obTwo": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"call": call_phrases["obTwo"],
"rest": FIVE_BAR_REST,
},
"bsn": {"tempo_fast": TEMPO_FAST,
"rmark": rmark,
"resp": resp_phrases["bsn"],
"rest": FIVE_BAR_REST,
},
"trpOneTwo": {
"tempo_fast": TEMPO_FAST,
"rmark": rmark,
Expand Down Expand Up @@ -526,18 +561,55 @@ def get_brass_section() -> dict:
"chorus_eights_ad": chorus_eights_ad,
"chorus_eights_ae": chorus_eights_ae,
},
"tmp": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "call": call_phrases["tmp"]},
"vibes": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "resp": resp_phrases["vibes"]},
"tmp": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"call": call_phrases["tmp"],
"rest": FIVE_BAR_REST,
},
"vibes": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"resp": resp_phrases["vibes"],
"rest": FIVE_BAR_REST,
},
"harp": {
"rest_i": FIVE_BAR_REST,
"rest_ii": FIVE_BAR_REST,
"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"resp": resp_phrases["harp"],
"rest": FIVE_BAR_REST,
},
"vnone": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"resp": resp_phrases["vnone"],
"rest": FIVE_BAR_REST,
},
"vntwo": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"resp": resp_phrases["vntwo"],
"rest": FIVE_BAR_REST,
},
"va": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"call": call_phrases["va"],
"rest": FIVE_BAR_REST,
},
"vc": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"call": call_phrases["vc"],
"rest": FIVE_BAR_REST,
},
"kb": {"tempo_fast": TEMPO_FAST,
"tsig": TSIG_FF,
"rmark": rmark,
"call": call_phrases["kb"],
"rest": FIVE_BAR_REST,

"vnone": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "resp": resp_phrases["vnone"]},
"vntwo": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "resp": resp_phrases["vntwo"]},
"va": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "call": call_phrases["va"]},
"vc": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "call": call_phrases["vc"]},
"kb": {"tempo_fast": TEMPO_FAST,"tsig": TSIG_FF, "rmark": rmark, "call": call_phrases["kb"]},
},
}
return instruments

Expand Down
Loading

0 comments on commit 0961f73

Please sign in to comment.