From: Neil Puttock Date: Thu, 4 Dec 2008 23:18:31 +0000 (+0000) Subject: Fix docs compilation programming errors and warnings. X-Git-Tag: release/2.12.0-1~13^2~32^2~18 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=7b9d994707d25a7cd10b53519cae1125ef4a64cc;p=lilypond.git Fix docs compilation programming errors and warnings. - use grob-interpret-markup instead of 'text - end manual repeat volta correctly - correct syntax for octave check in display-lily-test.ly - add 'direction to accidental-placement-interfaace - don't set 'bound-details for hairpins - add missing interfaces in define-grobs.scm - correct display methods for SustainEvent & SostenutoEvent --- diff --git a/Documentation/de/user/introduction.itely b/Documentation/de/user/introduction.itely index 0573efae42..3e6e0ec312 100644 --- a/Documentation/de/user/introduction.itely +++ b/Documentation/de/user/introduction.itely @@ -371,34 +371,33 @@ die Notenköpfe gezeichnet werden, während des Ausschnitts verändert. (pos (ly:grob-property grob 'staff-position))) (if (memq 'note-head-interface interfaces) (begin - (ly:grob-set-property! grob 'stencil ly:text-interface::print) - (ly:grob-set-property! grob 'font-family 'roman) - (ly:grob-set-property! grob 'text - (make-raise-markup -0.5 - (case pos - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla"))))))))) + (ly:grob-set-property! grob 'stencil + (grob-interpret-markup grob + (make-lower-markup 0.5 + (case pos + ((-5) "m") + ((-3) "c ") + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else "bla"))))))))) \new Voice \relative c' { - \stemUp - \set autoBeaming = ##f - \time 2/4 - 4 - \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil - \once \override NoteHead #'font-size = #-7 - \once \override NoteHead #'font-family = #'sans - \once \override NoteHead #'font-series = #'bold - - \once \override NoteHead #'style = #'cross - - \applyOutput #'Voice #mc-squared - - << - { d8[ es-( fis^^ g] fis2-) } - \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } - >> + \stemUp + \set autoBeaming = ##f + \time 2/4 + 4 + \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \once \override NoteHead #'font-size = #-7 + \once \override NoteHead #'font-family = #'sans + \once \override NoteHead #'font-series = #'bold + 4 + \once \override NoteHead #'style = #'cross + 4 + \applyOutput #'Voice #mc-squared + 4 + << + { d8[ es-( fis^^ g] fis2-) } + \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } + >> } @end lilypond diff --git a/Documentation/de/user/repeats.itely b/Documentation/de/user/repeats.itely index e0663fba59..bc69ef7cd0 100644 --- a/Documentation/de/user/repeats.itely +++ b/Documentation/de/user/repeats.itely @@ -285,6 +285,7 @@ g4 a g a c1 \set Score.repeatCommands = #'((volta #f) (volta "95") end-repeat) b1 +\set Score.repeatCommands = #'((volta #f)) @end lilypond @cindex Volta-Klammer mit Text diff --git a/Documentation/es/user/introduction.itely b/Documentation/es/user/introduction.itely index 601c5b22ca..a58ae10786 100644 --- a/Documentation/es/user/introduction.itely +++ b/Documentation/es/user/introduction.itely @@ -378,34 +378,33 @@ altera durante el transcurso del fragmento musical. (pos (ly:grob-property grob 'staff-position))) (if (memq 'note-head-interface interfaces) (begin - (ly:grob-set-property! grob 'stencil ly:text-interface::print) - (ly:grob-set-property! grob 'font-family 'roman) - (ly:grob-set-property! grob 'text - (make-raise-markup -0.5 - (case pos - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla"))))))))) + (ly:grob-set-property! grob 'stencil + (grob-interpret-markup grob + (make-lower-markup 0.5 + (case pos + ((-5) "m") + ((-3) "c ") + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else "bla"))))))))) \new Voice \relative c' { - \stemUp - \set autoBeaming = ##f - \time 2/4 - 4 - \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil - \once \override NoteHead #'font-size = #-7 - \once \override NoteHead #'font-family = #'sans - \once \override NoteHead #'font-series = #'bold - - \once \override NoteHead #'style = #'cross - - \applyOutput #'Voice #mc-squared - - << - { d8[ es-( fis^^ g] fis2-) } - \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } - >> + \stemUp + \set autoBeaming = ##f + \time 2/4 + 4 + \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \once \override NoteHead #'font-size = #-7 + \once \override NoteHead #'font-family = #'sans + \once \override NoteHead #'font-series = #'bold + 4 + \once \override NoteHead #'style = #'cross + 4 + \applyOutput #'Voice #mc-squared + 4 + << + { d8[ es-( fis^^ g] fis2-) } + \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } + >> } @end lilypond diff --git a/Documentation/fr/user/introduction.itely b/Documentation/fr/user/introduction.itely index 00eb1f1bfd..a884a833df 100644 --- a/Documentation/fr/user/introduction.itely +++ b/Documentation/fr/user/introduction.itely @@ -382,34 +382,33 @@ musique. (pos (ly:grob-property grob 'staff-position))) (if (memq 'note-head-interface interfaces) (begin - (ly:grob-set-property! grob 'stencil ly:text-interface::print) - (ly:grob-set-property! grob 'font-family 'roman) - (ly:grob-set-property! grob 'text - (make-raise-markup -0.5 - (case pos - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla"))))))))) + (ly:grob-set-property! grob 'stencil + (grob-interpret-markup grob + (make-lower-markup 0.5 + (case pos + ((-5) "m") + ((-3) "c ") + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else "bla"))))))))) \new Voice \relative c' { - \stemUp - \set autoBeaming = ##f - \time 2/4 - 4 - \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil - \once \override NoteHead #'font-size = #-7 - \once \override NoteHead #'font-family = #'sans - \once \override NoteHead #'font-series = #'bold - - \once \override NoteHead #'style = #'cross - - \applyOutput #'Voice #mc-squared - - << - { d8[ es-( fis^^ g] fis2-) } - \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } - >> + \stemUp + \set autoBeaming = ##f + \time 2/4 + 4 + \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \once \override NoteHead #'font-size = #-7 + \once \override NoteHead #'font-family = #'sans + \once \override NoteHead #'font-series = #'bold + 4 + \once \override NoteHead #'style = #'cross + 4 + \applyOutput #'Voice #mc-squared + 4 + << + { d8[ es-( fis^^ g] fis2-) } + \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } + >> } @end lilypond diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 3840c2f657..97b3f09b1d 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -361,34 +361,33 @@ changed during the music fragment. (pos (ly:grob-property grob 'staff-position))) (if (memq 'note-head-interface interfaces) (begin - (ly:grob-set-property! grob 'stencil ly:text-interface::print) - (ly:grob-set-property! grob 'font-family 'roman) - (ly:grob-set-property! grob 'text - (make-raise-markup -0.5 - (case pos - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla"))))))))) + (ly:grob-set-property! grob 'stencil + (grob-interpret-markup grob + (make-lower-markup 0.5 + (case pos + ((-5) "m") + ((-3) "c ") + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else "bla"))))))))) \new Voice \relative c' { - \stemUp - \set autoBeaming = ##f - \time 2/4 - 4 - \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil - \once \override NoteHead #'font-size = #-7 - \once \override NoteHead #'font-family = #'sans - \once \override NoteHead #'font-series = #'bold - - \once \override NoteHead #'style = #'cross - - \applyOutput #'Voice #mc-squared - - << - { d8[ es-( fis^^ g] fis2-) } - \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } - >> + \stemUp + \set autoBeaming = ##f + \time 2/4 + 4 + \once \override NoteHead #'stencil = #ly:note-head::brew-ez-stencil + \once \override NoteHead #'font-size = #-7 + \once \override NoteHead #'font-family = #'sans + \once \override NoteHead #'font-series = #'bold + 4 + \once \override NoteHead #'style = #'cross + 4 + \applyOutput #'Voice #mc-squared + 4 + << + { d8[ es-( fis^^ g] fis2-) } + \repeat unfold 5 { \applyOutput #'Voice #mc-squared s8 } + >> } @end lilypond diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 1ace6dc24f..28f020e519 100644 --- a/input/regression/apply-output.ly +++ b/input/regression/apply-output.ly @@ -9,39 +9,30 @@ position. " } -\layout { - ragged-right = ##t -} - #(define (mc-squared gr org cur) (let* - ( - (ifs (ly:grob-interfaces gr)) - (sp (ly:grob-property gr 'staff-position)) - ) - (if (memq 'note-head-interface ifs) - (begin - (ly:grob-set-property! gr 'stencil ly:text-interface::print) - (ly:grob-set-property! gr 'font-family 'roman) - (ly:grob-set-property! gr 'text - (make-raise-markup -0.5 - (case sp - ((-5) (make-simple-markup "m")) - ((-3) (make-simple-markup "c ")) - ((-2) (make-smaller-markup (make-bold-markup "2"))) - (else (make-simple-markup "bla")) - )))) - ))) - -\context Voice \relative c' { - \stemUp + ( + (ifs (ly:grob-interfaces gr)) + (sp (ly:grob-property gr 'staff-position)) + ) + (if (memq 'note-head-interface ifs) + (begin + (ly:grob-set-property! gr 'stencil + (grob-interpret-markup gr + (make-raise-markup -0.5 + (case sp + ((-5) (make-simple-markup "m")) + ((-3) (make-simple-markup "c ")) + ((-2) (make-smaller-markup (make-bold-markup "2"))) + (else (make-simple-markup "bla")) + )))) + )))) + +\new Voice \relative c' { \set autoBeaming = ##f - { 8 + 8 - \applyOutput #'Voice #mc-squared - - } + \applyOutput #'Voice #mc-squared + 8 } - -% EOF diff --git a/input/regression/display-lily-tests.ly b/input/regression/display-lily-tests.ly index 178ea14be4..41554fa25b 100644 --- a/input/regression/display-lily-tests.ly +++ b/input/regression/display-lily-tests.ly @@ -154,7 +154,7 @@ stderr of this run." \test "" ##[ \noPageTurn #] %% Checks -\test "" ##[ \octave a' #] % RelativeOctaveCheck +\test "" ##[ \octaveCheck a' #] % RelativeOctaveCheck \test "" ##[ | #] % BarCheck %% Marks diff --git a/lily/accidental-placement.cc b/lily/accidental-placement.cc index 1c7d356cc9..3d4b9ef3ac 100644 --- a/lily/accidental-placement.cc +++ b/lily/accidental-placement.cc @@ -426,6 +426,7 @@ ADD_INTERFACE (Accidental_placement, /* properties */ "accidental-grobs " + "direction " "left-padding " "padding " "positioning-done " diff --git a/lily/new-dynamic-engraver.cc b/lily/new-dynamic-engraver.cc index ad28ca205e..99d015067d 100644 --- a/lily/new-dynamic-engraver.cc +++ b/lily/new-dynamic-engraver.cc @@ -10,6 +10,7 @@ #include "engraver.hh" +#include "hairpin.hh" #include "international.hh" #include "item.hh" #include "note-column.hh" @@ -153,12 +154,14 @@ New_dynamic_engraver::process_music () if (current_spanner_) { current_spanner_->set_bound (LEFT, script_); - set_nested_property (current_spanner_, - scm_list_3 (ly_symbol2scm ("bound-details"), - ly_symbol2scm ("left"), - ly_symbol2scm ("attach-dir") - ), - scm_from_int (RIGHT)); + + if (!Hairpin::has_interface (current_spanner_)) + set_nested_property (current_spanner_, + scm_list_3 (ly_symbol2scm ("bound-details"), + ly_symbol2scm ("left"), + ly_symbol2scm ("attach-dir") + ), + scm_from_int (RIGHT)); } } diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index 3af72b0647..4009f6ebdf 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -357,7 +357,8 @@ (object-callbacks . ((normal-stems . ,ly:beam::calc-normal-stems))) (interfaces . (staff-symbol-referencer-interface unbreakable-spanner-interface - beam-interface)))))) + beam-interface + font-interface)))))) (BendAfter . ( @@ -1159,7 +1160,8 @@ (interfaces . (paper-column-interface axis-group-interface separation-item-interface - spaceable-grob-interface)))))) + spaceable-grob-interface + font-interface)))))) (NoteCollision . ( @@ -1197,7 +1199,10 @@ font-interface note-head-interface ledgered-interface - staff-symbol-referencer-interface)))))) + staff-symbol-referencer-interface + gregorian-ligature-interface + mensural-ligature-interface + vaticana-ligature-interface)))))) (NoteSpacing . ( @@ -1279,7 +1284,8 @@ (interfaces . (paper-column-interface separation-item-interface axis-group-interface - spaceable-grob-interface)))))) + spaceable-grob-interface + font-interface)))))) (ParenthesesItem . ((stencil . ,parentheses-item::print) @@ -1869,6 +1875,7 @@ text-interface instrument-specific-markup-interface side-position-interface + self-alignment-interface font-interface)))))) (TextSpanner diff --git a/scm/define-music-display-methods.scm b/scm/define-music-display-methods.scm index 4e846a5a64..4133fa6443 100644 --- a/scm/define-music-display-methods.scm +++ b/scm/define-music-display-methods.scm @@ -234,8 +234,8 @@ (define-span-event-display-method CrescendoEvent (event parser) #f "\\<" "\\!") (define-span-event-display-method DecrescendoEvent (event parser) #f "\\>" "\\!") (define-span-event-display-method PhrasingSlurEvent (event parser) #f "\\(" "\\)") -(define-span-event-display-method SustainEvent (event parser) #f "\\sustainDown" "\\sustainUp") -(define-span-event-display-method SostenutoEvent (event parser) #f "\\sostenutoDown" "\\sostenutoUp") +(define-span-event-display-method SustainEvent (event parser) #f "\\sustainOn" "\\sustainOff") +(define-span-event-display-method SostenutoEvent (event parser) #f "\\sostenutoOn" "\\sostenutoOff") (define-span-event-display-method TextSpanEvent (event parser) #f "\\startTextSpan" "\\stopTextSpan") (define-span-event-display-method TrillSpanEvent (event parser) #f "\\startTrillSpan" "\\stopTrillSpan") (define-span-event-display-method StaffSpanEvent (event parser) #f "\\startStaff" "\\stopStaff") @@ -576,7 +576,7 @@ Otherwise, return #f." (define-display-method RelativeOctaveCheck (octave parser) (let ((pitch (ly:music-property octave 'pitch))) - (format #f "\\octave ~a~a" + (format #f "\\octaveCheck ~a~a" (note-name->lily-string pitch parser) (octave->lily-string pitch))))