+1.3.146.jcn1
+============
+
+* Added warning message, rather than encouragement, against configuring
+without kpathsea support.
+
+* --srcdir build fix.
+
+* Moved convert-ly targets from ports to ly make, added ly templates
+to mutopia and input directories. Bugfix to convert-ly. Ran
+convert-ly in mutopia dir.
+
+* Recommented some scheme comments in .lys, checked that convert-ly
+doesn't destroy them.
+
+* Bugfixes to convert-ly: don't try to open unexistent file (eg,
+unexpanded wildcard). Don't remove one semicolon of ';;' scheme
+comments, don't remove semicolon after hash: #;
+
+* Fixed some errors from ; conversion.
1.3.145.jcn2
============
@item Bison (version 1.25 or newer).
Check out @uref{http://www.gnu.org/software/bison/,the bison webpage}
-@item TeX.
+@item @TeX{}.
+
+@TeX{} is used as an output backend.
-If you want LilyPond to use kpathsea support (recommended), make sure
-you have tetex 1.0 or newer (1.0.6 is known to work). You may need to
-install a tetex-devel or tetex-dev package too.
+Also, @TeX{}'s libkpathsea is used to find the fonts (.mf, .afm, .tfm).
+Make sure you have tetex 1.0 or newer (1.0.6 is known to work). You may
+need to install a tetex-devel or tetex-dev package too.
@item Texinfo (version 4.0 or newer).
The documentation of lily is written in texinfo. Check out
edit @file{mf/GNUmakefile}, removing the line saying @code{PFA_FILES=}.
@item kpathsea, a library for searching (TeX) files. @code{kpathsea} is
-usually included with your installation of TeX.
+usually included with your installation of TeX. You may need to install
+a tetex-devel or tetex-dev package too.
+
+In the very unlikely case that kpathsea is not available for your
+platform (ie, you're not running GNU/Linux, Windows, or any recent
+UNIX), you can compile LilyPond without kpathsea support. In that case,
+you'll probably have to indicate where @TeX{}'s tfm files live. Invoke
+configure something like:
+
+@example
+./configure --without-kpathsea --enable-tfm-path=/usr/share/texmf/fonts/tfm/public/cm/:/usr/share/texmf/fonts/tfm/ams/symbols
+@end example
@end itemize
touch $(outdir)/$(*F).nexi
$(outdir)/interfaces.itexi:
- cp dummy-interfaces.itexi $@
+ cp $(src-depth)/Documentation/user/dummy-interfaces.itexi $@
endif
MAJOR_VERSION=1
MINOR_VERSION=3
PATCH_LEVEL=146
-MY_PATCH_LEVEL=
+MY_PATCH_LEVEL=jcn1
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
if test "$kpathsea_b" = "yes"; then
AC_HAVE_HEADERS(kpathsea/kpathsea.h)
AC_CHECK_LIB(kpathsea, kpse_find_file)
- AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. Rerun with --without-kpathsea.) )
+ AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
fi
AC_MSG_CHECKING(whether to use kpathsea)
if test "$kpathsea_b" = yes; then
examples=trip star-spangled-banner paddy scarlatti-test
flexamples=
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
EXTRA_DIST_FILES=paddy.abc
include $(depth)/make/stepmake.make
depth = ../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
depth = ../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
%% cpp: don't start on first column
#(define (make-text-checker text)
(lambda (elt)
- huh, string-match undefined?
- (string-match text (ly-get-grob-property elt 'text))
+ ;; huh, string-match undefined?
+ ;; (string-match text (ly-get-grob-property elt 'text))
(equal? text (ly-get-grob-property elt 'text))
))
depth = ../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
depth = ../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
"
}
-\score{
- \notes\relative c''{
- [g8 c c,]
- [c16 c'' a f]
- \stemUp
- [c,,32 c'' a f]
-
- }
- \paper{
- linewidth=-1.
- \translator {
- \VoiceContext
- % If we want to test extreme beams,
- % we should not have them auto-kneed
- Beam \override #'auto-knee-gap = ##f
- }
- }
+extreme = \notes\relative c'' {
+ \stemBoth
+ [g8 c c,]
+ [c16 c'' a f]
+ \stemUp
+ [c,,32 c'' a f]
+ r4
+}
+\score {
+ {
+ % If we want to test extreme beams,
+ % we should not have them auto-kneed
+ \property Voice.Beam \override #'auto-knee-gap = ##f
+ \extreme
+ \property Voice.Beam \override #'slope-limit = #1000
+ \extreme
+ }
+ \paper{
+ linewidth=-1.
+ }
}
depth = ../..
examples= font20
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
EXTRA_DISTFILES=features.abc
% {
-#(define chord::names-alist-banter '())
+#;(define chord::names-alist-banter '())
#(set! chord::names-alist-banter
(append
'(
depth = ../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
global_path.parse_path (env_sz);
- /*
- Should use kpathsea, this is getting out of hand.
- */
- char *suffixes[] = {"ly", "afm", "scm", "tfm", "ps", 0};
+ /* Adding mf/out make lilypond unchanged source directory, when setting
+ LILYPONDPREFIX to lilypond-x.y.z */
+ char *suffixes[] = {"ly", "afm", "mf/out", "scm", "tfm", "ps", 0};
String prefix = prefix_directory;
if (prefix.empty_b ())
prefix = DIR_DATADIR;
(m . ,(make-pitch 0 2 -1 ))
(min . ,(make-pitch 0 2 -1 ))
(aug . ,(make-pitch 0 4 1 ))
- (dim . ,(make-pitch -100 4 -1 ))
+ ;; (dim . ,(make-pitch -100 4 -1 ))
(dim . ,(make-pitch -100 2 -1 ))
-; urg, not actually a chord-modifier, but it works
-; c7 -> <c bes>, c 7+ -> c b
+ ;; urg, not actually a chord-modifier, but it works
+ ;; c7 -> <c bes>, c 7+ -> c b
(maj . ,(make-pitch 0 6 1 ))
-; sus4 should delete 2 too...
+ ;; sus4 should delete 2 too...
(sus . ,(make-pitch 0 3 0 ))
)
(gis . ,(make-pitch -1 4 1 ))
(gisis . ,(make-pitch -1 4 2 ))
(asas . ,(make-pitch -1 5 -2 ))
- (ases . ,(make-pitch -1 5 -2 )) non-standard name for asas
+ (ases . ,(make-pitch -1 5 -2 )) ;;non-standard name for asas
(as . ,(make-pitch -1 5 -1 ))
(a . ,(make-pitch -1 5 0 ))
(ais . ,(make-pitch -1 5 1 ))
(mutetriangle trim ,(make-pitch 1 4 1))
(triangle tri ,(make-pitch 1 4 2))
(opentriangle trio ,(make-pitch 1 5 0))
- "transposing" pitches:
+ ;; "transposing" pitches:
(oneup ua ,(make-pitch 0 1 0))
(twoup ub ,(make-pitch 0 2 0))
(threeup uc ,(make-pitch 0 3 0))
# empty
+convert-ly: local-convert-ly
+ $(LOOP)
+
+local-convert-ly:
+ $(PYTHON) $(CONVERT_LY) --edit --assume-old *ly
+
+local-help: local-ly-help
+
+local-ly-help:
+ @echo -e "\
+ convert-ly convert all LilyPond sources\n\
+"\
+#
+
+
local-WWW: $(ly_examples) $(fly_examples) $(ps_examples) $(png_examples)
-convert-ly: local-convert-ly
- $(LOOP)
-
-local-convert-ly:
- $(PYTHON) $(CONVERT_LY) --edit --assume-old *ly
-
tar:
mkdir -p $(outdir)/$(tarball)
cp -p *.ly $(outdir)/$(tarball)
@echo -e "\
<NAME> update $(outdir)/<NAME>.ps\n\
<NAME>-book update booklet $(outdir)/<NAME>-book.ps\n\
- convert-ly convert all LilyPond sources\n\
mutopia update PNGs, PostScript a4 and letter of all mutopia-examples\n\
png update PNGs of all examples\n\
ps update PostScript of all examples\n\
depth = ../..
examples=petite-ouverture-a-danser
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
examples=standchen
mutopia-examples=standchen
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
SUBDIRS = J.S.Bach F.Schubert E.Satie
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
depth = ../../..
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
include $(depth)/make/stepmake.make
\header{
- enteredby = "Tom Cato Amundsen";
- copyright = "Public Domain";
- piece = "Allemande";
+ enteredby = "Tom Cato Amundsen"
+ copyright = "Public Domain"
+ piece = "Allemande"
}
-\version "1.3.117";
+\version "1.3.146"
global = \notes{
- \time 4/4;
- \partial 8*3;
- \key es \major;
- \skip 1*15;
- \skip 4*3;
- \skip 16*4;
- \bar ":|:";
- \skip 16*3;
- \skip 1*16;
- \bar ":|";
+ \time 4/4
+ \partial 8*3
+ \key es \major
+ \skip 1*15
+ \skip 4*3
+ \skip 16*4
+ \bar ":|:"
+ \skip 16*3
+ \skip 1*16
+ \bar ":|"
}
hoyreEn = \notes\relative c'''{
-% \partial 4.;
+% \partial 4.
[as16 g f] |
[g16 d es b][c f es d][es b c g][as d c b] |
[c g as es][f es' d c][b8. a16][g8 b] |
}
venstreEn = \notes\relative c{
- \clef bass;
-% \partial 4.;
+ \clef bass
+% \partial 4.
r16 r8 |
- [c8 c,] \clef treble; r16 [as''' g f][g d es b][c f es d] |
- \clef bass; [es b c g][as8 f][g g,~][g16 f' es d] |
+ [c8 c,] \clef treble r16 [as''' g f][g d es b][c f es d] |
+ \clef bass [es b c g][as8 f][g g,~][g16 f' es d] |
[es b c g][as g' f es][f c d a][bes as' g f] |
[g d es b][c bes' as g][as es f c][d8 b'] |
%5
\header{
- enteredby = "Tom Cato Amundsen";
- copyright = "Public Domain";
- piece = "Capriccio";
+ enteredby = "Tom Cato Amundsen"
+ copyright = "Public Domain"
+ piece = "Capriccio"
}
%% I takt 22 foretar jeg et stemmekryss mellom stemme en og to, pga at den
%%
%% Noe liknende skjer også i mellom andre og tredje stemme i takt 28
-\version "1.3.117";
+\version "1.3.146"
global = \notes{
- \time 2/4;
- \key es \major;
+ \time 2/4
+ \key es \major
s2*48
- \bar ":|:";
+ \bar ":|:"
s2*48
- \bar "|.";
+ \bar "|."
}
vOne = \context Voice = voiceOne \notes\relative c''{
\vOne
>
\context Staff = bass <
- \clef bass;
+ \clef bass
\global
\vTwoSwitch
\vTwo
>
\paper{
}
- \midi{\tempo 4 =60;}
+ \midi{\tempo 4 =60}
}
\header {
- filename = "";
- title = "Partita II";
- piece = "Sinfonia";
- description = "6 Partite per il clavicembalo, Partita II (c-minor)";
- opus = "BWV 826";
- source = "Editio Musica Budapest (Urtext)";
- composer = "Johann Sebastian Bach (1685-1750)";
- enteredby = "Tom Cato Amundsen";
- copyright = "Public Domain";
+ filename = ""
+ title = "Partita II"
+ piece = "Sinfonia"
+ description = "6 Partite per il clavicembalo, Partita II (c-minor)"
+ opus = "BWV 826"
+ source = "Editio Musica Budapest (Urtext)"
+ composer = "Johann Sebastian Bach (1685-1750)"
+ enteredby = "Tom Cato Amundsen"
+ copyright = "Public Domain"
}
-\version "1.3.117";
+\version "1.3.146"
global = \notes {
- \time 4/4;
- \key es \major;
- \skip 1*7;
- \bar "||";
- \skip 1*22;
- \time 3/4;
- \skip 2.*62;
- \bar "|.";
+ \time 4/4
+ \key es \major
+ \skip 1*7
+ \bar "||"
+ \skip 1*22
+ \time 3/4
+ \skip 2.*62
+ \bar "|."
}
hoyreOpp = \notes\relative c'' {
}
hoyreNed = \notes\relative c'' {
- \clef violin;
+ \clef violin
\stemDown
<c4 g> r16 [c b16. c32] d4 r16 [d d16. es32] |
[f8. f16] f8 r <c4 g> r16 [es16 es16. f32] |
}
venstreOpp = \notes\relative c' {
- \clef bass;
+ \clef bass
\stemUp
<c4 g es> r <b as f d> r |
r <b f d> <c g es> r |
>
}
allegroTo = \notes\relative c'{
- \clef bass;
+ \clef bass
%30
\context Staff <
{ \stemUp <b8 g> r r4 r }
{ \stemDown g,8 r8 r4 r }
>
r2. | r2. |
- \clef treble; r8 [c16 d] [es8 f] [g as] |
+ \clef treble r8 [c16 d] [es8 f] [g as] |
[bes16 as g as][bes8 c] [des g,]
[bes e,][g c,][c'16 bes as g] | [as8 f g as][bes as] |
[g es f g as g] | [f es f d es f] | [g g,16 a] [b8 c] [d es] |
[f16 es d es][f8 g][as d,] |
- [f b,][d g,][g'16 f es d] | \clef bass;
+ [f b,][d g,][g'16 f es d] | \clef bass
[es d c8~][c16 es d c][bes a g f] |
%43
[d' c bes8~][bes16 d c bes][a g fis g] |
SUBDIRS =
EXTRA_DIST_FILES=
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
examples=
include $(depth)/make/stepmake.make
-\version "1.3.122";
+\version "1.3.146"
globalI = \notes{
- \time 12/8;
- \key g \major;
+ \time 12/8
+ \key g \major
}
-\version "1.3.122";
+\version "1.3.146"
globalIi = \notes{
- \time 4/4;
+ \time 4/4
\property Staff.TimeSignature \override #'style = #'C2/2
- \key a\minor;
+ \key a\minor
}
\header{
-filename = "viola-i.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "viola-i.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
\include "global-i.ly"
-\include "violoncello-i.ly";
+\include "violoncello-i.ly"
violaIStaff = \context Staff = viola <
\property Staff.instrument = "viola"
%\property Staff.instrument = "violin"
\notes\transpose c'' \violoncelloI
- \clef alto;
+ \clef alto
\globalI
>
\header{
-filename = "viola-ii.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "viola-ii.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
\include "global-ii.ly"
-\include "violoncello-ii.ly";
+\include "violoncello-ii.ly"
violaIiStaff = \context Staff = viola <
\property Staff.instrument = "viola"
%\property Staff.instrument = "violin"
- \clef alto;
+ \clef alto
\globalIi
\notes\transpose c'' \violoncelloIi
>
\header{
-filename = "viola-part.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "viola-part.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
% {
}
\midi{
%urg, real/duration
-% \tempo 4. = 69;
- \tempo 4 . = 50;
+% \tempo 4. = 69
+ \tempo 4 . = 50
}
}
\score{
\violaIiStaff
\paper{
-% castingalgorithm=0.0;
+% castingalgorithm=0.0
%\translator { \BarNumberingStaffContext }
- %\translator { \ScoreContext skipBars = 1; }
+ %\translator { \ScoreContext skipBars = 1 }
}
\midi{
-% \tempo 2 = 96;
- \tempo 2 = 75;
+% \tempo 2 = 96
+ \tempo 2 = 75
}
}
\header{
-filename = "violino-i.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violino-i.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
violinoI = \notes\relative c'' {
\property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8)\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16)
\context Voice { \stemUp\slurUp\tieUp a16 fis | g1. }
\context Voice=x { \stemDown\slurDown\tieDown c,16 c | b1. }
>
- \bar "|.";
+ \bar "|."
}
\include "global-i.ly"
\header{
-filename = "violino-ii.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violino-ii.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
violinoIi = \notes\relative c''{
R1*8 |
c1|
}
>
- \bar "|.";
+ \bar "|."
}
\include "global-ii.ly"
\violinoIi
\globalIi
>
-\version "1.3.122";
+\version "1.3.146"
\header{
-filename = "violino-part.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violino-part.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
% {
%\translator { \BarNumberingStaffContext }
}
\midi{
-% \tempo 4. = 69;
- \tempo 4 . = 50;
+% \tempo 4. = 69
+ \tempo 4 . = 50
}
}
\violinoIiStaff
\paper{
%\translator { \BarNumberingStaffContext }
-% castingalgorith=0;
+% castingalgorith=0
}
\midi{
-% \tempo 2 = 96;
- \tempo 2 = 75;
+% \tempo 2 = 96
+ \tempo 2 = 75
}
}
#(set! point-and-click line-column-location)
\header{
-filename = "violino-viola.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violino-viola.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
% {
-\include "violino-i.ly";
-\include "viola-i.ly";
+\include "violino-i.ly"
+\include "viola-i.ly"
\score{
\context GrandStaff <
}
\midi{
%urg real/duration
-% \tempo 4. = 69;
- \tempo 4 . = 50;
+% \tempo 4. = 69
+ \tempo 4 . = 50
}
}
% }
-\include "violino-ii.ly";
-\include "viola-ii.ly";
+\include "violino-ii.ly"
+\include "viola-ii.ly"
\score{
\context GrandStaff <
}
}
\midi{
-% \tempo 2 = 96;
- \tempo 2 = 75;
+% \tempo 2 = 96
+ \tempo 2 = 75
}
}
\header{
-filename = "violino-violoncello.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violino-violoncello.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
% {
-\include "violino-i.ly";
-\include "violoncello-i.ly";
+\include "violino-i.ly"
+\include "violoncello-i.ly"
\score{
\context GrandStaff <
}
\midi{
%urg, real/duration
-% \tempo 4. = 69;
- \tempo 4 . = 50;
+% \tempo 4. = 69
+ \tempo 4 . = 50
}
}
% }
-\include "violino-ii.ly";
-\include "violoncello-ii.ly";
+\include "violino-ii.ly"
+\include "violoncello-ii.ly"
\score{
\context GrandStaff <
}
}
\midi{
-% \tempo 2 = 96;
- \tempo 2 = 75;
+% \tempo 2 = 96
+ \tempo 2 = 75
}
}
\header{
-filename = "violoncello-i.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violoncello-i.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
violoncelloI = \notes\relative c{
\property Voice.autoBeamSettings \override #'(end * * * *) = #(make-moment 3 8)
- % too many [c8 c c] stuff here; some manual beaming
+ % too many [c8 c c] stuff here some manual beaming
%\property Voice.autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 16)
g8()a d, g b()g d()fis a d a()fis |
% FIXME?
fis [a(g)fis e d] g8()e c g'8 b, e c d d, |
g1.|
- \bar "|.";
+ \bar "|."
}
\include "global-i.ly"
violoncelloIStaff = \context Staff = violoncello <
\property Staff.instrument = "cello"
\violoncelloI
- \clef bass;
+ \clef bass
\globalI
>
\header{
-filename = "violoncello-ii.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violoncello-ii.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
violoncelloIi = \notes\relative c{
r2 a'2|c e,| f8(e)d2 e8()fis| g a bes2 a8()gis|
b(e,b')c b(e,b')d| c(a b)cis d()e f g|
%105
f e d cis d4 d,~|d c8 b c4 d|e d e e,|<e'1 a,>
- \bar "|.";
+ \bar "|."
}
\include "global-ii.ly"
violoncelloIiStaff = \context Staff = violoncello <
\property Staff.instrument = "cello"
\violoncelloIi
- \clef bass;
+ \clef bass
\globalIi
>
\header{
-filename = "violoncello-part.ly";
-title = "Vier Duette";
-description = "Four duets for Violino and Violoncello (Viola)";
-opus = "BWV";
-composer = "Johann Sebastian Bach (1685-1750)";
-enteredby = "jcn";
-copyright = "Public Domain";
+filename = "violoncello-part.ly"
+title = "Vier Duette"
+description = "Four duets for Violino and Violoncello (Viola)"
+opus = "BWV"
+composer = "Johann Sebastian Bach (1685-1750)"
+enteredby = "jcn"
+copyright = "Public Domain"
}
-\version "1.3.122";
+\version "1.3.146"
% {
}
\midi{
%urg, real/duration
-% \tempo 4. = 69;
- \tempo 4 . = 69;
+% \tempo 4. = 69
+ \tempo 4 . = 69
}
}
\score{
\violoncelloIiStaff
\paper{
- %castingalgorithm=0.;
+ %castingalgorithm=0.
%\translator { \BarNumberingStaffContext }
}
\midi{
-% \tempo 2 = 96;
- \tempo 2 = 75;
+% \tempo 2 = 96
+ \tempo 2 = 75
}
}
EXTRA_DIST_FILES=
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
examples=wtk1-fugue2
include $(depth)/make/stepmake.make
export LILYINCLUDE
examples=preludes-2
-LOCALSTEPMAKE_TEMPLATES=mutopia
+LOCALSTEPMAKE_TEMPLATES=ly mutopia
mutopia-examples=preludes-score
+\version "1.3.146"
%{
Header for Petites Preludes.
instrument = "Piano"
\header{
- title = "Petites Pr\'eludes";
- subtitle = "Clavierbuechlein";
- composer = "Johann Sebastian Bach (1685-1750)";
- enteredby = "JCN,HWN";
- instrument = \instrument;
+ title = "Petites Pr\'eludes"
+ subtitle = "Clavierbuechlein"
+ composer = "Johann Sebastian Bach (1685-1750)"
+ enteredby = "JCN,HWN"
+ instrument = \instrument
% mutopia headers.
- mutopiatitle = "Petites Préluedes";
- mutopiacomposer = "J.S.Bach (1685-1750)";
- mutopiaopus = "BWV924,939,999,925,926,940";
- mutopiainstrument = \intrument;
- date = "1700s";
- source = "Ed. Henry Lemoine Urtext";
- style = "Baroque";
- copyright = "Public Domain";
- maintainer = "Jan Nieuwenhuizen";
- maintainer_email = "janneke@gnu.org";
- lastupdated = "2001/Feb/25";
+ mutopiatitle = "Petites Préluedes"
+ mutopiacomposer = "J.S.Bach (1685-1750)"
+ mutopiaopus = "BWV924,939,999,925,926,940"
+ mutopiainstrument = \intrument
+ date = "1700s"
+ source = "Ed. Henry Lemoine Urtext"
+ style = "Baroque"
+ copyright = "Public Domain"
+ maintainer = "Jan Nieuwenhuizen"
+ maintainer_email = "janneke@gnu.org"
+ lastupdated = "2001/Feb/25"
mutopiapublicdomain = "\\parbox{\hsize}{\\thefooter\\quad\\small
\\\\This music is part of the Mutopia project,
\\texttt{http://www.mutopiaproject.org/}\\\\It has been typeset
and placed in the public domain by " + \maintainer +
".\\\\Unrestricted modification and redistribution is permitted
- and encouraged---copy this music and share it.}";
- tagline = \mutopiapublicdomain;
- footer = "pre-Mutopia-200y/mm/dd-nr";
+ and encouraged---copy this music and share it.}"
+ tagline = \mutopiapublicdomain
+ footer = "pre-Mutopia-200y/mm/dd-nr"
}
-\version "1.3.98";
+\version "1.3.146"
lowstaff = \translator "Staff" = "lower"
>
\stemBoth |
<c1 g e>
- \bar "|.";
+ \bar "|."
}
% lower = \context Staff \notes\relative c{
f4 e d-\prall c |
g'-\mordent^"\\textsharp" g, g'-\mordent g, |
g'-\mordent g, g'-\mordent g, |
- g' r s s | s s s s \clef "bass"; |
+ g' r s s | s s s s \clef "bass" |
<
{ \stemUp\tieUp g1 ~ g ~ g ~ g ~ g ~ g ~ g }
\context Voice=ii { \stemDown\tieDown g,1 ~ g ~ g ~ g ~ g ~ g ~ g }
>
<c,1 c,>
- \bar "|.";
+ \bar "|."
}
global = \notes{
- \time 4/4;
+ \time 4/4
}
\score{
>
\context Staff = lower <
\global
- \clef "bass";
+ \clef "bass"
\lower
>
>
- \paper { linewidth = 18.0 \cm; }
- \midi{ \tempo 4 = 80; }
+ \paper { linewidth = 18.0 \cm }
+ \midi{ \tempo 4 = 80 }
\header {
- opus = \opus;
- piece = \piece;
+ opus = \opus
+ piece = \piece
}
}
piece = "2"
-\version "1.3.98";
+\version "1.3.146"
upper = \context Staff \notes\relative c{
\context Voice=i
\property Voice.TextScript \set #'font-style = #'italic
<g,2 c>
<d4 b'>
<e1 c'>
- \bar "|.";
+ \bar "|."
}
lower = \context Staff \notes\relative c{
f1 ~ |
f8 d e c g'4 g, |
c,1
- \bar "|.";
+ \bar "|."
}
global = \notes{
- \time 4/4;
+ \time 4/4
}
\score{
>
\context Staff = lower <
\global
- \clef "bass";
+ \clef "bass"
\lower
>
>
\paper{
- linewidth = 18.0 \cm;
+ linewidth = 18.0 \cm
}
- \midi{ \tempo 4 = 100; }
+ \midi{ \tempo 4 = 100 }
\header {
- opus = \opus;
- piece = \piece;
+ opus = \opus
+ piece = \piece
}
}
This file was partly generated using m4.
%}
-\version "1.3.98";
+\version "1.3.146"
upper = \notes \transpose c'' {
<g4 d b>
- \bar "|.";
+ \bar "|."
}
lower = \notes{
g,4 r r |
%% FIXME: \fermata?
g,4_\fermata
- \bar "|.";
+ \bar "|."
}
global = \notes{
- \time 3/4;
- \key es \major;
+ \time 3/4
+ \key es \major
}
\score{
>
\context Staff = down <
\global
- \clef "bass";
+ \clef "bass"
\lower
>
>
\paper{
\translator {\OrchestralScoreContext }
}
- \midi{ \tempo 4 = 100; }
+ \midi{ \tempo 4 = 100 }
\header{
- opus = \opus;
- piece = \piece;
+ opus = \opus
+ piece = \piece
}
}
opus = "BWV 925"
piece = "4"
-\version "1.3.98"
+\version "1.3.146"
%{
g fis g a g b a g |
\stemUp\tieUp
fis4
- \skip 4*7; |
+ \skip 4*7 |
%10
\property Voice.TextScript \set #'font-style = #'finger
% d'4. cis8-"4\\_5" ~ cis b4 a8-"4\\_5" ~ |
fis8 e~ e d~ d4 cis |
d2 ~ d16 a b cis d4 |
- \bar "|.";
+ \bar "|."
}
two = \context Staff \notes\relative c{
a4
\translator Staff=lower \stemUp
r16 b fis a g4 r16 a e g |
- \skip 1*1;
+ \skip 1*1
s16
\translator Staff=upper \stemDown\tieDown
d'8. ~ d8 c d4 a8 g |
\stemUp\tieUp
g fis g a g b a g ~ |
g g fis e fis4 ~ fis2
- \bar "|.";
+ \bar "|."
}
three = \notes\relative c{
}
four = \context Staff \notes\relative c{
- \skip 1*9;
+ \skip 1*9
\context Voice=iv
\stemUp
\property Voice.NoteColumn \override #'horizontal-shift = #1
%10
a''2 fis |
d s |
- \skip 1*2; |
+ \skip 1*2 |
s4
\translator Staff=lower \stemUp\tieUp
a4 ~ a16 d, g8 fis e |
}
global = \notes{
- \time 4/4;
- \key d \major;
+ \time 4/4
+ \key d \major
}
\score{
>
\context Staff = lower <
\global
- \clef "bass";
+ \clef "bass"
\two
\three
>
>
\paper{
- linewidth = 18.0 \cm;
+ linewidth = 18.0 \cm
\translator{
\VoiceContext
% consider ending beam at every 1 2 note
autoBeamSettings \override #'(end 1 8 * *) = #(make-moment 1 4)
}
}
- \midi{ \tempo 4 = 70; }
+ \midi{ \tempo 4 = 70 }
\header{
- opus = \opus;
- piece = \piece;
+ opus = \opus
+ piece = \piece
}
}
piece = "5"
opus = "BWV 926"
-\version "1.3.98";
+\version "1.3.146"
upper = \context Staff \notes\relative c
\context Voice=i {
}
global = \notes{
- \time 3/4;
- \key f \major;
+ \time 3/4
+ \key f \major
}
\score{
\context PianoStaff <
\context Staff = upper <
\global
- { \upper \bar "|."; }
+ { \upper \bar "|." }
>
\context Staff = lower <
\global
- \clef "bass";
+ \clef "bass"
\lower
>
>
\paper{
- linewidth = 18.0 \cm;
+ linewidth = 18.0 \cm
}
- \midi{ \tempo 4 = 90; }
+ \midi{ \tempo 4 = 90 }
\header{
- piece = \piece;
- opus = \opus;
+ piece = \piece
+ opus = \opus
}
}
opus = "BWV 940"
piece = "6"
-\version "1.3.98";
+\version "1.3.146"
one = \context Staff \notes\relative c{
\context Voice=i
- \skip 1; |
+ \skip 1 |
\stemUp
r4 d''2 cis4 |
\stemBoth
fis4 g r8 g16 bes e4 |
%10
d1
- \bar "|.";
+ \bar "|."
}
two = \context Staff \notes\relative c{
d, cis' |
%10
a'1
- \bar "|.";
+ \bar "|."
}
four = \context Staff \notes\relative c{
\context Voice=iv
\stemDown
d2 cis |
- \skip 1*2; |
- \skip 4*3;
+ \skip 1*2 |
+ \skip 4*3
\translator Staff=upper \stemUp
\property Voice.NoteColumn \override #'horizontal-shift = #1
c''4 |
%5
a gis ~ gis16 gis fis e
- \skip 4*1;
+ \skip 4*1
\translator Staff=lower \stemDown
\property Voice.NoteColumn \override #'horizontal-shift = #0
\stemUp\tieUp
}
global = \notes{
- \time 4/4;
- \key f \major;
+ \time 4/4
+ \key f \major
}
\score{
>
\context Staff = lower <
\global
- \clef "bass";
+ \clef "bass"
\three
\four
>
>
\paper{
- linewidth = 18.0 \cm;
+ linewidth = 18.0 \cm
}
- \midi{ \tempo 4 = 40; }
+ \midi{ \tempo 4 = 40 }
\header{
- piece = \piece;
- opus = \opus;
+ piece = \piece
+ opus = \opus
}
}
-\version "1.3.98"
+\version "1.3.146"
% This is the main score file of the Petites Preludes
-\include "header.ly";
+\include "header.ly"
-\paper { linewidth = 18.0\cm; }
+\paper { linewidth = 18.0\cm }
\include "preludes-1.ly"
\include "preludes-2.ly"
str = re.sub ('\\\\key[ \t]*;', '\\key \\default;', str)
str = re.sub ('\\\\mark[ \t]*;', '\\mark \\default;', str)
- # only remove ; that are directly after words.
- # otherwise we interfere with Scheme comments, which is badbadbad.
- str = re.sub ("([^ \t]);", "\\1", str)
+ # Make sure groups of more than one ; have space before
+ # them, so that non of them gets removed by next rule
+ str = re.sub ("([^ \n\t;]);(;+)", "\\1 ;\\2", str)
+
+ # Only remove ; that are not after spaces, # or ;
+ # Otherwise we interfere with Scheme comments,
+ # which is badbadbad.
+ str = re.sub ("([^ \t;#]);", "\\1", str)
return str
conversions.append (((1,3,146), conv, 'semicolons removed'))
for f in files:
if f == '-':
f = ''
+ if not os.path.isfile (f):
+ continue
try:
do_one_file (f)
except UnknownVersion:
if test "$kpathsea_b" = "yes"; then
AC_HAVE_HEADERS(kpathsea/kpathsea.h)
AC_CHECK_LIB(kpathsea, kpse_find_file)
- AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. Rerun with --without-kpathsea.) )
+ AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions. You should install kpathsea; see INSTALL.txt. Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
fi
AC_MSG_CHECKING(whether to use kpathsea)
if test "$kpathsea_b" = yes; then
projects / lilypond.git / commitdiff