From 6251180897739ec2d134f50039cb6a151d054fb5 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sat, 17 Aug 2002 17:00:30 +0000 Subject: [PATCH] * lily/lily-guile.cc (type_check_assignment): if internal-type-checking set, abort if we find an unknown property. * input/regression/GNUmakefile,input/test/GNUmakefile: be anal with typechecks * input/test/*.ly: remove or update files using deprecated properties * lily/beam.cc: add 'knee to interface * lily/system.cc (spanner_count): new function --- ChangeLog | 11 ++++++++ input/regression/GNUmakefile | 1 + input/regression/accidental-cautionary.ly | 2 +- input/regression/accidental-octave.ly | 9 ++++-- input/regression/accidentals.ly | 2 +- input/regression/beam-quanting.ly | 29 ------------------- input/regression/fingering.ly | 19 +++---------- input/test/GNUmakefile | 2 ++ input/test/add-staccato.ly | 1 - input/test/ancient-font.ly | 3 +- input/test/beam-hss.ly | 34 ----------------------- input/test/beam-slope.ly | 14 ---------- input/test/beam-urg.ly | 12 -------- input/test/beams.ly | 1 - input/test/cautionaries.ly | 8 ++++-- input/test/collision-merge-dotted.ly | 19 ------------- input/test/dynamic-dir.ly | 13 --------- input/test/force-hshift.ly | 7 +++-- input/test/markup.ly | 4 --- input/test/maximum-rest-count.ly | 9 ++++-- input/test/monstrous.ly | 8 ++++-- input/test/no-stem-extend.ly | 8 ++++-- input/test/part-combine-moments.ly | 2 +- input/test/part-combine-staff.ly | 4 ++- input/test/perform-grace.ly | 2 -- input/test/rests.ly | 5 +++- input/test/sleur.ly | 9 ------ input/test/staff-line-leading.ly | 9 +++++- input/test/stem-centered.ly | 7 +++-- input/test/stem-length.ly | 5 ++-- input/test/text-spanner.ly | 10 ++++--- input/test/warnings.ly | 17 ------------ lily/accidental.cc | 2 +- lily/beam.cc | 2 +- lily/key-engraver.cc | 2 +- lily/lily-guile.cc | 6 ++++ lily/stem.cc | 4 +++ scm/grob-property-description.scm | 3 ++ scm/translator-property-description.scm | 1 + 39 files changed, 100 insertions(+), 206 deletions(-) diff --git a/ChangeLog b/ChangeLog index b422dcb87a..b77de701cd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,16 @@ 2002-08-17 Han-Wen Nienhuys + * lily/lily-guile.cc (type_check_assignment): if + internal-type-checking set, abort if we find an unknown property. + + * input/regression/GNUmakefile,input/test/GNUmakefile: be anal + with typechecks + + * lily/beam.cc: add 'knee to interface + + * input/test/*.ly: remove or update files using deprecated + properties + * lily/system.cc (spanner_count): new function * lily/break-substitution.cc (fast_fubstitute_grob_list): special diff --git a/input/regression/GNUmakefile b/input/regression/GNUmakefile index 99c4d8d71d..2528cf34b2 100644 --- a/input/regression/GNUmakefile +++ b/input/regression/GNUmakefile @@ -2,6 +2,7 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc +LILYPOND_BOOK_FLAGS=--extra-options '-e "(set-lily-option (quote internal-type-checking) \#t)"' include $(depth)/make/stepmake.make TITLE=LilyPond Regression Tests diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 38feb90c57..21eb95ad6d 100644 --- a/input/regression/accidental-cautionary.ly +++ b/input/regression/accidental-cautionary.ly @@ -9,6 +9,6 @@ smaller accidentals (default) or parentheses." \score { \notes { c''4 cis''?4 - \property Staff.Accidental \override #'cautionary-style = #'parentheses + \property Staff.Accidental \override #'style = #'parentheses cis''?4 }} diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index e0593b7e4f..4b115eeee2 100644 --- a/input/regression/accidental-octave.ly +++ b/input/regression/accidental-octave.ly @@ -4,7 +4,8 @@ \header { texidoc=" This shows how accidentals in different octaves are handled. -Fixme: Shorten and docu +FIXME: Shorten and docu + " } @@ -48,7 +49,11 @@ mel = \notes \transpose c'' { mus = \notes { \mel - \property Score.oneMeasureLazy = ##t + +%% FIXME. +% \property Score.oneMeasureLazy = ##t + + \property Score.autoAccidentals = #'(Staff (same-octave . 0)) < s1^""^""^"$\\backslash$property Score.autoAccidentals = \\#'(Staff (same-octave . 0))" \mel > \property Score.autoAccidentals = #'(Staff (same-octave . 1)) diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index 27b172a310..caf8774fd1 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -44,7 +44,7 @@ mel = \notes { \key d \major \time 4/4 < \context Staff \transpose c''' { \mel - \property Score.oneMeasureLazy = ##t +% \property Score.oneMeasureLazy = ##t \property Score.autoAccidentals = #'(Staff (same-octave . 0)) < s1^"$\\backslash$property Score.autoAccidentals = \\#'((same-octave . 0))" \mel > \property Score.autoAccidentals = #'(Staff (same-octave . 1)) diff --git a/input/regression/beam-quanting.ly b/input/regression/beam-quanting.ly index 91ac74d8ab..8b13789179 100644 --- a/input/regression/beam-quanting.ly +++ b/input/regression/beam-quanting.ly @@ -1,30 +1 @@ -\header { -texidoc = "Beam quanting can be twiddled using grob -properties. The following example shows how Y and DY can be -unquantised and quantised to 0 and 4 respectively." - -} - -\version "1.5.68" - -%{ -Have some fun beam quanting -%} - -% no y quantising -#(define (beam-vertical-position-quants m dy x y) '()) - -% rediculous dy quanting -#(define (beam-height-quants x y) '(0 4)) - -\score { - \notes\relative c'{ - \property Voice.Beam \override #'height-quant-function = #beam-height-quants - \property Voice.Beam \override #'vertical-position-quant-function = - #beam-vertical-position-quants - c8 c c c - c8 e g a - c,8 f b e - } -} diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index db5d5fa386..0614772ac4 100644 --- a/input/regression/fingering.ly +++ b/input/regression/fingering.ly @@ -2,13 +2,8 @@ \header { texidoc = "Automatic fingering tries to put fingering instructions -next to noteheads. scriptHorizontal puts the center fingerings horizontally next to -the note heads. - -For this to function, you have to @code{\apply} pitchify-scripts to -the music you're dealing with, and you have to do so outside of a -@code{\relative} block. " - +next to noteheads. +" } \score { @@ -17,11 +12,5 @@ the music you're dealing with, and you have to do so outside of a c4-4 < c-1 e-2 g-3 b-4 > -\apply #pitchify-scripts \relative c' { c4-4 - - < c-1 e-2 g-3 b-4 > - \property Voice.scriptHorizontal = ##t - - - < c-1 e-2 g-3 b-4 > - } } } +}} + diff --git a/input/test/GNUmakefile b/input/test/GNUmakefile index b742267c7b..df34db779d 100644 --- a/input/test/GNUmakefile +++ b/input/test/GNUmakefile @@ -4,6 +4,8 @@ depth = ../.. STEPMAKE_TEMPLATES=documentation texinfo tex LOCALSTEPMAKE_TEMPLATES=lilypond ly lysdoc +LILYPOND_BOOK_FLAGS=--extra-options '-e "(set-lily-option (quote internal-type-checking) \#t)"' + ## Hmm, would this work? No -- if we really want examples, move ## to other dir (input/) comes to mind. ## examples = font20 ancient-font diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 8384a70d02..427a48464e 100644 --- a/input/test/add-staccato.ly +++ b/input/test/add-staccato.ly @@ -10,7 +10,6 @@ one would not use scm constructs. See separate-staccato.ly first." #(define (make-script x) (let ((m (ly-make-music "Articulation_req"))) (ly-set-mus-property! m 'articulation-type x) - (ly-set-mus-property! m 'script x) m)) #(define (add-script m x) diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 74ed5af99f..abeb31b81d 100644 --- a/input/test/ancient-font.ly +++ b/input/test/ancient-font.ly @@ -133,7 +133,7 @@ lowerVoice = \context Staff = lowerNotes < \property Staff.KeySignature \set #'font-family = #'ancient \property Staff.KeySignature \override #'style = #'mensural \property Staff.Accidental \set #'font-family = #'ancient - \property Staff.Accidentalg \override #'style = #'mensural + \property Staff.Accidental \override #'style = #'mensural \property Staff.Custos \set #'font-family = #'ancient \property Staff.Custos \override #'style = #'mensural \property Staff.Custos \override #'neutral-position = #3 @@ -147,7 +147,6 @@ lowerVoice = \context Staff = lowerNotes < \property Voice.Porrectus \override #'style = #'mensural \property Voice.Porrectus \override #'solid = ##f \property Voice.Porrectus \override #'add-stem = ##t - \property Voice.Porrectus \override #'stem-direction = #1 \property Voice.Porrectus \override #'thickness = #0.7 % \property Voice.Porrectus \override #'auto-properties = ##t % \property Voice.Porrectus \override #'width = #3.0 diff --git a/input/test/beam-hss.ly b/input/test/beam-hss.ly index dbdc36d174..e69de29bb2 100644 --- a/input/test/beam-hss.ly +++ b/input/test/beam-hss.ly @@ -1,34 +0,0 @@ -\header { - -texidoc = "Beams in hang, straddle sit positions, forced there using -quanting." - -} - -\version "1.5.68" - -#(define ps-testing #t) -\score { - \notes\relative c'{ - \property Voice.Beam \override #'vertical-position-quant-function - = #(lambda (beam dy x staff-line) - (let* ((thick (ly-get-grob-property beam 'thickness)) - (hang (- 1 (/ (- thick staff-line) 2)))) - (append (list hang) (list (+ hang 1))))) - [d8 d] - - \property Voice.Beam \override #'vertical-position-quant-function - = #(lambda (beam dy x staff-line) '(0 1)) - [d8 d] - - \property Voice.Beam \override #'vertical-position-quant-function - = #(lambda (beam dy x staff-line) - (let* ((thick (ly-get-grob-property beam 'thickness)) - (sit (/ (- thick staff-line) 2))) - (append (list sit) (list (+ sit 1))))) - [d8 d] - } - \paper{ - linewidth = 0.0 - } -} diff --git a/input/test/beam-slope.ly b/input/test/beam-slope.ly index 83aa3895ca..8b13789179 100644 --- a/input/test/beam-slope.ly +++ b/input/test/beam-slope.ly @@ -1,15 +1 @@ -\version "1.5.68" - -fragment = \notes { - \property Voice.Beam \set #'direction = #1 - \property Voice.Beam \set #'height-hs = #0 - [a''8 e' d c] -} - -\paper { linewidth = -1. } - -\score { - \notes\relative c \fragment - \paper { } -} diff --git a/input/test/beam-urg.ly b/input/test/beam-urg.ly index 7f8f3ba037..8b13789179 100644 --- a/input/test/beam-urg.ly +++ b/input/test/beam-urg.ly @@ -1,13 +1 @@ -\version "1.5.68" -\score{ - \notes\relative c''{ - \property Score.beamQuantisation = #'none - % \property Score.beamQuantisation = #'normal - % \property Score.beamQuantisation = #'traditional - [g16 e f g] - } - \paper{ - linewidth = -1. - } -} diff --git a/input/test/beams.ly b/input/test/beams.ly index 31845f7b8b..8d6d33ddf6 100644 --- a/input/test/beams.ly +++ b/input/test/beams.ly @@ -11,7 +11,6 @@ TestedFeatures = "beams and beamflags" \score{ < -% \property Score.beamQuantisation = #'none \context GrandStaff < \context Staff = SA \notes\transpose c' { diff --git a/input/test/cautionaries.ly b/input/test/cautionaries.ly index 79344c0a91..6b06c73636 100644 --- a/input/test/cautionaries.ly +++ b/input/test/cautionaries.ly @@ -1,13 +1,15 @@ \version "1.5.68" +%% FIXME + \score { \notes \context Staff \transpose c''' { \key d \major - \property Staff.autoReminders = #'cautionary +% \property Staff.autoReminders = #'cautionary \property Staff.Accidental \override #'font-relative-size = #0 cis2 d - \property Staff.Accidental \override #'cautionary-size = #-1 +% \property Staff.Accidental \override #'cautionary-size = #-1 cis2 d - \property Staff.Accidental \override #'paren-cautionaries = ##f +% \property Staff.Accidental \override #'paren-cautionaries = ##f cis2 d } diff --git a/input/test/collision-merge-dotted.ly b/input/test/collision-merge-dotted.ly index 5687381bbe..8b13789179 100644 --- a/input/test/collision-merge-dotted.ly +++ b/input/test/collision-merge-dotted.ly @@ -1,20 +1 @@ -\version "1.5.68" -\score { - \context Voice \notes\relative c { - - \relative c'' \context Staff < - \context Voice = one { - \property Staff.collisionMergeDotted = ##t - \stemUp - [c8 f g a] - } - \context Voice = two { - \stemDown c,4. f8 - - }> - - } - \paper { } - \midi { } -} diff --git a/input/test/dynamic-dir.ly b/input/test/dynamic-dir.ly index 2377579e19..8b13789179 100644 --- a/input/test/dynamic-dir.ly +++ b/input/test/dynamic-dir.ly @@ -1,14 +1 @@ -\version "1.5.68" -%non of the dynamics properties work anymore - -\score { - \context Voice \notes\relative c { -% \stemDown\slurDown\tieDown - - \property Voice.dynamicDirection = #1 - \property Voice.dynamicPadding = #40 - c \p c \< \! c \ff\> c \!c-\p - - } -} diff --git a/input/test/force-hshift.ly b/input/test/force-hshift.ly index 0a8fd4efc4..8c11d2ac13 100644 --- a/input/test/force-hshift.ly +++ b/input/test/force-hshift.ly @@ -1,11 +1,14 @@ \version "1.5.68" +\header { + texidoc="Force hshift to override collisions" + } \score { \context Voice \notes\relative c { \context Staff < \context Voice = VA { - \property Voice.NoteColumn \override #'forced-hshift = #0.1 + \property Voice.NoteColumn \override #'force-hshift = #0.1 \stemUp \property Voice.NoteColumn \override #'horizontal-shift = #1 @@ -13,7 +16,7 @@ \context Voice = VB { \stemDown \property Voice.NoteColumn \override #'horizontal-shift = #1 - \property Voice.NoteColumn \override #'forced-hshift = #-0.1 + \property Voice.NoteColumn \override #'force-hshift = #-0.1 } > diff --git a/input/test/markup.ly b/input/test/markup.ly index 1d2e125acc..d7c5961ba7 100644 --- a/input/test/markup.ly +++ b/input/test/markup.ly @@ -2,9 +2,6 @@ \header { texidoc ="Test font selection and scm text markup" -%% Note that the font-encoding trick only works when uning latex, -%% ie, you must use ly2dvi. - } @@ -74,7 +71,6 @@ TextScript \override #'font-shape = #'upright TextScript \revert #'no-spacing-rods TextScript \override #'direction = #1 - TextScript \override #'font-encoding = #'T1 } } } diff --git a/input/test/maximum-rest-count.ly b/input/test/maximum-rest-count.ly index 8844755953..ebfa771aa7 100644 --- a/input/test/maximum-rest-count.ly +++ b/input/test/maximum-rest-count.ly @@ -1,15 +1,18 @@ \version "1.5.68" +\header { + texidoc = "Control the number of rests in a collision with maximum-rest-count." +} \score{ \context Staff \notes\relative c''< \context Voice = x { a4 r - \property Voice.maximumRestCount = #3 + \property Staff. RestCollision \set #'maximum-rest-count = #1 r - \property Staff.maximumRestCount = #2 + \property Staff. RestCollision \set #'maximum-rest-count = #2 r - \property Staff.maximumRestCount = #1 + \property Staff. RestCollision \set #'maximum-rest-count = #3 r r8 r8 c diff --git a/input/test/monstrous.ly b/input/test/monstrous.ly index c9984e3d90..8374aed36d 100644 --- a/input/test/monstrous.ly +++ b/input/test/monstrous.ly @@ -1,10 +1,14 @@ \version "1.5.68" - +\header { + texidoc ="FIXME" + } %% Chord gurus, is this ok now?? monstrous= \chords{ - \property Score.chordInversion = ##t + +%% fixme: +%% \property Score.chordInversion = ##t % /c is/was missing: bes:6/+c diff --git a/input/test/no-stem-extend.ly b/input/test/no-stem-extend.ly index 9494f33968..3939e79112 100644 --- a/input/test/no-stem-extend.ly +++ b/input/test/no-stem-extend.ly @@ -1,17 +1,19 @@ \version "1.5.68" +\header { + texidoc = "Don't extend stems to cetner line." +} \score { \context Voice \notes\relative c { - % test noStemExtend \context Staff < \context Voice = "a" { f2 f8 g a b - \property Voice.noStemExtend = ##t + \property Voice.Stem \set #'no-stem-extend = ##t f2 f8 g a b } \context Voice = "b" { c''2 c8 b a g - \property Voice.noStemExtend = ##t + \property Voice.Stem \set #'no-stem-extend = ##t c2 c8 b a g } > diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly index 741e913392..b1d53fe7ed 100644 --- a/input/test/part-combine-moments.ly +++ b/input/test/part-combine-moments.ly @@ -92,7 +92,7 @@ %% URG: this changes dynamics too %%textStyle = #"italic" TimeSignature \override #'style = #'C - maximumRestCount = #1 + RestCollision \set #'maximum-rest-count = #1 } } } diff --git a/input/test/part-combine-staff.ly b/input/test/part-combine-staff.ly index f277deaf2a..8807466b90 100644 --- a/input/test/part-combine-staff.ly +++ b/input/test/part-combine-staff.ly @@ -102,7 +102,9 @@ %% URG: this changes dynamics too %%textStyle = #"italic" TimeSignature \override #'style = #'C - maximumRestCount = #1 + + RestCollision \set #'maximum-rest-count = #1 + } } } diff --git a/input/test/perform-grace.ly b/input/test/perform-grace.ly index 812feab147..30cd484c5b 100644 --- a/input/test/perform-grace.ly +++ b/input/test/perform-grace.ly @@ -3,9 +3,7 @@ \score { \context Voice \notes\relative c { \context Voice=VoiceOne - \property Voice.graceFraction = #(make-moment 1 4) \grace c8 d4 d d d d - \property Voice.graceFraction = #(make-moment 1 2) \grace { e16 f e f } d4 d d d d } diff --git a/input/test/rests.ly b/input/test/rests.ly index 19d7a9cb66..1ca7f50251 100644 --- a/input/test/rests.ly +++ b/input/test/rests.ly @@ -1,9 +1,12 @@ \version "1.5.68" +\header { + texidoc ="mensural style rests." + } \score { \context Voice \notes\relative c { r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 - \property Staff.restStyle = "mensural" + \property Staff.Rest \override #'style = #'mensural \emptyText r\longa^"restStyle = \"mensural\"" r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 diff --git a/input/test/sleur.ly b/input/test/sleur.ly index 3dc630d311..3379524c7a 100644 --- a/input/test/sleur.ly +++ b/input/test/sleur.ly @@ -20,14 +20,6 @@ dirs = \notes\transpose c' { c'1() g' () c () g () c | } - -complex = \notes{ -\transpose c'{ - c,16( e,( g,( b,( d( f( a( c'())))))))c4 c4 |} -\transpose c'''{ - c,16( a( f( d( b,( g,( e,( c,())))))))c4 c4 |} -} - over = \notes\transpose c'{ @@ -175,7 +167,6 @@ clipping = \notes\transpose c'{ % { \shortlong \dirs - \complex \over \under \eccentric diff --git a/input/test/staff-line-leading.ly b/input/test/staff-line-leading.ly index aaa893b32f..0e6004b3d2 100644 --- a/input/test/staff-line-leading.ly +++ b/input/test/staff-line-leading.ly @@ -1,12 +1,19 @@ \version "1.5.68" +\header{ + texidoc ="Setting staff space on a staff " + } \score { \notes \relative c'' \context GrandStaff < \context Staff = up { c4 c4 } - \context Staff = down { \property Staff. staffSpace = #5.5 c4 + \context Staff = down { c4 [ e] [f c'] } > +\paper { \translator { + \StaffContext + StaffSymbol \set #'staff-space = #5.5 + }} } diff --git a/input/test/stem-centered.ly b/input/test/stem-centered.ly index dd418b1f35..ec6f3051ae 100644 --- a/input/test/stem-centered.ly +++ b/input/test/stem-centered.ly @@ -1,11 +1,12 @@ \version "1.5.68" - +\header { + texidoc ="mensural note heads." + } \score { \notes { \relative c'' { -\property Voice . noteHeadStyle = #'mensural -\property Voice. stemCentered = ##t +\property Voice . NoteHead \set #'style = #'mensural c\maxima*1/8 c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 } diff --git a/input/test/stem-length.ly b/input/test/stem-length.ly index 109c60e479..7e77d809d5 100644 --- a/input/test/stem-length.ly +++ b/input/test/stem-length.ly @@ -2,9 +2,8 @@ \score { \context Voice \notes\relative c { - - g''4 \property Voice.stemLength = #14 g4 \property Voice.stemLength = #3 g4 g,,4 - + g''4 \property Voice.Stem \set #'length = #14 g4 + \property Voice.Stem \set #'length = #3 g4 g,,4 } \paper { } \midi { } diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 16f821b69d..fce5b92e24 100644 --- a/input/test/text-spanner.ly +++ b/input/test/text-spanner.ly @@ -1,6 +1,8 @@ \version "1.5.68" - +\header { +texidoc = "ottava spanners." +} \score{ \notes\relative c''{ @@ -23,13 +25,13 @@ a \spanrequest \stop "text" - \property Staff."c0-position" = #-13 + \property Staff.centralCPosition = #-13 \property Voice.TextSpanner \override #'dash-length = #5 - \property Voice.TextSpanner \override #'line-thickness = #10 + \property Voice.TextSpanner \override #'thickness = #10 a \spanrequest \start "text" b c a \spanrequest \stop "text" - \property Staff."c0-position" = #-6 + \property Staff.centralCPosition = #-6 } } diff --git a/input/test/warnings.ly b/input/test/warnings.ly index 54d5bb267f..8b13789179 100644 --- a/input/test/warnings.ly +++ b/input/test/warnings.ly @@ -1,18 +1 @@ -\version "1.5.68" -\header { -texidoc="Various warnings -" -} - -linebreak = \penalty #-1000 - -\score { - \notes { - c'' - \property Voice.Stem \set #'length = #"foo" - \property Voice.Stem \set #'longth = #2 - \property Staff.clefStyle = #"foo" - \property Staff.clefStyle = #2 - } -} diff --git a/lily/accidental.cc b/lily/accidental.cc index 9d1ad1a34e..4200f3b88a 100644 --- a/lily/accidental.cc +++ b/lily/accidental.cc @@ -163,4 +163,4 @@ Accidental_interface::brew_molecule (SCM smob) ADD_INTERFACE (Accidental_interface, "accidental-interface", "a single accidental", - "cautionary-style style tie accidentals"); + "cautionary cautionary-style style tie accidentals"); diff --git a/lily/beam.cc b/lily/beam.cc index 4fd696937b..8e454d3e91 100644 --- a/lily/beam.cc +++ b/lily/beam.cc @@ -1480,6 +1480,6 @@ the ideal slope, how close the result is to the ideal stems, etc.). We take the best scoring combination. ", - "french-beaming position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness"); + "knee french-beaming position-callbacks concaveness-gap concaveness-threshold dir-function quant-score auto-knee-gap gap chord-tremolo beamed-stem-shorten shorten least-squares-dy damping flag-width-function neutral-direction positions space-function thickness"); diff --git a/lily/key-engraver.cc b/lily/key-engraver.cc index 52cedb5136..7dc6973123 100644 --- a/lily/key-engraver.cc +++ b/lily/key-engraver.cc @@ -63,7 +63,7 @@ Key_engraver::create_key (bool def) item_ = new Item (get_property ("KeySignature")); item_->set_grob_property ("c0-position", - get_property ("centralCPosition")); + get_property ("centralCPosition")); // todo: put this in basic props. item_->set_grob_property ("old-accidentals", get_property ("lastKeySignature")); diff --git a/lily/lily-guile.cc b/lily/lily-guile.cc index 6b96a31315..e911cb013e 100644 --- a/lily/lily-guile.cc +++ b/lily/lily-guile.cc @@ -584,6 +584,12 @@ type_check_assignment (SCM sym, SCM val, SCM type_symbol) ly_symbol2string (type_symbol).to_str0 () )); + + /* + Be strict when being anal :) + */ + if (internal_type_checking_global_b) + abort(); } else { diff --git a/lily/stem.cc b/lily/stem.cc index bbb7310fd4..05bddd3356 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -335,6 +335,10 @@ Stem::get_default_stem_end_position (Grob*me) Interval hp = head_positions (me); Real st = hp[dir] + dir * length_f; + + /* + TODO: change name to extend-stems to staff/center/'() + */ bool no_extend_b = to_boolean (me->get_grob_property ("no-stem-extend")); if (!grace_b && !no_extend_b && dir * st < 0) // junkme? st = 0.0; diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 02a50b8ff6..bf9637f67f 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -124,6 +124,8 @@ column as start/begin point. Only columns that have grobs or act as bounds are s (grob-property-description 'breakable boolean? "boolean indicating if this is a breakable item (clef, barline, key sig, etc.).") (grob-property-description 'c0-position integer? "integer indicating the position of central C.") (grob-property-description 'cautionary-style symbol? "style of cautionary accidentals. Choices are 'smaller (one size smaller) or 'parentheses.") +(grob-property-description 'cautionary boolean? "is this a cautionary accidentals.?") + (grob-property-description 'center-element ly-grob? "grob which will be at the center of the group after aligning (when using Align_interface::center_on_element). .") @@ -262,6 +264,7 @@ beaming style: stems stop at innermost beams.") For text, this is `relative'(?) to the current alignment. For barline, space after a thick line.") +(grob-property-description 'knee boolean? "Is this beam a knee?") (grob-property-description 'knee-spacing-correction number? "optical correction amount for knees. 0: no correction; 1: full correction.") (grob-property-description 'layer number? "The output layer [0..2]. The default is 1.") diff --git a/scm/translator-property-description.scm b/scm/translator-property-description.scm index 4258266410..1e0a16018d 100644 --- a/scm/translator-property-description.scm +++ b/scm/translator-property-description.scm @@ -272,6 +272,7 @@ not less than minimumFret") then beams are generated automatically.") (translator-property-description 'noDirection boolean? "Don't set directions by a2-engraver when part-combining.") (translator-property-description 'oneBeat moment? " How long does one beat in the current time signature last?") +(translator-property-description 'othersolo boolean? "FIXME") (translator-property-description 'pedalSustainStrings list? "List of string to print for sustain-pedal. Format is (UP UPDOWN DOWN), where each of the three is the string to print when this is done with the pedal.") -- 2.39.2