input/test fixes

[lilypond.git] / input / test / gregorian-scripts.ly

diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index 70326fad44600bb07a43b0129c2cb84e6917f977..7dffe7e400c5fb0bd3f2fc564a8a21b71fdf8519 100644 (file)
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,103 +1,53 @@
-\version "1.7.19"
+\version "2.3.8"
 \header {
-    title      = "Gregorian Scripts"
-    texidoc     = "
+    texidoc  = "@cindex Gregorian Scripts
 
-Gregorian Scripts:
+Here is demonstrated a preliminary support of Gregorian Scripts:
 
 ictus, circulus, semicirculus, accentus, episem.
 
-TODO: augmentum.
+"}
 
-FIXME: when applying an episem within a ligature, the TextSpanner's width
-collapses to 0.0.
+%{
 
-FIXME: clef does not show on each line
+TODO: augmentum.  Syntax: either as bracket (\augmentumInitium,
+\augmentumFinis), or as head prefix with subsequently collecting all
+dots and putting them behind the ligature in a vertical row.
+Counterexample to the second approach: Graduale Triplex, tempus per
+annum, hebdomada septima, alleluia (page 280).
 
-FIXME: horizontal spacing (ragged right mode)
+FIXME: horizontal spacing (ragged right mode).
 
 FIXME: padding/minimum-distance is fragile.
 
-"}
-
-\include "paper26.ly"
-\include "gregorian-init.ly"
-
-cantus = \notes \relative c' {
-  \clef "vaticana_do2"
+FIXME: episem stops one notehead too early.
 
-  a-\ictus
-  a-\circulus
-  a-\semicirculus
-  a-\accentus
+%}
 
-  %{ %% TODO: augmentum:
-     a-\augmentum
-     \[ \augmentumInitium b \flexa a \augmentumFinis \]
-  %}
-
-  a \episemInitium b \flexa a \episemFinis
-
-  \[ a \episemInitium b \flexa a \episemFinis \]
-}
+\include "gregorian-init.ly"
 
 \score {
-  \context VaticanaStaff <
-    \context VaticanaVoice <
-      \cantus
-    >
-  >
+  \context VaticanaVoice {
+    \override VaticanaScript  #'padding = #-0.5
+     {
+      a\ictus
+      a\circulus
+      a\semicirculus
+      a\accentus
+
+      %{ %% TODO: augmentum:
+       a\augmentum
+       \[ \augmentumInitium b \flexa a \augmentumFinis \]
+      %}
+
+      \[ a \episemInitium \pes b \flexa a \episemFinis \]
+    }
+  }
   \paper {
-    stafflinethickness = \staffspace / 5.0
     linewidth = 70.0
+    linethickness = \staffspace / 5.0
     width = 60.0
     indent = 0.0
     raggedright = ##t
-
-%   width = 15.0 \cm %%% no effect?
-%   gourlay_maxmeasures = 1. %%% no effect?
-
-    \translator {
-      \VoiceContext
-      \name VaticanaVoice
-      \alias Voice
-      \remove "Stem_engraver"
-      \remove Ligature_bracket_engraver
-      \consists Vaticana_ligature_engraver
-      NoteHead \set #'style = #'vaticana_punctum
-      Script \set #'padding = #0.0
-
-      % prepare TextSpanner for \episem{Initium|Finis} use
-      TextSpanner \set #'type = #'line
-      TextSpanner \set #'edge-height = #'(0 . 0)
-      TextSpanner \set #'padding = #0.5
-      TextSpanner \set #'edge-text = #'("" . "")
-    }
-    \translator {
-      \StaffContext
-      \name VaticanaStaff
-      \alias Staff
-      \accepts VaticanaVoice
-      \remove Bar_engraver
-      \consists Custos_engraver
-      StaffSymbol \set #'line-count = #4
-%      StaffSymbol \set #'width = #60.0 % FIXME: should be \linewidth
-      TimeSignature \set #'transparent = ##t
-      KeySignature \set #'style = #'vaticana
-      Accidental \set #'style = #'vaticana
-      Custos \set #'style = #'vaticana
-      Custos \set #'neutral-position = #3
-      Custos \set #'neutral-direction = #-1
-      Custos \set #'adjust-if-on-staffline = ##t
-    }
-    \translator {
-      \RemoveEmptyStaffContext
-      \accepts VaticanaVoice
-    }
-    \translator {
-      \ScoreContext
-      \accepts VaticanaStaff
-      \remove Bar_number_engraver
-    }
   }
 }