From 42f47af78202968f412a940f7ce9b3b1136fd236 Mon Sep 17 00:00:00 2001 From: Mike Solomon Date: Sun, 1 May 2011 13:30:44 -0700 Subject: [PATCH] Removes chord glissando from LilyPond as well as the docs. --- .../de/notation/fretted-strings.itely | 1 - .../chord-glissando-in-tablature.texidoc | 3 +- .../es/notation/fretted-strings.itely | 1 - .../chord-glissando-in-tablature.texidoc | 3 +- Documentation/notation/fretted-strings.itely | 1 - .../new/chord-glissando-in-tablature.ly | 6 +- ly/music-functions-init.ly | 66 ------------------- 7 files changed, 4 insertions(+), 77 deletions(-) diff --git a/Documentation/de/notation/fretted-strings.itely b/Documentation/de/notation/fretted-strings.itely index e4e56f10c5..5911f2ccd5 100644 --- a/Documentation/de/notation/fretted-strings.itely +++ b/Documentation/de/notation/fretted-strings.itely @@ -375,7 +375,6 @@ ties = \relative c' { @funindex \harmonic @funindex \harmonicByFret @funindex \harmonicByRatio -@funindex \chordGlissando Flageolett (engl. @emph{harmonic}) kann zur Tabulaturnotation als klingende Tonhöhe hinzugefügt werden: diff --git a/Documentation/de/texidocs/chord-glissando-in-tablature.texidoc b/Documentation/de/texidocs/chord-glissando-in-tablature.texidoc index aa4a660e5c..dd8b79c2e5 100644 --- a/Documentation/de/texidocs/chord-glissando-in-tablature.texidoc +++ b/Documentation/de/texidocs/chord-glissando-in-tablature.texidoc @@ -3,8 +3,7 @@ Gleiten von Akkorden kann sowohl im normalen Notensystem als auch in einer Tabulatur notiert werden. Saitennummern werden für Tabulaturen benötigt, weil die automatische Saitenberechnung unterschiedlich für -Akkorde und einzelne Noten funktioniert und -@code{\\chordGlissando} zieht Linien zwischen einzelnen Noten. +Akkorde und einzelne Noten funktioniert. " doctitlede = "Akkordglissando in Tabulaturen" diff --git a/Documentation/es/notation/fretted-strings.itely b/Documentation/es/notation/fretted-strings.itely index 908fa67ff5..799648cae7 100644 --- a/Documentation/es/notation/fretted-strings.itely +++ b/Documentation/es/notation/fretted-strings.itely @@ -384,7 +384,6 @@ ties = \relative c' { @funindex \harmonic @funindex \harmonicByFret @funindex \harmonicByRatio -@funindex \chordGlissando Se pueden añadir indicaciones de armónicos a la notación de tablatura como sus alturas de sonido: diff --git a/Documentation/es/texidocs/chord-glissando-in-tablature.texidoc b/Documentation/es/texidocs/chord-glissando-in-tablature.texidoc index af8d3349e5..967585c3c7 100644 --- a/Documentation/es/texidocs/chord-glissando-in-tablature.texidoc +++ b/Documentation/es/texidocs/chord-glissando-in-tablature.texidoc @@ -4,8 +4,7 @@ Los deslizamientos para acordes se pueden indicar tanto en el contexto Staff como en TabStaff. Los números de cuerda son necesarios para TabStaff porque los cálculos de cuerda automáticos son diferentes para -los acordes y para notas sueltas, y @code{\\chordGlissando} traza -líneas entre las notas individuales. +los acordes y para notas sueltas. " diff --git a/Documentation/notation/fretted-strings.itely b/Documentation/notation/fretted-strings.itely index 850557f37c..ec37a8636d 100644 --- a/Documentation/notation/fretted-strings.itely +++ b/Documentation/notation/fretted-strings.itely @@ -367,7 +367,6 @@ ties = \relative c' { @funindex \harmonic @funindex \harmonicByFret @funindex \harmonicByRatio -@funindex \chordGlissando Harmonic indications can be added to tablature notation as sounding pitches: diff --git a/Documentation/snippets/new/chord-glissando-in-tablature.ly b/Documentation/snippets/new/chord-glissando-in-tablature.ly index 1f5e08834d..cdf270278d 100644 --- a/Documentation/snippets/new/chord-glissando-in-tablature.ly +++ b/Documentation/snippets/new/chord-glissando-in-tablature.ly @@ -5,15 +5,13 @@ texidoc = " Slides for chords can be indicated in both Staff and TabStaff. String numbers are necessary for TabStaff because automatic -string calculations are different for chords and for single notes, -and @code{\chordGlissando} draws lines between single notes. +string calculations are different for chords and for single notes. " doctitle = "Chord glissando in tablature" } myMusic = \relative c' { - \chordGlissando - 8 + 1 \glissando } \score { diff --git a/ly/music-functions-init.ly b/ly/music-functions-init.ly index e83470dc62..9efa81ea65 100644 --- a/ly/music-functions-init.ly +++ b/ly/music-functions-init.ly @@ -204,72 +204,6 @@ breathe = (_i "Insert a breath mark.") (make-music 'BreathingEvent)) -%% Make slide indication for chords -chordGlissando = -#(define-music-function (parser location mus1 mus2) (ly:music? ly:music?) - "Make a glissando between the notes of triads @code{mus1} and @code{mus2}." - - (define (add-glissando musChord) - (let ((els (ly:music-property musChord 'elements))) - (ly:music-set-property! musChord 'elements (append els (list (make-music 'GlissandoEvent)))) - musChord)) - - (define (get-notes musicChord) - (filter (lambda(x) (eq? (ly:music-property x 'name) 'NoteEvent)) - (ly:music-property musicChord 'elements))) - - (define (select-note musChord index) - (let* ((notes (get-notes musChord)) - (non-notes (filter (lambda (x) - (not (eq? (ly:music-property x 'name) - 'NoteEvent))) - (ly:music-property musChord 'elements))) - (selected-note (list-ref notes index)) - (new-els (cons selected-note non-notes)) - (new-mus (ly:music-deep-copy musChord))) - (ly:music-set-property! new-mus 'elements new-els) - new-mus)) - - (define (add-glissando-line mus1 mus2 index) - (context-spec-music - (context-spec-music - (make-sequential-music - (list - hideNotes - (make-grob-property-set 'StringNumber 'transparent #t) - (make-grob-property-set 'NoteColumn 'ignore-collision #t) - ;; obviously, this isn't equivalent to \once, - ;; so could be changed if required - (make-grob-property-set 'Glissando 'thickness 2) - (make-grob-property-set 'DynamicText 'transparent #t) - (make-grob-property-set 'DynamicLineSpanner 'transparent #t) - (make-grob-property-set 'DynamicTextSpanner 'transparent #t) - (make-grob-property-set 'TextScript 'stencil #f) - (add-glissando (select-note mus1 index)) - (select-note mus2 index))) - 'Bottom (symbol->string (gensym))) - 'Staff)) - - (let* ((notes1 (get-notes mus1)) - (notes2 (get-notes mus2)) - (note-count (min (length notes1) (length notes2)))) - - #{ - \once \override Glissando #'minimum-length = #4 - \once \override Glissando #'springs-and-rods = #ly:spanner::set-spacing-rods - << - { - $(add-glissando mus1) - $mus2 - } - $(make-simultaneous-music - (map (lambda (x) - (add-glissando-line mus1 mus2 x)) - (iota note-count))) - >> - \revert NoteColumn #'ignore-collision - #})) - clef = #(define-music-function (parser location type) (string?) (_i "Set the current clef to @var{type}.") -- 2.39.5