From 22ffcd20ded89874d65e13f59a7c8cdcd7497240 Mon Sep 17 00:00:00 2001 From: fred Date: Wed, 27 Mar 2002 00:02:11 +0000 Subject: [PATCH] lilypond-1.3.104 --- input/bugs/arpeggio-collision.ly | 43 +++++++++++++++++++++++++++ input/test/hara-kiri-switch.ly | 2 +- input/test/jazz-chords.ly | 2 +- lily/arpeggio-engraver.cc | 17 ++++------- lily/local-key-engraver.cc | 4 +++ lily/pitch-squash-engraver.cc | 1 - scm/chord-names.scm | 21 ++++++++++---- tex/dyn.tex | 50 ++++++++++++++++++++++++++++++++ tex/number.tex | 33 +++++++++++++++++++++ 9 files changed, 153 insertions(+), 20 deletions(-) create mode 100644 input/bugs/arpeggio-collision.ly create mode 100644 tex/dyn.tex create mode 100644 tex/number.tex diff --git a/input/bugs/arpeggio-collision.ly b/input/bugs/arpeggio-collision.ly new file mode 100644 index 0000000000..996f19a696 --- /dev/null +++ b/input/bugs/arpeggio-collision.ly @@ -0,0 +1,43 @@ + +hairyChord = \context Staff \notes\relative c' < + \context Voice=one { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #0 + e4\arpeggio + } + + \context Voice=two { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #1 + cis\arpeggio + } + + \context Voice=three { + \property Voice.Stem \push #'direction = #1 + \property Voice.NoteColumn \push #'horizontal-shift = #2 + ais\arpeggio + } + + \context Voice=four { + \property Voice.Stem \push #'direction = #-1 + \property Voice.NoteColumn \push #'horizontal-shift = #-1 + fis\arpeggio + } +> + + +\score{ + \notes \transpose c'' { + \context Voice < fis''-\arpeggio g d a > + \context Voice < fis,-\arpeggio g d a > + \context Voice < fis''-\arpeggio g d a > + \hairyChord + } + \paper { + linewidth = -1.; + \translator{ + \StaffContext + connectArpeggios = ##t + } + } +} diff --git a/input/test/hara-kiri-switch.ly b/input/test/hara-kiri-switch.ly index e1c41c282c..f0219b663c 100644 --- a/input/test/hara-kiri-switch.ly +++ b/input/test/hara-kiri-switch.ly @@ -43,7 +43,7 @@ grandstaff = \context GrandStaff = one < \paper{ linewidth=80.0\mm; - \translator { \VoiceContext noAutoBeaming = "1"; } + \translator { \VoiceContext noAutoBeaming = ##t; } \translator { \HaraKiriStaffContext } \translator { \OrchestralScoreContext skipBars = 1; } } diff --git a/input/test/jazz-chords.ly b/input/test/jazz-chords.ly index 3ec8bd437d..90f1c26eea 100644 --- a/input/test/jazz-chords.ly +++ b/input/test/jazz-chords.ly @@ -44,7 +44,7 @@ c:13-.9+^11 % 7(#9,b13) % half diminished chords c:m5-.7 % slashed o = m7b5 -c:9.3-.5- % ø7(pure 9) +c:9.3-.5- % o/7(pure 9) % diminished chords c:m5-.7- % o = diminished seventh chord diff --git a/lily/arpeggio-engraver.cc b/lily/arpeggio-engraver.cc index 5a95deecdc..7455bf2255 100644 --- a/lily/arpeggio-engraver.cc +++ b/lily/arpeggio-engraver.cc @@ -66,13 +66,11 @@ Arpeggio_engraver::acknowledge_element (Score_element_info info) stems_.push (info.elem_l_); } - else - - /* - We can't catch local key items from Voice context, but let's leave - it here in case someone moves this stuff around. */ - if (Rhythmic_head::has_interface (info.elem_l_) - || Local_key_item::has_interface (info.elem_l_)) + /* + We can't catch local key items (accidentals) from Voice context, + see Local_key_engraver + */ + else if (Rhythmic_head::has_interface (info.elem_l_)) { supports_.push (info.elem_l_); } @@ -87,16 +85,13 @@ Arpeggio_engraver::process_acknowledged () arpeggio_ = new Item (get_property ("Arpeggio")); arpeggio_->set_parent (stems_[0], Y_AXIS); - // Staff_symbol_referencer::set_interface (arpeggio_); - for (int i = 0; i < stems_.size (); i++) { Pointer_group_interface::add_element (arpeggio_, "stems", stems_[i]); - //Side_position::add_support (arpeggio_, stems_[i]); } for (int i = 0; i < supports_.size (); i++) { - ;//Side_position::add_support (arpeggio_, supports_[i]); + Side_position::add_support (arpeggio_, supports_[i]); } announce_element (arpeggio_, arpeggio_req_); } diff --git a/lily/local-key-engraver.cc b/lily/local-key-engraver.cc index 866e1c2d9b..685f6c0f37 100644 --- a/lily/local-key-engraver.cc +++ b/lily/local-key-engraver.cc @@ -160,6 +160,10 @@ Local_key_engraver::process_acknowledged () { /* Hmm. Which one has to be on the left? + + On which left, code or paper? + + (Arpeggios are engraved left of accidentals, of course.) */ for (int i=0; i < arpeggios_.size (); i++) Side_position::add_support (arpeggios_[i], key_item_p_); diff --git a/lily/pitch-squash-engraver.cc b/lily/pitch-squash-engraver.cc index 0bed2d606e..90a73ea0ec 100644 --- a/lily/pitch-squash-engraver.cc +++ b/lily/pitch-squash-engraver.cc @@ -8,7 +8,6 @@ */ #include "staff-symbol-referencer.hh" #include "note-head.hh" -#include "pitch-squash-engraver.hh" #include "rhythmic-head.hh" #include "engraver.hh" diff --git a/scm/chord-names.scm b/scm/chord-names.scm index 418882146d..1cac00d032 100644 --- a/scm/chord-names.scm +++ b/scm/chord-names.scm @@ -63,6 +63,9 @@ ;; See input/test/american-chords.ly ;; ;; James Hammons, +;; + +;; DONT use non-ascii characters, even if ``it works'' in Windows (define chord::names-alist-american '()) (set! chord::names-alist-american @@ -106,7 +109,7 @@ ) chord::names-alist-american)) -;; Jazz chords, by Atte André Jensen +;; Jazz chords, by Atte Andr'e Jensen ;; NBs: This uses the american list as a base. ;; Some defs take up more than one line, ;; be carefull when messing with ;'s!! @@ -120,6 +123,8 @@ ;; ;; ;; +;; DONT use non-ascii characters, even if ``it works'' in Windows + (define chord::names-alist-jazz '()) (set! chord::names-alist-jazz (append @@ -214,17 +219,21 @@ ;; diminished chord(s) ; diminished seventh chord = o - ;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (((raise . 0.8)"o"))); works, but "o" is a little big - (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (("°"))) + + + ;; DONT use non-ascii characters, even if ``it works'' in Windows + + ;;(((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . (((raise . 0.8)"o"))); works, but "o" is a little big + (((0 . 0) (2 . -1) (4 . -1) (6 . -2)) . ((raise . 0.8) (size . -2) ("o"))) ;; half diminshed chords ; half diminished seventh chord = slashed o - (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (((raise . 0.8)"ø"))); works, but "ø" is a little big + (((0 . 0) (2 . -1) (4 . -1) (6 . -1)) . (((raise . 0.8)"/o"))) ; half diminished seventh chord with major 9 = slashed o cancelation 9 (((0 . 0) (2 . -1) (4 . -1) (6 . -1) (1 . 0)) . ( - ((raise . 0.8)"ø(") + ((raise . 0.8)"/o(") ((raise . 0.3)(music (named ("accidentals-0")))) - ((raise . 0.8)"9)"))); works, but "ø" is a little big + ((raise . 0.8)"9)"))); ;; Missing jazz chord definitions go here (note new syntax: see american for hints) diff --git a/tex/dyn.tex b/tex/dyn.tex new file mode 100644 index 0000000000..6db8f0082d --- /dev/null +++ b/tex/dyn.tex @@ -0,0 +1,50 @@ +% dyn.tex + +\font\fetaelevenfont=feta-din11 +\font\fetathirteenfont=feta-din13 +\font\fetasixteenfont=feta-din16 +\font\fetatwentyfont=feta-din20 +\font\fetatwentythreefont=feta-din23 +\font\fetatwentysixfont=feta-din26 + +\def\fetafont{\fetasixteenfont} + +\def\test#1{% + \hbox {% + \vrule height #1pt width 5pt + \hbox { pp p mp mf f ff } + \vrule height #1pt width 5pt + } + +} + +\def\testa#1{% + \hbox{ + \vrule height #1pt width 5pt + \hbox { sf sp sfz rfz } + \vrule height #1pt width 5pt + } + +} + +\parindent0mm +\magnification \magstep 2 +\baselineskip 10mm + +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + + +\let\test\testa +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + +\end diff --git a/tex/number.tex b/tex/number.tex new file mode 100644 index 0000000000..79621b51e5 --- /dev/null +++ b/tex/number.tex @@ -0,0 +1,33 @@ +% number.tex + +\font\fetaelevenfont=feta-nummer11 +\font\fetathirteenfont=feta-nummer13 +\font\fetasixteenfont=feta-nummer16 +\font\fetatwentyfont=feta-nummer20 +\font\fetatwentythreefont=feta-nummer23 +\font\fetatwentysixfont=feta-nummer26 + +\def\fetafont{\fetasixteenfont} + +\def\test#1{% + \hbox {% + \vrule height #1pt width 5pt + \vbox{44} + \vrule height #1pt width 5pt + \hfill + } + +} + +\parindent0mm +\magnification \magstep 2 +\baselineskip 10mm + +\fetaelevenfont \test{11} +\fetathirteenfont \test{13} +\fetasixteenfont \test{16} +\fetatwentyfont \test{20} +\fetatwentythreefont \test{23} +\fetatwentysixfont \test{26} + +\end -- 2.39.5