From: Jan Nieuwenhuizen Date: Thu, 5 Apr 2001 16:37:17 +0000 (+0200) Subject: patch::: 1.3.146.jcn1 X-Git-Tag: release/1.3.147~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=eb6cf5c0c4db23f26a3ac0fb229e8aff4448a7e4;p=lilypond.git patch::: 1.3.146.jcn1 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. --- diff --git a/CHANGES b/CHANGES index 4f8acd2e6f..a478451bc4 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,23 @@ +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 ============ diff --git a/Documentation/topdocs/INSTALL.texi b/Documentation/topdocs/INSTALL.texi index c4a9e3b078..c133a75d4a 100644 --- a/Documentation/topdocs/INSTALL.texi +++ b/Documentation/topdocs/INSTALL.texi @@ -72,11 +72,13 @@ Check out @uref{http://www.gnu.org/software/flex/,the Flex webpage}. @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 @@ -97,7 +99,18 @@ If you don't have MetaPost and don't want to use PostScript output, then 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 diff --git a/Documentation/user/GNUmakefile b/Documentation/user/GNUmakefile index d36ffe5d6d..207ee6654b 100644 --- a/Documentation/user/GNUmakefile +++ b/Documentation/user/GNUmakefile @@ -136,6 +136,6 @@ $(outdir)/lilypond-internals.nexi $(outdir)/lilypond-internals.texi: touch $(outdir)/$(*F).nexi $(outdir)/interfaces.itexi: - cp dummy-interfaces.itexi $@ + cp $(src-depth)/Documentation/user/dummy-interfaces.itexi $@ endif diff --git a/VERSION b/VERSION index cbf28cdcc6..a4558c5f8a 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond 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. diff --git a/aclocal.m4 b/aclocal.m4 index 8f08ec9a81..2fed2f24e9 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -421,7 +421,7 @@ AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ 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 diff --git a/input/GNUmakefile b/input/GNUmakefile index cdf61c3f95..c5e72463fa 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -7,7 +7,7 @@ SUBDIRS=bugs test regression tutorial no-notation ascii-art 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 diff --git a/input/ascii-art/GNUmakefile b/input/ascii-art/GNUmakefile index 659a10c8d0..9c2b9f48fe 100644 --- a/input/ascii-art/GNUmakefile +++ b/input/ascii-art/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/input/bugs/GNUmakefile b/input/bugs/GNUmakefile index 659a10c8d0..9c2b9f48fe 100644 --- a/input/bugs/GNUmakefile +++ b/input/bugs/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/input/les-nereides.ly b/input/les-nereides.ly index c7c527571f..cecc014765 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -35,8 +35,8 @@ cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly %% 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)) )) diff --git a/input/no-notation/GNUmakefile b/input/no-notation/GNUmakefile index 659a10c8d0..9c2b9f48fe 100644 --- a/input/no-notation/GNUmakefile +++ b/input/no-notation/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 558771769c..5d1d790f83 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -1,6 +1,6 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 4d241f305e..2cdc7ae801 100644 --- a/input/regression/beam-extreme.ly +++ b/input/regression/beam-extreme.ly @@ -8,21 +8,24 @@ Beam.auto-knee-gap was set to false. " } -\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. + } } diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index d3df72fc77..9791939930 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. examples= font20 -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia EXTRA_DISTFILES=features.abc diff --git a/input/test/banter-chords.ly b/input/test/banter-chords.ly index a79f52b0b8..a9a5771db7 100644 --- a/input/test/banter-chords.ly +++ b/input/test/banter-chords.ly @@ -18,7 +18,7 @@ TestedFeatures = "Banter named chords" % { -#(define chord::names-alist-banter '()) +#;(define chord::names-alist-banter '()) #(set! chord::names-alist-banter (append '( diff --git a/input/tutorial/GNUmakefile b/input/tutorial/GNUmakefile index 558771769c..5d1d790f83 100644 --- a/input/tutorial/GNUmakefile +++ b/input/tutorial/GNUmakefile @@ -1,6 +1,6 @@ depth = ../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/lily/main.cc b/lily/main.cc index d0a4492d0e..fe1d00cef8 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -255,10 +255,9 @@ setup_paths () 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; diff --git a/ly/chord-modifiers.ly b/ly/chord-modifiers.ly index 308bd3bea7..dd82fdb331 100644 --- a/ly/chord-modifiers.ly +++ b/ly/chord-modifiers.ly @@ -6,12 +6,12 @@ (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 7+ -> c b + ;; urg, not actually a chord-modifier, but it works + ;; c7 -> , 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 )) ) diff --git a/ly/deutsch.ly b/ly/deutsch.ly index cda93cf82a..8476b59531 100644 --- a/ly/deutsch.ly +++ b/ly/deutsch.ly @@ -34,7 +34,7 @@ (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 )) diff --git a/ly/drumpitch.ly b/ly/drumpitch.ly index addf137e36..84f5a55798 100644 --- a/ly/drumpitch.ly +++ b/ly/drumpitch.ly @@ -64,7 +64,7 @@ (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)) diff --git a/make/ly-targets.make b/make/ly-targets.make index e032d7ee59..3d27237276 100644 --- a/make/ly-targets.make +++ b/make/ly-targets.make @@ -1,2 +1,17 @@ # 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\ +"\ +# + + diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 904f2c3268..09168cb9cd 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -12,12 +12,6 @@ all: $(OUT_FILES) 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) @@ -51,7 +45,6 @@ local-mutopia-help: @echo -e "\ update $(outdir)/.ps\n\ -book update booklet $(outdir)/-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\ diff --git a/mutopia/E.Satie/GNUmakefile b/mutopia/E.Satie/GNUmakefile index dd90aa789f..f6330d6e9b 100644 --- a/mutopia/E.Satie/GNUmakefile +++ b/mutopia/E.Satie/GNUmakefile @@ -3,7 +3,7 @@ depth = ../.. examples=petite-ouverture-a-danser -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/F.Schubert/GNUmakefile b/mutopia/F.Schubert/GNUmakefile index 93cc570801..610767a2ca 100644 --- a/mutopia/F.Schubert/GNUmakefile +++ b/mutopia/F.Schubert/GNUmakefile @@ -4,7 +4,7 @@ depth = ../.. examples=standchen mutopia-examples=standchen -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/GNUmakefile b/mutopia/GNUmakefile index e7f9036a56..15a002caf5 100644 --- a/mutopia/GNUmakefile +++ b/mutopia/GNUmakefile @@ -4,7 +4,7 @@ depth = .. SUBDIRS = J.S.Bach F.Schubert E.Satie -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/GNUmakefile b/mutopia/J.S.Bach/Cembalo-Partitas/GNUmakefile index 68e87933e4..2e0ffe35c2 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/GNUmakefile +++ b/mutopia/J.S.Bach/Cembalo-Partitas/GNUmakefile @@ -3,6 +3,6 @@ depth = ../../.. -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly index 5baf3e7713..bdf5f23279 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Allemande.ly @@ -1,26 +1,26 @@ \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] | @@ -80,11 +80,11 @@ hoyreEn = \notes\relative c'''{ } 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 diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly index fd895d7b92..d0023f9d47 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Capriccio.ly @@ -1,7 +1,7 @@ \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 @@ -10,15 +10,15 @@ %% %% 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''{ @@ -484,7 +484,7 @@ vThreeSwitch = \context Voice = voiceThree \notes{ \vOne > \context Staff = bass < - \clef bass; + \clef bass \global \vTwoSwitch \vTwo @@ -494,5 +494,5 @@ vThreeSwitch = \context Voice = voiceThree \notes{ > \paper{ } - \midi{\tempo 4 =60;} + \midi{\tempo 4 =60} } diff --git a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly index 7e88b4d8bb..ffce46f69b 100644 --- a/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly +++ b/mutopia/J.S.Bach/Cembalo-Partitas/Partita_II_Sinfonia.ly @@ -1,26 +1,26 @@ \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'' { @@ -45,7 +45,7 @@ hoyreOpp = \notes\relative c'' { } hoyreNed = \notes\relative c'' { - \clef violin; + \clef violin \stemDown r16 [c b16. c32] d4 r16 [d d16. es32] | [f8. f16] f8 r r16 [es16 es16. f32] | @@ -58,7 +58,7 @@ hoyreNed = \notes\relative c'' { } venstreOpp = \notes\relative c' { - \clef bass; + \clef bass \stemUp r r | r r | @@ -254,19 +254,19 @@ allegroEn = \notes\relative c''{ > } allegroTo = \notes\relative c'{ - \clef bass; + \clef bass %30 \context Staff < { \stemUp 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] | diff --git a/mutopia/J.S.Bach/Duette/GNUmakefile b/mutopia/J.S.Bach/Duette/GNUmakefile index 15abf8ab41..436a3f0b71 100644 --- a/mutopia/J.S.Bach/Duette/GNUmakefile +++ b/mutopia/J.S.Bach/Duette/GNUmakefile @@ -5,7 +5,7 @@ depth = ../../.. SUBDIRS = EXTRA_DIST_FILES= -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia examples= include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Duette/global-i.ly b/mutopia/J.S.Bach/Duette/global-i.ly index acfdc4ed95..1f712fdd61 100644 --- a/mutopia/J.S.Bach/Duette/global-i.ly +++ b/mutopia/J.S.Bach/Duette/global-i.ly @@ -1,6 +1,6 @@ -\version "1.3.122"; +\version "1.3.146" globalI = \notes{ - \time 12/8; - \key g \major; + \time 12/8 + \key g \major } diff --git a/mutopia/J.S.Bach/Duette/global-ii.ly b/mutopia/J.S.Bach/Duette/global-ii.ly index 4bae8e8b01..d53900d149 100644 --- a/mutopia/J.S.Bach/Duette/global-ii.ly +++ b/mutopia/J.S.Bach/Duette/global-ii.ly @@ -1,7 +1,7 @@ -\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 } diff --git a/mutopia/J.S.Bach/Duette/viola-i.ly b/mutopia/J.S.Bach/Duette/viola-i.ly index 713333dc53..c1d2eaf8c0 100644 --- a/mutopia/J.S.Bach/Duette/viola-i.ly +++ b/mutopia/J.S.Bach/Duette/viola-i.ly @@ -1,22 +1,22 @@ \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 > diff --git a/mutopia/J.S.Bach/Duette/viola-ii.ly b/mutopia/J.S.Bach/Duette/viola-ii.ly index 502a52cafb..a757dd30ca 100644 --- a/mutopia/J.S.Bach/Duette/viola-ii.ly +++ b/mutopia/J.S.Bach/Duette/viola-ii.ly @@ -1,22 +1,22 @@ \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 > diff --git a/mutopia/J.S.Bach/Duette/viola-part.ly b/mutopia/J.S.Bach/Duette/viola-part.ly index 843ff1af78..081e81edea 100644 --- a/mutopia/J.S.Bach/Duette/viola-part.ly +++ b/mutopia/J.S.Bach/Duette/viola-part.ly @@ -1,14 +1,14 @@ \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" % { @@ -22,8 +22,8 @@ copyright = "Public Domain"; } \midi{ %urg, real/duration -% \tempo 4. = 69; - \tempo 4 . = 50; +% \tempo 4. = 69 + \tempo 4 . = 50 } } @@ -35,12 +35,12 @@ copyright = "Public Domain"; \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 } } diff --git a/mutopia/J.S.Bach/Duette/violino-i.ly b/mutopia/J.S.Bach/Duette/violino-i.ly index 1371aa5915..0b7ab79208 100644 --- a/mutopia/J.S.Bach/Duette/violino-i.ly +++ b/mutopia/J.S.Bach/Duette/violino-i.ly @@ -1,14 +1,14 @@ \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) @@ -92,7 +92,7 @@ violinoI = \notes\relative c'' { \context Voice { \stemUp\slurUp\tieUp a16 fis | g1. } \context Voice=x { \stemDown\slurDown\tieDown c,16 c | b1. } > - \bar "|."; + \bar "|." } \include "global-i.ly" diff --git a/mutopia/J.S.Bach/Duette/violino-ii.ly b/mutopia/J.S.Bach/Duette/violino-ii.ly index 9ea395694f..be108a446b 100644 --- a/mutopia/J.S.Bach/Duette/violino-ii.ly +++ b/mutopia/J.S.Bach/Duette/violino-ii.ly @@ -1,14 +1,14 @@ \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 | @@ -86,7 +86,7 @@ violinoIi = \notes\relative c''{ c1| } > - \bar "|."; + \bar "|." } \include "global-ii.ly" @@ -101,4 +101,4 @@ violinoIiStaff = \context Staff = violino < \violinoIi \globalIi > -\version "1.3.122"; +\version "1.3.146" diff --git a/mutopia/J.S.Bach/Duette/violino-part.ly b/mutopia/J.S.Bach/Duette/violino-part.ly index 25b0782c3d..b237a93408 100644 --- a/mutopia/J.S.Bach/Duette/violino-part.ly +++ b/mutopia/J.S.Bach/Duette/violino-part.ly @@ -1,14 +1,14 @@ \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" % { @@ -21,8 +21,8 @@ copyright = "Public Domain"; %\translator { \BarNumberingStaffContext } } \midi{ -% \tempo 4. = 69; - \tempo 4 . = 50; +% \tempo 4. = 69 + \tempo 4 . = 50 } } @@ -35,11 +35,11 @@ copyright = "Public Domain"; \violinoIiStaff \paper{ %\translator { \BarNumberingStaffContext } -% castingalgorith=0; +% castingalgorith=0 } \midi{ -% \tempo 2 = 96; - \tempo 2 = 75; +% \tempo 2 = 96 + \tempo 2 = 75 } } diff --git a/mutopia/J.S.Bach/Duette/violino-viola.ly b/mutopia/J.S.Bach/Duette/violino-viola.ly index 4861fc0a4e..d21857c25e 100644 --- a/mutopia/J.S.Bach/Duette/violino-viola.ly +++ b/mutopia/J.S.Bach/Duette/violino-viola.ly @@ -1,19 +1,19 @@ #(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 < @@ -27,15 +27,15 @@ copyright = "Public Domain"; } \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 < @@ -48,8 +48,8 @@ copyright = "Public Domain"; } } \midi{ -% \tempo 2 = 96; - \tempo 2 = 75; +% \tempo 2 = 96 + \tempo 2 = 75 } } diff --git a/mutopia/J.S.Bach/Duette/violino-violoncello.ly b/mutopia/J.S.Bach/Duette/violino-violoncello.ly index 7bd4401da9..b3b34db931 100644 --- a/mutopia/J.S.Bach/Duette/violino-violoncello.ly +++ b/mutopia/J.S.Bach/Duette/violino-violoncello.ly @@ -1,18 +1,18 @@ \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 < @@ -26,15 +26,15 @@ copyright = "Public Domain"; } \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 < @@ -47,8 +47,8 @@ copyright = "Public Domain"; } } \midi{ -% \tempo 2 = 96; - \tempo 2 = 75; +% \tempo 2 = 96 + \tempo 2 = 75 } } diff --git a/mutopia/J.S.Bach/Duette/violoncello-i.ly b/mutopia/J.S.Bach/Duette/violoncello-i.ly index f77c9ae23b..363c2d752d 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-i.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-i.ly @@ -1,18 +1,18 @@ \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 | @@ -62,7 +62,7 @@ violoncelloI = \notes\relative c{ % FIXME? fis [a(g)fis e d] g8()e c g'8 b, e c d d, | g1.| - \bar "|."; + \bar "|." } \include "global-i.ly" @@ -70,6 +70,6 @@ violoncelloI = \notes\relative c{ violoncelloIStaff = \context Staff = violoncello < \property Staff.instrument = "cello" \violoncelloI - \clef bass; + \clef bass \globalI > diff --git a/mutopia/J.S.Bach/Duette/violoncello-ii.ly b/mutopia/J.S.Bach/Duette/violoncello-ii.ly index f0a6cef080..604f896a9a 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-ii.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-ii.ly @@ -1,14 +1,14 @@ \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| @@ -66,7 +66,7 @@ violoncelloIi = \notes\relative c{ 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,| - \bar "|."; + \bar "|." } \include "global-ii.ly" @@ -74,6 +74,6 @@ violoncelloIi = \notes\relative c{ violoncelloIiStaff = \context Staff = violoncello < \property Staff.instrument = "cello" \violoncelloIi - \clef bass; + \clef bass \globalIi > diff --git a/mutopia/J.S.Bach/Duette/violoncello-part.ly b/mutopia/J.S.Bach/Duette/violoncello-part.ly index 135d9c04e6..e6d69cfcc8 100644 --- a/mutopia/J.S.Bach/Duette/violoncello-part.ly +++ b/mutopia/J.S.Bach/Duette/violoncello-part.ly @@ -1,14 +1,14 @@ \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" % { @@ -22,8 +22,8 @@ copyright = "Public Domain"; } \midi{ %urg, real/duration -% \tempo 4. = 69; - \tempo 4 . = 69; +% \tempo 4. = 69 + \tempo 4 . = 69 } } @@ -35,12 +35,12 @@ copyright = "Public Domain"; \score{ \violoncelloIiStaff \paper{ - %castingalgorithm=0.; + %castingalgorithm=0. %\translator { \BarNumberingStaffContext } } \midi{ -% \tempo 2 = 96; - \tempo 2 = 75; +% \tempo 2 = 96 + \tempo 2 = 75 } } diff --git a/mutopia/J.S.Bach/GNUmakefile b/mutopia/J.S.Bach/GNUmakefile index ebf1c3432c..c36ef8696a 100644 --- a/mutopia/J.S.Bach/GNUmakefile +++ b/mutopia/J.S.Bach/GNUmakefile @@ -6,7 +6,7 @@ SUBDIRS = Petites-Preludes Cembalo-Partitas Duette EXTRA_DIST_FILES= -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia examples=wtk1-fugue2 include $(depth)/make/stepmake.make diff --git a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile index f21147b3c7..48b1a47b36 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile +++ b/mutopia/J.S.Bach/Petites-Preludes/GNUmakefile @@ -8,7 +8,7 @@ LILYINCLUDE:=$(LILYINCLUDE):out export LILYINCLUDE examples=preludes-2 -LOCALSTEPMAKE_TEMPLATES=mutopia +LOCALSTEPMAKE_TEMPLATES=ly mutopia mutopia-examples=preludes-score diff --git a/mutopia/J.S.Bach/Petites-Preludes/header.ly b/mutopia/J.S.Bach/Petites-Preludes/header.ly index 6a0f0a3518..e700af66ac 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/header.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/header.ly @@ -1,3 +1,4 @@ +\version "1.3.146" %{ Header for Petites Preludes. @@ -11,30 +12,30 @@ 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" } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly index bc01566375..119471cba3 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-1.ly @@ -18,7 +18,7 @@ Lemoine puts fermatas on ending bar lines everywhere. -\version "1.3.98"; +\version "1.3.146" lowstaff = \translator "Staff" = "lower" @@ -88,7 +88,7 @@ upper = \context Staff=upper \notes\relative c { > \stemBoth | - \bar "|."; + \bar "|." } % lower = \context Staff \notes\relative c{ @@ -103,17 +103,17 @@ lower = \context Staff=lower \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 } > - \bar "|."; + \bar "|." } global = \notes{ - \time 4/4; + \time 4/4 } \score{ @@ -125,14 +125,14 @@ global = \notes{ > \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly index 7cc393dd7a..e4046587dc 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-2.ly @@ -4,7 +4,7 @@ opus= "BWV 939" 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 @@ -45,7 +45,7 @@ upper = \context Staff \notes\relative c{ - \bar "|."; + \bar "|." } lower = \context Staff \notes\relative c{ @@ -70,11 +70,11 @@ 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{ @@ -85,17 +85,17 @@ global = \notes{ > \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly index 0a72241a69..265518fdd7 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-3.ly @@ -14,7 +14,7 @@ note, some have dotted half notes. This file was partly generated using m4. %} -\version "1.3.98"; +\version "1.3.146" upper = \notes \transpose c'' { @@ -66,7 +66,7 @@ upper = \notes \transpose c'' { - \bar "|."; + \bar "|." } lower = \notes{ @@ -127,12 +127,12 @@ 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{ @@ -143,16 +143,16 @@ global = \notes{ > \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly index 21ebac2887..7b2f458c5c 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly @@ -3,7 +3,7 @@ opus = "BWV 925" piece = "4" -\version "1.3.98" +\version "1.3.146" %{ @@ -43,7 +43,7 @@ one = \context Staff \notes\relative c { 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" ~ | @@ -67,7 +67,7 @@ one = \context Staff \notes\relative c { fis8 e~ e d~ d4 cis | d2 ~ d16 a b cis d4 | - \bar "|."; + \bar "|." } two = \context Staff \notes\relative c{ @@ -103,7 +103,7 @@ 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 | @@ -131,7 +131,7 @@ two = \context Staff \notes\relative c{ \stemUp\tieUp g fis g a g b a g ~ | g g fis e fis4 ~ fis2 - \bar "|."; + \bar "|." } three = \notes\relative c{ @@ -172,14 +172,14 @@ 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 | @@ -194,8 +194,8 @@ four = \context Staff \notes\relative c{ } global = \notes{ - \time 4/4; - \key d \major; + \time 4/4 + \key d \major } \score{ @@ -208,22 +208,22 @@ global = \notes{ > \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly index 04b810b9d8..3792cad340 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-5.ly @@ -3,7 +3,7 @@ piece = "5" opus = "BWV 926" -\version "1.3.98"; +\version "1.3.146" upper = \context Staff \notes\relative c \context Voice=i { @@ -178,8 +178,8 @@ lower = \context Staff \notes\relative c{ } global = \notes{ - \time 3/4; - \key f \major; + \time 3/4 + \key f \major } \score{ @@ -187,22 +187,22 @@ global = \notes{ \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly index 3ddbbe51f1..0dc4d06a64 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-6.ly @@ -3,13 +3,13 @@ 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 @@ -26,7 +26,7 @@ one = \context Staff \notes\relative c{ fis4 g r8 g16 bes e4 | %10 d1 - \bar "|."; + \bar "|." } two = \context Staff \notes\relative c{ @@ -69,21 +69,21 @@ three = \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 @@ -97,8 +97,8 @@ four = \context Staff \notes\relative c{ } global = \notes{ - \time 4/4; - \key f \major; + \time 4/4 + \key f \major } \score{ @@ -111,19 +111,19 @@ global = \notes{ > \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 } } diff --git a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly index eb902adcfe..a7dbde535f 100644 --- a/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly +++ b/mutopia/J.S.Bach/Petites-Preludes/preludes-score.ly @@ -1,9 +1,9 @@ -\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" diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py index 03733c2d49..a92b9410cc 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -800,9 +800,14 @@ if 1: 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')) @@ -943,6 +948,8 @@ identify () for f in files: if f == '-': f = '' + if not os.path.isfile (f): + continue try: do_one_file (f) except UnknownVersion: diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 7705707883..06d81a675a 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -419,7 +419,7 @@ AC_DEFUN(AC_STEPMAKE_KPATHSEA, [ 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