Update to last Lilypond version, layout fixes, prepare for lilyglyphs library import

editionkainhofer.sty

@@ -8,6 +8,7 @@
 \usepackage{amsmath}
 \usepackage[english,ngerman]{babel}
 \usepackage{geometry}
+
 % \usepackage[utf8]{inputenc}
 % \usepackage{fontspec}
 \usepackage{multicol}
@@ -20,9 +21,13 @@
 \usepackage{relsize}
 \usepackage{graphics}
 \usepackage{enumerate}
-\usepackage{lilyglyphs/lilyglyphs}
+\usepackage{xspace}
+\input{lilyglyphs_def.itex}
 
 %%%%% XeLaTeX:
+% \usepackage[latin1]{inputenc}
+% \usepackage[T1]{fontenc}
+
 \usepackage{fontspec}% font selecting commands
 \usepackage{xunicode}% unicode character macros
 \usepackage{xltxtra} % a few fixes and extras
@@ -159,7 +164,7 @@
 
 \let\@software\@empty
 \newcommand{\software}[1]{\gdef\@software{#1}}
-\software{Lilypond 2.14, \href{http://www.lilypond.org/}{http://www.lilypond.org/}}
+\software{Lilypond 2.17, \href{http://www.lilypond.org/}{http://www.lilypond.org/}}
 
 
 \gdef\@editedby{Herausgegeben von: / Edited by:}
@@ -264,7 +269,6 @@
   \pagebreak
   \thispagestyle{empty}\null
   \pagebreak
-  \vfill\vfill\vfill\vfill\vfill\vfill
   \backpage
 }
 
@@ -272,6 +276,8 @@
   \thispagestyle{empty}
   \ifcolortitle\pagecolor{cover}\fi
   \null
+  ${}$
+  \vfill\vfill\vfill\vfill\vfill\vfill
   \ifx\@ismn\@empty%
   \else
     \begin{center}

lilyglyphs

-/home/reinhold/Software/lilyglyphs/
\ No newline at end of file

lilyglyphs_def.itex

+\usepackage{lilyglyphs/lilyglyphs}
+
+% Accent: scripts.sforzato
+\newcommand*{\accentBase}[1][]{%
+  \setkeys{lilyDesignOptions}{scale=1.5,raise=0.7}%
+  \lilyPrint[#1]{\hspace{0.25em}\lilyGetGlyph{scripts.sforzato}}%
+}
+% \newcommand*{\lilyAccent}[1][]{\accentBase[#1] }
+% \WithSuffix\newcommand\lilyAccent*[1][]{\accentBase[#1]}
+
+\newcommand{\pppp}{\lilyDynamics{pppp}\xspace}
+\newcommand{\ppp}{\lilyDynamics{ppp}\xspace}
+\newcommand{\pp}{\lilyDynamics{pp}\xspace}
+\newcommand{\p}{\lilyDynamics{p}\xspace}
+\renewcommand{\mp}{\lilyDynamics{mp}\xspace}
+\newcommand{\mf}{\lilyDynamics{mf}\xspace}
+\newcommand{\f}{\lilyDynamics{f}\xspace}
+\newcommand{\ff}{\lilyDynamics{ff}\xspace}
+\newcommand{\fff}{\lilyDynamics{fff}\xspace}
+\newcommand{\ffff}{\lilyDynamics{ffff}\xspace}
+\renewcommand{\sf}{\lilyDynamics{sf}\xspace}
+\newcommand{\fz}{\lilyDynamics{fz}\xspace}
+\newcommand{\ffz}{\lilyDynamics{ffz}\xspace}
+\newcommand{\sfz}{\lilyDynamics{sfz}\xspace}
+\newcommand{\rfz}{\lilyDynamics{rfz}\xspace}
+\newcommand{\pf}{\lilyDynamics{pf}\xspace}
+\newcommand{\fp}{\lilyDynamics{fp}\xspace}
+
+\newcommand{\acc}{\lilyAccent{}\xspace}
\ No newline at end of file

orchestrallily.ily

@@ -557,7 +557,7 @@ orchestralVoiceTypes = #(define-music-function (parser location types) (list?)
   (cond
       ((and (pair? music) (ly:music? (car music)) (not-null? (cdr music)) (ly:music? (cadr music)))
           ;(ly:message "Part-combine with two music expressions")
-          (oly:staff_handler_internal parser piece name "Staff" (list (make-part-combine-music parser music #f))))
+          (oly:staff_handler_internal parser piece name "Staff" (list (make-part-combine-music parser music #f '(0 . 8)))))
       ((null? music)
           ;;(ly:warning "Part-combine without any music expressions")
           '())