summaryrefslogtreecommitdiff
path: root/Master
diff options
context:
space:
mode:
authorManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-09-10 21:08:47 +0000
committerManuel Pégourié-Gonnard <mpg@elzevir.fr>2008-09-10 21:08:47 +0000
commit724ffe4c2fc32dd83ffd3250e60cd1267b938126 (patch)
treec74a71b0b37c4815040148c1e1db49b7016d9a08 /Master
parentf3fe45d3bc69ef621d0db8f5c93cfcbb5a761747 (diff)
mcontext-lilypond version 2.10.33 2008.09.08
git-svn-id: svn://tug.org/texlive/trunk@10548 c570f23f-e606-0410-a88d-b1316a301751
Diffstat (limited to 'Master')
-rw-r--r--Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdfbin236004 -> 108247 bytes
-rw-r--r--Master/texmf-dist/tex/context/third/lilypond/t-lilypond.tex107
-rwxr-xr-xMaster/tlpkg/bin/ctan2tds82
3 files changed, 87 insertions, 102 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 45acbcfa278..2537738f8b1 100644
--- a/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf
+++ b/Master/texmf-dist/doc/context/third/lilypond/t-lilypond.pdf
Binary files differ
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
diff --git a/Master/tlpkg/bin/ctan2tds b/Master/tlpkg/bin/ctan2tds
index d04357ddfea..698f4704e2c 100755
--- a/Master/tlpkg/bin/ctan2tds
+++ b/Master/tlpkg/bin/ctan2tds
@@ -206,7 +206,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'hfbright', "&MAKEflatten",
'hfoldsty', "&MAKEflatten",
'hyph-utf8', "&MAKEcopy",
- 'hyphen-german',"die 'in hyph-utf8'",
+ 'hyphen-german',"die 'please install hyphen-german by hand, sorry'",
'ibycus-babel',"&MAKEibycusbabel",
'ibygrk', "&MAKEflatten",
'ifacmtg', "die 'skipping, nonfree license'",
@@ -277,7 +277,6 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'morse', "die 'skipping, nosell license'",
'movie15', "&MAKEflatten",
'mpattern', "&MAKEmpattern",
- 'mpdinbrief', "die 'skipping, nonfree license",
'multido', "&MAKEpst",
'mwrite', "die 'skipping, nonfree license",
'mx' , "die 'skipping, author does not recommend system install'",
@@ -311,7 +310,6 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
'pict2e', "&MAKEpict2e",
'pictex', "&MAKEpictex",
'pinlabel', "&MAKEnosymlinks",
- 'pitthesis', "die 'skipping, no license info'",
'pl-qx', "&MAKEplqx",
'poster', "die 'skipping, nonfree license'",
'powerdot', '&MAKEflatten',
@@ -452,6 +450,7 @@ chdir $startdir || die "chdir($startdir) failed: $!"; # back to raw
%specialpostaction = (
'bibleref' => '&POSTlatex2html',
+ 'context-lilypond' => '&POSTcontext_lilypond',
'datetime' => '&POSTlatex2html',
'doipubmed' => '&POSTlatex2html',
'fpl' => '&POSTfpl',
@@ -540,7 +539,6 @@ $standardfoundry='public';
'catalogue', 'texmf-doc',
'comprehensive', 'texmf-doc',
'cursolatex', 'texmf-doc',
- 'doc-pictex', 'texmf-doc',
'dtxtut', 'texmf-doc',
'elhyphen', 'texmf',
'epslatex-fr', 'texmf-doc',
@@ -701,7 +699,6 @@ $standardfmt='latex';
'archaic', 'fonts',
'arev', 'fonts',
'arrayjob', 'generic',
- 'Asana-Math', 'fonts',
'aurical', 'fonts',
'automata', 'metapost',
'ascii', 'fonts',
@@ -838,18 +835,16 @@ $standarddocfmt='latex';
'parrun', 'parrun.ins',
'stmaryrd', 'stmaryrd.dtx',
'tablists', 'tablists.dtx',
- 'termlist', 'termlist.dtx',
'thesis', 'install.01|install.ndx',
'turnstile', 'turnstile-en.ins', # skip pt
);
$standardins='\.ins';
%specialinsrunner = (
- 'bullcntr' => 'latex', # requires interaction
- 'ctable' => 'latex', # requires interaction
- 'polski' => 'latex', # requires interaction
- 'psfragx' => 'latex', # requires interaction
- 'termlist' => 'tex',
+ 'bullcntr', 'latex', # requires interaction
+ 'ctable', 'latex', # requires interaction
+ 'polski', 'latex', # requires interaction
+ 'psfragx', 'latex', # requires interaction
);
$standardinsrunner="latex -interaction=nonstopmode";
@@ -905,7 +900,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'epslatex-fr', 'NULL',
'esint-type1', 'esint.tex',
'europecv', 'EuropeFlag|europasslogo|\.cls|\.def',
- 'fancytooltips','fancytipmark\.(eps|pdf|svg)|' . $standardtex,
'fltpoint', '\.sty|\.tex',
'fontch', '\.tex',
'footnpag', 'footnpag\.sty',
@@ -913,7 +907,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'genmisc', '\.sty|\.tex',
'geometry', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$', # not cfg
'ginpenc', '\.gie|\.sty',
- 'hc', '\.hld|' . $standardtex,
'hfoldsty', '\.sty|\.fd|\.cpa',
'hyper', '\.sty|\.hyp',
'hyplain', '(hyrules|hy.*plain|hylang)\..*',
@@ -940,7 +933,7 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'misc', '\.sty|\.ltx|\.cls',
'mkpattern', 'mkpatter.tex',
'mpman-ru', 'NULL', # doc package
- 'msg', '-msg\.tex|' . $standardtex,
+ 'msg', "-msg\.tex" . $standardtex,
'nag', '\.nag|' . $standardtex,
'nddiss', '\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$',
'ntheorem', '\.sty|\.std',
@@ -958,7 +951,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'ppchtex', 'm.*tex|m.*sty',
'prosper', '\.ps|\.eps|\.sty|\.cls',
'pstricks', 'pst-*\.tex',
- 'pst-text', 'pst-(text|char)\.(tex|sty)',
'pst-cox', 'pst-cox(coor|eterp)\.tex',
'pst-geo', 'pst-map.*\.tex|pst-map.*\.sty',
'pst-infixplot', 'infix-RPN\.tex|pst-infixplot\.tex',
@@ -979,7 +971,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'taylor', 'diagrams.tex',
'texsis', '\.txs|TXS.*tex|texsis.tex',
'ticket', '\.tdf|' . $standardtex,
- 'timetable', '\.tex',
'tools', '\.cfg|\.sty|\.clo|\.cls|\.def|\.fd$|.?\.tex|^\.tex$',
'translator', '\.dict|translator-language-mappings.tex|' . $standardtex,
'tugboat-plain','\.cmn|' . $standardtex,
@@ -989,7 +980,6 @@ $standardtex='\.cfg|\.sty|\.clo|\.ldf|\.cls|\.def|\.fd$|\.cmap|\.4ht$';
'wasy2', 'wasyfont\.tex',
'wordcount', '\.tex',
'xetexfontinfo','\.tex',
- 'xstring', 'xstring\.tex|' . $standardtex,
'zefonts', '\.sty|\.fd',
);
@@ -1082,19 +1072,17 @@ $standarddvi = 'NULL'; # rely on authors/CTAN making pdf's.
# packages which need special MetaPost files
$standardmp = '\.mp$';
%specialmp = (
- 'automata' => 'automata.mp', # not example.mp
- 'bpolynomial' => 'bpolynomial.mp', # not examples.mp
- 'dviincl' => 'fix.*mp', # not test-bop.mp
- 'epsincl' => 'eps.*mp', # not testincl.mp
- 'feynmp' => 'feynmp.mp',
- 'latexmp' => 'latexmp.mp',
- 'metago' => 'metago.mp', # not example-*
- 'mpattern' => 'mpattern.mp', # not test.mp
- 'mpman-ru' => 'NULL', # doc package
- 'pdfslide' => 'NULL', # not meta.mp
- 'polski' => 'NULL', # not sample-*.mp
- 'semioneside' => 'NULL', # not figure*.mp
- 'textpath' => 'textpath.mp', # not textpathfigs.mp
+ 'automata', 'automata.mp', # skip example.mp
+ 'bpolynomial', 'bpolynomial.mp', # skip examples.mp
+ 'dviincl', 'fix.*mp', # skip test-bop.mp
+ 'epsincl', 'eps.*mp', # skip testincl.mp
+ 'feynmp', 'feynmp.mp',
+ 'latexmp', 'latexmp.mp',
+ 'mpattern', 'mpattern.mp', # don't install test.mp
+ 'mpman-ru', 'NULL', # doc package
+ 'polski', 'NULL', # no sample-*.mp
+ 'semioneside', 'NULL', # don't install figure*.mp
+ 'textpath', 'textpath.mp', # don't install textpathfigs.mp
);
# packages which need special BibTeX styles installed
@@ -1113,7 +1101,6 @@ $standardbib='\.bib$'; # $ so we don't find README.bibtex in IEEEtran
'aguplus', 'NULL',
'amsrefs', 'ams.*bib', # not jr.bib
'apa', 'NULL',
- 'attachfile', 'NULL',
'babelbib', 'NULL',
'classicthesis','NULL',
'dehyph-exptl','NULL',
@@ -1189,16 +1176,15 @@ $standardpro='\.pro$';
'zefonts', 'slantcm.cfg',
);
-$standardmap='\.(map|tec)$';
+$standardmap='\.map';
%specialmap = (
- 'harvardkyoto' => 'README|' . $standardmap, # not worth extra dir
- 'ibygrk' => 'iby\.map', # not ibycus4.map, which is tex|mf
+ 'arabxetex' => '\.(map|tec)$',
'kerntest' => 'NULL', # skip test map file
+ 'ibygrk' => 'iby\.map', # not ibycus4.map, which is tex|mf
);
$standardmapdest = "fonts/map/dvips";
%specialmapdest = (
- 'arabxetex' => "fonts/misc/xetex/fontmapping",
- 'harvardkyoto' => "fonts/misc/xetex/fontmapping",
+ 'arabxetex' => "fonts/misc/xetex/fontmapping",
);
$standardvmap='\.ali$';
@@ -1280,7 +1266,6 @@ $standardclean = '\.head|\.tmp|\.dvi|\.log|\.out|\.aux|\.toc|\.lof|\.lot'
'mathexam' => 'sample.tex~',
'notes2bib' => "$standardclean|jawltxdoc.sty", # temp file for doc
'rsc' => "$standardclean|jawltxdoc.sty", # temp file for doc
- 'timetable' => "timetable.tex.sign",
);
# if a hash entry is specified here, README.TEXLIVE is created mentioning
@@ -2567,22 +2552,21 @@ sub MAKEtipa {
&runjob("$CP doc/* $DEST/doc/fonts/tipa");
}
-sub MAKEpslatex
-{
- &xchdir ($packagedir);
+sub MAKEpslatex {
+# this simply copies source files
+ chdir($packagedir) || die ("ERROR: cannot open directory");
$Foundry = $specialfoundry{$package} || $standardfoundry;
&runjob("mkdir -p $DEST/fonts/tfm/$Foundry/pslatex");
&runjob("mkdir -p $DEST/fonts/vf/$Foundry/pslatex");
&runjob("mkdir -p $DEST/tex/latex/pslatex");
- &runjob("mkdir -p $DEST/fonts/map/dvips/pslatex");
+ &runjob("mkdir -p $DEST/dvips/pslatex");
&runjob("mkdir -p $DEST/doc/latex/pslatex");
- &runjob("mkdir -p $DEST/source/latex/pslatex");
&runjob("$CP latex/* $DEST/tex/latex/pslatex");
&runjob("$CP tfm/* $DEST/fonts/tfm/$Foundry/pslatex");
&runjob("$CP vf/* $DEST/fonts/vf/$Foundry/pslatex");
&runjob("$CP dvips/* $DEST/fonts/map/dvips/pslatex");
- &runjob("$CP -r fontinst $DEST/source/latex/pslatex");
- &runjob("$CP -r shell $DEST/source/latex/pslatex");
+ &runjob("$CP -r fontinst $DEST/doc/latex/pslatex");
+ &runjob("$CP -r shell $DEST/doc/latex/pslatex");
}
sub MAKEeco {
@@ -3207,6 +3191,16 @@ sub FLATTEN_PREHOOK_cm_super
&SYSTEM ("$RM -rf dvipdfm");
}
+sub POSTcontext_lilypond {
+ print "POST$package - creating package-level sunbdirectories\n";
+ mkdir ("$DEST/doc/context/third/lilypond");
+ &SYSTEM ("$MV $DEST/doc/context/third/t-lilypond.pdf "
+ . "$DEST/doc/context/third/lilypond");
+ mkdir ("$DEST/tex/context/third/lilypond");
+ &SYSTEM ("$MV $DEST/tex/context/third/t-lilypond.tex "
+ . "$DEST/tex/context/third/lilypond");
+}
+
sub POSTfpl
{
print "POST$package - rename README.source\n";