Imported Upstream version 2.19.45

[lilypond.git] / input / regression / bookparts.ly

diff --git a/input/regression/bookparts.ly b/input/regression/bookparts.ly
index 52660c9312e8c1e57302c426308344b1e4173528..7ee4cf168398d38d3e1f5823ac670c9bc7d626a6 100644 (file)
--- a/input/regression/bookparts.ly
+++ b/input/regression/bookparts.ly
@@ -10,10 +10,6 @@ Page labels are also collected into the top-level paper."
 
 #(set-default-paper-size "a6")
 
-#(define-markup-command (roman-page-number layout props) ()
-  (let ((page-number (chain-assoc-get 'page:page-number props)))
-    (interpret-markup layout props (format #f "~@r" page-number))))
-
 \book {
   \tocItem \markup "First part"
   \header { title = "Book with several parts" }
@@ -25,8 +21,17 @@ Page labels are also collected into the top-level paper."
       left-margin = 20\mm
       right-margin = 20\mm
       line-width = 65\mm
-      evenHeaderMarkup = \markup \fill-line { \roman-page-number "SECOND PART" \null }
-      oddHeaderMarkup = \markup \fill-line { \null "SECOND PART" \roman-page-number }
+      page-number-type = #'roman-upper
+      evenHeaderMarkup = \markup \fill-line {
+        \fromproperty #'page:page-number-string
+        "SECOND PART"
+        \null
+      }
+      oddHeaderMarkup = \markup \fill-line {
+        \null
+        "SECOND PART"
+        \fromproperty #'page:page-number-string
+      }
     }
     \tocItem \markup "Second part"
     \markup \justify { Second part, with different margins and page header. }