release: 1.3.104

[lilypond.git] / ly / engraver.ly

diff --git a/ly/engraver.ly b/ly/engraver.ly
index 60c71da79679865b9a67b87eca7fb8f145955fcf..383bb18c8c7541cbc97034cb4b522c626acb7394 100644 (file)
--- a/ly/engraver.ly
+++ b/ly/engraver.ly
@@ -158,13 +158,13 @@ GraceContext=\translator {
        Stem \push  #'stem-length = #6.0
        Stem \push  #'direction = #1
 
-       NoteHead \push #'font-size = #-1
-       Stem \push #'font-size = #-1
+       NoteHead \push #'font-relative-size = #-1
+       Stem \push #'font-relative-size = #-1
        Stem \push #'stem-shorten = #'(0)
-       Beam \push #'font-size = #-1
-       TextScript \push #'font-size = #-1
-       Slur \push #'font-size = #-1
-       Accidentals \push #'font-size = #-1
+       Beam \push #'font-relative-size = #-1
+       TextScript \push #'font-relative-size = #-1
+       Slur \push #'font-relative-size = #-1
+       Accidentals \push #'font-relative-size = #-1
        Beam \push #'thickness = #0.3
        Beam \push #'space-function = #(lambda (x) 0.5)
 
@@ -372,7 +372,7 @@ ScoreContext = \translator {
 
        barAuto = ##t
        voltaVisibility = ##t
-       %  name, glyph id, c0 position
+       %  name, glyph id, clef position 
        supportedClefTypes = #'(
          ("treble" . ("clefs-G" -2))
          ("violin" . ("clefs-G" -2))
@@ -388,12 +388,52 @@ ScoreContext = \translator {
          ("bass" . ("clefs-F" 2 ))
          ("F" . ( "clefs-F" 2))
          ("subbass" . ("clefs-F" 4))
+         ("vaticana_do1" . ("clefs-vaticana_do" -1))
+         ("vaticana_do2" . ("clefs-vaticana_do" 1))
+         ("vaticana_do3" . ("clefs-vaticana_do" 3))
+         ("vaticana_fa1" . ("clefs-vaticana_fa" -1))
+         ("vaticana_fa2" . ("clefs-vaticana_fa" 1))
+         ("medicaea_do1" . ("clefs-medicaea_do" -1))
+         ("medicaea_do2" . ("clefs-medicaea_do" 1))
+         ("medicaea_do3" . ("clefs-medicaea_do" 3))
+         ("medicaea_fa1" . ("clefs-medicaea_fa" -1))
+         ("medicaea_fa2" . ("clefs-medicaea_fa" 1))
+         ("hufnagel_do1" . ("clefs-hufnagel_do" -1))
+         ("hufnagel_do2" . ("clefs-hufnagel_do" 1))
+         ("hufnagel_do3" . ("clefs-hufnagel_do" 3))
+         ("hufnagel_fa1" . ("clefs-hufnagel_fa" -1))
+         ("hufnagel_fa2" . ("clefs-hufnagel_fa" 1))
+         ("hufnagel" . ("clefs-hufnagel_do_fa" 4))
+         ("mensural1_c1" . ("clefs-mensural1_c" -4))
+         ("mensural1_c2" . ("clefs-mensural1_c" -2))
+         ("mensural1_c3" . ("clefs-mensural1_c" 0))
+         ("mensural1_c4" . ("clefs-mensural1_c" 2))
+         ("mensural2_c1" . ("clefs-mensural2_c" -4))
+         ("mensural2_c2" . ("clefs-mensural2_c" -2))
+         ("mensural2_c3" . ("clefs-mensural2_c" 0))
+         ("mensural2_c4" . ("clefs-mensural2_c" 2))
+         ("mensural2_c5" . ("clefs-mensural2_c" 4))
+         ("mensural3_c1" . ("clefs-mensural3_c" -2))
+         ("mensural3_c2" . ("clefs-mensural3_c" 0))
+         ("mensural3_c3" . ("clefs-mensural3_c" 2))
+         ("mensural3_c4" . ("clefs-mensural3_c" 4))
+         ("mensural_f" . ("clefs-mensural_f" 2))
        )
        % where is c0 in this clef?
        clefPitches = #'(("clefs-G" . -4)
          ("clefs-C" . 0)
-         ("clefs-F" . 4))
-               
+         ("clefs-F" . 4)
+         ("clefs-vaticana_do" . 0)
+         ("clefs-vaticana_fa" . 4)
+         ("clefs-medicaea_do" . 0)
+         ("clefs-medicaea_fa" . 4)
+         ("clefs-hufnagel_do" . 0)
+         ("clefs-hufnagel_fa" . 4)
+         ("clefs-hufnagel_do_fa" . 0)
+         ("clefs-mensural1_c" . 0)
+         ("clefs-mensural2_c" . 0)
+         ("clefs-mensural3_c" . 0)
+         ("clefs-mensural_f" . 0))
 
         automaticPhrasing = ##t;
        alignmentReference = \down;
@@ -431,6 +471,7 @@ ScoreContext = \translator {
          Key_item
          Staff_bar
          Time_signature
+         Custos
          Stanza_number
        )
 
@@ -440,10 +481,6 @@ ScoreContext = \translator {
        % TODO: uniform naming.;  
        %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
        
-
-
-       \include "auto-beam-settings.ly";
-
 }
 
 OrchestralScoreContext= \translator {