patch::: 1.5.22.jcn1

[lilypond.git] / input / test / markup.ly

diff --git a/input/test/markup.ly b/input/test/markup.ly
index 07f3ecb1bfb99ab446c97942bb41a783b4f9b2df..621567dbad6e0c9f25033a80cde19cb00d0c8375 100644 (file)
--- a/input/test/markup.ly
+++ b/input/test/markup.ly
@@ -1,5 +1,6 @@
+\version "1.3.146"
+
 
-\version "1.3.117";
 
 %
 % Test new font selection and scm text markup
@@ -8,23 +9,26 @@
 \score{
        \notes\relative c''{
                \stemUp
+% {
                a-"text"
                b-#"texta"
                c-#'(bold "textb")
 
                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" ((kern . -3) ((raise . -2) "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")
+               e-#'(((baselineskip . 0) (kern . 1.5) lines) "Violoncello" "    e" "Contrabasso")
                }
        \paper{
-               linewidth = -1.\mm;
+               linewidth = -1.\mm
                \translator{
                        \ScoreContext
                        TextScript \override #'font-family = #'roman