From: Jan Nieuwenhuizen Date: Sat, 19 May 2001 10:14:47 +0000 (+0200) Subject: patch::: 1.4.1.jcn3 X-Git-Tag: release/1.4.2~3 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=ce1108cc3097328a32b834cb3de6b9e14b2220ae;p=lilypond.git patch::: 1.4.1.jcn3 1.4.1.jcn3 ========== * Updated les-nereides. --- diff --git a/CHANGES b/CHANGES index fb18257fbd..584d0f45cf 100644 --- a/CHANGES +++ b/CHANGES @@ -1,3 +1,8 @@ +1.4.1.jcn3 +========== + +* Updated les-nereides. + 1.4.1.jcn2 ========== diff --git a/VERSION b/VERSION index b56ac51a2e..100eb9ff68 100644 --- a/VERSION +++ b/VERSION @@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=1 -MY_PATCH_LEVEL=jcn2 +MY_PATCH_LEVEL=jcn3 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff --git a/input/GNUmakefile b/input/GNUmakefile index ee4be08dc7..d94dff4e60 100644 --- a/input/GNUmakefile +++ b/input/GNUmakefile @@ -4,8 +4,7 @@ depth = .. SUBDIRS=bugs test regression tutorial no-notation ascii-art -examples=trip star-spangled-banner paddy twinkle -flexamples= +examples=trip star-spangled-banner paddy twinkle nereides LOCALSTEPMAKE_TEMPLATES=ly mutopia EXTRA_DIST_FILES=paddy.abc @@ -14,3 +13,7 @@ include $(depth)/make/stepmake.make local-check: $(addsuffix .dvi, $(addprefix $(outdir)/, $(examples))) +$(outdir)/nereides.ly: les-nereides.ly + cpp -P -traditional -o $@ -DFAKE_GRACE $< + + diff --git a/input/bugs/context-weirdness.ly b/input/bugs/context-weirdness.ly new file mode 100644 index 0000000000..b7f4a6e8eb --- /dev/null +++ b/input/bugs/context-weirdness.ly @@ -0,0 +1,52 @@ +\header { +texidoc = "context level weirdness. after some commands, explicit + \context Voice commands must be inserted; otherwise subsequent property + settings fail silently" +} + +% from les-nereides.ly + + #(define (make-text-checker text) + (lambda (elt) (equal? text (ly-get-grob-property elt 'text)))) + +\score { + \context PianoStaff < + \context Staff=upper \notes\relative c' { + \property Score.timing = ##f + + \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + c-"foe" + + \translator Staff=lower + + % staff switch moves us + % implicitely to staff level: text-checker won't see "foe" + \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + c-"foe" + + % get back to Voice level: it works again + \context Voice + \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + c-"foe" + + \clef treble + + % clef change moves us + % implicitely to staff level: text-checker won't see "foe" + \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + c-"foe" + + % get back to Voice level: it works again + \context Voice + \outputproperty #(make-text-checker "foe") #'extra-offset = #'(-2 . 4) + c-"foe" + + } + \context Staff=lower \notes\relative c' { + s + } + > + \paper { + linewidth = -1.0 + } +} \ No newline at end of file diff --git a/input/just-friends.ly b/input/just-friends.ly index 0f404178dd..193884c7f8 100644 --- a/input/just-friends.ly +++ b/input/just-friends.ly @@ -30,6 +30,18 @@ of a certain tune (Jazz, Real Book, for example), like %} +%{ + +FIXME + +This should (and once used to) look like: + + | Fmaj7 | Fmaj7 | F7 | Bes7 | + +but all bar lines (note bar line at line start) are now gone. + +%} + \score{ \context ChordNames \chords{ \property Score.barAtLineStart = 1 @@ -47,10 +59,17 @@ of a certain tune (Jazz, Real Book, for example), like } \paper{ indent = 0.0\mm - linewidth = 100.0\mm + linewidth = 120.0\mm \translator{ \ChordNamesContext barNonAuto = ##f + + % added + barAuto = ##t + defaultBarType = #"|" + Bar \override #'bar-size = #4 + %ChordName \override #'word-space = #3 + \consists Bar_engraver \consists "Volta_engraver" } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index cecc014765..838020509c 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,22 +1,18 @@ -\version "1.3.146" %{ - You should preprocess this file with the C preprocessor. The one with FAKE_GRACE looks best. 1. - -cpp -P -traditional -o l.ly les-nereides.ly + cpp -P -traditional -o l.ly les-nereides.ly 2. - -cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly + cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly %} +\version "1.3.148" - -\header{ +\header { composer = "ARTHUR GRAY" title = "LES N\\'ER\\'EIDES" subtitle = "THE NEREIDS" @@ -28,18 +24,52 @@ cpp -P -traditional -o l-fake.ly -DFAKE_GRACE les-nereides.ly } +% cpp: don't start on first column + #(set! point-and-click line-column-location) + %% cpp: don't start on first column #(define (grace-beam-space-function multiplicity) (* (if (<= multiplicity 3) 0.816 0.844) 0.8)) %% 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)) - (equal? text (ly-get-grob-property elt 'text)) - )) + (lambda (elt) (equal? text (ly-get-grob-property elt 'text)))) + +% complete and move to propert.ly? +smallFont = { + \property Score.PaperColumn \override #'space-factor = #0.6 + \property Score.PaperColumn \override #'to-musical-spacing-factor = #0.04 + \property Voice.NoteHead \override #'font-relative-size = #-1 + \property Voice.Stem \override #'font-relative-size = #-1 + \property Voice.Stem \override #'length = #6 + \property Voice.Stem \override #'beamed-lengths = + #(map (lambda (x) (* 1.25 x)) '(0.0 2.5 2.0 1.5)) + \property Voice.Stem \override #'beamed-minimum-lengths = + #(map (lambda (x) (* 1.25 x)) '(0.0 1.5 1.25 1.0)) + + \property Voice.Beam \override #'font-relative-size = #-1 + \property Voice.TextScript \override #'font-relative-size = #0 + \property Voice.Fingering \override #'font-relative-size = #-4 + \property Voice.Slur \override #'font-relative-size = #-1 + \property Staff.Accidentals \override #'font-relative-size = #-1 + \property Voice.Beam \override #'space-function = #grace-beam-space-function +} +unSmallFont = { + \property Voice.NoteHead \revert #'font-relative-size + \property Voice.Stem \revert #'font-relative-size + \property Voice.Stem \revert #'length + \property Voice.Stem \revert #'beamed-lengths + \property Voice.Stem \revert #'beamed-minimum-lengths + \property Voice.Beam \revert #'font-relative-size + \property Voice.TextScript \revert #'font-relative-size + \property Voice.Fingering \revert #'font-relative-size + \property Voice.Slur \revert #'font-relative-size + \property Staff.Accidentals \revert #'font-relative-size + \property Voice.Beam \revert #'space-function + \property Score.PaperColumn \revert #'space-factor + \property Score.PaperColumn \revert #'to-musical-spacing-factor +} global = \notes{ \partial 2 @@ -60,33 +90,37 @@ global = \notes{ treble = \context Voice=treble \notes\relative c''{ % Broken? \property Voice.NoteColumn \override #'horizontal-shift = #0 - \outputproperty #(make-type-checker 'text-item-interface) + \outputproperty #(make-type-checker 'text-interface) #'extra-offset = #'(-6 . 2) - %% *Style* = Large?? - \property Voice.TextScript \override #'style = #"Large" - r2^"Allegretto scherzando" - \property Voice.TextScript \revert #'style + r2^#'((Large upright) "Allegretto scherzando") %2 \property Voice.Stem \revert #'direction \property Voice.Stem \override #'direction = #1 r4 r2 %3 r4 r8. - % Huh, urg? Implicit \context Staff lifts us up to Staff context??? + + % Urg, this lifts us up to staff context \translator Staff=bass - % Get back - \context Voice + + % Get back: + \context Voice + + % If we don't get back to Voice, this text-checker doesn't work \outputproperty #(make-text-checker "m.d.") #'extra-offset = #'(-3 . -4) + % currently, this can't be (small) italic, because in the paperblock % we set italic_magnifictation to get large italics. cis,16^2^"m.d."( %4 <)dis,4 a' dis> + % Urg, this lifts us up to staff context \translator Staff=treble - % Get back - \context Voice + % Get back: + \context Voice + \property Voice.Slur \revert #'direction \property Voice.Slur \override #'direction = #1 \property PianoStaff.connectArpeggios = ##t @@ -96,19 +130,21 @@ treble = \context Voice=treble \notes\relative c''{ \property Voice.TextSpanner \override #'line-thickness = #2 \property Voice.TextSpanner \override #'dash-period = #0.5 - \property Voice.TextSpanner \override #'type = #"dotted-line" + \property Voice.TextSpanner \override #'type = #'dotted-line \property Voice.TextSpanner \override #'edge-height = #'(0 . 1.5) - \property Voice.TextSpanner \override #'edge-text = #'("8 " . "") - % Huh, urg? Implicit \context Staff lifts us up to Staff context??? + %% \property Voice.TextSpanner \override #'edge-text = #'("8 " . "") + \property Voice.TextSpanner \override #'edge-text = #'("8 " . " ") - % no, see seq-mus-iter --hwn - \property Staff."c0-position" = #-13 + % Urg, this lifts us up to staff context + \property Staff.centralCPosition = #-13 + % Get back: + \context Voice - % Get back - %\context Voice + % If we don't get back to Voice, this text-checker doesn't work \outputproperty #(make-text-checker "m.g.") - #'extra-offset = #'(-3 . -2) + #'extra-offset = #'(-3 . -3) + % currently, this can't be (small) italic, because in the paperblock % we set italic_magnifictation to get large italics. cis''''4^"m.g."\arpeggio \spanrequest \start "text" ( @@ -127,53 +163,27 @@ treble = \context Voice=treble \notes\relative c''{ \property Grace.Beam \override #'space-function = #grace-beam-space-function %% urg, dim. during grace dumps core here %% [a16-5( fis dis \spanrequest \stop "text" ] - %% [cis'32 a-1 fis-4 dis] [cis a )fis-2] + %%[cis'32 a-1 fis-4 dis] [cis a )fis-2] [a16-5( fis dis \spanrequest \stop "text" ] - \property Staff."c0-position" = #-6 + \property Staff.centralCPosition = #-6 + [cis32 a-1 fis-4 dis] [cis a )fis-2] } #else % FAKE_GRACE - \property Score.PaperColumn \override #'space-factor = #0.6 - \property Score.PaperColumn \override #'to-musical-spacing-factor = #0.04 - \property Voice.NoteHead \override #'font-relative-size = #-1 - \property Voice.Stem \override #'font-relative-size = #-1 - \property Voice.Stem \override #'length = #6 - \property Voice.Stem \override #'beamed-lengths = - #(map (lambda (x) (* 1.25 x)) '(0.0 2.5 2.0 1.5)) - \property Voice.Stem \override #'beamed-minimum-lengths = - #(map (lambda (x) (* 1.25 x)) '(0.0 1.5 1.25 1.0)) - - \property Voice.Beam \override #'font-relative-size = #-1 - \property Voice.TextScript \override #'font-relative-size = #-1 - \property Voice.Fingering \override #'font-relative-size = #-1 - \property Voice.Slur \override #'font-relative-size = #-1 - \property Staff.Accidentals \override #'font-relative-size = #-1 - \property Voice.Beam \override #'space-function = #grace-beam-space-function - + \smallFont + )cis16 \property Voice.Stem \revert #'direction \property Voice.Stem \override #'direction = #0 %% [a16^5( fis dis \spanrequest \stop "text" ] %% [cis'32 a-1 fis-4 dis] [cis a )fis-2] s s s [a16^5( fis dis \spanrequest \stop "text" ] - \property Staff."c0-position" = #-6 + \property Staff.centralCPosition = #-6 [cis32 a^1 fis^4 dis] [cis a )fis-2] s % s s - \property Voice.NoteHead \revert #'font-relative-size - \property Voice.Stem \revert #'font-relative-size - \property Voice.Stem \revert #'length - \property Voice.Stem \revert #'beamed-lengths - \property Voice.Stem \revert #'beamed-minimum-lengths - \property Voice.Beam \revert #'font-relative-size - \property Voice.TextScript \revert #'font-relative-size - \property Voice.Fingering \revert #'font-relative-size - \property Voice.Slur \revert #'font-relative-size - \property Staff.Accidentals \revert #'font-relative-size - \property Voice.Beam \revert #'space-function - \property Score.PaperColumn \revert #'space-factor - \property Score.PaperColumn \revert #'to-musical-spacing-factor + \unSmallFont #endif % FAKE_GRACE @@ -215,22 +225,23 @@ trebleTwo = \context Voice=trebleTwo \notes\relative c''{ bass = \context Voice=bass \notes\relative c{ % Allow ugly slurs \property Voice.Slur \override #'beautiful = #5.0 - \property Voice.Slur \override #'attachment-offset = #'((0 . -3) . (0 . -6)) + \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . -4)) \property Voice.Stem \revert #'direction \property Voice.Slur \override #'direction = #-1 % huh, auto-beamer? - r8. e,16-2( [ ] | + r8. e,16-2( [ ] | %2 + % Huh, urg? Implicit \context Staff lifts us up to Staff context??? \translator Staff=treble % Get back - \context Voice + \context Voice \property Voice.Stem \revert #'direction \property Voice.Stem \override #'direction = #-1 - \property Voice.slurEndAttachment = #'stem + \property Voice.Slur \override #'attachment = #'(stem . stem) <)a''4\arpeggio eis cis> %\stemBoth - \property Voice.slurEndAttachment = ##f + \property Voice.Slur \revert #'attachment % Huh, urg? Implicit \context Staff lifts us up to Staff context??? \translator Staff=bass % Get back @@ -239,7 +250,7 @@ bass = \context Voice=bass \notes\relative c{ \property Voice.Slur \revert #'y-free \property Voice.Slur \override #'y-free = #0.1 \property Voice.Slur \revert #'attachment-offset - \property Voice.Slur \override #'attachment-offset = #'((0 . -3) . (0 . -8)) + \property Voice.Slur \override #'attachment-offset = #'((0 . 3) . (0 . 8)) r8. cis,,16( %3 \property Voice.Stem \revert #'length @@ -281,21 +292,13 @@ bass = \context Voice=bass \notes\relative c{ \grace { } <)gis'2 e> #else s4 s8 s32 s s \clef bass - \property Score.PaperColumn \override #'space-factor = #0.6 - \property Score.PaperColumn \override #'to-musical-spacing-factor = #0.1 - \property Voice.NoteHead \override #'font-relative-size = #-1 - \property Voice.Stem \override #'font-relative-size = #-1 - \property Voice.Stem \override #'length = #6 - \property Voice.Slur \override #'font-relative-size = #-1 + + \smallFont + \property Voice.Slur \override #'attachment-offset = #'((-0.5 . 0) . (0.5 . 0)) - \property Voice.NoteHead \revert #'font-relative-size - \property Voice.Stem \revert #'font-relative-size - \property Voice.Stem \revert #'length - \property Voice.Slur \revert #'font-relative-size - \property Score.PaperColumn \revert #'space-factor - \property Score.PaperColumn \revert #'to-musical-spacing-factor + \unSmallFont <)gis'2 e> \property Voice.Slur \revert #'attachment-offset #endif @@ -349,7 +352,7 @@ middleDynamics = \context Dynamics=middle \notes{ s32\> s s \!s #endif s32 - \outputproperty #(make-type-checker 'text-item-interface) + \outputproperty #(make-type-checker 'text-interface) #'extra-offset = #'(0 . 1.5) s-"rall." s s s8 s4 @@ -357,13 +360,14 @@ middleDynamics = \context Dynamics=middle \notes{ \outputproperty #(make-type-checker 'dynamic-interface) #'extra-offset = #'(0 . 4) %s1\mf-"a tempo" - s2\mf-"a tempo" s4 - \outputproperty #(make-type-checker 'crescendo-interface) - #'extra-offset = #'(0.5 . -1) - s\> \!s8 +%% s2\mf-"a tempo" s4 + s2\mf-"a tempo" s8 +%% s\> \!s8 + s16 s32 s64 \> s s8 s \!s8 \outputproperty #(make-type-checker 'dynamic-interface) #'extra-offset = #'(-1 . 4) - s8\mf s4 s4 s8\> s32 s s \!s +%% s8\mf s4 s4 s8\> s32 s s \!s + s8\mf s4 s8 s16 s32 s64 \> s s16 s8 s32 s s s\! s128 } lowerDynamics = \context Dynamics=lower \notes{ @@ -386,20 +390,19 @@ lowerDynamics = \context Dynamics=lower \notes{ s32\sustainDown s s s #endif - \property Dynamics.stopSustain = #"" + \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "") s4 s16. s32\sustainUp %5 s8\sustainDown s s - \property Dynamics.stopSustain = #"*" - \property Dynamics.stopStartSustain = #"-P" + \property Dynamics.pedalSustainStrings = #'("Ped." "-P" "*") s s\sustainUp\sustainDown s s s\sustainUp %6 - \property Dynamics.stopStartSustain = #"" + \property Dynamics.pedalSustainStrings = #'("Ped." "*Ped." "") s8\sustainDown s s - \property Dynamics.stopStartSustain = #"-P" + \property Dynamics.pedalSustainStrings = #'("Ped." "-P" "*") s s\sustainUp\sustainDown s s s\sustainUp } @@ -427,8 +430,8 @@ lowerDynamics = \context Dynamics=lower \notes{ > > \paper { - %%BURP - magnification_italic = 1. + % Hmm + % magnification_italic = 1. \translator { \ScoreContext TimeSignature \override #'style = #'C @@ -442,22 +445,18 @@ lowerDynamics = \context Dynamics=lower \notes{ \consists "Output_property_engraver" Generic_property_list = #generic-voice-properties \consists "Property_engraver" - MinimumVerticalExtent = #(cons -3 -3) - VerticalAlignment \override #'threshold = #'(9 . 9) - - startSustain = #"Ped." - stopSustain = #"*" - stopStartSustain = #"*Ped." - startUnaChorda = #"una chorda" - stopUnaChorda = #"tre chorde" + MinimumVerticalExtent = #'(-1 . 1) + + pedalSustainStrings = #'("Ped." "*Ped." "*") + pedalUnaCordaStrings = #'("una corda" "" "tre corde") \consists "Piano_pedal_engraver" \consists "Script_engraver" \consists "Dynamic_engraver" \consists "Text_engraver" - %GURGURGU, text is initialised using TextScript - TextScript \override #'style = #"italic" - %%% TextScript \override #'font-relative-size = #2 + + TextScript \override #'font-relative-size = #1 + TextScript \override #'font-shape = #'italic \consists "Skip_req_swallow_translator" @@ -467,7 +466,7 @@ lowerDynamics = \context Dynamics=lower \notes{ \translator { \PianoStaffContext \accepts Dynamics - VerticalAlignment \override #'threshold = #'(7 . 7) + VerticalAlignment \override #'forced-distance = #7 } \translator { \GraceContext diff --git a/make/mutopia-rules.make b/make/mutopia-rules.make index 15226f7dad..d75f9197f2 100644 --- a/make/mutopia-rules.make +++ b/make/mutopia-rules.make @@ -13,6 +13,9 @@ $(outdir)/%.png: $(outdir)/%.ps $(outdir)/%.ly.txt: %.ly ln -f $< $@ +$(outdir)/%.ly.txt: $(outdir)/%.ly + cp -f $< $@ + $(outdir)/%.ly.txt: %.abc #which file to show here -- abc seems more cute? ln -f $< $@