From 7a0f6ed20a117b8e74183f515d229804ea415400 Mon Sep 17 00:00:00 2001
From: Han-Wen Nienhuys <hanwen@xs4all.nl>
Date: Sat, 19 Jul 2003 09:53:22 +0000
Subject: [PATCH] *** empty log message ***

---
 input/test/add-staccato.ly         | 24 +++++++++---------------
 input/test/hymn.ly                 | 17 +++++++----------
 input/test/improv.ly               | 24 +++++++++++++-----------
 input/test/part-combine-moments.ly |  3 ---
 input/test/rests.ly                | 22 +++++++---------------
 input/test/script-abbreviations.ly | 10 ++++++++--
 input/test/script-chart.ly         |  9 +++++++--
 input/test/vaticana.ly             |  6 +-----
 8 files changed, 52 insertions(+), 63 deletions(-)

diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 996196b511..9b65422ea3 100644
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
-\version "1.7.18"  %% or actually: 1.7.1 ...
-% FIXME: doesn't work with 1.7.19.  Check with more recent version.
+\version "1.7.18
+
 \header {
 
 texidoc= "@cindex Add Stacato
@@ -15,16 +15,11 @@ one would not use scm constructs.  See separate-staccato.ly first.
      m))
     
 #(define (add-script m x)
