diff --git a/morch/Makefile b/morch/Makefile index 0fbb58a..c96882e 100644 --- a/morch/Makefile +++ b/morch/Makefile @@ -19,10 +19,23 @@ PARTS_INCLUDE := $(PARTS_DIR)/segments.ily .PHONY: parts segments clean -all: score parts +all: dist default: all +dist: score parts score-dist + rm $(BUILD_DIR)/parts/*.ly + rm $(BUILD_DIR)/*.ly + rm $(BUILD_DIR)/*.ily + rm -rf $(BUILD_DIR)/segments + rm $(BUILD_DIR)/lilypond.sh + rm $(BUILD_DIR)/parts/*.ily + rm $(BUILD_DIR)/score.pdf + +score-dist: dist.org + @ emacs $< --batch -f org-latex-export-to-pdf + @ mv dist.pdf $(BUILD_DIR)/marana-score.pdf + @ rm dist.tex* # Generate segments ############################################################ # segments: setup $(SEGMENTS) @@ -61,3 +74,4 @@ build_dir: clean: rm -rf $(BUILD_DIR) + rm dist.tex dist.pdf diff --git a/morch/dist.org b/morch/dist.org new file mode 100644 index 0000000..af6fb9a --- /dev/null +++ b/morch/dist.org @@ -0,0 +1,47 @@ +#+LATEX_CLASS: report +#+LATEX_CLASS_OPTIONS: [a3paper] +#+LATEX_HEADER: \usepackage{times} +#+LATEX_HEADER: \usepackage{pdfpages} + +#+OPTIONS: toc:nil +#+BEGIN_EXPORT latex +\newcommand*{\titleTH}{\begingroup % Create the command for including the title page in the document +\raggedleft % Right-align all text +\vspace*{\baselineskip} % Whitespace at the top of the page + +{\LARGE\bfseries marana}\\[\baselineskip] % First part of the title, if it is unimportant consider making the font size smaller to accentuate the main title + +{{\Huge for symphony orchestra}}\\[\baselineskip] % Main title which draws the focus of the reader + +\vfill % Whitespace between the title block and the publisher + +{\large Adam McCartney} % Publisher and logo + +\vspace*{3\baselineskip} % Whitespace at the bottom of the page +\endgroup} + +%---------------------------------------------------------------------------------------- +% BLANK DOCUMENT +%---------------------------------------------------------------------------------------- + +\begin{document} + + +\frontmatter +\begin{titlepage} +\begin{center} +\pagestyle{plain} % Removes page numbers +\titleTH % This command includes the title page +\end{center} +\end{titlepage} + +\mainmatter + +\newpage +\thispagestyle{empty} +\mbox{} +\newpage + +\includepdf[pages=-]{./build/score.pdf} +\end{document} +#+END_EXPORT diff --git a/morch/score/score.ly b/morch/score/score.ly index 6968ee5..545d469 100644 --- a/morch/score/score.ly +++ b/morch/score/score.ly @@ -29,13 +29,13 @@ system-system-spacing.stretchability = #15 %how flexible the spacing is - myStaffSize = #20 + myStaffSize = #17 #(define fonts (make-pango-font-tree "Times New Roman" "Nimbus Sans" "Luxi Mono" - (/ myStaffSize 20))) + (/ myStaffSize 19))) } diff --git a/morch/src/brassIYGH_A.py b/morch/src/brassIYGH_A.py index dbe103c..0b6f84e 100644 --- a/morch/src/brassIYGH_A.py +++ b/morch/src/brassIYGH_A.py @@ -16,7 +16,7 @@ ) -from stringcanon import printmacros +from stringcanon import MACROS, printmacros CALL_ROOTS = ["bf", "bf", "bf", "f"] RESP_ROOTS = ["", "", "", "", @@ -57,28 +57,28 @@ # filltemplates(), which takes the newly created matrix as an arg TEMPLATE_MAP = { - "obOne": """r4 {0}4\\fp ~ {0}8\\ppp r8 r4 - r4 {1}4\\fp ~ {1}8\\ppp r8 r4 - r4 {2}4\\fp ~ {2}8\\ppp r8 r4 - r4 {3}4\\fp ~ {3}8\\ppp r8 r4 + "obOne": """r4 {0}4\\fp-. r2 + r4 {1}4\\fp-. r2 + r4 {2}4\\fp-. r2 + r4 {3}4\\fp-. r2 r1 """, - "obTwo": """r4 {0}4\\fp ~ {0}8\\ppp r8 r4 - r4 {1}4\\fp ~ {1}8\\ppp r8 r4 - r4 {2}4\\fp ~ {2}8\\ppp r8 r4 - r4 {3}4\\fp ~ {3}8\\ppp r8 r4 + "obTwo": """r4 {0}4\\fp-. r2 + r4 {1}4\\fp-. r2 + r4 {2}4\\fp-. r2 + r4 {3}4\\fp-. r2 r1 """, - "clOne": """r4 {0}2\\fp {0}4\\ppp - r4 {1}2\\fp {1}4\\ppp - r4 {2}2\\fp {2}4\\ppp - r4 {3}2\\fp {3}4\\ppp + "clOne": """r4 {0}2\\f\\> {0}4\\ppp + r4 {1}2\\f\\> {1}4\\ppp + r4 {2}2\\f\\> {2}4\\ppp + r4 {3}2\\f\\> {3}4\\ppp r1 """, - "clTwo": """r4 {0}2\\fp {0}4\\ppp - r4 {1}2\\fp {1}4\\ppp - r4 {2}2\\fp {2}4\\ppp - r4 {3}2\\fp {3}4\\ppp + "clTwo": """r4 {0}2\\f\\> {0}4\\ppp + r4 {1}2\\f\\> {1}4\\ppp + r4 {2}2\\f\\> {2}4\\ppp + r4 {3}2\\f\\> {3}4\\ppp r1 """, "tmp": """r4 {0}8-.\\f r8 r8 {0}8-. r4 @@ -87,41 +87,41 @@ r4 {3}8-. r8 r8 {3}8-. r4 r1 """, - "va": """r4 {0}2.\\fp ~ - {0}4\\ppp {1}2.\\fp ~ - {1}4\\ppp {2}2.\\fp ~ - {2}4\\ppp {3}2.\\fp ~ + "va": """r4 {0}2.\\f\\> ~ + {0}4\\ppp {1}2.\\f\\> ~ + {1}4\\ppp {2}2.\\f\\> ~ + {2}4\\ppp {3}2.\\f\\> ~ {3}1\\ppp """, - "vc": """r4 {0}2.\\fp ~ - {0}4\\ppp {1}2.\\fp ~ - {1}4\\ppp {2}2.\\fp ~ - {2}4\\ppp {3}2.\\fp ~ + "vc": """r4 {0}2.\\f\\> ~ + {0}4\\ppp {1}2.\\f\\> ~ + {1}4\\ppp {2}2.\\f\\> ~ + {2}4\\ppp {3}2.\\f\\> ~ {3}1\\ppp """, - "kb": """r4 {0}2.\\fp ~ - {0}4 {1}2.\\fp ~ - {1}4 {2}2.\\fp ~ - {2}4 {3}2.\\fp ~ - {3}1 + "kb": """r4 {0}2.\\f\\> ~ + {0}4 {1}2.\\f\\> ~ + {1}4 {2}2.\\f\\> ~ + {2}4 {3}2.\\f\\> ~ + {3}1\\ppp """, - "fluteOne": """r8 {0}8\\fp ~ {0}4~ - {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. + "fluteOne": """r8 {0}8\\f\\> ~ {0}4~ + {0}4\\ppp r4 r8 {1}8\\f\\> ~ {1}4~ + {1}4\\ppp r4 r8 {2}8\\f\\> ~ {2}4~ + {2}4\\ppp r4 r8 {3}8\\f\\> ~ {3}4~ + {3}4\\ppp r2. """, - "fluteTwo": """r8 {0}8\\fp ~ {0}4~ - {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\\f\\> ~ {0}4~ + {0}4\\ppp r4 r8 {1}8\\f\\> ~ {1}4~ + {1}4\\ppp r4 r8 {2}8\\f\\> ~ {2}4~ + {2}4\\ppp r4 r8 {3}8\\f\\> ~ {3}4~ + {3}4\\ppp r2. """, - "bsn": """r2 r8 {0}8\\fp ~ {0}4~ - {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. + "bsn": """r2 r8 {0}8\\f\\> ~ {0}4~ + {0}2 r8 {1}8\\f\\> ~ {1}4~ + {1}2 r8 {2}8\\f\\> ~ {2}4~ + {2}2 r8 {3}8\\f\\> ~ {3}4~ + {3}4\\ppp r2. """, "vibes": """r2^\\ord^\\mmallets r8 {0}8\\p ~ {0}4~ {0}2 r8 {1}8 ~ {1}4~ @@ -135,24 +135,22 @@ {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~ - {1}2\\ppp ~ {1}8 {2}8\\fp ~ {2}4~ - {2}2\\ppp ~ {2}8 {3}8\\fp ~ {3}4~ + "vnone": """r2 r8 {0}8\\f\\> ~ {0}4~ + {0}2\\ppp ~ {0}8 {1}8\\f\\> ~ {1}4~ + {1}2\\ppp ~ {1}8 {2}8\\f\\> ~ {2}4~ + {2}2\\ppp ~ {2}8 {3}8\\f\\> ~ {3}4~ {3}1\\ppp """, - "vntwo": """r2 r8 {0}8\\fp ~ {0}4~ - {0}2\\ppp ~ {0}8 {1}8\\fp ~ {1}4~ - {1}2\\ppp ~ {1}8 {2}8\\fp ~ {2}4~ - {2}2\\ppp ~ {2}8 {3}8\\fp ~ {3}4~ + "vntwo": """r2 r8 {0}8\\f\\> ~ {0}4~ + {0}2\\ppp ~ {0}8 {1}8\\f\\> ~ {1}4~ + {1}2\\ppp ~ {1}8 {2}8\\f\\> ~ {2}4~ + {2}2\\ppp ~ {2}8 {3}8\\f\\> ~ {3}4~ {3}1\\ppp """, } -MACROS = {"VIA_SORD": "viaSord = \\markup \"via sord.\"", - "ORD": "ord = \\markup { ord. }", - "MEDMALLETS": "mmallets = \\markup { med. mallets }", +MACROS = { } CALLS = [ diff --git a/morch/src/brassIYGH_B.py b/morch/src/brassIYGH_B.py index ec18912..7e3e8fc 100644 --- a/morch/src/brassIYGH_B.py +++ b/morch/src/brassIYGH_B.py @@ -50,28 +50,28 @@ # filltemplates(), which takes the newly created matrix as an arg TEMPLATE_MAP = { - "obOne": """r8 {0}8\\fp ~ {0}4. r8\\ppp r4 - r8 {1}8\\fp ~ {1}4. r8\\ppp r4 - r8 {2}8\\fp ~ {2}4. r8\\ppp r4 - r8 {3}8\\fp ~ {3}4. r8\\ppp r4 + "obOne": """r8 {0}8\\fp-. r2 r4 + r8 {1}8\\fp-. r2 r4 + r8 {2}8\\fp-. r2 r4 + r8 {3}8\\fp-. r2 r4 r1 """, - "obTwo": """r8 {0}8\\fp ~ {0}4. r8\\ppp r4 - r8 {1}8\\fp ~ {1}4. r8\\ppp r4 - r8 {2}8\\fp ~ {2}4. r8\\ppp r4 - r8 {3}8\\fp ~ {3}4. r8\\ppp r4 + "obTwo": """r8 {0}8\\fp-. r2 r4 + r8 {1}8\\fp-. r2 r4 + r8 {2}8\\fp-. r2 r4 + r8 {3}8\\fp-. r2 r4 r1 """, - "clOne": """r8 {0}8\\fp ~ {0}2~ {0}4\\ppp - r8 {1}8\\fp ~ {1}2~ {1}4\\ppp - r8 {2}8\\fp ~ {2}2~ {2}4\\ppp - r8 {3}8\\fp ~ {3}2~ {3}4\\ppp + "clOne": """r8 {0}8\\f\\> ~ {0}2~ {0}4\\ppp + r8 {1}8\\f\\> ~ {1}2~ {1}4\\ppp + r8 {2}8\\f\\> ~ {2}2~ {2}4\\ppp + r8 {3}8\\f\\> ~ {3}2~ {3}4\\ppp r1 """, - "clTwo": """r8 {0}8\\fp ~ {0}2~ {0}4\\ppp - r8 {1}8\\fp ~ {1}2~ {1}4\\ppp - r8 {2}8\\fp ~ {2}2~ {2}4\\ppp - r8 {3}8\\fp ~ {3}2~ {3}4\\ppp + "clTwo": """r8 {0}8\\f\\> ~ {0}2~ {0}4\\ppp + r8 {1}8\\f\\> ~ {1}2~ {1}4\\ppp + r8 {2}8\\f\\> ~ {2}2~ {2}4\\ppp + r8 {3}8\\f\\> ~ {3}2~ {3}4\\ppp r1 """, "tmp": """r8 {0}8-.\\f r2 {0}8-. r8 @@ -80,41 +80,41 @@ r8 {3}8-. r2 {3}8-. r8 r1 """, - "va": """r8 {0}8\\fp ~ {0}2. ~ - {0}8\\ppp {1}8\\fp ~ {1}2. ~ - {1}8\\ppp {2}8\\fp ~ {2}2. ~ - {2}8\\ppp {3}8\\fp ~ {3}2. ~ + "va": """r8 {0}8\\f\\> ~ {0}2. ~ + {0}8\\ppp {1}8\\f\\> ~ {1}2. ~ + {1}8\\ppp {2}8\\f\\> ~ {2}2. ~ + {2}8\\ppp {3}8\\f\\> ~ {3}2. ~ {3}1\\ppp """, - "vc": """r8 {0}8\\fp ~ {0}2. ~ - {0}8\\ppp {1}8\\fp ~ {1}2. ~ - {1}8\\ppp {2}8\\fp ~ {2}2. ~ - {2}8\\ppp {3}8\\fp ~ {3}2. ~ + "vc": """r8 {0}8\\f\\> ~ {0}2. ~ + {0}8\\ppp {1}8\\f\\> ~ {1}2. ~ + {1}8\\ppp {2}8\\f\\> ~ {2}2. ~ + {2}8\\ppp {3}8\\f\\> ~ {3}2. ~ {3}1\\ppp """, - "kb": """r8 {0}8\\fp ~ {0}2. ~ - {0}8\\ppp {1}8\\fp ~ {1}2. ~ - {1}8\\ppp {2}8\\fp ~ {2}2. ~ - {2}8\\ppp {3}8\\fp ~ {3}2. ~ + "kb": """r8 {0}8\\f\\> ~ {0}2. ~ + {0}8\\ppp {1}8\\f\\> ~ {1}2. ~ + {1}8\\ppp {2}8\\f\\> ~ {2}2. ~ + {2}8\\ppp {3}8\\f\\> ~ {3}2. ~ {3}1\\ppp """, - "fluteOne": """r2. {0}4\\fp ~ - {0}4 r2 {1}4\\fp ~ - {1}4 r2 {2}4\\fp ~ - {2}4 r2 {3}4\\fp ~ - {3}4 r2. + "fluteOne": """r2. {0}4\\f\\> ~ + {0}4\\ppp r2 {1}4\\f\\> ~ + {1}4\\ppp r2 {2}4\\f\\> ~ + {2}4\\ppp r2 {3}4\\f\\> ~ + {3}4\\ppp r2. """, - "fluteTwo": """r2. {0}4\\fp ~ - {0}4. r8 r4 {1}4\\fp ~ - {1}4. r8 r4 {2}4\\fp ~ - {2}4. r8 r4 {3}4\\fp ~ - {3}4. r8 r2 + "fluteTwo": """r2. {0}4\\f\\> ~ + {0}4.\\ppp r8 r4 {1}4\\f\\> ~ + {1}4.\\ppp r8 r4 {2}4\\f\\> ~ + {2}4.\\ppp r8 r4 {3}4\\f\\> ~ + {3}4.\\ppp r8 r2 """, - "bsn": """r2. {0}4\\fp ~ - {0}2 r4 {1}4\\fp ~ - {1}2 r4 {2}4\\fp ~ - {2}2 r4 {3}4\\fp ~ - {3}2 r2 + "bsn": """r2. {0}4\\f\\> ~ + {0}2\\ppp r4 {1}4\\f\\> ~ + {1}2\\ppp r4 {2}4\\f\\> ~ + {2}2\\ppp r4 {3}4\\f\\> ~ + {3}2\\ppp r2 """, "vibes": """r2 r8 {0}8\\p ~ {0}4~ {0}2 r8 {1}8 ~ {1}4~ @@ -128,16 +128,16 @@ {2}2 r8 {3}8 ~ {3}4~ {3}4 r2. """, - "vnone": """r2. {0}4\\fp ~ - {0}2\\ppp r4 {1}4\\fp ~ - {1}2\\ppp r4 {2}4\\fp ~ - {2}2\\ppp r4 {3}4\\fp ~ + "vnone": """r2. {0}4\\f\\> ~ + {0}2\\ppp r4 {1}4\\f\\> ~ + {1}2\\ppp r4 {2}4\\f\\> ~ + {2}2\\ppp r4 {3}4\\f\\> ~ {3}2\\ppp r2 """, - "vntwo": """r2. {0}4\\fp ~ - {0}2\\ppp r4 {1}4\\fp ~ - {1}2\\ppp r4 {2}4\\fp ~ - {2}2\\ppp r4 {3}4\\fp ~ + "vntwo": """r2. {0}4\\f\\> ~ + {0}2\\ppp r4 {1}4\\f\\> ~ + {1}2\\ppp r4 {2}4\\f\\> ~ + {2}2\\ppp r4 {3}4\\f\\> ~ {3}2\\ppp r2 """, } diff --git a/morch/src/stringcanon.py b/morch/src/stringcanon.py index 4d8869e..f3f36d1 100644 --- a/morch/src/stringcanon.py +++ b/morch/src/stringcanon.py @@ -161,9 +161,9 @@ "trb": "r2 {0}8-.\\fp^\\consord {0}-. r4 {1}8-. {1}-. r4 r2", "tuba": "r2 {0}8-.\\fp^\\consord {0}-. r4 {1}8-. {1}-. r4 r2", "tmp": "r4 {0}4--\\p {0}8-- {0}8-- {0}4-- {0}8-- {0}8-- {0}4-- {0}4-- r4", - "va": "r4 {0}4--\\p^\\tasto\\( {0}8-- {0}8--\\) {0}4--\\( {0}8-- {0}8--\\) {1}4--\\( {1}4--\\) r4", - "vc": "r4 {0}4--\\p^\\tasto\\( {0}8-- {0}8--\\) {1}4--\\( {1}8-- {1}8--\\) {2}4--\\( {2}4--\\) r4", - "kb": "r4 {0}4--\\p^\\tasto\\( {0}8-- {0}8--\\) {0}4--\\( {0}8-- {0}8--\\) {0}4--\\( {0}4--\\) r4", + "va": "r4 {0}4--\\p\\(^\\tasto {0}8-- {0}8--\\) {0}4--\\( {0}8-- {0}8--\\) {1}4--\\( {1}4--\\) r4", + "vc": "r4 {0}4--\\p\\(^\\tasto {0}8-- {0}8--\\) {1}4--\\( {1}8-- {1}8--\\) {2}4--\\( {2}4--\\) r4", + "kb": "r4 {0}4--\\p\\(^\\tasto {0}8-- {0}8--\\) {0}4--\\( {0}8-- {0}8--\\) {0}4--\\( {0}4--\\) r4", }, "B": { "fluteOne": "r1 {0}2.\\p {1}4 {1}1", @@ -175,9 +175,9 @@ "harp": """\\repeat tremolo 8 {{ {0}16\\ppp {1} }} | \\repeat tremolo 8 {{ {2}16\\f {3} }} | \\repeat tremolo 8 {{ {4}16\\ppp {5} }} |""", - "vnone": "r2. {0}8\\mp(^\\ord^\\espress {1}8 {2}2.)-- {3}4:16 ^\\ord\\> ~ {3}2.:16^\\pont\\ppp r4", - "vntwo": "r2. r8 {0}8\\p~^\\ord^\\espress {0}2\\< {1}2\\> {2}2.:16\\ppp r4", - "vc": "r2. {0}4\\mp~^\\ord^\\espress {0}4 {1}2\\> {2}4 ^\\ord ~ {2}2.:16^\\pont\\ppp r4", + "vnone": "r2. {0}8\\mp(^\\ord {1}8 {2}2.)-- {3}4:16 ^\\ord\\> ~ {3}2.:16^\\pont\\ppp r4", + "vntwo": "r2. r8 {0}8\\p~^\\ord {0}2\\< {1}2\\> {2}2.:16\\ppp^\\pont r4", + "vc": "r2. {0}4\\mp~^\\ord {0}4 {1}2\\> {2}4 ^\\ord ~ {2}2.:16^\\pont\\ppp r4", }, # C phrases are phrases that link A and B "C": {}, @@ -206,6 +206,10 @@ "PED": "ped = \\markup { pedal depressed }", "CON_SORD": "consord = \\markup {con sord.}", "VIA_SORD": "viasord = \\markup {via sord.}", + "FEATHERED_BEAM_RIGHT": "featheredBeamRight = { \\override Beam.grow-direction = #RIGHT }", + "FEATHERED_BEAM_LEFT": "featheredBeamLeft = { \\override Beam.grow-direction = #LEFT }", + "VIA_SORD": "viaSord = \\markup \"via sord.\"", + "MEDMALLETS": "mmallets = \\markup { med. mallets }", } ################################################################ @@ -473,6 +477,8 @@ def get_segment() -> dict: INIT_HARP_PEDAL = "r2_\\markup { \\harp-pedal #\"--^|----\" } r2 r2 r2" + PAGE_BREAK = "\\break" + METER_2_4 = "\\time 2/4" METER_4_4 = "\\time 4/4" @@ -491,6 +497,7 @@ def get_segment() -> dict: "mm01_04": SECT_A_REST, "mm05_08": SECT_A_REST, "mm09_12": SECT_A_REST, + "break": PAGE_BREAK, "mm13": METER_4_4, "rmark1": RMARKS[0], "mm13_15": SECT_B_REST, @@ -499,6 +506,7 @@ def get_segment() -> dict: "mm19_22": SECT_A_REST, "mm23_26": SECT_A_REST, "mm27_30": SECT_A_REST, + "break": PAGE_BREAK, "mm31": METER_4_4, "rmark2": RMARKS[1], "mm31_33": fluteOne_B[2], @@ -507,6 +515,7 @@ def get_segment() -> dict: "mm37_40": SECT_A_REST, "mm41_44": SECT_A_REST, "mm45_48": SECT_A_REST, + "break": PAGE_BREAK, "mm49": METER_4_4, "rmark3": RMARKS[2], "mm49_51": fluteOne_B[4], @@ -515,6 +524,7 @@ def get_segment() -> dict: "mm55_58": SECT_A_REST, "mm59_62": SECT_A_REST, "mm63_66": SECT_A_REST, + "break": PAGE_BREAK, "mm67": METER_4_4, "rmark4": RMARKS[3], "mm67_69": fluteOne_B[6], @@ -523,14 +533,17 @@ def get_segment() -> dict: "mm73_76": SECT_A_REST, "mm77_80": SECT_A_REST, "mm81_84": SECT_A_REST, + "break": PAGE_BREAK, "mm85": METER_4_4, "rmark5": RMARKS[4], "mm85_87": fluteOne_B[8], "mm88_90": fluteOne_B[9], + "break": PAGE_BREAK, "mm91": METER_2_4, "mm91_94": SECT_A_REST, "mm95_98": SECT_A_REST, "mm99_102": SECT_A_REST, + "break": PAGE_BREAK, }, "fluteTwo": { "mm01": METER_2_4, diff --git a/morch/src/wwindChorale.py b/morch/src/wwindChorale.py index 8ab0f28..fcb6a30 100644 --- a/morch/src/wwindChorale.py +++ b/morch/src/wwindChorale.py @@ -11,16 +11,11 @@ from operator import itemgetter from marana.tools import create_voice, outputheader, generate_chunk -from stringcanon import printmacros +from stringcanon import MACROS, printmacros items = {2, 3} total = 34 -MACROS = { - "FEATHERED_BEAM_RIGHT": "featheredBeamRight = { \\override Beam.grow-direction = #RIGHT }", - "FEATHERED_BEAM_LEFT": "featheredBeamLeft = { \\override Beam.grow-direction = #LEFT }", -} - def createTraversal(items: set[int], total: int, seqlen: int) -> list[int] | int: """ @@ -70,26 +65,26 @@ def make_bars_four_four(parent_list: list[list[str]]) -> list[str]: FLUTE_ONE = [ - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[0], # 8 - ["r4 e''8-.\\fp\\pp r8"] * SEQ_ONE[1], # 4 - ["r4 e''8-.\\fp\\pp r8"] * SEQ_ONE[2], # 4 - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[3], # 2 - ["r4 c''8-.\\fp\\pp r8"] * SEQ_ONE[4], # 9 - ["r4 c''8-.\\fp\\pp r8"] * SEQ_ONE[5], # 2 - ["r4 b'8-.\\fp\\pp r8"] * SEQ_ONE[6], # 5 + ["r4 a'8-.\\fp r8"] * SEQ_ONE[0], # 8 + ["r4 e''8-.\\fp r8"] * SEQ_ONE[1], # 4 + ["r4 e''8-.\\fp r8"] * SEQ_ONE[2], # 4 + ["r4 a'8-.\\fp r8"] * SEQ_ONE[3], # 2 + ["r4 c''8-.\\fp r8"] * SEQ_ONE[4], # 9 + ["r4 c''8-.\\fp r8"] * SEQ_ONE[5], # 2 + ["r4 b'8-.\\fp r8"] * SEQ_ONE[6], # 5 ] FLUTE_ONE_BARS = make_bars_four_four(FLUTE_ONE) # prepend dynamics to first bar FLUTE_TWO = [ - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[0], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[1], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[2], - ["r4 e'8-.\\fp\\pp r8"] * SEQ_ONE[3], - ["r4 f'8-.\\fp\\pp r8"] * SEQ_ONE[4], - ["r4 f'8-.\\fp\\pp r8"] * SEQ_ONE[5], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[6], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[0], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[1], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[2], + ["r4 e'8-.\\fp r8"] * SEQ_ONE[3], + ["r4 f'8-.\\fp r8"] * SEQ_ONE[4], + ["r4 f'8-.\\fp r8"] * SEQ_ONE[5], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[6], ] FLUTE_TWO_BARS = make_bars_four_four(FLUTE_TWO) @@ -208,25 +203,25 @@ def make_bars_four_four(parent_list: list[list[str]]) -> list[str]: CLARINET_ONE = [ - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[0], - ["r4 cs''8-.\\fp\\pp r8"] * SEQ_ONE[1], - ["r4 c''8-.\\fp\\pp r8"] * SEQ_ONE[2], - ["r4 g'8-.\\fp\\pp r8"] * SEQ_ONE[3], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[4], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[5], - ["r4 b'8-.\\fp\\pp r8"] * SEQ_ONE[6], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[0], + ["r4 cs''8-.\\fp r8"] * SEQ_ONE[1], + ["r4 c''8-.\\fp r8"] * SEQ_ONE[2], + ["r4 g'8-.\\fp r8"] * SEQ_ONE[3], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[4], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[5], + ["r4 b'8-.\\fp r8"] * SEQ_ONE[6], ] CLARINET_ONE_BARS = make_bars_four_four(CLARINET_ONE) CLARINET_TWO = [ - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[0], - ["r4 a8-.\\fp\\pp r8"] * SEQ_ONE[1], - ["r4 a8-.\\fp\\pp r8"] * SEQ_ONE[2], - ["r4 c'8-.\\fp\\pp r8"] * SEQ_ONE[3], - ["r4 e'8-.\\fp\\pp r8"] * SEQ_ONE[4], - ["r4 d'8-.\\fp\\pp r8"] * SEQ_ONE[5], - ["r4 a'8-.\\fp\\pp r8"] * SEQ_ONE[6], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[0], + ["r4 a8-.\\fp r8"] * SEQ_ONE[1], + ["r4 a8-.\\fp r8"] * SEQ_ONE[2], + ["r4 c'8-.\\fp r8"] * SEQ_ONE[3], + ["r4 e'8-.\\fp r8"] * SEQ_ONE[4], + ["r4 d'8-.\\fp r8"] * SEQ_ONE[5], + ["r4 a'8-.\\fp r8"] * SEQ_ONE[6], ] CLARINET_TWO_BARS = make_bars_four_four(CLARINET_TWO) diff --git a/morch/todo.org b/morch/todo.org index 749805c..e35c66f 100644 --- a/morch/todo.org +++ b/morch/todo.org @@ -26,7 +26,7 @@ ** DONE Harp pedaling ** DONE Parts -** TODO Proof Read [3/4] +** TODO Proof Read [4/4] *** DONE Woodwinds [7/7] - [X] fl 1 - [X] fl 2 @@ -47,12 +47,13 @@ *** DONE Perc [2/2] - [X] timps - [X] vibes -*** TODO Strings [1/6] +*** DONE Strings [6/6] - [X] harp - - [ ] vln1 - - [ ] vln2 - - [ ] vla - - [ ] vlc - - [ ] cb + - [X] vln1 + - [X] vln2 + - [X] vla + - [X] vlc + - [X] cb +*** TODO Cover & dist