From 505bdbf46bc29f44d1bb4f07f42be38aef1bf0e2 Mon Sep 17 00:00:00 2001 From: Rune Zedeler Date: Sat, 7 Sep 2002 23:49:53 +0000 Subject: [PATCH] 2002-09-07 Rune Zedeler * input/sondag-morgen/*.ly: Tablature fixes * ly/performer-init.ly: BUGFIX: add alias Timing to Score context --- ChangeLog | 6 ++++- input/sondag-morgen/sondag-morgen-intro.ly | 24 +++++++++---------- .../sondag-morgen-omkvaed-volta1.ly | 10 ++++---- .../sondag-morgen-omkvaed-volta2.ly | 14 +++++------ .../sondag-morgen-omkvaed-volta3.ly | 2 +- input/sondag-morgen/sondag-morgen-omkvaed.ly | 22 ++++++++--------- input/sondag-morgen/sondag-morgen-outro.ly | 22 ++++++++--------- .../sondag-morgen-vers-volta1.ly | 2 +- .../sondag-morgen-vers-volta2.ly | 2 +- input/sondag-morgen/sondag-morgen-vers.ly | 12 +++++----- input/sondag-morgen/sondag-morgen.ly | 5 ++++ ly/engraver-init.ly | 2 +- ly/performer-init.ly | 1 + scm/output-lib.scm | 4 +++- 14 files changed, 70 insertions(+), 58 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3efc068cdf..5ccc5eb03b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2002-09-07 Rune Zedeler + * input/sondag-morgen/*.ly: Tablature fixes + + * ly/performer-init.ly: BUGFIX: add alias Timing to Score context + * lily/parser.yy and lily/lexer.ll: Use E_UNSIGNED instead of E_DIGIT * lily/musical-request.cc (String_number_req): Added @@ -12,7 +16,7 @@ * scm/output-lib.scm (tablature-stem-attachment-function): Changed (guitar-tunings): List added - ((every-nth-bar-number-visible n) barnum): Instead of default-bar-number-visibility + ((every-nth-bar-number-visible n) barnum): added * scm/grob-description.scm (TabNoteHead): Extra-offset added (UGH!) diff --git a/input/sondag-morgen/sondag-morgen-intro.ly b/input/sondag-morgen/sondag-morgen-intro.ly index 51ee1f1430..71ec11cdbd 100644 --- a/input/sondag-morgen/sondag-morgen-intro.ly +++ b/input/sondag-morgen/sondag-morgen-intro.ly @@ -123,18 +123,18 @@ guitar = \notes \transpose c' { \time 2/2 \key e \minor \property Staff.Arpeggio \override #'arpeggio-direction = #1 - g'8-5_"FLANGE" fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - + g'8\5_"FLANGE" fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + } diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly index e307be2148..5583a4a6d7 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta1.ly @@ -99,11 +99,11 @@ pial = \notes { } guitar = \notes { \guitar - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 e-2 ~ | - - ~ - r | + e8\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 e\2 ~ | + + ~ + r | } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly index b7bd520831..3ae4d121a7 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta2.ly @@ -127,16 +127,16 @@ pial = \notes { } guitar = \notes { \guitar - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | + e8\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | + e\2 e\2 < a\3 d'\4> e\2 e\2 e\2 < h\3 e'\4> e\2 | s1*0_"FLANGE" \repeat unfold 2 { - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 + r8 d'\4 d'\4 a'\5 d'\4 e'\4 d'\4 + r8 d'\4 d'\4 a'\5 d'\4 e'\4 d'\4 } - r8 d'-4 d'-4 a'-5 d'-4 e'-4 d'-4 - r8 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | + r8 d'\4 d'\4 a'\5 d'\4 e'\4 d'\4 + r8 < a\3 d'\4> e\2 < ais\3 dis'\4> e\2 < h\3 e'\4> | } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly index f9e5abd10d..bc3fea6724 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed-volta3.ly @@ -67,7 +67,7 @@ pial = \notes { } guitar = \notes { \guitar - e8-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | + e8\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-omkvaed.ly b/input/sondag-morgen/sondag-morgen-omkvaed.ly index b13d2ea53c..6296206f8a 100644 --- a/input/sondag-morgen/sondag-morgen-omkvaed.ly +++ b/input/sondag-morgen/sondag-morgen-omkvaed.ly @@ -145,17 +145,17 @@ guitar = \notes { \guitar \key e \minor \time 4/4 - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 < a-3 d'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'8-4 a'-5> e-2 r8 ~ | - ~ | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 e-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | - e-2 e-2 < a-3 d'-4> e-2 e-2 e-2 < h-3 e'-4> e-2 | - e8-2 < d'-4 g'-5> e-2 e-2 < e'-4 a'-5> e-2 < d'-4 g'-5> e-2 | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | + e\2 e\2 < a\3 d'\4> e\2 e\2 e\2 < h\3 e'\4> e\2 | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | + e\2 e\2 < a\3 d'\4> e\2 e\2 < a\3 d'\4> e\2 < h\3 e'\4> | + e8\2 < d'\4 g'\5> e\2 e\2 < e'8\4 a'\5> e\2 r8 ~ | + ~ | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | + e\2 e\2 e\2 < a\3 d'\4> e\2 < ais\3 dis'\4> e\2 < h\3 e'\4> | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | + e\2 e\2 < a\3 d'\4> e\2 e\2 e\2 < h\3 e'\4> e\2 | + e8\2 < d'\4 g'\5> e\2 e\2 < e'\4 a'\5> e\2 < d'\4 g'\5> e\2 | } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-outro.ly b/input/sondag-morgen/sondag-morgen-outro.ly index cbd718bcd8..81aedf008b 100644 --- a/input/sondag-morgen/sondag-morgen-outro.ly +++ b/input/sondag-morgen/sondag-morgen-outro.ly @@ -135,18 +135,18 @@ pial = \notes { guitar = \notes{ \guitar \time 2/2 - r2 | + r2 | \property Staff.Arpeggio \override #'arpeggio-direction = #1 - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - a8-3( d'-4 a'-5 a-3 d'-4 a'-5 a-3 )d'-4 | - - g'8-5 fis'4-5 d'8-4 r8 h4.-3 | - + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + a8\3( d'\4 a'\5 a\3 d'\4 a'\5 a\3 )d'\4 | + + g'8\5 fis'4\5 d'8\4 r8 h4.\3 | + } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-vers-volta1.ly b/input/sondag-morgen/sondag-morgen-vers-volta1.ly index f24d27e25a..250e4fb090 100644 --- a/input/sondag-morgen/sondag-morgen-vers-volta1.ly +++ b/input/sondag-morgen/sondag-morgen-vers-volta1.ly @@ -64,7 +64,7 @@ pial = \notes { guitar = \notes { \guitar \relative c' { - r2 | + r2 | } } diff --git a/input/sondag-morgen/sondag-morgen-vers-volta2.ly b/input/sondag-morgen/sondag-morgen-vers-volta2.ly index 897e37c4d6..0ae77fffc0 100644 --- a/input/sondag-morgen/sondag-morgen-vers-volta2.ly +++ b/input/sondag-morgen/sondag-morgen-vers-volta2.ly @@ -69,7 +69,7 @@ pial = \notes { } guitar = \notes { \guitar - r4 e8-2 < a-3 d'-4> e-2 < ais-3 dis'-4> e-2 < h-3 e'-4> | + r4 e8\2 < a\3 d'\4> e\2 < ais\3 dis'\4> e\2 < h\3 e'\4> | } cello = \notes { diff --git a/input/sondag-morgen/sondag-morgen-vers.ly b/input/sondag-morgen/sondag-morgen-vers.ly index 7438a03bda..ec637df9ac 100644 --- a/input/sondag-morgen/sondag-morgen-vers.ly +++ b/input/sondag-morgen/sondag-morgen-vers.ly @@ -210,18 +210,18 @@ guitar = \notes { \time 7/8 s1*0_"NO FLANGE" \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | + [ ] [ ] []| + [ ] [ ][ ] | } - [ ] [ ] []| + [ ] [ ] []| \time 9/8 - r4 [ ] [ ] | + r4 [ ] [ ] | \time 7/8 \key g \major \repeat percent 3 { - [ ] [ ] []| - [ ] [ ][ ] | + [ ] [ ] []| + [ ] [ ][ ] | } \time 4/4 s1*0-\mf \repeat unfold 2 diff --git a/input/sondag-morgen/sondag-morgen.ly b/input/sondag-morgen/sondag-morgen.ly index ed1f2285c5..6e0349dca3 100644 --- a/input/sondag-morgen/sondag-morgen.ly +++ b/input/sondag-morgen/sondag-morgen.ly @@ -15,6 +15,7 @@ sd = \translator Staff = down piece = "Score" tagline = "\\Large{Form: Intro Vers$_1$ Vers$_2$ Omkvæd Vers$_1$ Omkvæd Omkvæd Outro }" } + \score { \notes < \property Score.automaticMelismata = ##t @@ -78,6 +79,10 @@ sd = \translator Staff = down \context TabStaff=gui < \property Staff.instrument = "Guitar " \property Staff.instr = "gt " + \property TabStaff.stringOneTopmost = ##f + \property TabStaff.highStringOne = ##f + \property TabStaff.stringTunings = #(reverse guitar-tunings) + \context TabVoice \guitar > \context Staff = cello < diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index c8127652da..c195c75f97 100644 --- a/ly/engraver-init.ly +++ b/ly/engraver-init.ly @@ -397,7 +397,7 @@ ScoreContext = \translator { automaticMelismata = ##t defaultBarType = #"|" - barNumberVisibility = #(every-nth-bar-number-visible 1) + barNumberVisibility = #default-bar-number-visibility explicitClefVisibility = #all-visible explicitKeySignatureVisibility = #all-visible diff --git a/ly/performer-init.ly b/ly/performer-init.ly index 500ea65b51..0735bce8f1 100644 --- a/ly/performer-init.ly +++ b/ly/performer-init.ly @@ -106,6 +106,7 @@ ScoreContext = \translator { \type "Score_performer" \name Score + \alias Timing instrument = #"bright acoustic" \accepts Staff \accepts GrandStaff diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 32ef10d7be..9267948f69 100644 --- a/scm/output-lib.scm +++ b/scm/output-lib.scm @@ -222,4 +222,6 @@ centered, X==1 is at the right, X == -1 is at the left." (string-encode-integer (quotient i 26)))))) -(define ((every-nth-bar-number-visible n) barnum) (and (> barnum 1) (= 0 (modulo barnum n)))) +(define ((every-nth-bar-number-visible n) barnum) (= 0 (modulo barnum n))) + +(define (default-bar-number-visibility barnum) (> barnum 1)) -- 2.39.5