Skip to content

Commit

Permalink
Final updates before v1 release
Browse files Browse the repository at this point in the history 
Cleaned up build script to fully automate the distribution (includes
now a small wrapper for the build directory that can be easily
archived. Final edits in all the four sections as well as the
score.ly. Inclusion of a new file dist.org that basically generates
the cover for the score in latex.
  • Loading branch information
@adammccartney
adammccartney committed Jun 30, 2022
1 parent 0961f73 commit 616cd03
Show file tree
Hide file tree
Showing 8 changed files with 225 additions and 157 deletions.
16 changes: 15 additions & 1 deletion morch/Makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -61,3 +74,4 @@ build_dir:

clean:
rm -rf $(BUILD_DIR)
rm dist.tex dist.pdf
47 changes: 47 additions & 0 deletions morch/dist.org
View file
Original file line number Diff line number Diff line change
@@ -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
4 changes: 2 additions & 2 deletions morch/score/score.ly
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)))

}

Expand Down
110 changes: 54 additions & 56 deletions morch/src/brassIYGH_A.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
)


from stringcanon import printmacros
from stringcanon import MACROS, printmacros

CALL_ROOTS = ["bf", "bf", "bf", "f"]
RESP_ROOTS = ["<bf,, bf, d>", "<bf,, bf, d>", "<bf,, bf, d>", "<f,, f, a,>",
Expand Down Expand Up @@ -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
Expand All @@ -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~
Expand All @@ -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 = [
Expand Down
102 changes: 51 additions & 51 deletions morch/src/brassIYGH_B.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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~
Expand All @@ -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
""",
}
Expand Down
Loading

0 comments on commit 616cd03

Please sign in to comment.