Available at
lurl(ftp://ftp.ctan.org/tex-archive/macros/latex/contrib/supported/geometry)
or at mirror site lurl(ftp://ftp.dante.de)
+
+it()MetaPost, if you want to use direct PostScript output. Please
+note that tetex-0.4pl8 (included with Redhat 5.x) does not include
+file(mfplain.mp), which is needed for producing the scaleable font files.
)
+pl 62.hwn1
+ - ps-to-pfa.py: use std modules re, find
+ - minor input fixes
+ - use mfplain.mp
+ - Metapost does unfill with setgray. This confuses
+GS. Do text substitution with eofill.
+
+pl 62.jcn3
+ - bfs: preludes
+ - found more wierd spacing
+
+pl 62.jcn2
+ - bf: don't start auto-beam on stem that contains only a rest
+ - bf: rm .ms yodl output
+ - bumped stepmake version
+
+pl 62.uu1
+ - don't space rhythmic requests coming from Lyrics.
+
+pl 62.jcn1
+ - bf: auto-beamer: consider starting beam based on new rhythmic head
+ - bfs: preludes-4, cello-suites
+ - \addlyricsified standchen and twinkle (ugh: \repeat and \addlyrics)
+ - bf: interstaff slur slope damping
+ - bf: in-band signaling slur snap
+
+pl 61.jbr1
+ - Documentation/ntweb/GNUmakefile: Made EXTRA_DIST_FILE style fix and
+ added dist-plain target as dependency to the default target.
+ - scripts/ly2dvi.py: getpid does not behave very well across platforms
+ so I am creating temp file names with the Python tempfile module.
+ The generate lilypond dependency file option was broken and
+ is now operational. I also changed the dependency switch
+ from -d or -M to match lilypond.
+ - stepmake/bin/package-zip32.sh: Added build of ntweb html
+ documentation
+
+***********
pl 61.hwn2
- revise / junk various input files.
- junk Music_list_iterator
. * align left edge of broken (de)cresc/slur/tie/tuplet/volta
. * auto-staff-switching.
. * broken examples:
-mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly
-mutopia/J.S.Bach/Petites-Preludes/preludes-4.ly
-mutopia/J.S.Bach/Solo-Cello-Suites/*
+input/star-spangled-banner.ly: hw?
+mutopia/J.S.Bach/Petites-Preludes/preludes-paper.ly? hw?
+mutopia/J.S.Bach/Solo-Cello-Suites/prelude-cello.ly: hw: slurs + autobeamer ?
mutopia/Coriolan/*
. * spacing of accidentals
. * PostScript
. * half notes in pfa
. * We need feta-din*.mf files for more sizes than 10.
-. * fix dynamics decently, ie. use kerning & ligatures.
+. * fix dynamics decently, ie. use kerning & ligatures.
.* Cleanups needed
. * \$ and $ identifier syntax in examples.
(require 'allout)
(outline-init 't)
+
PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=1
-PATCH_LEVEL=62
+PATCH_LEVEL=63
MY_PATCH_LEVEL=
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl WARNING WARNING WARNING WARNING
dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
#TODO. This could be more efficient.
name = 'ps-to-pfa'
-version = '0.3'
+version = '0.4'
datadir = ''
+import find
import os
import sys
f.write ('%!PS-AdobeFont-3.0: ' + font_name + '\n')
f.write ('%%%%Creator: %s-%s\n' % (name, version))
f.write ('\n')
- f.write ('/setgray { 1 add } bind def\n'
- '\n'
-'8 dict begin\n'
-'/FontType 3 def %% Required elements of font\n'
-'/FontName /%s def\n'
-'/FontMatrix [.001 0 0 .001 0 0] def\n'
-'%%/FontMatrix [.01 0 0 .01 0 0] def\n'
-'%%/FontMatrix [0.1 0 0 0.1 0 0] def\n'
-'%%/FontBBox [-1000 -1000 1000 1000] def\n'
-'/FontBBox [-3000 -3000 3000 3000] def\n'
-'%%/FontBBox [-300 -300 300 300] def\n'
-'%%/FontBBox [-30 -30 30 30] def\n'
-'\n'
-'/Encoding 256 array def %% Trivial encoding vector\n'
-'0 1 255 {Encoding exch /.notdef put} for\n' % (font_name))
-
+ f.write (r"""
+8 dict begin
+/FontType 3 def %% Required elements of font
+/FontName /%s def""" % font_name)
+ f.write (r"""
+/FontMatrix [.083 0 0 .083 0 0] def %% why .83?
+/FontBBox [-1000 -1000 1000 1000] def %% does not seem to matter.
+/Encoding 256 array def %% Trivial encoding vector
+0 1 255 {Encoding exch /.notdef put} for
+""")
def footer (f):
- f.write ('\n'
-'/BuildGlyph { % Stack contains: font charname\n'
-'% 1000 0 % Width\n'
-'% -1000 -1000 1000 1000 % Bounding Box\n'
-'% -750 -750 750 750 % Bounding Box\n'
-'% -750 -750 750 750 % Bounding Box\n'
-' 3000 0 % Width\n'
-' -3000 -3000 3000 3000 % Bounding Box\n'
-'% 300 0 % Width\n'
-'% -300 -300 300 300 % Bounding Box\n'
-'% 30 0 % Width\n'
-'% -30 -30 30 30 % Bounding Box\n'
-' setcachedevice\n'
-' exch /CharProcs get exch % Get CharProcs dictionary\n'
-' 2 copy known not {pop /.notdef} if % See if charname is known\n'
-' get exec % Execute character procedure\n'
-'} bind def\n'
-'\n'
-'/BuildChar { % Level 1 compatibility\n'
-' 1 index /Encoding get exch get\n'
-' 1 index /BuildGlyph get exec\n'
-'} bind def\n'
-'\n'
-'currentdict\n'
-'end % of font dictionary\n')
- f.write ('\n')
+ f.write (r"""
+/BuildGlyph { % Stack contains: font charname
+ 1000 0 % Width
+ -1000 -1000 1000 1000 % Bounding Box
+ setcachedevice
+ exch /CharProcs get exch % Get CharProcs dictionary
+ 2 copy known not {pop /.notdef} if % See if charname is known
+ get exec % Execute character procedure
+} bind def
+
+/BuildChar { % Level 1 compatibility
+ 1 index /Encoding get exch get
+ 1 index /BuildGlyph get exec
+} bind def
+
+currentdict
+end % of font dictionary
+"""
+)
+
f.write ('/%s\n' % font_name)
f.write (''
'exch definefont pop % Define the font\n')
+
+suspect_re = re.compile ('closepath (.*?) 1 setgray newpath (.*?) closepath fill')
+
def characters (f):
- #urg
- # chars = os.listdir ()
- # chars.sort ()
sys.stderr.write ('[')
- pipe = os.popen ('/bin/ls -1 ' + font_name + '.[0-9] ' + font_name + '.[0-9][0-9] ' + font_name + '.[0-9][0-9][0-9] 2> /dev/null')
- chars = []
- i = pipe.readline ()
- while i:
- chars.append (i[0:len (i)-1])
- i = pipe.readline ()
- f.write ('\n'
-'/CharProcs 3 dict def % Subsidiary dictiorary for\n'
-'CharProcs begin % individual character definitions\n')
+
+ files = []
+ import find # q
+ suffixes = [".[0-9]", ".[0-9][0-9]", ".[0-9][0-9][0-9]"]
+ for suf in suffixes:
+ files = files + find.find (font_name + suf)
+
+
+ # concat all files into charprocs.
charprocs = ' /.notdef {} def\n'
encoding = ''
- for i in chars:
+ for i in files:
s = gulp_file (i)
- s = regsub.gsub ('^%.*\n', '', s)
- s = regsub.gsub ('^showpage\n', '', s)
- s = regsub.gsub ('^', ' ', s)
- n = atoi (regsub.gsub ('.*\.', '', i))
+ s = re.sub ('%[^\n]*\n', '', s)
+
+ # if you want readable stuff, look at MP output.
+ s = re.sub ('[\n\t ]+', ' ', s)
+ s = re.sub ('showpage', '', s)
+
+ # MP's implementation of unfill confuses GS.
+ # Look for "Metapost & setgray" on deja.com
+ # we do some twiddling to use eofill i.s.o. fill
+ if re.search ('setgray',s ):
+ m = suspect_re.search (s)
+ while m:
+ fill = m.group (1)
+ path = m.group (2)
+
+ # be complicated, in case of gsave/grestore.
+ # vill as quick hack to avoid duple substitutions.
+ fill = re.sub ('fill', 'eovill', fill, count = 1)
+ s = re.sub (m.group (0), ' %s %s ' % (path, fill), s)
+ m = suspect_re.search (s)
+
+ s = re.sub ('eovill' , 'eofill', s)
+ s = re.sub ('0 setgray' ,'', s)
+
+
+ m = re.match ('.*\.([0-9]+)',i)
+ n = atoi (m.group (1))
+
s = '\n /%s-%d{\n%s} bind def\n' % (font_name, n, s)
encoding = encoding + 'Encoding %d /%s-%d put\n' % (n, font_name, n)
charprocs = charprocs + s
+
+ f.write ('\n'
+'/CharProcs 3 dict def % Subsidiary dictiorary for\n'
+'CharProcs begin % individual character definitions\n')
f.write (charprocs)
f.write ('\n')
f.write ('end % of CharProcs\n')
footer (ps_file)
sys.stderr.write ('\n')
ps_file.close ()
-sys.stderr.write ('Wrote PostScript font: %s\n'% output_name)
+sys.stderr.write ('Wrote PostScript font: %s\n' % output_name)
--- /dev/null
+% jij had zoon mooi tight spacing example,
+% kan zo'n harde space ook niet voor en na maatstreep!
+\score {
+ \notes \relative c'' {
+ \time 2/4;
+ \property Voice.beamAuto=0
+ a4 a8
+ a32 a a a
+}
+%set bit wide
+\paper {linewidth = 100.\mm;}
+}
--- /dev/null
+% slur minimum length too long, or what happened?
+\score {
+ \notes \relative c'' {
+ c8()c c()c
+ c()c c()c
+}
+%set very tight
+\paper {linewidth = 40.\mm;}
+}
another =
- \relative c'' \notes{ \time 6/4;
+ \notes \relative c'' { \time 6/4;
c1. c1. \time 4/4;c4 c4 c4 c4 c1 c1 c1
}
{
end_beam ();
}
- else if (Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_))
+ }
+
+ if (Stem* stem_l = dynamic_cast<Stem *> (info.elem_l_))
+ {
+ Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
+ if (!rhythmic_req)
{
- Rhythmic_req *rhythmic_req = dynamic_cast <Rhythmic_req *> (info.req_l_);
- if (!rhythmic_req)
- {
- programming_error ("Stem must have rhythmic structure");
- return;
- }
-
- if (stem_l->beam_l_)
- {
- junk_beam ();
- return ;
- }
-
- /*
- now that we have last_add_mom_, perhaps we can (should) do away
- with these individual junk_beams
- */
+ programming_error ("Stem must have rhythmic structure");
+ return;
+ }
+
+#if 0
+ /*
+ Don't (start) auto-beam over empty stems.
+ ugly check for rests!
+ --> doesn't even work: stem-dir is not set
+
+ ../flower/include/drul-array.hh:26: Real & Drul_array<double>::elem<Real>(enum Direction): Assertion `d==1 || d== -1' failed.
+/home/fred/root/usr/scripts/src/out/Linux/li: line 8: 14641 Aborted (core dumped) lilypond $opts
+
+ */
+ if (stem_l->extent (Y_AXIS).empty_b ())
+ {
+ if (stem_l_arr_p_)
+ end_beam ();
+ return;
+ }
+#else
+ if (!stem_l->head_l_arr_.size ())
+ {
+ if (stem_l_arr_p_)
+ end_beam ();
+ return;
+ }
+#endif
- int durlog =rhythmic_req->duration_.durlog_i_;
- if (durlog <= 2)
+ if (stem_l->beam_l_)
+ {
+ if (stem_l_arr_p_)
+ junk_beam ();
+ return ;
+ }
+
+ /*
+ now that we have last_add_mom_, perhaps we can (should) do away
+ with these individual junk_beams
+ */
+
+ int durlog =rhythmic_req->duration_.durlog_i_;
+ if (durlog <= 2)
+ {
+ if (stem_l_arr_p_)
end_beam ();
- else
+ return;
+ }
+
+ /*
+ if shortest duration would change
+ reconsider ending/starting beam first.
+ */
+ Moment mom = rhythmic_req->duration_.length_mom ();
+ consider_end_and_begin (mom);
+ if (!stem_l_arr_p_)
+ return;
+ if (mom < shortest_mom_)
+ {
+ if (stem_l_arr_p_->size ())
{
- /*
- if shortest duration would change
- reconsider ending/starting beam first.
- */
- Moment mom = rhythmic_req->duration_.length_mom ();
- consider_end_and_begin (mom);
+ shortest_mom_ = mom;
+ consider_end_and_begin (shortest_mom_);
if (!stem_l_arr_p_)
return;
- if (mom < shortest_mom_)
- {
- if (stem_l_arr_p_->size ())
- {
- shortest_mom_ = mom;
- consider_end_and_begin (shortest_mom_);
- if (!stem_l_arr_p_)
- return;
- }
- shortest_mom_ = mom;
- }
- Moment now = now_mom ();
-
- grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2);
- stem_l_arr_p_->push (stem_l);
- last_add_mom_ = now;
- extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom ();
}
+ shortest_mom_ = mom;
}
+ Moment now = now_mom ();
+
+ grouping_p_->add_stem (now - beam_start_moment_ + beam_start_location_, durlog - 2);
+ stem_l_arr_p_->push (stem_l);
+ last_add_mom_ = now;
+ extend_mom_ = extend_mom_ >? now + rhythmic_req->length_mom ();
}
}
*/
Drul_array<Real> yextent_drul_;
+public: // urg, autobeamer needs to know if there are (only) rests here?
Link_array<Note_head> head_l_arr_;
Link_array<Rest> rest_l_arr_;
STEPMAKE_TEMPLATES=metafont metapost install install-out
-EXTRA_DIST_FILES += README feta.mp mfplain.ini
+EXTRA_DIST_FILES += README feta.mp
+
+# wtf is feta.mp ?
FET_FILES = $(wildcard feta[0-9]*.mf)
def breapth_endchar =
scantokens extra_endchar;
if proofing > 0: makebox_with_breapth(proofrule); fi
- chardx := 10*(w + b);
+% chardx := 10*(w + b);
shipit;
endgroup
enddef;
draw_block ((0,-breve_rest_y), (breve_rest_x, breve_rest_y));
fet_endchar;
+tracingvariables := 1;
+
fet_beginchar("multi rest", "-4", "multirest");
set_char_box(multi_rest_x#, multi_rest_x#,
breve_rest_y#, breve_rest_y#);
input feta-klef;
input feta-timesig;
else:
- input feta-bolletjes;
+% input feta-bolletjes;
% input feta-banier;
-% input feta-eindelijk;
+ input feta-eindelijk;
% input feta-klef;
% input feta-toevallig;
% input feta-schrift;
input feta-sleur;
+%
+% URG. The attached slurs look weird, and discontinuous in their connection to the
+% main part. --hwn
+
fet_beginchar("upprall", "upprall", "upprall")
% trills := 4;
trills := 3;
+%
+% What's this ? --hwn
+%
+
% feta.mp
batchmode;
c4~ [c16 g' des c] [bes es bes as] |
[g as bes c] [des8 bes] g'4~ |
[g8 c,16 bes] [as f' bes, as] [g des' g, f] |
- [e f g as] [bes8 g] [e'.-\prallprall d32 e] |
+ [e f g as] [bes8 g] [e'8.-\prallprall d32 e] |
%78
[f8 f,16 g] [as8 bes c d] |
[es16 d c d] [es8 f g as] |
EXTRA_DIST_FILES=
+LILYINCLUDE:=$(LILYINCLUDE):out
+export LILYINCLUDE
+
examples=preludes-2
LOCALSTEPMAKE_TEMPLATES=mutopia
\version "1.1.60";
-upper = \type Staff \notes \transpose c'' {
- \type Voice=i
+upper = \context Staff \notes \transpose c'' {
+ \context Voice=i
\property Voice . textstyle = "italic"
%# s(^c@ ^es@ ^g@ ^\p(\<@ ^\!@ ^)\!@ ^\>@)
t(c,es,g,^\p(\<@,\!,^)\!@,\>)
s(fis` c es)
s(fis` c es)
r16 [g`(\< b` d] [b` g` b` d] [es c a` \!fis] |
- <
- {\stemup ) g2.-\fermata\mf}
- \type Voice=ii {\stemdown <b`2. d>}
+ \context Staff <
+ \context Voice=i {\stemup ) g2.-\fermata\mf}
+ \context Voice=ii {\stemdown <b`2. d>}
>
\stemboth
\bar "|.";
}
-lower = \type Staff \notes{
+lower = \context Staff \notes{
% c4 r [g8-.(\ped )es-.\*] |
c4 r [g8-.( )es-.] |
c4 r [g8-.( )es-.] |
\score{
% Semplice e non troppo legato
- \type GrandStaff <
- \type Staff = upper <
+ \context GrandStaff <
+ \context Staff = upper <
\global
\upper
>
- \type Staff = lower <
+ \context Staff = lower <
\global
\clef "bass";
\lower
\header{
filename = "preludes.ly";
% mmm
-title = "DOUZE PETITES PR\\'ELUDES";
+title = "Petites Pr\'eludes";
% urg subtitle = "Clavierb\\"uchlein";
subtitle = "Clavierbuechlein";
composer = "Johann Sebastian Bach (1685-1750)";
\include "preludes-1.ly"
\include "preludes-2.ly"
-% urg, still broken
-% \include "preludes-3.ly"
+\include "preludes-3.ly"
\include "preludes-4.ly"
\include "preludes-5.ly"
\include "preludes-6.ly"
But merging melodic and scripts doen't work too well yet (see viola_scripts).
%}
-n = { \slurnormal }
-d = { \slurdotted }
-comma = "\\sethuge\\ \\ ,"
-
-phrasingcomma = { } % { \bar "empty"; \mark "'"; \nobreak }
-
allemande_a = \context Staff \notes \relative c {
\context Voice=i
\stemup
g()f e()d d()cis d()e a,8 bes16()g |
f( a )d f, e8 cis' \stemup d8. e16 \stemboth f g a bes! |
%3
- \stemup c8 \n d16()es \stemboth d()c bes()a c()bes a()g d'8. f,16 |
- e( g )bes d c()bes a()g \n bes()a g()f
+ \stemup c8 d16()es \stemboth d()c bes()a c()bes a()g d'8. f,16 |
+ e( g )bes d c()bes a()g bes()a g()f
< f8. a> <f16 a > |
% urg fix
- b \n f( e )d e \d cis'( d )cis \stemup d8.( )e16 \stemboth
- \n f( e d)e |
+ b f( e )d e cis' d cis \stemup d8. e16 \stemboth
+ f( e d)e |
%6
d( c b )c b( a gis)a gis8-\prall fis16()e e' c( a )g |
\stemup e' a, f d d f d b \stemboth
- gis( b e )gis \d b( d c )b |
+ gis( b e )gis b d c b |
%8
- \n c( a f )e d( f e )d gis8.-\trill()a16 \d b d e,()d |
+ c( a f )e d( f e )d gis8.-\trill()a16 b d e, d |
% urg
- c( e a)d \stemup b8.-\trill a16 a8 s4 s8 \stemboth |
+ c e a d \stemup b8.-\trill a16 a8 s4 s8 \stemboth |
%10
d,!16 gis( a b a gis fis )e \stemup e8 f16()e \stemboth
d()c b()a |
- \stemup d8 e16()f \stemboth\d e()d c()b
+ \stemup d8 e16()f \stemboth e d c b
\stemup d'16()b c()a \stemboth e8 gis |
- a,8. cis16 e g!( f! )e f( a )d gis, a8.
+ a,8. cis16 e g! f! e f a d gis, [ a8. ]
%13
e16 \stemup e8. f16 \stemboth
- \n g!()e f()a \n cis,( d )e bes a8.-\trill()g16 |
- f a'(f)d g \n b,()cis a' g(f e)d fis d()es c( |
+ g!()e f()a cis,( d )e bes a8.-\trill()g16 |
+ f a'(f)d g b,()cis a' g(f e)d fis d()es c( |
%15
)bes g'(a, )g fis a d c' bes(fis)g bes d()a bes()g |
- es(d)es g c()a bes()g \d d(c)d g \n bes()fis g()es |
+ es(d)es g c()a bes()g d c d g bes()fis g()es |
%17
- \n c(bes)c bes' a(c)es g, \stemup fis8-\trill\d g16()a \stemboth
- d,8 es16()c |
- bes(d )g bes, d,8 fis' \stemup g8. a16 \stemboth bes d g, f |
+ c(bes)c bes' a(c)es g, \stemup fis8-\trill g16 a \stemboth
+ d,8 es16 c |
+ bes d g bes, d,8 fis' \stemup g8. a16 \stemboth bes d g, f |
%19
- \stemup e8.-\trill()f16 \stemboth g()e c()bes
- \n a()f' g,()f e g'( a )bes |
- % :-(
- % bes( a g )f^\comma
- bes( a g )f \phrasingcomma
+ \stemup e8.-\trill f16 \stemboth g e c bes
+ a()f' g,()f e g'( a )bes |
+ bes( a g )f
a()e f()d bes d(f)a d()a bes()g |
%21
- a,(\n)g'(\n cis())d e()g, a()e f()d bes()d \d gis, f'(e)d |
- % \n d( cis b )a^\comma c(a)fis d' c a( b )d
- \n d( cis b )a \phrasingcomma %^"\\sethuge\\ \\ ,"
+ a,()g'cis()d e()g, a()e f()d bes()d gis, f' e d |
+ d( cis b )a
c(a)fis d' c a( b )d
f!(d )gis, d' |
%23
s1 |
f!16 s16*3 b, s16*3 s2 |
s1 |
- s4 e dis8 ~ dis32 e( fis gis a b c d! c b c )a |
+ \property Voice.slurVerticalDirection=1
+ s4 e [dis8 ~ dis32 e( fis gis] [a b c d! c b c )a] |
+ \property Voice.slurVerticalDirection=0
%10
s2 <a8 c,> s8 s4 |
<b8 gis,> s8 s4 <e,8 a,> s8 s4 |
s2 s4 s8.
- s16 |
+ s16
<cis'8 g,> s8 s2. |
%15
s1*3 |
>
-\version "1.1.52";
+\version "1.1.55";
But merging melodic and scripts doen't work too well yet (see viola_scripts).
%}
-n = { \slurnormal }
-d = { \slurdotted }
-
courante_a = \context Staff \notes \relative c {
\context Voice=i
d'16 |
- d a f a d, f g a \d bes()a bes()g |
- \stemup <g4 a> s4 \stemboth \d g16()f g()e |
+ d a f a d, f g a bes a bes g |
+ \stemup <g4 a> s4 \stemboth g16 f g e |
% urg, a good case for mean-distance-beam-dir-algorithm!
- f()d e()c! \n bes(a)bes a' g f e d |
+ f d e c! bes(a)bes a' g f e d |
%4
- % cis e \n a,(\d(b cis d e f )g )bes-- a e |
- cis e \n a,(b cis d e f )g bes-- a e |
- % f a \n d,(\d( e f g a bes )c )bes-- d c |
- f a \n d,( e f g a bes )c bes-- d c |
- \n\stemup <c4 f,> ~ < c16 f,> bes a g \stemboth f()es d()es |
+ cis e a,(b cis d e f )g bes-- a e |
+ f a d,( e f g a bes )c bes-- d c |
+ \stemup <c4 f,> ~ < c16 f,> bes a g \stemboth f()es d()es |
%7
d bes(a)bes d bes e! bes f' bes, g' bes, |
- \d e,( g )c d e f g a bes()a bes()g |
- \n a f(e)f a f bes f c' f, d' f, |
+ e, g c d e f g a bes a bes g |
+ a f(e)f a f bes f c' f, d' f, |
%10
cis( e )a b cis d e f g()f g()e |
- d,( a' )f' e \n d()c d()c b()a b()a |
- \n gis( a )b e, \n f()e f()d e()c d()b |
+ d,( a' )f' e d()c d()c b()a b()a |
+ gis( a )b e, f()e f()d e()c d()b |
%13
- \n c a'( b c b a gis)a d, a' e a |
+ c a'( b c b a gis)a d, a' e a |
f a( b c b a gis)a f a e a |
dis, a'( b c b a gis)a e a e gis |
- a e cis e a, cis e gis a8.
- e'16 |
+ a e cis e a, cis e gis [ a8. ]
+ e'16
%17
e cis a cis e, f g a bes()g cis()g |
\stemup d'4 ~ d16 a d e f d a c! \stemboth |
- \n b16 f(d)f \d g, d'(f)g b f d' f, |
+ b16 f(d)f g, d' f g b f d' f, |
%20
- e g c,(d e f g a )bes! d c g |
+ e g c, d e f g a bes! d c g |
\stemup a s16*3 s4 s4
d, ~ d16 e! f g \stemboth a bes c d |
%23
- e, bes(a)g a f' \n g,()f \d c()g' f' e |
- f a( bes a g f e )f g e f d |
+ e, bes a g a f' g,()f c g' f' e |
+ f a bes a g f e f g e f d |
cis g' b, g' a, g' b, g' cis, g' a, g' |
%26
f d f a d a d e f a, f d |
- g, d'(g)a bes g' a, f' g, e' f, d' |
- \n cis(d)e cis a cis bes cis a cis g cis |
+ g, d' g a bes g' a, f' g, e' f, d' |
+ cis(d)e cis a cis bes cis a cis g cis |
%29
- \n f, d'(e f e d cis)d g, d' a d |
- \d bes d(e f e d cis)d bes d a d |
+ f, d'(e f e d cis)d g, d' a d |
+ bes d e f e d cis d bes d a d |
gis, d'(e f e d cis)d a d a cis |
d a f a d, f a, d
d,8.
s16 |
s2. |
%2
- \n cis4 ~ cis16 d e f s4 |
+ cis4 ~ cis16 d e f s4 |
s2.*3 |
%6
a,4 s2
s2.*9
% 16
s2 s8.
- s16 |
+ s16
s2.
%18
f'4 s s |
s2.*2
%21
+ \property Voice.slurVerticalDirection=1
f16 c'(bes a g f es d )es c' f, es |
+ \property Voice.slurVerticalDirection=0
bes4 s s
s2.*9
s2 s8.
\$courante_b
>
-\version "1.1.52";
+\version "1.1.55";
But merging melodic and scripts doen't work too well yet (see viola_scripts).
%}
-n = { \slurnormal }
-d = { \slurdotted }
-
sarabande_a = \context Staff \notes \relative c {
\context Voice=i
- \stemup \d d8.()e16 e4.-\trill( d16 )e |
- f4. \stemboth e8(d)c |
- bes g' \n f e16(f g a bes)d, |
- cis4.-\trill\d b8(a)g |
+ \stemup d8. e16 e4.-\trill d16 e |
+ f4. \stemboth e8 d c |
+ [bes g'] f e16(f g a bes)d, |
+ cis4.-\trill b8 a g |
% copy bar 1, half bar 2
- \stemup \d d'8.()e16 f4.-\trill( d16 )e |
+ \stemup d'8. e16 f4.-\trill d16 e |
%5
- f4. \stemboth d8(e)f |
- \n g bes16()a c()bes a()g d'8 f, |
- \stemup e4.-\trill \stemboth \d d8(c)bes |
+ f4. \stemboth d8 e f |
+ g bes16()a c()bes a()g d'8 f, |
+ \stemup e4.-\trill \stemboth d8 c bes |
%8
- \stemup \n f' g16()a a4. g16()f |
+ \stemup f' g16()a a4. g16()f |
g8 a16()bes bes4. c16()d |
% 11
- \stemboth \d e,8()f c, g' f'()e |
+ \stemboth e,8 f c, g' f' e |
f4 f,2 |
- \stemup a'4 \d a4.-\trill()bes8 |
- c bes16()a \stemboth fis8.-\trill()es16 d8()c |
- bes g' a, fis' es'()d |
+ \stemup a'4 a4.-\trill bes8 |
+ c bes16 a \stemboth fis8.-\trill es16 d8 c |
+ bes g' a, fis' es' d |
%16
- \stemup bes4.-\trill \stemboth a8(g)f! |
- e bes()a f'(g)a |
- d, as()g es'(f)g |
- cis, bes' a g16()f e!8 f16()d |
- cis8 e16()a a,8. g'16 \n f8()e |
+ \stemup bes4.-\trill \stemboth a8 g f! |
+ e bes a f' g a |
+ d, as g es' f g |
+ cis, bes' a g16 f e!8 f16 d |
+ cis8 e16 a a,8. g'16 f8()e |
%21
\stemup d e16()f f4. e16()d |
e8 f16()g g4. a16()bes |
- \d a8 cis16()d d,8 e16(f32)g f8-\trill \n e16()d |
+ a8 cis16 d d,8 e16 f32 g f8-\trill e16()d |
d4 d,16 a'( b cis d e f )g |
%25
a(b c)b c4. b16()a |
- \d b(cis d )cis d4. \n e16()f |
- \stemboth d(cis)d f, a,8 e' \d d'()cis |
+ b cis d cis d4. e16()f |
+ \stemboth d(cis)d f, a,8 e' d' cis |
d4 d,,2 |
}
%10
bes4 <g2 f'> |
s2.*2 |
- \d f'8()es es4. r8 |
+ f'8 es es4. r8 |
d4 s2 |
%15
s2. |
\$sarabande_b
>
-\version "1.1.52";
+\version "1.1.55";
\relative c'
{
\time 4/4;
- \partial 4;
+ r4 |
R1*4
c'2^"tutti" g
c, r
%!PS-Adobe-1.0: lilyponddefs
% hmm
-/setgray { 1 add } bind def
+% /setgray { 1 add } bind def
/stafflinethickness mudelapaperstaffline def
/staffheight mudelapaperstaffheight def
PACKAGE_NAME=StepMake
MAJOR_VERSION=0
MINOR_VERSION=1
-PATCH_LEVEL=77
+PATCH_LEVEL=78
MY_PATCH_LEVEL=
# use the above to send patches, always empty for released version:
dnl WARNING WARNING WARNING WARNING
dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
-dnl WARNING WARNING WARNING WARNING
-dnl do not edit! this is aclocal.m4, generated from stepmake/aclocal.m4
dnl aclocal.m4 -*-shell-script-*-
dnl StepMake subroutines for configure.in
# -$(METAPOST) "&mfmp \mode=ljfour; \mag=100.0; batchmode; input $<"
# -$(METAPOST) "&mfplain \mode=lowres; \mag=100.0; batchmode; input $<"
-$(outdir)/%.0: %.mf
- -$(METAPOST) "&mfplain \mode=lowres; \mag=30.0; batchmode; input $<"
+$(outdir)/%.0: %.mf mfplain.mem
+ -$(METAPOST) "&mfplain \mode=lowres; \mag=1.0; nonstopmode; input $<"
+
+
+
+mfplain.mem: mfplain.ini
+ $(INIMETAPOST) mfplain.ini
+
$(outdir)/%.pfa: $(outdir)/%.0
$(PYTHON) $(depth)/buildscripts/ps-to-pfa.py --output $(basename $<).pfa $<
-pfa: mfplain.mem $(PFA_FILES)
-mfplain.mem: mfplain.ini
- $(INIMETAPOST) mfplain.ini
+pfa: $(PFA_FILES)
local-dist: configure
+# urg!: this gets into every package (ie: yodl)
local-distclean:
rm -f config.h config.hh config.make Makefile GNUmakefile \
config.cache config.status config.log index.html \
$(outdir)/%.txt: %.yo
# $(YODL2TXT) -doutdir=$(outdir) --live-data=3 -o $@ $<
$(YODL2MSLESS) -doutdir=$(outdir) --live-data=3 $< > $@
-# rm -f $(basename $<).ms
-
+ rm -f $(basename $<).ms
projects / lilypond.git / commitdiff