X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Documentation%2Fsnippets%2Fincipit.ly;h=522bf1d730908d279191aed8d640c2cb49d63eae;hb=7b3d43f2b604e8ccdc24315fa0c094e04dcfcbaf;hp=1b289671a15e9bec74ebdf17e4f870ee585e7d10;hpb=ebc3cdab150ac7de7857043d301f784fd0f8aecc;p=lilypond.git

diff --git a/Documentation/snippets/incipit.ly b/Documentation/snippets/incipit.ly
index 1b289671a1..522bf1d730 100644
--- a/Documentation/snippets/incipit.ly
+++ b/Documentation/snippets/incipit.ly
@@ -4,59 +4,27 @@
 % and then run scripts/auxiliar/makelsr.py
 %
 % This file is in the public domain.
-%% Note: this file works from version 2.15.42
-\version "2.15.42"
+%% Note: this file works from version 2.19.16
+\version "2.19.16"
 
 \header {
-  lsrtags = "staff-notation, ancient-notation"
+  lsrtags = "ancient-notation, staff-notation"
+
   texidoc = "
-Incipits can be added using the instrument name grob, but keeping
-separate the instrument name definition and the incipit definition.
+When transcribing mensural music, an incipit at the beginning of the piece is
+useful to indicate the original key and tempo.  Musicians today are used
+to bar lines, but these were not known during the period of mensural music.  As
+a compromise, bar lines are often printed between the staves, a layout style
+called mensurstriche layout.
 "
+
   doctitle = "Incipit"
 } % begin verbatim
 
 