-   (if (equal? (ly:get-mus-property m 'name) 'RequestChord)
-       (ly:set-mus-property! m 'elements
-			    (cons (make-script x)
-				  (ly:get-mus-property m 'elements)))
-
-       (let ((es (ly:get-mus-property m 'elements))
-	     (e (ly:get-mus-property m 'element)) )
-	 (map (lambda (y) (add-script y x)) es)
-	 (if (ly:music? e)
-	     (add-script e x))))
+   (if
+    (equal? (ly:get-mus-property m 'name) 'EventChord)
+    (ly:set-mus-property! m 'elements
+			  (cons (make-script x)
+				(ly:get-mus-property m 'elements))))
    m)
 
 #(define (add-staccato m)
@@ -32,10 +27,9 @@ one would not use scm constructs.  See separate-staccato.ly first.
 
 \score {
   \notes\relative c'' {
-    a b \apply #add-staccato { c c } 
-    a b \apply #add-staccato { c c } 
+    a b \apply #(lambda (x) (music-map add-staccato x)) { c c } 
   }
-	\paper{ raggedright = ##t }
+  \paper{ raggedright = ##t }
 }
 
 
diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index e916091699..f60d1ddcec 100644
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,15 +1,12 @@
 \version "1.7.18"
-%  We have other examples of partcombine.  Candidate for delete.  -gp
-%  leave it for now; I need to check some things.
-% FIXMEsoon -gp
-%{
-Jan:
-> Why remove this?  Do we have another hymn with part-combiner?  Maybe
-> move to template?
-%}
 
-\header { texidoc = "@cindex Hymn
-You can combine two parts on the same staff. " }
+\header { texidoc = "
+
+You can combine two parts on the same staff using the part
+combiner. For vocal scores (hymns), there is no need to add solo/a2
+texts, so they should be switched off.
+
+" }
 
 \score{
 	\context Staff <
diff --git a/input/test/improv.ly b/input/test/improv.ly
index efa4a7cd5d..fc8faf52cb 100644
--- a/input/test/improv.ly
+++ b/input/test/improv.ly
@@ -1,9 +1,16 @@
 \version "1.7.18"
-\header { texidoc = "@cindex Improv
-Noteheads for improvisation have a different shape. " }
+\header {
 
-%{ TODO: the construct with separet SquashVoice context is a little
- gory. FIXME.  %}
+texidoc =
+
+
+"@cindex improvisation
+
+
+Noteheads for improvisation have a different shape.
+
+
+" }
 
 
 improOn = \notes {\translator Voice = impro }
@@ -29,20 +36,15 @@ global = \notes { s1*3 \bar "|." }
       \name SquashVoice
       \alias Voice
       \consists Pitch_squash_engraver
-      \consists "Accidental_engraver"
       squashedPosition = #0
       NoteHead \override #'style = #'slash
-      Accidental \override #'transparent = ##t
     }
+
     \translator {
       \VoiceContext
       \alias SquashVoice
-      \consists "Accidental_engraver"
-    }
-    \translator {
-      \ScoreContext
-      \accepts SquashVoice
     }
+    
     \translator {
       \StaffContext
       \remove "Accidental_engraver"
diff --git a/input/test/part-combine-moments.ly b/input/test/part-combine-moments.ly
index 1574efbb24..af96f80f54 100644
--- a/input/test/part-combine-moments.ly
+++ b/input/test/part-combine-moments.ly
@@ -91,11 +91,8 @@ only have one stem. "
 			\accepts "StaffCombineStaff"
 			skipBars = ##t 
 
-			%%FIXME barScriptPadding = #2.0 % dimension \pt
 			RehearsalMark \override #'padding = #4
 			BarNumber \override #'padding = #3
-			%% URG: this changes dynamics too
-			%%textStyle = #"italic"
 			TimeSignature \override #'style = #'C
 			RestCollision \set #'maximum-rest-count = #1
 		}
diff --git a/input/test/rests.ly b/input/test/rests.ly
index c4805f0811..4dcab82ce2 100644
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,7 +1,10 @@
 \version "1.7.18"
 \header {
     texidoc = "@cindex Rests
-Rests in various styles."
+
+Rests in various styles.
+
+"
 }
 
 % FIXME: Currently, this file produces "warning: flag `d-3' not found"
@@ -10,6 +13,7 @@ Rests in various styles."
 
 \score { 
     \context Staff \notes\relative c {
+	\property Score.timing = ##f
 	\property Staff.Rest \set #'style = #'mensural
 	r\maxima^"Rest style = \#'mensural"
 	r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
@@ -18,29 +22,17 @@ Rests in various styles."
 	\property Staff.Rest \set #'style = #'neo_mensural
 	r\maxima^"Rest style = \#'neo\\_mensural"
 	r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-	\break
+	\bar empty 	\break
 
 	\property Staff.Rest \set #'style = #'classical
 	r\maxima^"Rest style = \#'classical"
 	r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
-	\break
+\break
 
 	\property Staff.Rest \set #'style = #'default
 	r\maxima^"Rest style = \#'default"
 	r\longa r\breve r1 r2 r4 r8 r16 r32 r64 r128 r128 
 	\break
     }
-    \paper {
-	\translator {
-	    \StaffContext
-	    %%%% FIXME: The following looks good, but produces
-	    %%%% lots of warnings:
-	    % \remove Bar_engraver
-	}
-	\translator {
-	    \ScoreContext
-	    \remove Bar_number_engraver
-	}
-    }
 }
 
diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index d7ae6461ab..5832d4d967 100644
--- a/input/test/script-abbreviations.ly
+++ b/input/test/script-abbreviations.ly
@@ -1,7 +1,13 @@
+
+% this chart is used in the manual too.
+
 \version "1.7.18"
-% FIXMEsoon: check if test/ is the right place.
 \header { texidoc = "@cindex Script Abbreviations
-Some scripts may be entered using an abbreviation. "
+
+Some scripts may be entered using an abbreviation.
+
+"
+	  
 }
 
 \score {
diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly
index 406817f17f..ef3974f782 100644
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,8 +1,13 @@
 \version "1.7.18"
-% FIXMEsoon: check if test/ is the best place.
+
+% this chart is used in the manual too.
+
 \header {
     texidoc ="@cindex Feta scripts
-A chart showing all feta scripts. "
+
+A chart showing all feta scripts.
+
+"
 }
 
 \score {
diff --git a/input/test/vaticana.ly b/input/test/vaticana.ly
index c6c80d2794..fab7d16020 100644
--- a/input/test/vaticana.ly
+++ b/input/test/vaticana.ly
@@ -43,10 +43,7 @@ verba = \context Lyrics = verba \lyrics {
     indent = 0.0
 	raggedright = ##t
 %
-% FIXME: ragged-right alignment is currently broken
-	% I don't think it is any more.  -gp
-%   width = 12.0 \cm
-%   gourlay_maxmeasures = 30.
+% FIXME: packed alignment is currently broken
 %
 
     \translator {
@@ -67,7 +64,6 @@ verba = \context Lyrics = verba \lyrics {
       \remove Bar_engraver
       \consists Custos_engraver
       StaffSymbol \set #'line-count = #4
-%     StaffSymbol \set #'width = #60.0 % FIXME: how to get same as \linewidth?
       TimeSignature \set #'transparent = ##t
       KeySignature \set #'style = #'vaticana
       Accidental \set #'style = #'vaticana
-- 
2.39.5