mcontext-lilypond version 2.10.33 2008.09.08

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

1 files changed, 49 insertions, 58 deletions

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 410b335dc18..4faaa6bf14a 100644
--- a/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex
+++ b/Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex
@@ -1,47 +1,52 @@
 %D \module
-%D	[		 file=t-lilypond,
-%D		    version=2007.09.02,
-%D		         title=\CONTEXT\ User Modules,
-%D		   subtitle=LilyPond Connections (Music Typesetting),
-%D		    author={Christopher Creutzig, Henning Hraban Ramm, Mojca Miklavec},
-%D	          date=\currentdate,
-%D	          copyright=Christopher Creutzig]
+%D    [          file=t-lilypond,
+%D            version=2008.09.08,
+%D              title=\CONTEXT\ User Modules,
+%D           subtitle=LilyPond Connections (Music Typesetting),
+%D             author={Christopher Creutzig, Henning Hraban Ramm, Mojca Miklavec},
+%D               date=\currentdate,
+%D          copyright=Christopher Creutzig]
 %C
-%C	This module licensed under the GNU GPL.
+%C This module is licensed under the GNU GPL.
 
 %D This module serves to include LilyPond music directly in the
 %D \CONTEXT\ source, just as \METAPOST\ code can be.
-%D It should work from LilyPond version 2.8, but you should always use 
-%D the latest stable version of LilyPond (this is tested with 2.10.29).
+%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
 %D {\bfa Complete list of options:}
 %D
 %D \starttabulate[|l|l|l|]
-%D	\NC	option\NC	default\NC	comment\NC\NR
-%D	\HL
-%D	\NC	staffsize\NC	20\NC	 in pt	\NC\NR
-%D	\NC	indent\NC	0pt\NC	 first line indent	\NC\NR
-%D	\NC	time\NC	yes\NC	 count time? (i.e. show time signature, set bars, split line)	\NC\NR
-%D	\NC	clef\NC	yes\NC	 show clef?	\NC\NR
-%D	\NC	linewidth\NC	\\localhsize\NC		\NC\NR
-%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	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	"Century Schoolbook L"\NC	 font for e.g. lyrics	\NC\NR
-%D	\NC	sansfont\NC	"LMSans10"\NC	 font for e.g. chords	\NC\NR
-%D	\NC	monofont\NC	"Courier" \NC	 normally not used	\NC\NR
+%D    \NC option\NC default\NC comment\NC\NR
+%D    \HL
+%D    \NC staffsize\NC 20\NC in pt    \NC\NR
+%D    \NC indent\NC 0pt\NC first line indent    \NC\NR
+%D    \NC time\NC yes\NC count time? (i.e. show time signature, set bars, split line)    \NC\NR
+%D    \NC clef\NC yes\NC show clef?    \NC\NR
+%D    \NC linewidth\NC \\localhsize\NC    \NC\NR
+%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 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
+%D    \NC sansfont\NC "LMSans10"\NC font for e.g. chords    \NC\NR
+%D    \NC monofont\NC "LMTypewriter10" \NC normally not used    \NC\NR
 %D \stoptabulate
 %D
 %D TODO: Proper support for multipage results.
 %D
 %D TODO: LilyPond ---> \CONTEXT.
 %D
+%D {\bfa Commented Source}
+%D
 %D As usual, we use a prefix for buffers, \type{\getparameters} etc.:
 
 \writestatus{loading}{LilyPond module}
+
 \startmodule[lilypond]
 
 \unprotect
@@ -77,7 +82,7 @@
 /string^^J
 #(ly:set-option (quote no-point-and-click))/string^^J
 /string^^J
-\version "2.10.29"/string^^J
+\version "2.10.33"/string^^J
 #(define version-seen? #t)/string^^J
 \layout {/string^^J
 /iflily!time/else
@@ -168,9 +173,9 @@
 	fragment=\v!no,
 	barnumbers=\v!no,
 	showshowemptyempty=\v!no,
-	seriffont="Century Schoolbook L", % LilyPond default font
+	seriffont="TeX Gyre Schola", % LilyPond default font
 	sansfont="LMSans10",
-	monofont="Bitstream Vera Sans Mono",
+	monofont="LMTypewriter10",
 	]
 
 %D If you want to know which fonts of your system LilyPond can see
@@ -243,43 +248,29 @@
 	\endbuffer%
 %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}!
 %D
-%D If \type{\ifeof18} creates an error for you, your pdfe\TeX\ is too old.
-%D just change it to \type{\iftrue} then.
-%D (\type{\ifeof18} checks whether \type{\write18} is disabled.)
-	
-	%\def\LP{echo LILYPOND \lily!filename.tmp}
-	%\def\PDF{echo PStoPDF \lily!filename.eps}
-	\def\LP{texmfstart --ifchanged=\lily!filename.tmp --exec bin:lilypond -b eps -dno-gs-load-fonts -dinclude-eps-fonts \lily!filename.tmp}
+%D It would be nice, if \type{-ddelete-intermediate-files} would delete all useless intermediate files.
+%D More possible options in \type{lily.scm}.
 	\def\PDF{texmfstart --ifchanged=\lily!filename.eps pstopdf \lily!filename.eps}
+	
 %D The following line is needed for Lua\TeX, where buffers are kept in memory
 %D in contrast to other (older) flavours of \TeX\ where they're written to a
 %D file automatically. We have to require writing to a file explicitely
 %D with \type{\savebuffer}.
-	\ifx\directlua\undefined \else \savebuffer[lilypond-\the\lily!figures]\fi
-%D
-%D If \type{\ifeof18} creates an error for you, your pdfetex is too old.
-%D just change it to \iftrue then.	 (\type{\ifeof18} checks whether \type{\write18}
-%D is disabled.)
-%D
-	\ifeof18
-		%\writestatus{DEBUG-w18}{\LP}%
-		\expanded{\installprogram{\LP}}%
-		\doif\jobsuffix{pdf}{%
-			\installprogram{\PDF}%
-		}%
-	\else
-		%\writestatus{DEBUG-EXE}{\LP}%
-		\executesystemcommand{\LP}%
-		\doif\jobsuffix{pdf}{%
-			\executesystemcommand{\PDF}%
-		}%
-	\fi
-	%\stopmode% only first run
+	\ifx\directlua\undefined \else \savebuffer[lilypond-\lily!figures]\fi
+
+	\executesystemcommand{\LP}%
+	\doif\jobsuffix{pdf}{%
+		\executesystemcommand{\PDF}%
+	}%			
 	\doifelse\jobsuffix{pdf}
 		{\def\lily!img{\lily!filename .pdf}}%
 		{\def\lily!img{\lily!filename .eps}}%
-%D
+%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
 %D short snippets as well.
@@ -365,4 +356,4 @@ It is also possible to mix text and music:
 
 TODO: The \type{\lower} in the example above should not be necessary.
 
-\stoptext
+\stoptext
\ No newline at end of file