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
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
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
}
--- /dev/null
+\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;
+ }
+}
)
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
}
+ }
}
--- /dev/null
+\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;
+ }
+}
% 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
}
+ }
}
--- /dev/null
+scheme = \notes {
+ <c'1 e' g'>
+ <e' g' c''>
+ <e e' g' c''>
+}
+
+\score {
+ <
+ \context ChordNamesVoice \scheme
+ \context Staff \scheme
+ >
+ \paper { linewidth = -1.; }
+}
{
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
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);
}
}
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"),
; 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
;; 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
;; 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)
(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
(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")
(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")
(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
'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
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
projects / lilypond.git / commitdiff