diff --git a/LilyPond_CheatSheet.def b/LilyPond_CheatSheet.def
new file mode 100644
index 0000000000000000000000000000000000000000..1eda91bdcb9c170f5afde4a480f31b39af353df9
--- /dev/null
+++ b/LilyPond_CheatSheet.def
@@ -0,0 +1,30 @@
+{
+ "output_dir": "LilyPond_CheatSheet",
+ "version": "2.15.0",
+ "template": "",
+ "language": "deutsch",
+
+ "defaults": {
+ "title": "LilyPond Cheatsheet",
+ "subtitle": "Basic Usage, LilyPond version 2.15",
+ "composer": "Reinhold Kainhofer",
+
+ "year": "2011",
+ "publisher": "Edition Kainhofer, Vienna",
+ "publisherurl": "http://www.edition-kainhofer.com/",
+ "editor": "Reinhold Kainhofer",
+ "editorurl": "http://reinhold.kainhofer.com/",
+ "editormail": "reinhold@kainhofer.com",
+ "scorenumber": "EK-Sheet-01",
+ "scoreinfo": "",
+ "basename": "LilyPond_CheatSheet",
+
+ "instruments": [],
+ "vocalvoices": [],
+ "noscore_instruments": [],
+ "scores": [],
+ },
+
+ "scores": [""],
+ "latex": {},
+}
diff --git a/LilyPond_CheatSheet.pdf b/LilyPond_CheatSheet.pdf
index f5470203e60d69371a43cb1d4f0e6877b10f47e0..faf6339ff01df05fd436cb335760a5ebbe2c6f70 100644
Binary files a/LilyPond_CheatSheet.pdf and b/LilyPond_CheatSheet.pdf differ
diff --git a/LilyPond_CheatSheet.tex b/LilyPond_CheatSheet.tex
index d6f513ef1c3a125769be123aa4eb0296b1df2e00..4c2610cc6994fed248682d0f909007687f1d81a0 100644
--- a/LilyPond_CheatSheet.tex
+++ b/LilyPond_CheatSheet.tex
@@ -1,5 +1,10 @@
\documentclass[a4paper,portrait,fontscale=1,margin=1cm]{baposter}
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Crop marks for printing
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% \usepackage[width=232truemm,height=319truemm,center,cam]{crop}
+
\tracingstats=0
\usepackage{relsize}
@@ -9,7 +14,7 @@
\usepackage{colortbl}
\usepackage{grffile} % Fix loading files name a.preview.pdf
\usepackage{helvet}
-\usepackage{listings}
+% \usepackage{listings}
\usepackage{fancyvrb} % to allow Verbatim inside headerbox
\usepackage[pdfborderstyle=\@empty]{hyperref}
@@ -20,6 +25,13 @@
\newcommand{\mytilde}{\kern 0em\lower .7ex\hbox{~}\kern -0.1em}
\catcode`~=13 % revert back to treating tilde (~) as an active character
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Table formatting
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\newcolumntype{x}[1]{>{\raggedright}m{#1}}
+\newcommand{\tn}{\tabularnewline}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
% Multicol Settings
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
@@ -44,37 +56,46 @@
\DeclareGraphicsExtensions{.preview.pdf,.pdf,.eps,.png,.jpg}
\DeclareGraphicsRule{.preview.pdf}{pdf}{*}{}
+
+
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% Define some colors
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\definecolor{posterBackground}{rgb}{0.875,1.0,0.7}
+\definecolor{boxBorder}{rgb}{0,1.0,0.0}
+\definecolor{boxBackground}{rgb}{1,1,1}
+\definecolor{textColor}{rgb}{0,0,0}
+
+\definecolor{row1}{rgb}{0.8,0.8,0.8}
+\definecolor{row2}{rgb}{1,1,1}
+
+\newlength{\leftimgwidth}
+
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Begin of Document
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+\rowcolors{1}{row1}{row2} % color table rows in alternating colors automatically
+
+
\begin{document}
\sf\smaller % smaller, sans-serif font by default
-\rowcolors{1}{row1}{row2} % color table rows in alternating colors automatically
+\pagecolor{posterBackground}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
%%% Here starts the poster
%%%---------------------------------------------------------------------------
%%% Format it to your taste with the options
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-% Define some colors
-\definecolor{posterBackground}{rgb}{0.875,1.0,0.7}
-\definecolor{boxBorder}{rgb}{0,1.0,0.0}
-\definecolor{boxBackground}{rgb}{1,1,1}
-\definecolor{textColor}{rgb}{0,0,0}
-\definecolor{row1}{rgb}{0.8,0.8,0.8}
-\definecolor{row2}{rgb}{1,1,1}
-
-
-\newlength{\leftimgwidth}
\begin{poster}{ % Poster Options
% General poster settings
% grid=yes, % Show grid to help with alignment
colspacing=1em,
+ columns=3,
headerheight=0.065\textheight,
- %background=none,
- background=plain,
+ background=none,
+% background=plain,
bgColorOne=posterBackground,
% Box headers:
headershape=rectangle,
@@ -94,11 +115,8 @@
{\includegraphics[height=6em]{images/double-lily-modified3}} % eyecatcher
{\Huge LilyPond - Music Typesetting} % Title
{
- Basic usage - LilyPond Version 2.14\\[0.1em]
+ Basic usage - LilyPond Version 2.14 and above\\[0.1em]
\footnotesize Cheatsheet by R. Kainhofer, Edition Kainhofer, \url{http://www.edition-kainhofer.com/}
-% \smaller \vspace{0.25em} Reinhold Kainhofer, \url{reinhold@kainhofer.com}\\
-% \smaller \smaller Edition Kainhofer, \url{http://www.edition-kainhofer.com/}
- % \textit{and} LilyPond (\url{http://www.lilypond.org/})
} % Authors
{\includegraphics[height=6em]{images/double-lily-modified3}} % logo
@@ -118,7 +136,7 @@
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{Command-line usage}{name=cmdline,column=0,row=0,span=2}{
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-\colorbox{white}{\texttt{lilypond [-l LOGLEVEL] [-dSCMOPTIONS] [-o OUTPUT] [-V] FILE.ly [FILE1.ly]}}
+\colorbox{white}{\texttt{lilypond [-l LOGLEVEL] [-dSCMOPTIONS] [-o OUTPUT] [-V] FILE.ly [FILE2.ly]}}
\vspace{0.5em}
Common options:\vspace{-1.5em}
@@ -133,11 +151,11 @@ Common options:\vspace{-1.5em}
\end{tabbing}
\columnbreak
\begin{tabbing}
-\= -daux-files=\#f \qquad\qquad \= No .tex, .texi, .count files\\
-\> -dpreview \> Cropped ``preview'' image\\
-\> -dpixmap-format=pngalpha \> \qquad\quad{}transparent PNG\\
+\= -dpreview \hspace{5.5em} \= Cropped ``preview'' image\\
\> -dlog-file=FILE \> Create .log file\\
-\> -dno-point-and-click \> No Point \& Click info
+\> -dno-point-and-click \> No Point \& Click info\\
+\> -dpixmap-format=pngalpha \> \hspace{3.5em}Transparent PNG\\
+\> -dno-delete-intermediate-files \> \hspace{3.5em}Keep .ps files\\
\end{tabbing}
\end{multicols}\vspace{-2em}
@@ -146,42 +164,40 @@ Common options:\vspace{-1.5em}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{Basic Notation}{name=basic,column=0,span=2,below=cmdline}{
-% \begin{tabular}{|m{2.7cm}m{4.5cm}m{4.45cm}|}\hline
-\begin{tabular}{m{2.7cm}m{4.5cm}m{4.45cm}}%\hline
-\includegraphics[scale=\imgw]{out/notenames} & \texttt{c d e f g a b} & Note names (Dutch) \\
-\includegraphics[scale=\imgw]{out/relative} & \texttt{\textbackslash{}relative c' \{c f d' c,\}} & Relative mode (change less than a fifth), raise/lower one octave \\
-\includegraphics[scale=\imgw]{out/durations.preview} & \texttt{g1\,\,\,g2\,\,\,g4\,\,\,g8\,\,\,g16\,\,\,g4.\,\,\,g4..} & durations (1, 2, 4, 8, 16, ...); append ``\texttt{.}'' for dotted note \\
-\includegraphics[scale=\imgw]{out/alterations.preview.pdf} & \texttt{cis bes as cisis beses b b!\ b?} & Alterations: \texttt{-is/-es} for sharp/flat, \texttt{-isis/-eses} for double, \texttt{!} forces, \texttt{?} shows cautionary accidental \\
-\includegraphics[scale=\imgw]{out/clefs} & \texttt{\textbackslash{}clef "treble" \textbackslash{}clef "bass" \textbackslash{}clef "tenor" \textbackslash{}clef "treble\_8" } & Clefs \\
-\includegraphics[scale=\imgw]{out/time} & \texttt{\textbackslash{}time 4/4 \textbackslash{}time 2/2 \textbackslash{}time 3/4 \textbackslash{}time 3/8 } & Time signature \\
-\includegraphics[scale=\imgw]{out/keys} & \texttt{\textbackslash{}key c \textbackslash{}minor \ \ \textbackslash{}key b \textbackslash{}dorian \ \ \textbackslash{}key c \textbackslash{}major } & Key signature\\
-
-\includegraphics[scale=\imgw]{out/chords} & \texttt{<c e g>4 <f c'> q2 } & Chords \\
-\includegraphics[scale=\imgw]{out/ties} & \texttt{c4\mytilde{} c c2\mytilde{} c4 <c a f>\mytilde{} c } & Tie \\
-\includegraphics[scale=\imgw]{out/slurs} & \texttt{c( a) c\textbackslash( b( a) g f\textbackslash) } & Slur / Phrasing slur \\
-\includegraphics[scale=\imgw]{out/beaming} &\texttt{g8 g8 g8[ g g] g8[ g16 g16]$\!\!\!\!\!\!$} & Beaming \\
+% \begin{tabular}{|x{2.7cm}x{4.5cm}x{4.45cm}|}\hline
+\begin{tabular}{x{2.7cm}x{4.5cm}x{4.45cm}}%\hline
+\includegraphics[scale=\imgw]{out/notenames} & \texttt{c d e f g a b} & Note names (Dutch) \tn
+\includegraphics[scale=\imgw]{out/alterations.preview.pdf} & \texttt{cis bes as cisis beses b b!\ b?} & Alterations: \texttt{-is/-es} for sharp/flat, \texttt{-isis/-eses} for double, \texttt{!} forces, \break\texttt{?} shows cautionary accidental \tn
+\includegraphics[scale=\imgw]{out/relative} & \texttt{\textbackslash{}relative c' \{c f d' c,\}} & Relative mode (change less than a fifth), raise/lower one octave \tn
+\includegraphics[scale=\imgw]{out/durations.preview} & \texttt{g1\,\,\,g2\,\,\,g4\,\,\,g8\,\,\,g16\,\,\,g4.\,\,\,g4..} & durations (1, 2, 4, 8, 16, ...); \break append ``\texttt{.}'' for dotted note \tn
+\includegraphics[scale=\imgw]{out/beaming} &\texttt{g8 g8 g8[ g g] g8[ g16 g16]$\!\!\!\!\!\!$} & Automatic and manual beaming \tn
+\includegraphics[scale=\imgw]{out/rest.preview.pdf} & \texttt{r2\,\,\,r4\,\,\,r4.\,\,\,r4..\,\,\,r8\,\,\,r16\,\,\,r32}$\!\!\!$ & rests: \texttt{r} like a note name \tn
+\includegraphics[scale=\imgw]{out/clefs} & \texttt{\textbackslash{}clef "treble" \textbackslash{}clef "bass" \textbackslash{}clef "tenor" \textbackslash{}clef "treble\_8" } & Clefs \tn
+\includegraphics[scale=\imgw]{out/time} & \texttt{\textbackslash{}time 4/4 \textbackslash{}time 2/2 \textbackslash{}time 3/4 \textbackslash{}time 3/8 } & Time signature \tn
+\includegraphics[scale=\imgw]{out/keys} & \texttt{\textbackslash{}key c \textbackslash{}minor \ \ \textbackslash{}key b \textbackslash{}dorian \ \ \textbackslash{}key c \textbackslash{}major } & Key \tn
-\includegraphics[scale=\imgw]{out/rest.preview.pdf} & \texttt{r2\,\,\,r4\,\,\,r4.\,\,\,r4..\,\,\,r8\,\,\,r16\,\,\,r32}$\!\!\!$ & rests: \texttt{r} like a note name \\
-\includegraphics[scale=\imgw]{out/mmrest.preview.pdf} & \texttt{R1 | R1*3 | \textbackslash{}time 3/4 R2.*4 } & Full-/Multimeasure rests: \texttt{R} (with exact duration)\\
+\includegraphics[scale=\imgw]{out/chords} & \texttt{<c e g>4 <f c'> q2 } & Chords, repeated chord \tn
+\includegraphics[scale=\imgw]{out/ties} & \texttt{c4\mytilde{} c c2\mytilde{} c4 <c a f>\mytilde{} c } & Tie \tn
+\includegraphics[scale=\imgw]{out/slurs} & \texttt{c( a) c\textbackslash( b( a) g f\textbackslash) } & Slur / Phrasing slur \tn
-\includegraphics[scale=\imgw]{out/dynamics} & \texttt{g\textbackslash{}p\textbackslash{}< a b c\textbackslash{}f\textbackslash{}cresc d e\textbackslash{}!}$\!\!\!$ & Dynamics, hairpins, text crescendo\\
+\includegraphics[scale=\imgw]{out/dynamics} & \texttt{g\textbackslash{}p\textbackslash{}< a b c\textbackslash{}f\textbackslash{}cresc d e\textbackslash{}!}$\!\!\!$ & Dynamics, hairpins, text crescendo \tn
-\includegraphics[scale=\imgw]{out/repeats} & \texttt{c1 \textbackslash{}repeat volta 2 \{ d \} \textbackslash{}alternative \{\{e1\} \{f\}\} g$\!\!$} & Repeats\\
+\includegraphics[scale=\imgw]{out/articulations} & \texttt{c4-> c-.\ c\^{}| c\^{}-\_+ c\textbackslash{}trill c\textbackslash{}marcato c\^{}"Text"} & Articulations and text markup \tn
-\includegraphics[scale=\imgw]{out/bars} & \texttt{\textbackslash{}partial 8 c8 | c1 | d \textbackslash{}bar"||" c \textbackslash{}bar"|."} & Partial measure, bar check, bar lines\\
+\includegraphics[scale=\imgw]{out/bars} & \texttt{\textbackslash{}partial 8 c8 | c1 | c \textbackslash{}bar"||" c \textbackslash{}bar"|."} & Partial measure, bar line check,\break bar lines \tn
+\includegraphics[scale=\imgw]{out/mmrest.preview.pdf} & \texttt{R1 | R1*3 | \textbackslash{}time 3/4 R2.*4 } & Full-/Multimeasure rests: \texttt{R} (with exact duration)\tn
+\includegraphics[scale=\imgw]{out/repeats} & \texttt{c1 \textbackslash{}repeat volta 2 \{ d \} \textbackslash{}alternative \{\{e\} \{f\}\} g} & Repeats (with alternative endings; can be left out)\tn
-\includegraphics[scale=\imgw]{out/articulations} & \texttt{c4-> c-.\ c\^{}| c\^{} -\_+ c\textbackslash{}trill c\textbackslash{}marcato} & Articulations\\
+\includegraphics[scale=\imgw]{out/tempo-text}$\!$ & \texttt{\textbackslash{}tempo "Adagio" 4=60 c1 c c \textbackslash{}mark \textbackslash{}default c \textbackslash{}mark "X"} & Tempo indications, text marks \tn
-\includegraphics[scale=\imgw]{out/tempo-text} & \texttt{\textbackslash{}tempo "Adagio" 4=60 c1 c c \textbackslash{}mark \textbackslash{}default c } & Tempo, marks\\
+\includegraphics[scale=\imgw]{out/grace} & \texttt{\textbackslash{}grace d8 c4 \textbackslash{}appoggiatura d8 c4 \textbackslash{}acciaccatura d8 c4} & Grace notes \tn
-\includegraphics[scale=\imgw]{out/grace} & \texttt{\textbackslash{}grace d8 c4 \textbackslash{}appoggiatura d8 c4 \textbackslash{}acciaccatura d8 c4} & Grace notes\\
+\includegraphics[scale=\imgw]{out/tuplet} & \texttt{\textbackslash{}times 2/3 \{c8 d e\} \textbackslash{}times 4/5 \{c d e d c\} } & Triplet, tuplets \tn
-\includegraphics[scale=\imgw]{out/tuplet} & \texttt{\textbackslash{}times 2/3 \{c8 d e\} \textbackslash{}times 4/5 \{c d e d c\} } & Triplet, tuplets\\
-
-\includegraphics[scale=\imgw]{out/parallel} & \texttt{<{}<\{a2 c4 a\}\textbackslash\textbackslash{}\{f4 g4 f2\}>{}>} & Parallel music\\
+\includegraphics[scale=\imgw]{out/parallel} & \texttt{<{}<\{a2 c4 a\}\textbackslash\textbackslash{}\{f4 g4 f2\}>{}>} & Parallel music \tn
% \hline
@@ -191,18 +207,19 @@ Common options:\vspace{-1.5em}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{General Syntax}{name=syntax,column=2,aligned=cmdline,bottomaligned=cmdline}{
-\begin{tabular}{m{2.5cm}m{2.9cm}}%\hline
-\texttt{\textbackslash{}xxxx} & function or variable\\
-\texttt{\{ \dots\ \}} & Code grouping\\
-\texttt{var = \{c'4 d'\}} & Variable assignment\\
-\texttt{\textbackslash{}version "2.14.0"$\!$} & LilyPond version \\
-\texttt{\% \dots} & Comment\\
-\texttt{\%\{ \dots\ \%\}} & Block comment\\
-\texttt{c1 | d2 e |} & Bar checks\\
-% \texttt{\textbackslash{}bar"||" \textbackslash{}bar"|."$\!\!$} & Bar line types\\
-% \texttt{\textbackslash{}partial 8 c8 | } & Partial measure \\
-\texttt{\#'(}..\texttt{),\,\,\#\#t,\,\,\#'sym$\!\!\!\!$} & Scheme list, true, symb.$\!$
-% \\\hline
+\begin{tabular}{x{2.5cm}x{2.95cm}}%\hline
+\texttt{\textbackslash{}xxxx} & function or variable\tn
+\texttt{\{ \dots\ \}} & Code grouping\tn
+\texttt{var = \{\dots\}} & Variable assignment\tn
+\texttt{\textbackslash{}version "2.14.0"$\!$} & LilyPond version \tn
+\texttt{\% \dots} & Comment\tn
+\texttt{\%\{ \dots\ \%\}} & Block comment\tn
+\texttt{c\textbackslash\dots} & Postfix-notation (notes)\tn
+% \texttt{c1 | d2 e |} & Bar checks\tn
+% \texttt{\textbackslash{}bar"||" \textbackslash{}bar"|."$\!\!$} & Bar line types\tn
+% \texttt{\textbackslash{}partial 8 c8 | } & Partial measure \tn
+\texttt{\#'(}..\texttt{),\,\,\#\#t,\,\,\#'sym$\!\!\!\!$} & Scheme list, true, symb.$\!\!\!$
+% \tn\hline
\end{tabular}
}
@@ -212,7 +229,7 @@ Common options:\vspace{-1.5em}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{Creating Staves, Voices and Groups}{name=hierarchy,column=2,below=syntax}{
-\begin{tabular}{m{0.96\textwidth}}%\hline
+\begin{tabular}{x{0.96\textwidth}}%\hline
\rowcolor{row2}
\VerbatimInput[firstline=17,lastline=37]{examples/hierarchy.ly}
@@ -264,7 +281,7 @@ Common options:\vspace{-1.5em}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{Adding Lyrics}{name=lyrics,column=0,below=basic,above=bottom}{
-\begin{tabular}{m{0.96\textwidth}}%\hline
+\begin{tabular}{x{0.96\textwidth}}%\hline
\rowcolor{row2}
\VerbatimInput[firstline=12,lastline=19]{examples/lyrics.ly}
@@ -279,7 +296,7 @@ Common options:\vspace{-1.5em}
%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
\headerbox{Writing text and markup}{name=simple_markup,column=1,below=basic,above=bottom}{
-\begin{tabular}{m{0.96\textwidth}}%\hline
+\begin{tabular}{x{0.96\textwidth}}%\hline
\rowcolor{row2}
{\smaller
\VerbatimInput[firstline=2,lastline=9]{examples/writing_text.ly}
@@ -327,8 +344,8 @@ Creative Commons Attribution-NonCommercial 3.0
columns=3,
colspacing=1em,
headerheight=0.08\textheight,
- %background=none,
- background=plain,
+ background=none,
+% background=plain,
bgColorOne=posterBackground,
% Box headers:
headershape=rectangle,
@@ -455,20 +472,20 @@ V spacing
\headerbox{Note names in the most common languages}{name=notenames,column=1,span=2,above=bottom}{
Select with: \texttt{\textbackslash{}language "italiano"}, default is ``nederlands''
-\begin{tabular}{|p{1.2cm}p{2.7cm}p{3.9cm}|}\hline
-Language & Note names & accidentals \\\hline
-
-nederlands & c d e f g a bes b & -is -es -isis -eses \\
-% catalan & do re mi fa sol la sib si & -d/-s -b -dd/-ss -bb \\
-deutsch & c d e f g a b h & -is -es -isis -eses \\
-english & c d e f g a bf b & -s/-sharp -f/-flat -ss/-x -ff\\
-espanol & do re mi fa sol la sib si & -s -b -ss/-x -bb \\
-italiano & do re mi fa sol la sib si & -d -b -dd -bb \\
-% norsk & c d e f g a b h & -iss/-is -ess/-es -ississ/-isis -essess/-eses \\
-% portugues & do re mi fa sol la sib si & -s -b -ss -bb \\
-% suomi & c d e f g a b h & -is -es -isis -eses \\
-% svenska & c d e f g a b h & -iss -ess -ississ -essess \\
-% vlaams & do re mi fa sol la sib si &-k -b -kk -bb \\
+\begin{tabular}{|x{1.5cm}x{2.7cm}x{3.9cm}|}\hline
+Language & Note names & accidentals \tn\hline
+
+nederlands & c d e f g a bes b & -is -es -isis -eses \tn
+% catalan & do re mi fa sol la sib si & -d/-s -b -dd/-ss -bb \tn
+deutsch & c d e f g a b h & -is -es -isis -eses \tn
+english & c d e f g a bf b & -s/-sharp -f/-flat -ss/-x -ff\tn
+espanol & do re mi fa sol la sib si & -s -b -ss/-x -bb \tn
+italiano & do re mi fa sol la sib si & -d -b -dd -bb \tn
+% norsk & c d e f g a b h & -iss/-is -ess/-es -ississ/-isis -essess/-eses \tn
+% portugues & do re mi fa sol la sib si & -s -b -ss -bb \tn
+% suomi & c d e f g a b h & -is -es -isis -eses \tn
+% svenska & c d e f g a b h & -iss -ess -ississ -essess \tn
+% vlaams & do re mi fa sol la sib si &-k -b -kk -bb \tn
\hline
\end{tabular}
diff --git a/Makefile b/Makefile
index 0f8b755f7cedbf95d69de2a039ad8a7a49602c73..af9367c05bc06b56f78248dc5936d41d08370779 100644
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,10 @@ $(OUT):
$(outfiles): $(OUT)/%.pdf: $(IN)/%.ly
- LILYPOND_LOGLEVEL=BASIC lilypond -drelative-includes -dbackend=eps -dpreview -dno-aux-files --pdf --png -dpixmap-format=pngalpha -o $(basename $@) $<
+ LILYPOND_LOGLEVEL=BASIC lilypond -drelative-includes -dbackend=eps -dpreview -dno-aux-files --pdf -o $(basename $@) $<
$(sheets): %.pdf: %.tex $(outfiles)
- pdflatex $<
\ No newline at end of file
+ pdflatex $<
+
+webshop: $(distfiles)
+ python ../Diverses/Webshop/EditionKainhofer_CSVI_Generate.py "LilyPond_CheatSheet.def" $(sheets)
diff --git a/examples/bars.ly b/examples/bars.ly
index 2b9cbb286cf5ab1117c51f67de26ab526dc50e1d..0a21fd9484972b65adc7305e43262517f6184de2 100644
--- a/examples/bars.ly
+++ b/examples/bars.ly
@@ -4,4 +4,4 @@
timing = ##t
}
}
-\relative c'' { \partial 8 c8 | c1 | d \bar"||" c \bar"|." }
\ No newline at end of file
+\relative c'' { \partial 8 c8 | c1 | c \bar"||" c \bar"|." }
\ No newline at end of file
diff --git a/examples/basic-notation-snippets.ily b/examples/basic-notation-snippets.ily
index b7285569c922b0f10efdded229c31221a4032b8f..d419164720a998dde195fb45962e7e160c0d443b 100644
--- a/examples/basic-notation-snippets.ily
+++ b/examples/basic-notation-snippets.ily
@@ -1,7 +1,7 @@
\version "2.15.7"
\paper {
- line-width=7\cm
+ line-width=5.5\cm
ragged-right=##f
}
\layout {
@@ -12,3 +12,9 @@
\remove "Time_signature_engraver"
}
}
+\header {
+ tagline =##f
+}
+\paper {
+ indent=0\cm
+}
\ No newline at end of file
diff --git a/examples/partial.ly b/examples/partial.ly
deleted file mode 100644
index d2fb4f4a222b690548caf083204b2e752fbddd12..0000000000000000000000000000000000000000
--- a/examples/partial.ly
+++ /dev/null
@@ -1,2 +0,0 @@
-\include "basic-notation-snippets.ily"
-\relative c'' { \partial 8 c8 | g1 }
\ No newline at end of file
diff --git a/examples/repeats.ly b/examples/repeats.ly
index 7d6a79fafa5bf4ec9291df78480538ef49ee81cf..febc42881dd788b7f0b890c871867245f2f7cf52 100644
--- a/examples/repeats.ly
+++ b/examples/repeats.ly
@@ -8,4 +8,4 @@
pages=1
systems-per-page=1
}
-\relative c' { c1 \repeat volta 2 { d } \alternative {{ e1 } { f}} g }
\ No newline at end of file
+\relative c' { c1 \repeat volta 2 { d } \alternative {{ e } { f}} g }
\ No newline at end of file
diff --git a/examples/tempo-text.ly b/examples/tempo-text.ly
index 78c3bcd7370742fc36555ffe587d2312f4817164..750627a7f6557ad69f7af8ef722051c3bcb06e17 100644
--- a/examples/tempo-text.ly
+++ b/examples/tempo-text.ly
@@ -4,4 +4,4 @@
timing = ##t
}
}
-\relative c'' { \tempo "Adagio" 4=60 c1 c c \mark \default c }
\ No newline at end of file
+\relative c'' { \tempo "Adagio" 4=60 c1 c c \mark \default c \mark "X"}
\ No newline at end of file
diff --git a/examples/writing_text.ly b/examples/writing_text.ly
index c39ffe431e2e03721203209275c1d25c3b6d7f25..63f68a65cbeb3a276ce589ff5ce56a9737a8466c 100644
--- a/examples/writing_text.ly
+++ b/examples/writing_text.ly
@@ -7,3 +7,7 @@
\rounded-box text, \with-color #red Text
}
}
+
+\paper {
+ line-width=7\cm
+}
\ No newline at end of file
diff --git a/out/alterations.pdf b/out/alterations.pdf
index a1c6ccf7829f167c49e1acea2594109e2040dca7..99691536fbae86a8adf192347dad119bd35b7134 100644
Binary files a/out/alterations.pdf and b/out/alterations.pdf differ
diff --git a/out/alterations.preview.pdf b/out/alterations.preview.pdf
index b2132bdf470c81f151542a2d22b6f53b2644e79d..b94d89fe259d3c6a00b1fb76a6b0636351d4fc23 100644
Binary files a/out/alterations.preview.pdf and b/out/alterations.preview.pdf differ
diff --git a/out/articulations.pdf b/out/articulations.pdf
index dd1293a17674743bd2ff6239ebc32621e2c218e6..90cd5aeb165dc952398f668e4a65fa004cae8d24 100644
Binary files a/out/articulations.pdf and b/out/articulations.pdf differ
diff --git a/out/articulations.preview.pdf b/out/articulations.preview.pdf
index 572e3e514dc8b2bc8872f095ae5357616171b2d6..cccb6c510495bfc837c3e697f2f68cf7daa377b2 100644
Binary files a/out/articulations.preview.pdf and b/out/articulations.preview.pdf differ
diff --git a/out/bars.pdf b/out/bars.pdf
index ecc514260adb47db4ce7a57ad130a70420958027..acecd7eabbbcad234a89750fc77204e6bc17d52a 100644
Binary files a/out/bars.pdf and b/out/bars.pdf differ
diff --git a/out/bars.preview.pdf b/out/bars.preview.pdf
index 3c705e2cdd67c914a507e0c84b7fad9d75d52f10..da06eb6e4ee0cfe95b788aeca5bacf95e59edf98 100644
Binary files a/out/bars.preview.pdf and b/out/bars.preview.pdf differ
diff --git a/out/beaming.pdf b/out/beaming.pdf
index 03d54119343fe0d1309b8402b7607d5136874189..df77da6a122599d3d0f562461e2eb2799022864e 100644
Binary files a/out/beaming.pdf and b/out/beaming.pdf differ
diff --git a/out/beaming.preview.pdf b/out/beaming.preview.pdf
index 6a1ff61697e1c92ec809d87a3b24d86ca4baaa04..149772118409cfb61cc3713c3e5c3bcc4c15654d 100644
Binary files a/out/beaming.preview.pdf and b/out/beaming.preview.pdf differ
diff --git a/out/chords.pdf b/out/chords.pdf
index 4b4b32fa04aecd20bda0209b255d86218ba6f964..4db18be58a6192677087a6fdc02b1a9f6a11b366 100644
Binary files a/out/chords.pdf and b/out/chords.pdf differ
diff --git a/out/chords.preview.pdf b/out/chords.preview.pdf
index 523d0c61ec3e5e9b4371db9585c129ae610f41bf..aa7d09af40b266e6ff41bdcdc106b89641a7f7fd 100644
Binary files a/out/chords.preview.pdf and b/out/chords.preview.pdf differ
diff --git a/out/clefs.pdf b/out/clefs.pdf
index fc21d465f0e29207cc2e0124aea39717daad9f34..3c5db74bd8855dab2afacf25aad787bc0a4bde0c 100644
Binary files a/out/clefs.pdf and b/out/clefs.pdf differ
diff --git a/out/clefs.preview.pdf b/out/clefs.preview.pdf
index ca7866a2c40df50c769e0562677147a9b6d0c6d1..85fbab204976cdaf3b63735c162060ea4ab9b036 100644
Binary files a/out/clefs.preview.pdf and b/out/clefs.preview.pdf differ
diff --git a/out/durations.pdf b/out/durations.pdf
index 383de8fade2eb9ab4d97df7a96a3aadf56da4452..f2f349be5f52442686155466857209e799ad4287 100644
Binary files a/out/durations.pdf and b/out/durations.pdf differ
diff --git a/out/durations.preview.pdf b/out/durations.preview.pdf
index 4f5571f851eb43002f9b23f487d756fc29491037..4810c2147ceed331a7f5870583125404c6eb787e 100644
Binary files a/out/durations.preview.pdf and b/out/durations.preview.pdf differ
diff --git a/out/dynamics.pdf b/out/dynamics.pdf
index 2046e447fa4db552eae5368c78df677a027ffe4e..f08b62421758764bf7dabafee71cf54235715cdf 100644
Binary files a/out/dynamics.pdf and b/out/dynamics.pdf differ
diff --git a/out/dynamics.preview.pdf b/out/dynamics.preview.pdf
index 37a8eab106cfba780609cd1eafc1e15dceb18b0c..097dcc5ee209f41d4c8c75acd1adc8b515e5ff09 100644
Binary files a/out/dynamics.preview.pdf and b/out/dynamics.preview.pdf differ
diff --git a/out/grace.pdf b/out/grace.pdf
index eb8ea26cf85f72838017d90b07cce869c872a30a..b2200ad41e9d84aab75390302fd3f15de7a964cc 100644
Binary files a/out/grace.pdf and b/out/grace.pdf differ
diff --git a/out/grace.preview.pdf b/out/grace.preview.pdf
index 5bc557c4361c398c087b28fb5831e8214fa1b0fe..47eac83ec28503a90805178d26d20bfcbc6ac483 100644
Binary files a/out/grace.preview.pdf and b/out/grace.preview.pdf differ
diff --git a/out/hierarchy.pdf b/out/hierarchy.pdf
index b52291cb6d735cf4546fbc18dce1464c83e73b2a..6a8c64021330676f81574b00d69ba6de9afcfed1 100644
Binary files a/out/hierarchy.pdf and b/out/hierarchy.pdf differ
diff --git a/out/hierarchy.preview.pdf b/out/hierarchy.preview.pdf
index 2abfbb101674d92e4aae81a665191d1ce76d0551..104ad7e9552e899ffec85bbca49254e6cfaddbfa 100644
Binary files a/out/hierarchy.preview.pdf and b/out/hierarchy.preview.pdf differ
diff --git a/out/keys.pdf b/out/keys.pdf
index 4f5ea6eabdd670958676b901ea1ef142378c45db..171da473f2398a33a8d20adbf8fa1f2b4751fd0f 100644
Binary files a/out/keys.pdf and b/out/keys.pdf differ
diff --git a/out/keys.preview.pdf b/out/keys.preview.pdf
index b578565ce415435362320d78bfa7cef840bf31e6..e0cb064cccc3fa471249983950b5cee48cf190a7 100644
Binary files a/out/keys.preview.pdf and b/out/keys.preview.pdf differ
diff --git a/out/lyrics.pdf b/out/lyrics.pdf
index a44b27c53b7b992c3d98a88454d80f72eabce97c..7ae6d068bf04aed77582a3b7159132bdaa0dc290 100644
Binary files a/out/lyrics.pdf and b/out/lyrics.pdf differ
diff --git a/out/lyrics.preview.pdf b/out/lyrics.preview.pdf
index c478a67c8cfa618e13d6b72185390c884cfa6cd5..fa3a58e71e802787faa1b357c7430f3ede4e2971 100644
Binary files a/out/lyrics.preview.pdf and b/out/lyrics.preview.pdf differ
diff --git a/out/mmrest.pdf b/out/mmrest.pdf
index ada9b4c3d1eebf8a6bc929df38336b3deecee5cd..6290194235ef27429d05308dfb6920e97ffea7c5 100644
Binary files a/out/mmrest.pdf and b/out/mmrest.pdf differ
diff --git a/out/mmrest.preview.pdf b/out/mmrest.preview.pdf
index caf568a29f9e2055e040bcf764d377b59a6c7a02..314f5d849580ebd56a8d9277376fa53b563ef191 100644
Binary files a/out/mmrest.preview.pdf and b/out/mmrest.preview.pdf differ
diff --git a/out/notenames.pdf b/out/notenames.pdf
index 51f59e19fa8ee5bda56388f6c7a33c31926ec211..a550b58462339c45d33cf343da32d5f5e3be47d3 100644
Binary files a/out/notenames.pdf and b/out/notenames.pdf differ
diff --git a/out/notenames.preview.pdf b/out/notenames.preview.pdf
index 83b4ce2bfa1f39c5a6835c080902b80d6f1f875a..01c9e5e465b6aaa6eaa99668ba5237206402b089 100644
Binary files a/out/notenames.preview.pdf and b/out/notenames.preview.pdf differ
diff --git a/out/parallel.pdf b/out/parallel.pdf
index 0ff7d4055cfbdc12e82a54e3a3e1f3ca5645996a..3477740269cf1d19551ef1041d61fea2a5d16870 100644
Binary files a/out/parallel.pdf and b/out/parallel.pdf differ
diff --git a/out/parallel.preview.pdf b/out/parallel.preview.pdf
index c66a69157e4b956a42e6f975d109258fe7636db8..f593f0e98261eead5b32f8b0f5b1d4edd68c670c 100644
Binary files a/out/parallel.preview.pdf and b/out/parallel.preview.pdf differ
diff --git a/out/partial.pdf b/out/partial.pdf
deleted file mode 100644
index 51232d76e661a3e7ffc990827edf971c76667f9f..0000000000000000000000000000000000000000
Binary files a/out/partial.pdf and /dev/null differ
diff --git a/out/partial.preview.pdf b/out/partial.preview.pdf
deleted file mode 100644
index 37bf4f71c88dc84d572e1ba06122cefb5412ca18..0000000000000000000000000000000000000000
Binary files a/out/partial.preview.pdf and /dev/null differ
diff --git a/out/relative.pdf b/out/relative.pdf
index a9bd1882dbc739068c9d49f1cfd69a090a7199f5..13f4b3a790c7e6ec1a2ee0d5fd4be2ad54c21952 100644
Binary files a/out/relative.pdf and b/out/relative.pdf differ
diff --git a/out/relative.preview.pdf b/out/relative.preview.pdf
index 173af9742336c769f8f159900f0dedd38a3e7f42..db22a9d7bdfb89ca7ed0bf052e13614a264af8cc 100644
Binary files a/out/relative.preview.pdf and b/out/relative.preview.pdf differ
diff --git a/out/repeats.pdf b/out/repeats.pdf
index 9f7b21ba0ccd2bc3061fbf60ebfb406575534074..340a4448a7b74d197ef54b334dd23d0e2a4a4b6a 100644
Binary files a/out/repeats.pdf and b/out/repeats.pdf differ
diff --git a/out/repeats.preview.pdf b/out/repeats.preview.pdf
index 687089bac03c75a9663bfdd82bf8a7ac70f8a442..1c4841f9268c54ba2137de31c49b71f22539b7e6 100644
Binary files a/out/repeats.preview.pdf and b/out/repeats.preview.pdf differ
diff --git a/out/rest.pdf b/out/rest.pdf
index fe804c86d3bdc20b4f3e5daa68b9deee204317b4..d1fc226dbd1f01c678a42060848b364a808bd9db 100644
Binary files a/out/rest.pdf and b/out/rest.pdf differ
diff --git a/out/rest.preview.pdf b/out/rest.preview.pdf
index f3fde7b2c9fd84855e1690dd47ae36319fae7a6b..474e6e1ac028658e4507786d9a6ff52792764094 100644
Binary files a/out/rest.preview.pdf and b/out/rest.preview.pdf differ
diff --git a/out/slurs.pdf b/out/slurs.pdf
index c65dd4b0d9f0a9648a7561dd3b90050f66cc53da..73d6b4f0df3e9acb1f5ffd98879b5b62d4d41f0e 100644
Binary files a/out/slurs.pdf and b/out/slurs.pdf differ
diff --git a/out/slurs.preview.pdf b/out/slurs.preview.pdf
index b864aab5222ca0dadb8daf37c724ca5b53b39805..cf4e78b5e41e1ac291c9992552925d87183941a8 100644
Binary files a/out/slurs.preview.pdf and b/out/slurs.preview.pdf differ
diff --git a/out/tempo-text.pdf b/out/tempo-text.pdf
index 66f2ae68513f7b643abdc9ec4f2519461bedc265..07955af005d9e251cf783903730d9f48b0fcca17 100644
Binary files a/out/tempo-text.pdf and b/out/tempo-text.pdf differ
diff --git a/out/tempo-text.preview.pdf b/out/tempo-text.preview.pdf
index 168f4e662ff978a75805420c9c82b9ec5f002463..2ac92682405c8aa2e7e0d7844a45590d6c8f504b 100644
Binary files a/out/tempo-text.preview.pdf and b/out/tempo-text.preview.pdf differ
diff --git a/out/ties.pdf b/out/ties.pdf
index 1a4ea026b78ac05e8802e09603e463f601c16f7f..4c3cf3b022248a6a148a6b0fa36291fefee842e5 100644
Binary files a/out/ties.pdf and b/out/ties.pdf differ
diff --git a/out/ties.preview.pdf b/out/ties.preview.pdf
index aa3a864b1b06b99c7d69e45942042fbd8ebb82a0..8bb79ef9f9ce3a9574991a1e8d32e0f8ddb4659e 100644
Binary files a/out/ties.preview.pdf and b/out/ties.preview.pdf differ
diff --git a/out/time.pdf b/out/time.pdf
index 021573c340e63a9b3dd0403117f7813621c33d44..046abfee064fe3ed8d43c00498c6c3ed9940ed0a 100644
Binary files a/out/time.pdf and b/out/time.pdf differ
diff --git a/out/time.preview.pdf b/out/time.preview.pdf
index 1a8f1ef5660e56b214356520fb048438a0b11ddf..c192598b6395b1c5a894daff955c48076f8693a6 100644
Binary files a/out/time.preview.pdf and b/out/time.preview.pdf differ
diff --git a/out/tuplet.pdf b/out/tuplet.pdf
index 0643b890024250e390d178ed46e6be3fd3f0c995..1232e2c41b57298e4bc9fd0bfc0938c49836612f 100644
Binary files a/out/tuplet.pdf and b/out/tuplet.pdf differ
diff --git a/out/tuplet.preview.pdf b/out/tuplet.preview.pdf
index 2feed534b68a6dde3c752303a9843b91603aa304..ce2475c8c0fe85abf3e2dcd88a5975e354c420cb 100644
Binary files a/out/tuplet.preview.pdf and b/out/tuplet.preview.pdf differ
diff --git a/out/writing_text.pdf b/out/writing_text.pdf
index 04a2e7d54c6fceab33114e1cc7d3a6f7e3a20ef7..1090a86b990baa720250a6244fe35ee288cfa9d9 100644
Binary files a/out/writing_text.pdf and b/out/writing_text.pdf differ
diff --git a/out/writing_text.preview.pdf b/out/writing_text.preview.pdf
index eb7252210111c310661c0c8fe3234b55aa1f6d4d..ddf3f607b5f4df23eaf6181911026d219c55916a 100644
Binary files a/out/writing_text.preview.pdf and b/out/writing_text.preview.pdf differ