From: Jan Nieuwenhuizen Date: Sun, 25 Feb 2001 12:33:05 +0000 (+0100) Subject: patch::: 1.3.131.jcn1 X-Git-Tag: release/1.3.132~2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=a6157e173876ce2a638649ba8c240f02ed905888;p=lilypond.git patch::: 1.3.131.jcn1 1.3.131.jcn1 ============ * Bugfix: out-letter/%.ps generation for mutopia. * Bugfix: don't use $(message ) in makefiles; some versions of make choke on this. * Bugfix: ly2dvi.py: don't add magic `//' to TEXINPUTS,MFINPUTS; this chokes kpsewhich 3.3.1 (bug report filed). * Bugfix: file-path.cc: don't interpret relative path as system root. * Bugfix: --srcdir install. --- diff --git a/CHANGES b/CHANGES index 29b2aa7ecd..6b0a505022 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,18 @@ +1.3.131.jcn1 +============ + +* Bugfix: out-letter/%.ps generation for mutopia. + +* Bugfix: don't use $(message ) in makefiles; some versions of make +choke on this. + +* Bugfix: ly2dvi.py: don't add magic `//' to TEXINPUTS,MFINPUTS; this +chokes kpsewhich 3.3.1 (bug report filed). + +* Bugfix: file-path.cc: don't interpret relative path as system root. + +* Bugfix: --srcdir install. + 1.3.130.hwn2 ============ diff --git a/GNUmakefile.in b/GNUmakefile.in index dc4b58369b..41d87c4315 100644 --- a/GNUmakefile.in +++ b/GNUmakefile.in @@ -20,7 +20,7 @@ IN_FILES := $(wildcard *.in) EXTRA_DIST_FILES = lilypond-font-lock.el lilypond-mode.el vimrc VERSION $(README_FILES) $(SCRIPTS) $(IN_FILES) NON_ESSENTIAL_DIST_FILES = $(README_TXT_FILES) INSTALLATION_DIR=$(datadir) -INSTALLATION_FILES=config.make VERSION +INSTALLATION_FILES=$(builddir)/config.make VERSION # bootstrap stepmake: # diff --git a/VERSION b/VERSION index 530cea21ba..50cbaad621 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=3 PATCH_LEVEL=131 -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 377a145e20..c23e7d4d3e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -403,7 +403,7 @@ dnl fi PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else - ROOTSEP='/' + ROOTSEP=':' DIRSEP='/' PATHSEP=':' LN=ln diff --git a/flower/file-path.cc b/flower/file-path.cc index d7d6d27c37..f290b83628 100644 --- a/flower/file-path.cc +++ b/flower/file-path.cc @@ -17,8 +17,9 @@ #define PATHSEP ':' #endif +/* We don't have multiple roots, set this to '\0'? */ #ifndef ROOTSEP -#define ROOTSEP '/' +#define ROOTSEP ':' #endif #ifndef DIRSEP @@ -56,7 +57,7 @@ split_path (String path) if (i >= 0) { p.root = path.left_str (i); - path = path.right_str (path.length_i () - i); // - 1); + path = path.right_str (path.length_i () - i - 1); } i = path.index_last_i (DIRSEP); diff --git a/input/bugs/dynamic-collide.ly b/input/bugs/dynamic-collide.ly index 84d3cdcdc8..789e081390 100644 --- a/input/bugs/dynamic-collide.ly +++ b/input/bugs/dynamic-collide.ly @@ -1,47 +1,111 @@ - % dynamics should not collide with staff % dynamics (of two voices) should not collide with eachother +% strange stem through beam bug in bar 8 on viola staff +% 1-staff-high brace should collapse \header { texidoc="Template for part-combining orchestral scores"; } -End = { \skip 1; } -violoncello = \notes\relative c'' { - c1\ff +End = { \skip 1*8; } + +violaI = \notes\relative c'' { + c1 \break c c c c\break + g4\p\< r r r8 g(| + )c,4 r r r8 c| + [\!f8\sf(\>as f as][f g d)\!g]| + r [es'\p(c)es] r [d(bes)d]| + + } +violaII = \notes\relative c'' { + c1 c c c c + g4\p\< r r r8 g(| + )c,4 r r r8 c| + [\!f8\sf(\>as f as][f g d)\!g]| + r [c\p(g)c] r [bes(g)bes]| +} + -contrabasso = \notes\relative c'' { - c1\pp +violoncello = \notes\relative c { + c4\< c c c + \!c1\pp c c c + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line + [g8\p\<(bes' g bes][d bes g)d~]| + [d8(a' fis a][d a fis)d]| + [\!f!8\sf\>(as f as][f g d)g]| + %75 + \!c,4\p r d r| } -flautiStaff = \notes \context Staff = flauti < - \context Voice=oneBassi \End - \context Voice=twoBassi \End - \context Voice=Flauti \partcombine Voice - \context Thread=oneFlauti \violoncello - \context Thread=twoFlauti \contrabasso +contrabasso = \notes\relative c { + d8\< d d d d d d d + \!c1\ff c c c + \property Voice.crescendoText = #"cresc." + \property Voice.crescendoSpanner = #'dashed-line + g4\p\< r r r8 g(| + )c4 r r r8 c(| + \!)b1\sf| + c4\p r d r| +} + +violeStaff = \notes \context Staff = viole < + \context Voice=oneViole < + \property Staff.instrument = #"Viola" + \property Staff.instr = #"Vla." + + \End + > + \context Voice=twoViole < + \property Staff.instrument = #"Viola II" + \property Staff.instr = #"Vla. II" + \End + > + \context Voice=oneViole \partcombine Voice + \context Thread=oneViole \violaI + \context Thread=twoViole \violaII > -staffCombineProperties = { - \property Voice.devNullThread = #'unisolo - \property Voice.soloADue = ##t - \property Voice.soloText = #"" - \property Voice.soloIIText = #"" +staffCombinePianoStaffProperties = { + \property PianoStaff.devNullThread = #'() + \property PianoStaff.soloADue = ##t + \property PianoStaff.soloText = #"" + \property PianoStaff.soloIIText = #"" % This is non-conventional, but currently it is % the only way to tell the difference. - \property Voice.aDueText = #"\\`a2" - \property Voice.splitInterval = #'(1 . 0) - \property Voice.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) + \property PianoStaff.aDueText = #"\\`a2" + \property PianoStaff.splitInterval = #'(1 . 0) + \property PianoStaff.changeMoment = #`(,(make-moment 1 1) . ,(make-moment 1 1)) } + \score { < - \flautiStaff - > + \context StaffGroup < + \violeStaff + \context PianoStaff = bassi_group \notes < + \staffCombinePianoStaffProperties + \context Staff=oneBassi < \clef bass; + \property Staff.instrument = #'(lines + "Violoncello" " e" "Contrabasso") + \property Staff.instr = #"Vc." + \End > + \context Staff=twoBassi < \clef bass; + \property Staff.instrument = #"Contrabasso" + \property Staff.instr = #"Cb." + + \End > + + \context Staff=oneBassi \partcombine Staff + \context Voice=oneBassi { \violoncello } + \context Voice=twoBassi { \contrabasso } + > +> + > \paper { % \paperSixteen linewidth = 80 * \staffspace; @@ -54,17 +118,32 @@ staffCombineProperties = { \VoiceContext \remove "Rest_engraver"; - devNullThread = #'never + % The staff combine (bassi part) needs a + % thread_devnull_engraver here. + % Instead of maintaining two separate hierarchies, + % we switch add it, but switch it off immideately. + % The staff combine parts switch it on. + % devNullThread = #'never \consists "Thread_devnull_engraver"; - - soloText = #"I." - soloIIText = #"II." - soloADue = ##f } \translator{ \HaraKiriStaffContext \consists "Mark_engraver"; } + \translator { + \OrchestralScoreContext + skipBars = ##t + devNullThread = #'never + soloText = #"I." + soloIIText = #"II." + + % Hmm + currentBarNumber = #218 + BarNumber \override #'padding = #3 + RestCollision \override #'maximum-rest-count = #1 + marginScriptHorizontalAlignment = #1 + TimeSignature \override #'style = #'C + } } } diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 7fd502cf41..5317b7ada1 100644 --- a/lily/paper-outputter.cc +++ b/lily/paper-outputter.cc @@ -46,7 +46,7 @@ Paper_outputter::Paper_outputter (String name) if (verbatim_scheme_b_) { *stream_p_ << "" - ";;; Usage: guile -s x.scm > x.lytex\n" + ";;; Usage: guile -s x.scm > x.tex\n" "(primitive-load-path 'standalone.scm)\n" ";(scm-tex-output)\n" "(scm-ps-output)\n" diff --git a/make/lilypond-vars.make b/make/lilypond-vars.make index b68d7f6132..94531eb693 100644 --- a/make/lilypond-vars.make +++ b/make/lilypond-vars.make @@ -12,7 +12,8 @@ the-script-dir=$(wildcard $(script-dir)) ifneq ($(the-script-dir),) -$(message running from source tree stepmake) +### some versions apparently choke on $(message) +### $(message running from source tree stepmake) ABC2LY = $(script-dir)/abc2ly.py CONVERT_LY = $(script-dir)/convert-ly.py @@ -23,8 +24,8 @@ PS_TO_GIFS = $(buildscript-dir)/ps-to-gifs.sh PS_TO_PNGS = $(buildscript-dir)/ps-to-pngs.sh else - -$(message running from installed stepmake) +### some versions apparently choke on $(message) +### $(message running from installed stepmake) ABC2LY = $(shell $(SHELL) -c 'type -p abc2ly') LY2DVI = $(shell $(SHELL) -c 'type -p ly2dvi') diff --git a/make/ly.make b/make/ly.make index b7d4b7e581..e41d3bd055 100644 --- a/make/ly.make +++ b/make/ly.make @@ -20,7 +20,8 @@ make-root?=$(wildcard /usr/share/lilypond/make) make-root?=$(wildcard /usr/share/lilypond/make) #make-root=/make ifneq ($(make-root),) -$(message running from $(make-root)) +### some versions apparently choke on $(message) +### $(message running from $(make-root)) depth=$(make-root)/.. LOCALSTEPMAKE_TEMPLATES=ly mutopia include $(make-root)/stepmake.make @@ -41,6 +42,15 @@ endif name=book tarball=$(name) parts=$(patsubst %.ly,%,$(wildcard *-part.ly)) + +# +# scores for target local-WWW (duh) +# +examples= + +# +# scores for target mutopia +# mutopia-examples=$(name) $(parts) # @@ -60,8 +70,15 @@ $(outdir)/%-book.ps: $(outdir)/%.ps # # Also clean hand-compiled stuff in cwd # -localclean: local-auto-gen-clean +localclean: local-auto-gen-clean local-letter-clean + +# Compose string from two parts: must not remove myself. +auto-gen-tag=Generated +auto-gen-tag+= automatically by local-auto-gen-clean: - rm -f `grep -l 'Generated automacially by' *` + rm -f `grep -l '$(auto-gen-tag)' *` rm -f *.dvi *.png + +local-letter-clean: + rm -f $(outdir)-letter/* diff --git a/make/mutopia-targets.make b/make/mutopia-targets.make index 26982c301a..d22249cbb0 100644 --- a/make/mutopia-targets.make +++ b/make/mutopia-targets.make @@ -2,6 +2,7 @@ .PHONY: mutopia png ps scores tar .PRECIOUS: $(outdir)/%.ps $(outdir)/%-book.ps +.PRECIOUS: $(outdir)-letter/%.dvi $(outdir)-letter/%.ps all: $(OUT_FILES) diff --git a/mutopia/Coriolan/contrabasso.ly b/mutopia/Coriolan/contrabasso.ly index 2846c70995..295361aa91 100644 --- a/mutopia/Coriolan/contrabasso.ly +++ b/mutopia/Coriolan/contrabasso.ly @@ -230,8 +230,10 @@ contrabasso = \notes \relative c { %195 )g,4 r r r8 g(| - \!)d2\ff e'| - dis b| +%% \!)d2\ff e'| +%% dis b| + \!)d2\ff e| + dis b'| es4\p r r r8 es(| )a,4 r r r8 a(| )g1| diff --git a/mutopia/Coriolan/violoncello.ly b/mutopia/Coriolan/violoncello.ly index fc09b8232f..75b2871679 100644 --- a/mutopia/Coriolan/violoncello.ly +++ b/mutopia/Coriolan/violoncello.ly @@ -299,8 +299,10 @@ violoncello = \notes \relative c { \property Voice.crescendoSpanner = #'dashed-line [a8\<( f' d f][a f d )a!~]| [a( e' cis e][a e c )g]| - \!f2\ff e| - dis b'~| +%% \!f2\ff e| +%% dis b'~| + \!f2\ff e'| + dis b~| [b8\p( g' e g][b g e )b!~]| %200 diff --git a/po/nl.po b/po/nl.po index c35e8b2d43..4b7e5f06d1 100644 --- a/po/nl.po +++ b/po/nl.po @@ -1,5 +1,5 @@ # nl.po -- GNU LilyPond's dutch language file -# Copyright (C) 1998, 1999, 2000 Jan Nieuwenhuizen , Han-Wen Nienhuys . +# Copyright (C) 1998, 1999, 2000, 2001 Jan Nieuwenhuizen , Han-Wen Nienhuys . # Jan Nieuwenhuizen , 1998. # Han-Wen Nienhuys , 1998. # diff --git a/scripts/ly2dvi.py b/scripts/ly2dvi.py index 5d97714123..8f5d9da305 100644 --- a/scripts/ly2dvi.py +++ b/scripts/ly2dvi.py @@ -478,18 +478,25 @@ class Properties: this.__set('include', tmp, 'environment') - t= os.pathsep + t = os.pathsep if os.environ.has_key ('TEXINPUTS'): t = os.environ['TEXINPUTS'] + os.pathsep - os.environ['TEXINPUTS'] = t + \ - os.path.join(this.get('root'), 'tex' ) + \ - os.pathsep + os.path.join(this.get('root'), 'ps' ) - - t='' + + ly2dvi_t = t + \ + os.path.join(this.get('root'), 'tex' ) + \ + os.pathsep + os.path.join(this.get('root'), 'ps' ) + # Don't add the magic `//' to TEXINPUTS + ly2dvi_t = re.sub ('//*', '/', ly2dvi_t) + os.environ['TEXINPUTS'] = ly2dvi_t + + m = '' if os.environ.has_key ('MFINPUTS'): - t = os.environ['MFINPUTS'] - os.environ['MFINPUTS'] = t + os.pathsep + \ - os.path.join(this.get('root'), 'mf') + m = os.environ['MFINPUTS'] + ly2dvi_m = m + os.pathsep + \ + os.path.join(this.get('root'), 'mf') + ly2dvi_m = re.sub ('//*', '/', ly2dvi_m) + # Don't add the magic `//' to MFINPUTS + os.environ['MFINPUTS'] = ly2dvi_m if os.environ.has_key('TMP'): this.__set('tmp',os.environ['TMP'],'environment') @@ -548,9 +555,11 @@ class Properties: else: path ='' cmd =('kpsewhich tex %s %s' % (var,errorlog)) + sys.stderr.write ('executing: %s'% cmd) pipe = os.popen (cmd, 'r') path = pipe.readline ()[:-1] # chop off \n return_status = pipe.close() + sys.stderr.write ('\n') if return_status and not path: path = os.path.join(this.get('root'), 'tex', var) fd = open(path, 'r') diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index f5ba556edd..4fed30f3d0 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -401,7 +401,7 @@ dnl fi PATHSEP=':' INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" else - ROOTSEP='/' + ROOTSEP=':' DIRSEP='/' PATHSEP=':' LN=ln diff --git a/stepmake/stepmake/tex-rules.make b/stepmake/stepmake/tex-rules.make index c5da9738cd..6a8c78b764 100644 --- a/stepmake/stepmake/tex-rules.make +++ b/stepmake/stepmake/tex-rules.make @@ -17,5 +17,5 @@ $(outdir)/%.ps: $(outdir)/%.dvi cd $(outdir) && dvips -ta4 -o $(@F) $(