From 1de38c68f210764f241251ba27dc0a7cb54a68d8 Mon Sep 17 00:00:00 2001
From: Reinhold Kainhofer <reinhold@kainhofer.com>
Date: Mon, 6 Apr 2015 20:54:04 +0200
Subject: [PATCH] Update to last Lilypond version, layout fixes, prepare for
lilyglyphs library import
---
editionkainhofer.sty | 12 +++++++++---
lilyglyphs | 1 -
lilyglyphs_def.itex | 29 +++++++++++++++++++++++++++++
orchestrallily.ily | 2 +-
4 files changed, 39 insertions(+), 5 deletions(-)
delete mode 120000 lilyglyphs
create mode 100644 lilyglyphs_def.itex
diff --git a/editionkainhofer.sty b/editionkainhofer.sty
index 6d9d590..2d679b6 100644
--- a/editionkainhofer.sty
+++ b/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}
diff --git a/lilyglyphs b/lilyglyphs
deleted file mode 120000
index 73625bb..0000000
--- a/lilyglyphs
+++ /dev/null
@@ -1 +0,0 @@
-/home/reinhold/Software/lilyglyphs/
\ No newline at end of file
diff --git a/lilyglyphs_def.itex b/lilyglyphs_def.itex
new file mode 100644
index 0000000..45b0041
--- /dev/null
+++ b/lilyglyphs_def.itex
@@ -0,0 +1,29 @@
+\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
diff --git a/orchestrallily.ily b/orchestrallily.ily
index 154df4f..7373a6b 100644
--- a/orchestrallily.ily
+++ b/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")
'())
--
GitLab