-incipit =
-#(define-music-function (parser location incipit-music) (ly:music?)
-  #{
-    \once \override Staff.InstrumentName #'self-alignment-X = #RIGHT
-    \once \override Staff.InstrumentName #'self-alignment-Y = #UP
-    \once \override Staff.InstrumentName #'Y-offset =
-      #(lambda (grob)
-         (+ 4 (system-start-text::calc-y-offset grob)))
-    \once \override Staff.InstrumentName #'padding = #0.3
-    \once \override Staff.InstrumentName #'stencil =
-      #(lambda (grob)
-	 (let* ((instrument-name (ly:grob-property grob 'long-text)))
-	   (set! (ly:grob-property grob 'long-text)
-		 #{ \markup
-		      \score
-		         {
-			   { \context MensuralStaff \with {
-	                        instrumentName = #instrument-name
-			        \override VerticalAxisGroup
-			         #'Y-extent = #'(-4 . 4)
-	                     } { #incipit-music }
-			   }
-	                   \layout { $(ly:grob-layout grob)
-			             line-width = \indent
-		                     indent =
-				% primitive-eval is probably easiest for
-				% escaping lexical closure and evaluating
-				% everything respective to (current-module).
-	                             #(primitive-eval
-                                       '(or (false-if-exception (- indent (* mm incipit-width)))
-					    (* 0.5 indent)))
-			             ragged-right = ##f
-			             ragged-last = ##f
-			             system-count = #1 }
-			 }
-		  #})
-           (system-start-text::print grob)))
-  #})
-
-%%%%%%%%%%%%%%%%%%%%%%%%%
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+% A short excerpt from the Jubilate Deo by Orlande de Lassus
+%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
 
 global = {
   \set Score.skipBars = ##t
@@ -67,24 +35,18 @@ global = {
   \skip 1*8
 
   % let finis bar go through all staves
-  \override Staff.BarLine #'transparent = ##f
+  \override Staff.BarLine.transparent = ##f
 
   % finis bar
   \bar "|."
 }
 
-discantusIncipit = <<
-  \new MensuralVoice = "discantusIncipit" <<
-    \repeat unfold 9 { s1 \noBreak }
-    {
-      \clef "neomensural-c1"
-      \key f \major
-      \time 2/2
-      c''1.
-    }
-  >>
-  \new Lyrics \lyricsto discantusIncipit { IV- }
->>
+discantusIncipit = {
+  \clef "neomensural-c1"
+  \key f \major
+  \time 2/2
+  c''1.
+}
 
 discantusNotes = {
   \transpose c' c'' {
@@ -94,72 +56,54 @@ discantusNotes = {
     c'4 e'4.( d'8 c' b |
     a4) b a2 |
     b4.( c'8 d'4) c'4 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     c'1 |
     b\breve |
   }
 }
 
 discantusLyrics = \lyricmode {
-  Ju -- bi -- |
-  la -- te De -- |
-  o, om --
-  nis ter -- |
-  ra, __ om- |
-  "..." |
-  -us. |
+  Ju -- bi -- la -- te De -- o,
+  om -- nis ter -- ra, __ om-
+  "..."
+  -us.
 }
 
-altusIncipit = <<
-  \new MensuralVoice = "altusIncipit" <<
-    \repeat unfold 9 { s1 \noBreak }
-    {
-      \clef "neomensural-c3"
-      \key f \major
-      \time 2/2
-      r1 f'1.
-    }
-  >>
-  \new Lyrics \lyricsto altusIncipit { IV- }
->>
+altusIncipit = {
+  \clef "neomensural-c3"
+  \key f \major
+  \time 2/2
+  r1 f'1.
+}
 
 altusNotes = {
   \transpose c' c'' {
     \clef "treble"
-    % two measures
     r2 g2. e4 fis g |
     a2 g4 e |
     fis g4.( fis16 e fis4) |
     g1 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     g1 |
     g\breve |
   }
 }
 
 altusLyrics = \lyricmode {
-  % two measures
-  Ju -- bi -- la -- te |
-  De -- o, om -- |
-  nis ter -- ra, |
-  "..." |
-  -us. |
+  Ju -- bi -- la -- te
+  De -- o, om -- nis ter -- ra,
+  "..."
+  -us.
 }
 
-tenorIncipit = <<
-  \new MensuralVoice = "tenorIncipit" <<
-    \repeat unfold 9 { s1 \noBreak }
-    {
-      \clef "neomensural-c4"
-      \key f \major
-      \time 2/2
-      r\longa
-      r\breve
-      r1 c'1.
-    }
-  >>
-  \new Lyrics \lyricsto tenorIncipit { IV- }
->>
+tenorIncipit = {
+  \clef "neomensural-c4"
+  \key f \major
+  \time 2/2
+  r\longa
+  r\breve
+  r1 c'1.
+}
 
 tenorNotes = {
   \transpose c' c' {
@@ -169,33 +113,25 @@ tenorNotes = {
     R1 |
     % two measures
     r2 d'2. d'4 b e' |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     e'1 |
     d'\breve |
   }
 }
 
 tenorLyrics = \lyricmode {
-  % two measures
-  Ju -- bi -- la -- te |
-  "..." |
+  Ju -- bi -- la -- te
+  "..."
   -us.
 }
 
-bassusIncipit = <<
-  \new MensuralVoice = "bassusIncipit" <<
-    \repeat unfold 9 { s1 \noBreak }
-    {
-      \clef "bass"
-      \key f \major
-      \time 2/2
-      %% incipit
-      r\maxima
-      f1.
-    }
-  >>
-  \new Lyrics \lyricsto bassusIncipit { IV- }
->>
+bassusIncipit = {
+  \clef "mensural-f"
+  \key f \major
+  \time 2/2
+  r\maxima
+  f1.
+}
 
 bassusNotes = {
   \transpose c' c' {
@@ -205,15 +141,15 @@ bassusNotes = {
     R1 |
     R1 |
     g2. e4 |
-    \once \override NoteHead #'transparent = ##t
+    \once \hide NoteHead
     e1 |
     g\breve |
   }
 }
 
 bassusLyrics = \lyricmode {
-  Ju -- bi- |
-  "..." |
+  Ju -- bi-
+  "..."
   -us.
 }
 
@@ -221,40 +157,40 @@ bassusLyrics = \lyricmode {
   <<
     \new StaffGroup = choirStaff <<
       \new Voice = "discantusNotes" <<
-        \global
         \set Staff.instrumentName = #"Discantus"
         \incipit \discantusIncipit
+        \global
         \discantusNotes
       >>
-      \new Lyrics = "discantusLyrics" \lyricsto discantusNotes { \discantusLyrics }
+      \new Lyrics \lyricsto discantusNotes { \discantusLyrics }
       \new Voice = "altusNotes" <<
-        \global
         \set Staff.instrumentName = #"Altus"
+        \global
         \incipit \altusIncipit
         \altusNotes
       >>
-      \new Lyrics = "altusLyrics" \lyricsto altusNotes { \altusLyrics }
+      \new Lyrics \lyricsto altusNotes { \altusLyrics }
       \new Voice = "tenorNotes" <<
-        \global
         \set Staff.instrumentName = #"Tenor"
+        \global
         \incipit \tenorIncipit
         \tenorNotes
       >>
-      \new Lyrics = "tenorLyrics" \lyricsto tenorNotes { \tenorLyrics }
+      \new Lyrics \lyricsto tenorNotes { \tenorLyrics }
       \new Voice = "bassusNotes" <<
-        \global
         \set Staff.instrumentName = #"Bassus"
+        \global
         \incipit \bassusIncipit
         \bassusNotes
       >>
-      \new Lyrics = "bassusLyrics" \lyricsto bassusNotes { \bassusLyrics }
+      \new Lyrics \lyricsto bassusNotes { \bassusLyrics }
     >>
   >>
   \layout {
     \context {
       \Score
       %% no bar lines in staves or lyrics
-      \override BarLine #'transparent = ##t
+      \hide BarLine
     }
     %% the next two instructions keep the lyrics between the bar lines
     \context {
@@ -265,7 +201,7 @@ bassusLyrics = \lyricmode {
     \context {
       \Voice
       %% no slurs
-      \override Slur #'transparent = ##t
+      \hide Slur
       %% Comment in the below "\remove" command to allow line
       %% breaking also at those bar lines where a note overlaps
       %% into the next measure.  The command is commented out in this