* input/regression/new-markup-scheme.ly: oops. font-family=music

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

diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 5cca51435df6e1adab85571ddba635d9bade74ce..bbfc6447df5848b0f2f464dafc6327a8617cdfd7 100644 (file)
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -1,4 +1,4 @@
-\version "2.3.8"
+\version "2.5.2"
 
 %{
    Markup titles also available for direct PostScript output:
@@ -25,17 +25,19 @@ For century schoolbook font:
 
 %}
 
-\paper{
+\layout{
     #(define page-breaking ly:optimal-page-breaks)
     %% Ughr, this breaks TeX output...
     %% fonts = #(make-century-schoolbook-tree 1.0)
     inputencoding = #"latin1"
 }
 
-latinTest = \markup { \latin-i "Hellö" }
+latinTest = \markup {
+    "Hellö"
+}
     
 sizeTest = \markup {
-       \column <
+       \column {
             { \normalsize "normalsize"
               \hspace #5
               \smaller "smaller"
@@ -53,21 +55,21 @@ sizeTest = \markup {
               \hspace #5
               \bigger \bigger \bigger "bigger"
             }
-       >
+       }
 }
 
+
 spaceTest = \markup { "two space chars" }
 \header {
     texidoc = "Make titles using markup.  Only in direct PostScript output."
 
-    ##tagline = "my tagline for v \version"
-    copyright = "Copyright by /me"
+    tagline = "my tagline for "
     
     %dedication = "För my dør Lily"
     % ugh: encoding char-size
     %dedication = "For my öòóôõø so dear Lily"
     dedication = \markup { "For my "
-                          \latin-i { "öòóôõø" }
+%                         "öòóôõø"
                           " so dear Lily" }
     title = "Title"
     subtitle = "(and (the) subtitle)"
@@ -82,20 +84,17 @@ spaceTest = \markup { "two space chars" }
     piece = "Piece"
 
     %% Override automatic book title
-    %% bookTitle = \markup { \fill-line < \huge\bold \title > > }
+    %% bookTitle = \markup { \fill-line { \huge\bold \title } }
 }
 
-%% suggest harder :-)
-%% noPagebreak = #(make-event-chord (list (make-penalty-music 0 1e9)))
-
 \book {
     
     \score {
        \context Staff  \relative c' {
            c2-\sizeTest c2-\spaceTest
        }
-       \paper {
-           #(paper-set-staff-size (* 11.0 pt)) 
+       \layout {
+           #(layout-set-staff-size (* 11.0 pt)) 
        }
     }
     
@@ -108,7 +107,7 @@ spaceTest = \markup { "two space chars" }
            
            %% FIXME: TODO factor \pagebreak \noPagebreak into regtest
            %% Without this, page breaks are better, after measure: 12
-           \noPagebreak
+           \noPageBreak
            \repeat unfold 30 { a b c d \break }
            c1
        }
@@ -118,7 +117,7 @@ spaceTest = \markup { "two space chars" }
            opus = "opus 1"
            piece = "Second"
        }
-       \paper {
+       \layout {
        }
     }
 }