From: fred Date: Wed, 27 Mar 2002 00:48:05 +0000 (+0000) Subject: lilypond-1.3.122 X-Git-Tag: release/1.5.59~976 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=0ef7fce48fdb9dc5587c3cc101ba86d91ad41da0;p=lilypond.git lilypond-1.3.122 --- diff --git a/aclocal.m4 b/aclocal.m4 index 110ee942eb..1a095357e6 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,31 +1,6 @@ dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in -function base () -{ - expr "$1" : "\(/[^/]*\)" -} - -function unbase () -{ - expr "$1" : "/[^/]*\(.*\)" -} - -function walk () -{ - from=`(cd "$1" && pwd)` - to=`pwd` - t=`base "$to"` - f=`base "$from"` - while [ -n "$t" -a "$t" = "$f" ]; do - to=`unbase "$to"` - from=`unbase "$from"` - t=`base "$to"` - f=`base "$from"` - done - echo ..$to -} - AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) if test "$BIBTEX2HTML" = "bib2html"; then diff --git a/buildscripts/walk.sh b/buildscripts/walk.sh index 41d24b0319..a1ffd5c1d9 100644 --- a/buildscripts/walk.sh +++ b/buildscripts/walk.sh @@ -15,8 +15,11 @@ function unbase () function walk () { - from=`(cd "$1" && pwd)` - to=`pwd` + if expr "$1" : '/' > /dev/null 2>&1; then + c=../ + fi + from=`(cd "$1" && pwd) | sed 's://*:/:g'` + to=`pwd | sed 's://*:/:g'` t=`base "$to"` f=`base "$from"` while [ -n "$t" -a "$t" = "$f" ]; do @@ -25,10 +28,8 @@ function walk () t=`base "$to"` f=`base "$from"` done - i=`echo $from | sed -e 's/[^/]\+/../g'` - if expr "$from" : '/' > /dev/null 2>&1; then - c=.. - fi + i=`echo $from | sed -e 's:[^/]\+:..:g'` + i=`echo $i | sed -e 's:/[.][.]:..:'` echo $c$i$to } diff --git a/input/bugs/chord-changes.ly b/input/bugs/chord-changes.ly new file mode 100644 index 0000000000..55f2d1d1f0 --- /dev/null +++ b/input/bugs/chord-changes.ly @@ -0,0 +1,21 @@ +\header{ +texidoc="property chordChanges: only display chord names when +there's a change in the chords scheme, but always display the +chord name after a line break. +"; +} + +scheme = \chords { + \property ChordNames.chordChanges = ##t + c1:m \break c:m c:m c:m d +} + +\score { + \notes < + \context ChordNamesVoice \scheme + \context Staff \transpose c'' \scheme + > + \paper{ + linewidth = 40 * \staffspace; + } +} diff --git a/input/test/american-chords.ly b/input/test/american-chords.ly index 82ad35fd2c..97a6bb6ca4 100644 --- a/input/test/american-chords.ly +++ b/input/test/american-chords.ly @@ -13,44 +13,43 @@ ) chord::names-alist-american)) -chord = \notes\transpose c''\chords{ - \property ChordNames.ChordName \override #'style = #'american -c % Major triad -cs:m % Minor triad -df:m5- % Diminished triad -c:5^3 % Root-fifth chord -c:4^3 % Suspended fourth triad -c:5+ % Augmented triad -c:2^3 % "2" chord -c:m5-.7- % Diminished seventh -c:7+ % Major seventh -c:7.4^3 % Dominant seventh suspended fourth -c:5+.7 % Augmented dominant seventh -c:m5-.7 % "Half" diminished seventh -c:5-.7 % Dominant seventh flat fifth -c:5-.7+ % Major seventh flat fifth -c:m7+ % Minor-major seventh -c:m7 % Minor seventh -c:7 % Dominant seventh -c:6 % Major sixth -c:m6 % Minor sixth -c:9^7 % Major triad w/added ninth -c:6.9^7 % Six/Nine chord -c:9 % Dominant ninth -c:7+.9 % Major ninth -c:m7.9 % Minor ninth +scheme = \chords { + c % Major triad + cs:m % Minor triad + df:m5- % Diminished triad + c:5^3 % Root-fifth chord + c:4^3 % Suspended fourth triad + c:5+ % Augmented triad + c:2^3 % "2" chord + c:m5-.7- % Diminished seventh + c:7+ % Major seventh + c:7.4^3 % Dominant seventh suspended fourth + c:5+.7 % Augmented dominant seventh + c:m5-.7 % "Half" diminished seventh + c:5-.7 % Dominant seventh flat fifth + c:5-.7+ % Major seventh flat fifth + c:m7+ % Minor-major seventh + c:m7 % Minor seventh + c:7 % Dominant seventh + c:6 % Major sixth + c:m6 % Minor sixth + c:9^7 % Major triad w/added ninth + c:6.9^7 % Six/Nine chord + c:9 % Dominant ninth + c:7+.9 % Major ninth + c:m7.9 % Minor ninth } -\score{ -< -\context ChordNames \chord -\context Staff \chord -> - \paper - { - \translator { - \ChordNamesContext - ChordName \override #'word-space = #1 - } +\score { + \notes < + \context ChordNames \scheme + \context Staff \transpose c'' \scheme + > + \paper { + \translator { + \ChordNamesContext + ChordName \override #'word-space = #1 + ChordName \override #'style = #'american } + } } diff --git a/input/test/chord-changes.ly b/input/test/chord-changes.ly new file mode 100644 index 0000000000..2ac2cc20e9 --- /dev/null +++ b/input/test/chord-changes.ly @@ -0,0 +1,21 @@ +\header{ +texidoc="property chordChanges: only display chord names when +there's a change in the chords scheme, but always display the +chord name after a line break. +"; +} + +scheme = \chords { +% \property ChordNames.chordChanges = ##t + c1:m \break c:m c:m c:m d +} + +\score { + \notes < + \context ChordNamesVoice \scheme + \context Staff \transpose c'' \scheme + > + \paper{ + linewidth = 40 * \staffspace; + } +} diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index fefa24587a..3eb5a65639 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -11,57 +11,57 @@ % cp locate `msam9.tfm` LILYPONDPREFIXxtfm % -chord = \notes\transpose c''\chords{ -\property ChordNames.ChordName \override #'style = #'jazz -% major chords -c -c:6 % 6 = major triad with added sixth -c:maj % triangle = maj -c:6.9^7 % 6/9 -c:9^7 % add9 +scheme = \chords { + % major chords + c + c:6 % 6 = major triad with added sixth + c:maj % triangle = maj + c:6.9^7 % 6/9 + c:9^7 % add9 -% minor chords -c:m % m = minor triad -c:m.6 % m6 = minor triad with added sixth -c:m.7+ % m triangle = minor major seventh chord -c:3-.6.9^7 % m6/9 -c:m.7 % m7 -c:3-.9 % m9 -c:3-.9^7 % madd9 + % minor chords + c:m % m = minor triad + c:m.6 % m6 = minor triad with added sixth + c:m.7+ % m triangle = minor major seventh chord + c:3-.6.9^7 % m6/9 + c:m.7 % m7 + c:3-.9 % m9 + c:3-.9^7 % madd9 -% dominant chords -c:7 % 7 = dominant -c:7.5+ % +7 = augmented dominant -c:7.5- % 7b5 = hard diminished dominant -c:9 % 7(9) -c:9- % 7(b9) -c:9+ % 7(#9) -c:13^9.11 % 7(13) -c:13-^9.11 % 7(b13) -c:13^11 % 7(9,13) -c:13.9-^11 % 7(b9,13) -c:13.9+^11 % 7(#9,13) -c:13-^11 % 7(9,b13) -c:13-.9-^11 % 7(b9,b13) -c:13-.9+^11 % 7(#9,b13) + % dominant chords + c:7 % 7 = dominant + c:7.5+ % +7 = augmented dominant + c:7.5- % 7b5 = hard diminished dominant + c:9 % 7(9) + c:9- % 7(b9) + c:9+ % 7(#9) + c:13^9.11 % 7(13) + c:13-^9.11 % 7(b13) + c:13^11 % 7(9,13) + c:13.9-^11 % 7(b9,13) + c:13.9+^11 % 7(#9,13) + c:13-^11 % 7(9,b13) + c:13-.9-^11 % 7(b9,b13) + c:13-.9+^11 % 7(#9,b13) -% half diminished chords -c:m5-.7 % slashed o = m7b5 -c:9.3-.5- % o/7(pure 9) - -% diminished chords -c:m5-.7- % o = diminished seventh chord + % half diminished chords + c:m5-.7 % slashed o = m7b5 + c:9.3-.5- % o/7(pure 9) + % diminished chords + c:m5-.7- % o = diminished seventh chord } -\score{ -< -\context ChordNames \chord -\context Staff \chord -> - \paper - { - \translator { \ChordNamesContext ChordName \override #'word-space = #1 } -% \translator { \LyricsContext textScriptWordSpace = #0.3 } +\score { + \notes < + \context ChordNames \scheme + \context Staff \transpose c'' \scheme + > + \paper { + \translator { + \ChordNamesContext + ChordName \override #'word-space = #1 + ChordName \override #'style = #'jazz } + } } diff --git a/input/test/note-chords.ly b/input/test/note-chords.ly new file mode 100644 index 0000000000..2b6cfe905d --- /dev/null +++ b/input/test/note-chords.ly @@ -0,0 +1,13 @@ +scheme = \notes { + + + +} + +\score { + < + \context ChordNamesVoice \scheme + \context Staff \scheme + > + \paper { linewidth = -1.; } +} diff --git a/lily/chord-name-engraver.cc b/lily/chord-name-engraver.cc index a8143f1845..a3541404a3 100644 --- a/lily/chord-name-engraver.cc +++ b/lily/chord-name-engraver.cc @@ -45,7 +45,7 @@ Chord_name_engraver::Chord_name_engraver () { chord_name_p_ = 0; chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); - last_chord_ = gh_cons (SCM_EOL, gh_cons (SCM_EOL, SCM_EOL)); + last_chord_ = SCM_EOL; } void @@ -92,9 +92,19 @@ Chord_name_engraver::create_grobs () chord_name_p_ = new Item (get_property ("ChordName")); chord_name_p_->set_grob_property ("chord", chord_); announce_grob (chord_name_p_, 0); - SCM s = get_property ("drarnChords"); //FIXME! - if (to_boolean (s) && last_chord_ != SCM_EOL && - gh_equal_p (chord_, last_chord_)) + SCM s = get_property ("chordChanges"); +#ifdef DEBUG + /* + gdb crashes upon printscm (chord_) etc... + ugh: why does gh_equal_p () not seem to work?? + */ + printf ("chord: %s\n", ly_scm2string (ly_write2scm (chord_)).ch_C ()); + printf ("last_chord: %s\n", ly_scm2string (ly_write2scm (last_chord_)).ch_C ()); + int i = gh_equal_p (chord_, last_chord_); + printf ("i: %d\n", i); +#endif + if (to_boolean (s) && last_chord_ != SCM_EOL + && gh_equal_p (chord_, last_chord_)) chord_name_p_->set_grob_property ("begin-of-line-visible", SCM_BOOL_T); } } diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index ebbdab9a96..55af3b8196 100644 --- a/lily/system-start-delimiter.cc +++ b/lily/system-start-delimiter.cc @@ -26,7 +26,6 @@ System_start_delimiter::staff_bracket (Grob*me,Real height) me->get_grob_property ("arch-angle"), me->get_grob_property ("arch-width"), gh_double2scm (arc_height), - me->get_grob_property ("bracket-width"), gh_double2scm (height), me->get_grob_property ("arch-thick"), me->get_grob_property ("bracket-thick"), diff --git a/scm/chord-name.scm b/scm/chord-name.scm index 49604d17bb..eac4cd2659 100644 --- a/scm/chord-name.scm +++ b/scm/chord-name.scm @@ -138,7 +138,9 @@ ; major sixth chord = 6 (((0 . 0) (2 . 0) (4 . 0) (5 . 0)) . (((raise . 0.5) "6"))) ; major seventh chord = triangle - (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) . (((raise . 0.5)((font-family . "math") "M")))) + ;; shouldn't this be a filled black triange, like this: ? --jcn + ;; (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) . (((raise . 0.5)((font-family . math) "N")))) + (((0 . 0) (2 . 0) (4 . 0) (6 . 0)) . (((raise . 0.5)((font-family . math) "M")))) ; major chord add nine = add9 (((0 . 0) (2 . 0) (4 . 0) (1 . 0)) . (((raise . 0.5) "add9"))) ; major sixth chord with nine = 6/9 @@ -147,8 +149,10 @@ ;; minor chords ; minor sixth chord = m6 (((0 . 0) (2 . -1) (4 . 0) (5 . 0)) . (rows("m")((raise . 0.5) "6"))) - ; minor major seventh chord = m triangle - (((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . (rows ("m") ((raise . 0.5)((font-family . "math") "M")))) + ;; minor major seventh chord = m triangle + ;; shouldn't this be a filled black triange, like this: ? --jcn + ;;(((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . (rows ("m") ((raise . 0.5)((font-family . math) "N")))) + (((0 . 0) (2 . -1) (4 . 0) (6 . 0)) . (rows ("m") ((raise . 0.5)((font-family . math) "M")))) ; minor seventh chord = m7 (((0 . 0) (2 . -1) (4 . 0) (6 . -1)) . (rows("m")((raise . 0.5) "7"))) ; minor sixth nine chord = m6/9 diff --git a/scm/grob-description.scm b/scm/grob-description.scm index 2f3a0d5f00..043f356734 100644 --- a/scm/grob-description.scm +++ b/scm/grob-description.scm @@ -57,7 +57,7 @@ ;; todo: clean this up a bit: the list is getting ;; rather long. (molecule-callback . ,Beam::brew_molecule) - (thickness . 0.42) ; in staff-space, should use stafflinethick? + (thickness . 0.48) ; in staff-space (before-line-breaking-callback . ,Beam::before_line_breaking) (after-line-breaking-callback . ,Beam::after_line_breaking) (default-neutral-direction . 1) @@ -541,7 +541,6 @@ (glyph . bar-line) (arch-width . 1.5) (bracket-thick . 0.25) - (bracket-width . 2.0) (Y-extent-callback . #f) (font-family . braces) ;; if you want to set point-size, you cannot set diff --git a/scm/grob-property-description.scm b/scm/grob-property-description.scm index 9d760daae4..be23bed083 100644 --- a/scm/grob-property-description.scm +++ b/scm/grob-property-description.scm @@ -55,6 +55,7 @@ In the case of alignment grobs, this should contain only one number.") (grob-property-description 'beam-thickness number? "thickness, measured in staffspace") (grob-property-description 'beam-thickness number? "thickness, measured in staffspace") (grob-property-description 'beam-width number? "width of the tremolo sign") +(grob-property-description 'beamAuto boolean? "enable autobeaming?") (grob-property-description 'beamed-lengths list? "list of stem lengths given beam multiplicity ") (grob-property-description 'beamed-minimum-lengths list? "list of minimum stem lengths given beam multiplicity") (grob-property-description 'beamed-stem-shorten number? "shorten beamed stems in forced direction") @@ -80,7 +81,7 @@ column as start/begin point. Only columns that have grobs or act as bounds are s (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). ") - +(grob-property-description 'chordChanges boolean? "only show changes in chord scheme?") (grob-property-description 'collapse-height number? "Minimum height of system start delimiter. If smaller, the delimiter is removed.") (grob-property-description 'column-space-strength number? "relative strength of space following breakable columns (eg. prefatory matter)") (grob-property-description 'columns list? "list of grobs, typically containing paper-columns, list of note-columns") diff --git a/scm/interface-description.scm b/scm/interface-description.scm index e6a034a060..4ae22d7a7d 100644 --- a/scm/interface-description.scm +++ b/scm/interface-description.scm @@ -686,11 +686,7 @@ position 0." (lily-interface 'stem-tremolo-interface "" - '( - stem - beam-width - beam-thickness - beam-space-function + '( stem beam-width beam-thickness beam-space-function ))) (define separation-item-interface @@ -717,7 +713,7 @@ Calc dimensions for the Separating_group_spanner; this has to be 'system-start-delimiter-interface "#'style can be bar-line, bracket or brace" '(collapse-height thickness arch-height arch-angle arch-thick - arch-width bracket-thick bracket-width glyph ))) + arch-width bracket-thick glyph ))) (define text-spanner-interface (lily-interface diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 110ee942eb..1a095357e6 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -1,31 +1,6 @@ dnl aclocal.m4 -*-shell-script-*- dnl StepMake subroutines for configure.in -function base () -{ - expr "$1" : "\(/[^/]*\)" -} - -function unbase () -{ - expr "$1" : "/[^/]*\(.*\)" -} - -function walk () -{ - from=`(cd "$1" && pwd)` - to=`pwd` - t=`base "$to"` - f=`base "$from"` - while [ -n "$t" -a "$t" = "$f" ]; do - to=`unbase "$to"` - from=`unbase "$from"` - t=`base "$to"` - f=`base "$from"` - done - echo ..$to -} - AC_DEFUN(AC_STEPMAKE_BIBTEX2HTML, [ AC_CHECK_PROGS(BIBTEX2HTML, bibtex2html bib2html, error) if test "$BIBTEX2HTML" = "bib2html"; then