From 3895d5318aa724112178e35bf646329937b108e3 Mon Sep 17 00:00:00 2001
From: fred <fred>
Date: Wed, 27 Mar 2002 01:01:12 +0000
Subject: [PATCH] lilypond-1.3.149

---
 input/test/coriolan-margin.ly    | 8 ++++----
 input/test/figured-bass.ly       | 4 ++--
 input/test/markup.ly             | 6 +++---
 input/test/metronome.ly          | 8 ++++----
 input/test/part-combine-score.ly | 6 +++---
 input/test/textscript.ly         | 8 ++++----
 input/trip.ly                    | 2 +-
 input/tutorial/os-score.ly       | 4 ++--
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index 6f5b0e20de..e1a2f78c1d 100644
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -32,8 +32,8 @@ oboi = \notes \relative c' {
 
 clarinetti = \notes \relative c' {
 %   \property Staff.instrument = #`("Clarinetti in B" ,text-flat)
-  \property Staff.instrument	= #`(lines "2 Clarinetti" (rows "(B" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cl." (rows "(B" ,raisedflat ")"))
+  \property Staff.instrument	= #`(lines "2 Clarinetti" (columns "(B" ,raisedflat ")"))
+  \property Staff.instr		= #`(lines "Cl." (columns "(B" ,raisedflat ")"))
 
   c1 c
 }
@@ -45,8 +45,8 @@ fagotti = \notes \relative c' {
 }
 
 corni = \notes \relative c' {
-  \property Staff.instrument	= #`(lines "2 Corni" (rows "(E" ,raisedflat ")"))
-  \property Staff.instr		= #`(lines "Cor." (rows "(E" ,raisedflat ")"))
+  \property Staff.instrument	= #`(lines "2 Corni" (columns "(E" ,raisedflat ")"))
+  \property Staff.instr		= #`(lines "Cor." (columns "(E" ,raisedflat ")"))
 
   c1 c
 }
diff --git a/input/test/figured-bass.ly b/input/test/figured-bass.ly
index c087742691..102c7f90b6 100644
--- a/input/test/figured-bass.ly
+++ b/input/test/figured-bass.ly
@@ -6,7 +6,7 @@
 
 
 % Scheme macros for accidentals. Note how they can be combined
-% with other strings, for example in: d^#`(rows ,sharp "4")
+% with other strings, for example in: d^#`(columns ,sharp "4")
 
 #(define sharp '((raise . 0.2) (music (named "accidentals-1"))))
 #(define natural '((raise . 0.2) (music (named "accidentals-0"))))
@@ -21,7 +21,7 @@
       fis4^"7 6" [g8 d] e4^"7 6" [f?8 c] |
       [d^#sharp d b g][c^"7" c^"5" a^"6" f] |
       [bes^"7" bes^"5" g^"6" e] a4^#sharp d^"6" ~ |
-      d^#`(rows ,sharp "4") c^"6" d e^#sharp |
+      d^#`(columns ,sharp "4") c^"6" d e^#sharp |
   }
 }
 
diff --git a/input/test/markup.ly b/input/test/markup.ly
index ab20df7781..621567dbad 100644
--- a/input/test/markup.ly
+++ b/input/test/markup.ly
@@ -16,12 +16,12 @@
 
 		d-#'(lines "one" "two" "three")
 		e-#'(lines (bold "one") 
-		  (rows "and" "there" "is" ((font-family . number) "2"))
+		  (columns "and" "there" "is" ((font-family . number) "2"))
 		  (italic "three"))
 		f-#'(finger "3")
 		g-#'(music (named "noteheads-2" "flags-u3"))
-		b-#'(rows "a" (((kern . 3) (raise . 2)) "b") "c")
-		c-#'(rows "1" (((raise . -2) (kern . -1)) "2") "3")
+		b-#'(columns "a" (((kern . 3) (raise . 2)) "b") "c")
+		c-#'(columns "1" (((raise . -2) (kern . -1)) "2") "3")
 % }
 	        d-#'(lines "Violoncello" "    e" "Contrabasso")
 	        e-#'((lines (baselineskip . 0) (kern . 1.5)) "Violoncello" "    e" "Contrabasso")
diff --git a/input/test/metronome.ly b/input/test/metronome.ly
index d20eb577c6..6439e82f12 100644
--- a/input/test/metronome.ly
+++ b/input/test/metronome.ly
@@ -13,13 +13,13 @@
 %
 % FIXME: put in an item, and typeset by an engraver.
 
