context-lilypond update (8mar09)

git-svn-id: svn://tug.org/texlive/trunk@12340 c570f23f-e606-0410-a88d-b1316a301751

2 files changed, 14 insertions, 19 deletions

diff --git a/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf b/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf
index 2537738f8b1..12798d78ef6 100644
--- a/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf
+++ b/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf
diff --git a/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex b/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex
index 4faaa6bf14a..6165c77d931 100644
--- a/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex
+++ b/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex
@@ -1,6 +1,6 @@
 %D \module
 %D    [          file=t-lilypond,
-%D            version=2008.09.08,
+%D            version=2009.03.05,
 %D              title=\CONTEXT\ User Modules,
 %D           subtitle=LilyPond Connections (Music Typesetting),
 %D             author={Christopher Creutzig, Henning Hraban Ramm, Mojca Miklavec},
@@ -12,9 +12,7 @@
 %D This module serves to include LilyPond music directly in the
 %D \CONTEXT\ source, just as \METAPOST\ code can be.
 %D
-%D It is supposed to work only with LilyPond's stable version 2.10.
-%D
-%D LilyPond 2.11 (and therefore probably 2.12) changed the output parameter.
+%D It is supposed to work only with LilyPond's stable version 2.12.
 %D
 %D {\bfa Complete list of options:}
 %D
@@ -29,7 +27,7 @@
 %D    \NC betweensystemspace\NC 54pt\NC space between systems    \NC\NR
 %D    \NC height\NC \\textheight\NC    \NR
 %D    \NC align\NC ?\NC default depends on fragment=...    \NC\NR
-%D    \NC fragment\NC no\NC    \NC\NR
+%D    \NC fragment\NC no\NC whole staff line or only snippet?   \NC\NR
 %D    \NC barnumbers\NC no\NC show numbers of measures?    \NC\NR
 %D    \NC showempty\NC no\NC drop empty staves?    \NC\NR
 %D    \NC seriffont\NC "TeX Gyre Schola"\NC font for e.g. lyrics    \NC\NR
@@ -81,10 +79,17 @@
 /gdef/lily!prefix</string^^J
 /string^^J
 #(ly:set-option (quote no-point-and-click))/string^^J
+#(ly:set-option (quote delete-intermediate-files))/string^^J
 /string^^J
-\version "2.10.33"/string^^J
+\version "2.12.0"/string^^J
 #(define version-seen? #t)/string^^J
 \layout {/string^^J
+/iflily!showempty/else
+% drop empty staves/string^^J
+	\context { \RemoveEmptyStaffContext } % MUST come first/string^^J
+	\context { \Score \override VerticalAxisGroup #'remove-first = ##t }/string^^J
+/fi
+/string^^J
 /iflily!time/else
 % switch off time signature (i.e. only one line, no bars)/string^^J
 	ragged-last = ##t/string^^J
@@ -96,12 +101,6 @@
 	\context { \Score \remove "Bar_number_engraver" }/string^^J
 /fi
 /string^^J
-/iflily!showempty/else
-% drop empty staves/string^^J
-	\context { \RemoveEmptyStaffContext }/string^^J
-	\context { \Score \override VerticalAxisGroup #'remove-first = ##t }/string^^J
-/fi
-/string^^J
 /iflily!clef/else
 % switch off clef sign/string^^J
 	\context { \Staff \remove "Clef_engraver" }/string^^J
@@ -140,11 +139,11 @@
 \newdimen\lily!vsize
 \newdimen\lily!indent
 \newdimen\lily!betweensystemspace
+\newif\iflily!showempty
 \newif\iflily!align
 \newif\iflily!clef
 \newif\iflily!time
 \newif\iflily!barnumbers
-\newif\iflily!showempty
 
 \newcounter\lily!figures
 
@@ -249,8 +248,7 @@
 %D
 %D Generating a PDF directly always creates a whole page, so we generate EPS first.
 
-	\def\LP{texmfstart --ifchanged=\lily!filename.tmp --exec bin:lilypond -beps -dno-gs-load-fonts -dinclude-eps-fonts -ddelete-intermediate-files \lily!filename.tmp}
-%D PATCH: For LilyPond 2.11+ replace \type{-b eps} with \type{-dbackend=eps}!
+	\def\LP{texmfstart --ifchanged=\lily!filename.tmp --exec bin:lilypond -dbackend=eps -dno-gs-load-fonts -dinclude-eps-fonts -ddelete-intermediate-files \lily!filename.tmp}
 %D
 %D It would be nice, if \type{-ddelete-intermediate-files} would delete all useless intermediate files.
 %D More possible options in \type{lily.scm}.
@@ -269,7 +267,6 @@
 	\doifelse\jobsuffix{pdf}
 		{\def\lily!img{\lily!filename .pdf}}%
 		{\def\lily!img{\lily!filename .eps}}%
-%D We removed the previous write18 check; \type{installprogram} doesn't work with recent ConTeXt versions.
 
 %D TODO: Get the relevant dimension directly from LilyPond,
 %D to place the instrument name into the left margin for
@@ -350,9 +347,7 @@ is typeset as
 \stoplilypond
 
 It is also possible to mix text and music:
-\lower 8.2pt\hbox{\lilypond[fragment=true,staffsize=16,time=no]{g'}} is a g.
-
-(Seems like this still doesn't work...)
+\lower 8.2pt\hbox{\lilypond[fragment=true,staffsize=16,time=no,clef=no]{g'}} is a g.
 
 TODO: The \type{\lower} in the example above should not be necessary.