From: fred Date: Tue, 26 Mar 2002 21:46:26 +0000 (+0000) Subject: lilypond-1.1.24 X-Git-Tag: release/1.5.59~2622 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=fa0f08d32fd7a2b011661095348f4608544fa7a4;p=lilypond.git lilypond-1.1.24 --- diff --git a/NEWS b/NEWS index 766301d266..9234df1a8e 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,88 @@ +pl 24, Hacking Apart Together (Jan 25) + +pl 23.jbr1 + - scripts/ly2dvi.py: Windows 95 shell does not support redivrection + of stderr. We now distribute ash and use it when needed. + - stepmake/bin/package-zip32.sh: distribute ash, and guild ice-9/ + directory. We build and distribute manpages in html format instead + of text format. + - Documentation/ntweb: Updated doco and now distributing as a self + extracted binary with install script. + +pl 23.hwn4 + - bugfixes + - changed All_font_metrics to do TFM as well. + - changed init/ to ly/ + +pl 23.jcn8 + - tfm reader; revamped code from fontutils-0.6 + +pl 23.hwn3 + - {Bar numbers|staff margin stuff|marks} fixed using +Bar_script_engraver as base class + - bf: PS points != Lily \pt + - junked Bar_column_engraver + - junked Text_item and some old files. + + +pl 23.jcn7 + - bf: piano-brace size (veels te simpel: kruis vingers tegen reject) + - crude autobeam stuff in mi2mu + - brevis, longa chords: c1*2,*4 + - mutopia/E.Satie/petite-ouverture-a-danser.ly + - prop: voltaVisibility + - more cello-suite-ii fixes: + * nice repeats + * removed all beams ifo auto-beamer + - bf's: autobeam + - junked dur2real; beamAutoEndx now as rational string: "1/2" + +pl 23.hwn2 + - _8 clef + - junked #args symtable def. + - junked Text_item. + - moved Bar assembling into LilyPond + - junked symtables reads + - Lookup cleanups + - junked Symtable from init/table* + +pl 23.hwn1 + - revamped Scarlatti K3-L378 + - some more doco + - use interning/SCM for Scopes + - hanging on now works for breakables too. + +pl 23.jcn6 + - chord fixes; notemode chord syntax changed: @c@ @c-7@ + - fixed cello-suite ii + - bf's: auto-beamer; but nasty bug remains: input/bug/auto-beam.ly + - bf: extender + - (bit ugly) fix for lyric-chords + - fixed repeats (dankjewel lieverd) + * input/twinkle.ly + * input/star*.ly + +pl 23.jcn3 + - succussfully removed []s from wtk1-fugue2.ly + - bf + smarter autobeamer + +pl 23.jcn2 + - mi2mu: d-minor: des->cis, g-minor ges->fis + +pl 23.mb1 + - bf: Position and possible SIGSEGV in Mark_engraver + - Added padding support in G_staff_side_item + - bf: Correct direction of textual scripts. + - bf, lookup.cc: Fewer warnings about missing text styles. + Same units used in all .afm files. + +pl 22.jcn5 + - auto-beaming v0: input/test/auto-beam.ly + + + +*********** + pl 22.jcn4 - bf's: repeat-engraver; \bar "|:", ":|" now deprecated for repeats - bf: :|, |: diff --git a/input/GNUmakefile b/input/GNUmakefile index 26dc6aee1a..4b8cc939e9 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -4,7 +4,7 @@ depth = .. SUBDIRS=test bugs -examples=praeludium-fuga-E twinkle-pop star-spangled-banner +examples=praeludium-fuga-E star-spangled-banner flexamples= LOCALSTEPMAKE_TEMPLATES=mutopia diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index 8809726e7c..5c53037cd5 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -1,6 +1,6 @@ export PATH:=$(topdir)/lily/out:$(topdir)/buildscripts/out:$(PATH) export MFINPUTS:=$(topdir)/mf/$(PATHSEP)$(MFINPUTS)$(PATHSEP)$(PATHSEP) -export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)$(PATHSEP) -export LILYINCLUDE:=$(topdir)/scm$(PATHSEP)$(topdir)/init$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(LILYINCLUDE) +export TEXINPUTS:=$(topdir)/tex/$(PATHSEP)$(topdir)/ps/$(PATHSEP)$(TEXINPUTS)$(PATHSEP)..$(PATHSEP)$(PATHSEP) +export LILYINCLUDE:=$(topdir)/scm$(PATHSEP)$(topdir)/ly$(PATHSEP)$(topdir)/mf/out$(PATHSEP)$(PATHSEP)$(topdir)/tfm:$(LILYINCLUDE) diff --git a/mf/GNUmakefile b/mf/GNUmakefile index 3925ccc051..69c1f018d9 100644 --- a/mf/GNUmakefile +++ b/mf/GNUmakefile @@ -6,15 +6,14 @@ STEPMAKE_TEMPLATES=metafont metapost install install-out EXTRA_DIST_FILES += TODO README feta.mp mfplain.ini -FET_FILES = $(wildcard feta[0-9]*.mf) feta-din10.mf +FET_FILES = $(wildcard feta[0-9]*.mf) feta-din10.mf \ + $(wildcard feta-nummer[0-9]*.mf) LYTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.ly)) LOG_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.log)) TEXTABLES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.tex)) -AFM_IN_FILES = $(wildcard *.afm.in) -AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) \ - $(addprefix $(outdir)/, $(AFM_IN_FILES:.in=)) XPM_FONTS = feta20 +AFM_FILES = $(addprefix $(outdir)/, $(FET_FILES:.mf=.afm)) ALL_GEN_FILES=$(LYTABLES) $(TEXTABLES) $(LOG_FILES) $(AFM_FILES) diff --git a/mutopia/D.Scarlatti/GNUmakefile b/mutopia/D.Scarlatti/GNUmakefile index 2d7fc58cf0..cd768eeb70 100644 --- a/mutopia/D.Scarlatti/GNUmakefile +++ b/mutopia/D.Scarlatti/GNUmakefile @@ -2,7 +2,7 @@ depth = ../.. -examples= +examples=sonata-k3-l378 LOCALSTEPMAKE_TEMPLATES=mutopia include $(depth)/make/stepmake.make diff --git a/mutopia/D.Scarlatti/sonata-k3-l378.ly b/mutopia/D.Scarlatti/sonata-k3-l378.ly new file mode 100644 index 0000000000..0ff9b9ee04 --- /dev/null +++ b/mutopia/D.Scarlatti/sonata-k3-l378.ly @@ -0,0 +1,255 @@ + \header { + composer = "Domenico Scarlatti"; + title="Sonata K.3" + opus="L.378"; + movement="Presto"; + copyright = "General Public License"; +} + +tolower = \translator Staff = lower +toupper = \translator Staff = upper + +RHtoL = { \tolower \stemdown } +RHtoR = { \toupper \stemup } +LHtoR = { \toupper \stemup } +LHtoL = { \tolower \stemdown } + +\score { + \notes + \type PianoStaff < + \type Staff = upper <\type Voice = mainV <{ + % 1 + \stemup s1 + s4 [e'16 d' c' b] a4 s | + s4 a' e' c'' | + b'4 a'2 gis'4 | + s4 c'' a' e'' | + % 5 + d''4 c''2 b'4 | + s4 c'' g' f'' | + e''4 d''2 cis''4 | + s4 d'' a' g'' | + fis''4 e''2 dis''4 | + % 10 + [e''8 d''] c''2 b'4~b' + a'2 g'4~g' + fis'2 e'4~e' + d'2 c'4~c' + b2 a4 | + % 15 + s4 c' dis' fis' | + a'4 c'' dis'' fis'' | + a''4 c'''2 [b''8 a''] | + g''4 f'' e'' d''^\fermata | + s1 + % 20 + s + s4 \RHtoL a, b, cis | + d4 e f2 | + \RHtoR f4 aes b d' | + f'4 aes' b' d'' | + % 25 + f''4 aes''2 [g''8 f''] | + ees''4 d'' c'' d'' | + g'4 b' c'' \RHtoL f | + e4 e'2 \RHtoR d''4 | + e'4 b' c'' \RHtoL b, | + % 30 + a,4 a \RHtoR c'' d'' | + a4 b c' d' | + e'4 f' g' a' | + b'4 [a'8 g'] g''4 c'' | + c''4~[c''16 b' c'' d''] d''4.^\prall c''8 | + % 35 + c''4 c''' b'' bes'' + a'' aes''2 g''4~g'' + f''2 dis''4~dis'' + d''2 c''4~c'' + b'4 c'' d'' | + % 40 + e'4 f' g' a' | + b'4 [a'8 g'] g''4 c'' | + c''4~[c''16 b' c'' d''] d''4.^\prall c''8 | + c''4 [g''16 f'' e'' d''] c''4 s | + s4 [g16 f e d] c4 s | + s4 c'' g' + < + { f''4 e'' c'' d'' b' c''2. } + \type Voice = anotherV { a'4 g'2 f'2 e'2. } + > s4 | + + + s4 [g'16 f' e' d'] c'4 s | + s4 c'' g' ees'' ~ + < { ees'' d''2 c''4 } + \type Voice = anotherV { \stemdown g'2 fis'2 } + > + | + bes'4 s2 [d'16 c' bes a] | + g4 s2 | + | + d''4 [a''16 g'' f'' e''] d''4 s | + s4 [a16 g f e] d4 s | + s4 d'' a' f'' | + < + { f''4 e'' e'' d'' } + \type Voice = anotherV { \stemdown bes'2 bes'2 } + > | + < a'4 cis''> s2. | + \RHtoL s4 a' gis' g' | + fis'4 f' e'2 | + dis'4 d' cis' c' | + b4 bes a2 | + gis4 g fis f | + \RHtoR s4 e gis b | + d'4 f' gis' b' | + d''4 f''2 e''8 d'' | + c''4 b' a' g'^\fermata | + s1 s + \RHtoL s4 d e fis | + g4 a bes2 | + \RHtoR e'4 g' bes' e'' | + bes''2. [a''8 gis''] | + a''4 g''2 [f''8 e''] | + f''4 e''2 [d''8 cis''] | + d''4 c''2 [b'8 a'] | + gis'4 gis'' a'' \RHtoL d | + c4 c'2 \RHtoR b''4 | + c''4 gis'' a'' \RHtoL g, | + f,4 f2 \RHtoR b''4 | + f'4 gis' a' b' | + c''4 d'' e'' f'' | + gis'4 [a'8 b'] e'4 d'' | + < \type Voice = mainV { c''4 d'' s2 } + \type Voice = anotherV { \stemdown a'2 } + > + a'4 a'' gis'' g'' | + fis''4 f''2 e''4~e'' + d''2 c''4~c'' + b'2 a'4~a' + gis'4 a' d'' | + < \type Voice = mainV { c''4 d'' s2 } + \type Voice = anotherV { \stemdown } | + > + a'4 s2 [e'16 d' c' b] | + a4 s2 | %% added some chording. + | + a'2. | + }>> + + + \type Staff = lower <{ + + \stemdown s2. [e''16 d'' c'' b'] | + + a'4 + s2 + \clef bass; % HWN + [e16 d c b,] | + a,4 s2 a4 | + e4 c' b2 | + a4 s2 c'4 | + g4 e' d'2 | + c'4 s2 d'4 | + a4 f' e'2 | + d'4 s2 e'4 | + b4 g' fis'2 | + e'2 dis'4 d' | + cis'4 c' b2 | + bes4 a gis g | + fis4 f e2 | + dis4 d cis c | + b,2 s | + s1 + s4 b, cis dis | + e4 f g2 | + \LHtoR g4 bes cis' e' | + g'4 bes' cis'' e'' | + g''4 bes''2 [a''8 g''] | + f''4 e'' d'' c''^\fermata | + s1 s + \LHtoL s4 g, a, b, | + c4 d dis f | + g4 g'2 \LHtoR d''4 | + g'4 b' c'' \LHtoL d | + c4 c'2 \LHtoR d''4 | + c'4 b'2 \LHtoL g,4 | + f,4 f e d | + c4 d e f | + g,4 g e f | + g4 f g g, | + c2 s + \LHtoR %% added. HWN + s4 c'' b' bes' | + a'4 gis' g'2 | + fis'4 f' e' dis' + \LHtoL + | + d4 d' c' b | + c4 d e f | + g,4 g e f | + g4 f g g, | + c2 s4 [g'16 f' e' d'] | + c'4 s2 [g,16 f, e, d,] | + c,4 c s f | + g2 g, | + c2. \LHtoR [g''16 f'' e'' d''] | + + c''4 \LHtoL + s2 [g16 f e d] | + c4 s2 c'4 | + d'2 d | + g4 + \LHtoR + [d''16 c'' bes' a'] g'4 \LHtoL s2 + [d16 c bes, a,] g,4 g | + a2 a, | + d2 s4 \LHtoR [a'16 g' f' e'] | + d'4 \LHtoL s2 [a,16 g, f, e,] | + d,4 s2 d'4 | + g2 g, | + a,4 \LHtoR a'' gis'' g'' | + fis''4 f''2 e''4~e'' + d''2 c''4~c'' + b'2 a'4~a' + g'2 f'4~f' + e'2 d'4 | + \LHtoL e,2^\fermata s | + s1 + s4 e fis gis | + a4 b c'2 | + \LHtoR fis4 a c' ees' | + fis'4 a' c'' ees'' | + c'''2. [bes''8 a''] | + bes''4 a'' g'' f'' | + s1 + \LHtoL s4 c d e | + f2 e | + d2 c | + b,2 a, | + e4 e'2 \LHtoR b''4 | + e''4 gis'' a'' \LHtoL b, | + a,4 a2 \LHtoR b''4 | + a'4 gis'' a'' \LHtoL e, | + d,4 d' c' b | + a4 b c' d' | + e4 d' c' d' | + e'4 d' e' e | + a2 s | + s4 a' gis' g' | + fis'4 f' e'2 | + dis'4 d' cis' c' | + d | + e4 d e e, | + a,4 \LHtoR [e''16 d'' c'' b'] a'4 \LHtoL s2 + [e16 d c b,] a,4 d | + e2 e, | + a,2. + } + > > + + + \paper{ + barsize=50.0; + } +} diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 7c36e368e6..c0c07f6408 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -14,7 +14,7 @@ Output: DVI file """ name = 'ly2dvi' -version = '0.0.9' +version = '0.0.11' errorlog = '' import sys @@ -231,7 +231,7 @@ class TeXOutput: else: pageheight = Props.get('pageheight') pagewidth = Props.get('pagewidth') - + horizontalMarginArg = ( (pagewidth - linewidth)/2 ) verticalMarginArg = ( (pageheight - textheight)/2 ) @@ -341,7 +341,7 @@ class TeXOutput: psoutfile=this.__base + '.ps' if Props.get('output') != '': psoutfile = os.path.join(Props.get('output'), psoutfile ) - stat = os.system('dvips -o %s %s 2>&1' % (psoutfile,outfile)) + stat = os.system('dvips -o %s %s' % (psoutfile,outfile)) if stat: sys.exit('ExitBadPostscript') @@ -393,7 +393,7 @@ class Properties: 'pageheight' : [845, this.__overrideTable['init']], 'papersize' : ['a4paper', this.__overrideTable['init']], 'textheight' : [0, this.__overrideTable['init']], - 'linewidth' : [0, this.__overrideTable['init']], + 'linewidth' : [500, this.__overrideTable['init']], 'orientation' : ['portrait', this.__overrideTable['init']], 'language' : ['%', this.__overrideTable['init']], 'include' : [[], this.__overrideTable['init']], @@ -674,7 +674,7 @@ class Properties: else: sys.exit('ExitBadWidth', m.group(2)) else: - sys.exit('ExitBadWidth', size) + sys.stderr.write ('ly2dvi: warning: ignoring linewidth: ' + size + '\n') # # setOrientation @@ -1016,7 +1016,11 @@ def main(): type = infile.type() infile.close() if type == 'source': - cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) + if os.environ.has_key('OS') and \ + os.environ['OS'] == 'Windows_95': + cmd = 'ash -c "lilypond %s %s 2>&1"' %(getLilyopts(), file) + else: + cmd = 'lilypond %s %s 2>&1' % (getLilyopts(), file) sys.stderr.write ('executing: %s\n'% cmd) fd = os.popen(cmd , 'r')