-#(define note '(rows (music "noteheads-2" ((kern . -0.1) "flags-stem"))))
-#(define eight-note `(rows ,note ((kern . -0.1) (music ((raise . 3.5) "flags-u3")))))
-#(define dotted-eight-note `(rows ,eight-note (music "dots-dot")))
+#(define note '(columns (music "noteheads-2" ((kern . -0.1) "flags-stem"))))
+#(define eight-note `(columns ,note ((kern . -0.1) (music ((raise . 3.5) "flags-u3")))))
+#(define dotted-eight-note `(columns ,eight-note (music "dots-dot")))
 
 \score {
   \notes\relative c'' {
-    a1^#`((rows (font-relative-size . -1)) ,dotted-eight-note " = 64")
+    a1^#`((columns (font-relative-size . -1)) ,dotted-eight-note " = 64")
   }
   \paper {
     linewidth = -1.
diff --git a/input/test/part-combine-score.ly b/input/test/part-combine-score.ly
index ca51a9ea66..a6d71cc8e4 100644
--- a/input/test/part-combine-score.ly
+++ b/input/test/part-combine-score.ly
@@ -46,10 +46,10 @@ flautiStaff =  \notes \context VoiceCombineStaff = flauti <
 %  \property VoiceCombineStaff.instr = #"Fl."
 
   \property VoiceCombineStaff.instrument = #`((kern . 0.5) (lines
-    "2 Clarinetti" (rows "(B" ,text-flat ")")))
+    "2 Clarinetti" (columns "(B" ,text-flat ")")))
 
   \property VoiceCombineStaff.instr = #`((kern . 0.5) (lines
-    "Cl."  (rows "(B" ,text-flat ")")))
+    "Cl."  (columns "(B" ,text-flat ")")))
 
   %\global
   \context VoiceCombineVoice=one \partcombine VoiceCombineVoice
@@ -149,7 +149,7 @@ bassiGroup =  \context PianoStaff = bassi_group \notes <
 
     % Ugh, markup burps
     \property StaffCombineStaff.instrument = #'((kern . 0.5)
-    (lines "Violoncello" (rows "    e") (rows "Contrabasso")))
+    (lines "Violoncello" (columns "    e") (rows "Contrabasso")))
 
     \property StaffCombineStaff.instr = #"Vc."
     
diff --git a/input/test/textscript.ly b/input/test/textscript.ly
index 24ccd550bc..8937ff889b 100644
--- a/input/test/textscript.ly
+++ b/input/test/textscript.ly
@@ -7,16 +7,16 @@
 
 \score{
   \notes\relative c''{
-    c'1^#'(rows (dynamic "p") " ma sosten.") 
+    c'1^#'(columns (dynamic "p") " ma sosten.") 
     c^#'(bold "ABCD")
-    c^#'(rows "Dal " (music "scripts-segno")) 
+    c^#'(columns "Dal " (music "scripts-segno")) 
     c^#'(Large "ABCD") 
     \break
     \property Voice . TextScript \override #'font-shape = #'upright
-    c1^#'(rows (dynamic "p") " ma sosten.")  
+    c1^#'(columns (dynamic "p") " ma sosten.")  
     c^#'(bold "ABCD")
     \property Voice . TextScript \override #'font-series = #'bold
-    c^#'(rows "Dal " (music "scripts-segno")) 
+    c^#'(columns "Dal " (music "scripts-segno")) 
     c^#'(Large "ABCD")
   }
 }
diff --git a/input/trip.ly b/input/trip.ly
index 946dfb8601..ec69cb2771 100644
--- a/input/trip.ly
+++ b/input/trip.ly
@@ -92,7 +92,7 @@ praeludiumLeft =  \notes \relative c {
 fugaIIRight =  \notes   \relative c''   {
   \key e \major              % E-major
   \clef violin
-  \time3/4
+  \time 3/4
 
   %15
   \context Staff <
diff --git a/input/tutorial/os-score.ly b/input/tutorial/os-score.ly
index db0e3b3938..a5fe3ec333 100644
--- a/input/tutorial/os-score.ly
+++ b/input/tutorial/os-score.ly
@@ -43,8 +43,8 @@
       >
       \context Staff = corni <
         \property Staff.midiInstrument = #"french horn"
-	\property Staff.instrument = #`(lines "Corno" (rows "(E" ,text-flat ")"))
-	\property Staff.instr = #`(lines "Cor."  (rows "(E" ,text-flat ")"))
+	\property Staff.instrument = #`(lines "Corno" (columns "(E" ,text-flat ")"))
+	\property Staff.instr = #`(lines "Cor."  (columns "(E" ,text-flat ")"))
 	\property Staff.transposing = #3
 	\notes \key bes \major
 	\context Voice=one \corno
-- 
2.39.5