The grand \paper -> \layout, \bookpaper -> \paper renaming.

diff --git a/ChangeLog b/ChangeLog
index b31c812f16705add87fe23ecfc91c5215d1c7f2a..965336cb9925ac9a597335481ede2329d1a66504 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,11 @@
+2004-10-09  Jan Nieuwenhuizen  <janneke@gnu.org>
+
+       The grand \paper -> \layout, \bookpaper -> \paper renaming.
+

 2004-10-10  Graham Percival  <gperlist@shaw.ca>
 
 2004-10-10  Graham Percival  <gperlist@shaw.ca>
 

-       * Documentation/user/notation.itely: add raggedright to a whole bunch of places.
+       * Documentation/user/notation.itely: add raggedright to a whole
+       bunch of places.

 
 2004-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 
 
 2004-10-10  Han-Wen Nienhuys  <hanwen@xs4all.nl>
 

diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely
index 398b4a91ee020254fc0a082b08a2b7418185c009..90af827458e25c19ec869c4e0869c638780f064c 100644 (file)
--- a/Documentation/user/changing-defaults.itely
+++ b/Documentation/user/changing-defaults.itely
@@ -555,10 +555,10 @@ or crashes, or both.
 The adjustments of the previous subsections (@ref{Changing context
 properties on the fly}, @ref{Modifying context plug-ins} and
 @ref{Layout tunings within contexts}) can also be entered separate
 The adjustments of the previous subsections (@ref{Changing context
 properties on the fly}, @ref{Modifying context plug-ins} and
 @ref{Layout tunings within contexts}) can also be entered separate

-from the music, in the @code{\paper} block,
+from the music, in the @code{\layout} block,

 
 @example
 
 @example

-\paper @{
+\layout @{

   @dots{}
   \context @{
     \Staff
   @dots{}
   \context @{
     \Staff


@@ -591,7 +591,7 @@ affect all staves in the score.
 
 Other contexts can be modified analogously.
 
 
 Other contexts can be modified analogously.
 

-The @code{\set} keyword is optional within the @code{\paper} block, so
+The @code{\set} keyword is optional within the @code{\layout} block, so

 
 @example
 \context @{
 
 @example
 \context @{


@@ -625,7 +625,7 @@ The next example shows how to build a different type of
 to indicate improvisation in Jazz pieces,
 
 @lilypond[raggedright]
 to indicate improvisation in Jazz pieces,
 
 @lilypond[raggedright]

-  \paper { \context {
+  \layout { \context {

     \name ImproVoice
     \type "Engraver_group_engraver"
     \consists "Note_heads_engraver"
     \name ImproVoice
     \type "Engraver_group_engraver"
     \consists "Note_heads_engraver"


@@ -650,10 +650,10 @@ to indicate improvisation in Jazz pieces,
 
 
 These settings are again done within a @code{\context} block inside a
 
 
 These settings are again done within a @code{\context} block inside a

-@code{\paper} block,
+@code{\layout} block,

 
 @example
 
 @example

-  \paper @{
+  \layout @{

     \context @{
       @dots{}
     @}
     \context @{
       @dots{}
     @}


@@ -744,10 +744,10 @@ which is sometimes when reusing existing context definitions. }
   }
 @end verbatim 
 
   }
 @end verbatim 
 

-Putting both into a @code{\paper} block, like
+Putting both into a @code{\layout} block, like

 
 @example
 
 @example

-  \paper @{
+  \layout @{

     \context @{
       \name ImproVoice
       @dots{}
     \context @{
       \name ImproVoice
       @dots{}


@@ -1530,12 +1530,12 @@ encoding is passed as an extra argument to @code{\markup} commands,
 and is passed similarly to lyric syllables.
 
 If no @code{\encoding} has been specified, then the encoding is taken
 and is passed similarly to lyric syllables.
 
 If no @code{\encoding} has been specified, then the encoding is taken

-from the @code{\paper} block (or @code{\bookpaper}, if @code{\paper}
+from the @code{\layout} block (or @code{\paper}, if @code{\layout}

 does not specify encoding). The variable @code{inputencoding} may be
 set to a string or symbol specifying  the encoding, e.g.
 
 @verbatim
 does not specify encoding). The variable @code{inputencoding} may be
 set to a string or symbol specifying  the encoding, e.g.
 
 @verbatim

-  \paper {
+  \layout {

     inputencoding = "latin1"
   } 
 @end verbatim
     inputencoding = "latin1"
   } 
 @end verbatim


@@ -1556,7 +1556,7 @@ Rather, you should say
 @end verbatim
 
 @noindent
 @end verbatim
 
 @noindent

-or set @code{inputencoding} in the @code{\bookpaper} block. 
+or set @code{inputencoding} in the @code{\paper} block. 

 
 There is a special encoding, called @code{TeX}. This encoding does not
 reencode text for the font used. Rather, it tries to guess the width
 
 There is a special encoding, called @code{TeX}. This encoding does not
 reencode text for the font used. Rather, it tries to guess the width


@@ -1573,7 +1573,7 @@ are passed to the output back-end verbatim.
 @subsection Nested scores
 
 It is possible to nest music inside markups, by adding a @code{\score}
 @subsection Nested scores
 
 It is possible to nest music inside markups, by adding a @code{\score}

-block to markup expression. Such a score must contain a @code{\paper}
+block to markup expression. Such a score must contain a @code{\layout}

 block.
 
 @lilypond[verbatim,raggedright]
 block.
 
 @lilypond[verbatim,raggedright]


@@ -1581,7 +1581,7 @@ block.
   c4  d^\markup {
     \score {
       \relative { c4 d e f }
   c4  d^\markup {
     \score {
       \relative { c4 d e f }

-      \paper { }
+      \layout { }

     }
   }
   e f
     }
   }
   e f


@@ -1629,7 +1629,7 @@ titles.
 * Multiple movements::          
 * Creating titles::             
 * Page breaking::               
 * Multiple movements::          
 * Creating titles::             
 * Page breaking::               

-* Paper size::                  
+* paper size::                  

 * Page layout::                 
 @end menu
 
 * Page layout::                 
 @end menu
 


@@ -1639,7 +1639,7 @@ titles.
 
 @cindex font size, setting
 @cindex staff size, setting
 
 @cindex font size, setting
 @cindex staff size, setting

-@cindex @code{paper} file
+@cindex @code{layout} file

 
 The Feta font provides musical symbols at eight  different
 sizes. Each font is tuned for a different staff size: at a smaller size
 
 The Feta font provides musical symbols at eight  different
 sizes. Each font is tuned for a different staff size: at a smaller size


@@ -1919,11 +1919,11 @@ No work-around exists for decreasing the amount of space.
 @cindex @code{linewidth}
 
 The most basic settings influencing the spacing are @code{indent} and
 @cindex @code{linewidth}
 
 The most basic settings influencing the spacing are @code{indent} and

-@code{linewidth}. They are set in the @code{\paper} block. They
+@code{linewidth}. They are set in the @code{\layout} block. They

 control the indentation of the first line of music, and the lengths of
 the lines.
 
 control the indentation of the first line of music, and the lengths of
 the lines.
 

-If  @code{raggedright} is set to true in the @code{\paper}
+If  @code{raggedright} is set to true in the @code{\layout}

 block, then the lines are justified at their natural length. This
 useful for short fragments, and for checking how tight the natural
 spacing is.
 block, then the lines are justified at their natural length. This
 useful for short fragments, and for checking how tight the natural
 spacing is.


@@ -2106,7 +2106,7 @@ This is a demonstration of the fields available,
     }
     { c'1 }
   }
     }
     { c'1 }
   }

-  \bookpaper {
+  \paper {

     linewidth = 8.0 \cm
   }
 }
     linewidth = 8.0 \cm
   }
 }


@@ -2123,14 +2123,14 @@ Different fonts may be selected for each element, by using a
 
 A more advanced option is to change the Scheme functions
 @code{make-book-title} and @code{make-score-title} functions, defined
 
 A more advanced option is to change the Scheme functions
 @code{make-book-title} and @code{make-score-title} functions, defined

-in the @code{\bookpaper} of the @code{\book} block. These functions
+in the @code{\paper} of the @code{\book} block. These functions

 create a block of titling, given the information in the
 @code{\header}. The init file @file{ly/titling.scm} shows how the
 default format is created, and it may be used as a template for
 different styles.
 
  
 create a block of titling, given the information in the
 @code{\header}. The init file @file{ly/titling.scm} shows how the
 default format is created, and it may be used as a template for
 different styles.
 
  

-@cindex \bookpaper
+@cindex \paper

 @cindex header
 @cindex footer
 @cindex page layout
 @cindex header
 @cindex footer
 @cindex page layout


@@ -2150,7 +2150,7 @@ from happening.  Of course, the @code{\pageBreak} command also forces
 a line break.
 
 Page breaks are computed by the @code{page-breaking} function in the
 a line break.
 
 Page breaks are computed by the @code{page-breaking} function in the

-@code{\bookpaper} block. 
+@code{\paper} block. 

 
 @refcommands
 
 
 @refcommands
 


@@ -2159,8 +2159,8 @@ Page breaks are computed by the @code{page-breaking} function in the
 @cindex  @code{\noPageBreak} 
 @code{\noPageBreak} 
 
 @cindex  @code{\noPageBreak} 
 @code{\noPageBreak} 
 

-@node Paper size
-@subsection Paper size
+@node paper size
+@subsection paper size

 
 @cindex paper size
 @cindex page size
 
 @cindex paper size
 @cindex page size


@@ -2169,11 +2169,11 @@ Page breaks are computed by the @code{page-breaking} function in the
 To change the paper size, there are two commands,
 @example
         #(set-default-paper-size "a4")
 To change the paper size, there are two commands,
 @example
         #(set-default-paper-size "a4")

-        \paper@{
+        \layout@{

            #(set-paper-size "a4")
         @}
 @end example
            #(set-paper-size "a4")
         @}
 @end example

-The second one sets the size of the @code{\paper} block that it is in.
+The second one sets the size of the @code{\layout} block that it is in.

 
 The following paper sizes are supported.
 
 
 The following paper sizes are supported.
 


@@ -2210,9 +2210,9 @@ LilyPond will do page layout, setting margins and adding headers and
 footers to each page.
 
 The default layout responds to the following settings in the
 footers to each page.
 
 The default layout responds to the following settings in the

-@code{\bookpaper} block
+@code{\paper} block

 
 

-@cindex \bookpaper
+@cindex \paper

 
 @table @code
 @item firstpagenumber
 
 @table @code
 @item firstpagenumber


@@ -2231,7 +2231,7 @@ The default layout responds to the following settings in the
 @item leftmargin
  Margin between the left side of the page and the beginning  of the music.
 @item linewidth
 @item leftmargin
  Margin between the left side of the page and the beginning  of the music.
 @item linewidth

- The length of the paper line.
+ The length of the systems.

 @item headsep
  Distance between top-most music system and the page header
 @item footsep
 @item headsep
  Distance between top-most music system and the page header
 @item footsep


@@ -2276,7 +2276,7 @@ book and the title of piece).
 @end table
 
 @example
 @end table
 
 @example

-        \bookpaper@{
+        \paper@{

            hsize = 2\cm
            topmargin = 3\cm
            bottommargin = 3\cm
            hsize = 2\cm
            topmargin = 3\cm
            bottommargin = 3\cm


@@ -2286,11 +2286,11 @@ book and the title of piece).
 
 You can also define these values in scheme. In that case @code{mm},
 @code{in}, @code{pt} and @code{cm} are variables defined in
 
 You can also define these values in scheme. In that case @code{mm},
 @code{in}, @code{pt} and @code{cm} are variables defined in

-@file{book-paper-defaults.ly} with values in millimeters. That's why the
+@file{paper-defaults.ly} with values in millimeters. That's why the

 value has to be multiplied in the example above.
 
 @example
 value has to be multiplied in the example above.
 
 @example

-        \bookpaper@{
+        \paper@{

         #(define bottommargin (* 2 cm)) 
         @}
 @end example
         #(define bottommargin (* 2 cm)) 
         @}
 @end example


@@ -2306,7 +2306,7 @@ printed parts are good PR for us, so please leave the tagline if you
 can.}
 
 The header and footer are created by the functions @code{make-footer}
 can.}
 
 The header and footer are created by the functions @code{make-footer}

-and @code{make-header}, defined in @code{\bookpaper}. The default
+and @code{make-header}, defined in @code{\paper}. The default

 implementations are in @file{scm/page-layout.scm}.
 
 The following settings influence the header and footer layout.
 implementations are in @file{scm/page-layout.scm}.
 
 The following settings influence the header and footer layout.


@@ -2317,7 +2317,7 @@ The following settings influence the header and footer layout.
 @end table
 
 The page layout itself is done by two functions in the
 @end table
 
 The page layout itself is done by two functions in the

-@code{\bookpaper}, @code{page-music-height} and
+@code{\paper}, @code{page-music-height} and

 @code{page-make-stencil}. The former tells the line-breaking algorithm
 how much space can be spent on a page, the latter creates the actual
 page given the system to put on it.
 @code{page-make-stencil}. The former tells the line-breaking algorithm
 how much space can be spent on a page, the latter creates the actual
 page given the system to put on it.


@@ -2359,8 +2359,8 @@ A @code{.ly} file contains any number of toplevel expressions, where a
 toplevel expressions is one of the following
 
 @itemize @bullet
 toplevel expressions is one of the following
 
 @itemize @bullet

-@item An output definition, such as @code{\bookpaper}, @code{\midi}
-and @code{\paper}. Such a definition at toplevel changes the default
+@item An output definition, such as @code{\paper}, @code{\midi}
+and @code{\layout}. Such a definition at toplevel changes the default

 settings for the block entered.
 
 @item An @code{\header} block. This sets the global header block. This
 settings for the block entered.
 
 @item An @code{\header} block. This sets the global header block. This


@@ -2406,7 +2406,7 @@ defined in the init file @file{scm/lily.scm}.
 The following example shows three things which may be entered at
 toplevel
 @verbatim
 The following example shows three things which may be entered at
 toplevel
 @verbatim

-   \paper  {
+   \layout  {

      % movements are non-justified by default    
      raggedright = ##t
    }
      % movements are non-justified by default    
      raggedright = ##t
    }

diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely
index 2a8be09fcff3caff9c944b8ed3f8a2ed8c1c9e4f..aec99a45dfeb7219817685af47dbbc56e957bb39 100644 (file)
--- a/Documentation/user/examples.itely
+++ b/Documentation/user/examples.itely
@@ -87,7 +87,7 @@ melody = \relative c' {
 
 \score{
    \new Staff \melody
 
 \score{
    \new Staff \melody

-   \paper { }
+   \layout { }

    \midi { \tempo 4=60 }
 }
 
    \midi { \tempo 4=60 }
 }
 


@@ -124,7 +124,7 @@ text = \lyricmode {
       }
       \lyricsto "one" \new Lyrics \text
    >>
       }
       \lyricsto "one" \new Lyrics \text
    >>

-   \paper { }
+   \layout { }

    \midi { \tempo 4=60 }
 }
 
    \midi { \tempo 4=60 }
 }
 


@@ -159,7 +159,7 @@ harmonies = \chordmode {
    \context Staff = one \melody
    >>
 
    \context Staff = one \melody
    >>
 

-   \paper{ }
+   \layout{ }

    \midi  { \tempo 4=60}
 }
 
    \midi  { \tempo 4=60}
 }
 


@@ -200,7 +200,7 @@ harmonies = \chordmode {
    }
    \lyricsto "one" \new Lyrics \text
    >>
    }
    \lyricsto "one" \new Lyrics \text
    >>

-   \paper { }
+   \layout { }

    \midi  { \tempo 4=60}
 }
 
    \midi  { \tempo 4=60}
 }
 


@@ -237,7 +237,7 @@ lower = \relative c {
       \context Staff = upper \upper
       \context Staff = lower \lower
    >>  
       \context Staff = upper \upper
       \context Staff = lower \lower
    >>  

-   \paper { }  
+   \layout { }  

    \midi { \tempo 4=60 }  
 }
 
    \midi { \tempo 4=60 }  
 }
 


@@ -292,7 +292,7 @@ lower = \relative c {
          \context Staff = lower \lower
       >>
    >>
          \context Staff = lower \lower
       >>
    >>

-   \paper {
+   \layout {

       \context { \RemoveEmptyStaffContext }
    }  
    \midi { \tempo 4=60}
       \context { \RemoveEmptyStaffContext }
    }  
    \midi { \tempo 4=60}


@@ -346,7 +346,7 @@ pedal =  {
     >>
     \context Dynamics=pedal \pedal
   >>
     >>
     \context Dynamics=pedal \pedal
   >>

-  \paper {
+  \layout {

     \context {
       \type "Engraver_group_engraver"
       \name Dynamics
     \context {
       \type "Engraver_group_engraver"
       \name Dynamics


@@ -437,7 +437,7 @@ cello = \relative c'{
       \new Staff << \global \viola >>
       \new Staff << \global \cello >>
    >>
       \new Staff << \global \viola >>
       \new Staff << \global \cello >>
    >>

-   \paper { }
+   \layout { }

    \midi { \tempo 4=60}
 }
 
    \midi { \tempo 4=60}
 }
 


@@ -511,7 +511,7 @@ bassWords = \lyricmode {
       \context Lyrics = basses \lyricsto basses \bassWords
    >>
 
       \context Lyrics = basses \lyricsto basses \bassWords
    >>
 

-   \paper {
+   \layout {

       \context {
          % a little smaller so lyrics can be closer to the staff. 
          \Staff minimumVerticalExtent = #'(-3 . 3) 
       \context {
          % a little smaller so lyrics can be closer to the staff. 
          \Staff minimumVerticalExtent = #'(-3 . 3) 


@@ -735,7 +735,7 @@ bassusLyrics = \lyricmode {
        \context Voice = bassusNotes << \global \bassusNotes >>
        \context Lyrics = bassusLyrics \lyricsto bassusNotes { \bassusLyrics }
     >>
        \context Voice = bassusNotes << \global \bassusNotes >>
        \context Lyrics = bassusLyrics \lyricsto bassusNotes { \bassusLyrics }
     >>

-    \paper {
+    \layout {

        \context {
            \Score
            \override BarLine #'transparent = ##t
        \context {
            \Score
            \override BarLine #'transparent = ##t


@@ -1010,7 +1010,7 @@ drumContents = {
                 \new DrumStaff { \drumContents }
         >>
 >>
                 \new DrumStaff { \drumContents }
         >>
 >>

-        \paper {
+        \layout {

                 \context { \RemoveEmptyStaffContext }
                 \context {
                         \Score
                 \context { \RemoveEmptyStaffContext }
                 \context {
                         \Score


@@ -1108,7 +1108,7 @@ chant = \relative c' {
 }
 \score {
    \chant
 }
 \score {
    \chant

-   \paper{ }
+   \layout{ }

    \midi { \tempo 4=60 }
 }
 
    \midi { \tempo 4=60 }
 }
 

diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely
index ccce7fd2db65d3d3453860564cbcc3d2063d805e..60c97d609649569d14bb410d2293b80193fa9633 100644 (file)
--- a/Documentation/user/introduction.itely
+++ b/Documentation/user/introduction.itely
@@ -345,7 +345,7 @@ note heads, the @code{Note_heads_engraver}.
 
 \score {
    \topVoice
 
 \score {
    \topVoice

-   \paper {
+   \layout {

    \context {
       \Voice
       \remove "Stem_engraver"
    \context {
       \Voice
       \remove "Stem_engraver"


@@ -377,7 +377,7 @@ Then a @code{Staff_symbol_engraver} adds the staff
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

     \context {
       \Voice
       \remove "Stem_engraver"
     \context {
       \Voice
       \remove "Stem_engraver"


@@ -408,7 +408,7 @@ the @code{Clef_engraver} defines a reference point for the staff
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

     \context {
       \Voice
       \remove "Stem_engraver"
     \context {
       \Voice
       \remove "Stem_engraver"


@@ -437,7 +437,7 @@ and the @code{Stem_engraver} adds stems.
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

     \context {
       \Voice
       \remove "Phrasing_slur_engraver"
     \context {
       \Voice
       \remove "Phrasing_slur_engraver"

diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi
index 7fdf1ef1421cb50d9e7cd334b77978c4d02a7af4..9cb51848b7fdb838d28e78e71bfc7b3a8b9efaf9 100644 (file)
--- a/Documentation/user/invoking.itexi
+++ b/Documentation/user/invoking.itexi
@@ -432,7 +432,7 @@ Show the warranty with which GNU LilyPond comes. (It comes with
 @subsection Additional parameters
 
 The @code{lilypond} program responds to several parameters specified
 @subsection Additional parameters
 
 The @code{lilypond} program responds to several parameters specified

-in a @code{\paper} section of the input file.  They can be overridden
+in a @code{\layout} section of the input file.  They can be overridden

 by supplying a @code{--set} command line option.
 
 @table @code
 by supplying a @code{--set} command line option.
 
 @table @code


@@ -461,19 +461,19 @@ achieve this specify @code{twoside}.
 
 @item orientation
     Set orientation.  Choices are @code{portrait} or @code{landscape}.  Is
 
 @item orientation
     Set orientation.  Choices are @code{portrait} or @code{landscape}.  Is

-read from the @code{\paper} block, if set.
+read from the @code{\layout} block, if set.

         
 @item textheight
     The vertical extension of the music on the page.  It is normally 
     calculated automatically, based on the paper size.
 
 @item linewidth
         
 @item textheight
     The vertical extension of the music on the page.  It is normally 
     calculated automatically, based on the paper size.
 
 @item linewidth

-        The music line width.  It is normally read from the @code{\paper}
+        The music line width.  It is normally read from the @code{\layout}

 block.
 
 @item papersize
    The paper size (as a name, e.g. @code{a4}).  It is normally read from
 block.
 
 @item papersize
    The paper size (as a name, e.g. @code{a4}).  It is normally read from

-the @code{\paper} block.
+the @code{\layout} block.

   
 @item fontenc
      The font encoding, should be set identical to the @code{font-encoding}
   
 @item fontenc
      The font encoding, should be set identical to the @code{font-encoding}

diff --git a/Documentation/user/latex-example.latex b/Documentation/user/latex-example.latex
index 6132a3a67d7b3557db5082acfb02054b296f0be3..4a8e1fcb937765436c64edc1252f257cb573da3e 100644 (file)
--- a/Documentation/user/latex-example.latex
+++ b/Documentation/user/latex-example.latex
@@ -34,7 +34,7 @@ c d e
   enteredby =   "JCN"
   instrument = "instrument"
 }
   enteredby =   "JCN"
   instrument = "instrument"
 }

-\paper { linewidth = -1. }
+\layout { linewidth = -1. }

 \relative c'' { a b c d }
 \end{lilypond}
 
 \relative c'' { a b c d }
 \end{lilypond}
 

diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely
index 5c549ddc5137ddbce02dda30fb89ec3c045cadd3..83946e378bad9d323c0b1439de5927860ede0e73 100644 (file)
--- a/Documentation/user/lilypond-book.itely
+++ b/Documentation/user/lilypond-book.itely
@@ -158,7 +158,7 @@ Larger examples can be put in a separate file, and introduced with
 @node Integrating LaTeX and music
 @section Integrating LaTeX and music
 
 @node Integrating LaTeX and music
 @section Integrating LaTeX and music
 

-La@TeX{} is the de facto standard for publishing papers in the exact
+La@TeX{} is the de facto standard for publishing layouts in the exact

 sciences. It is built on top of the @TeX{} typesetting engine, so it
 provides the best typography available anywhere.
  
 sciences. It is built on top of the @TeX{} typesetting engine, so it
 provides the best typography available anywhere.
  


@@ -408,7 +408,7 @@ adds some boilerplate code, so you can enter like
 @end example 
 
 @noindent
 @end example 
 
 @noindent

-without @code{\paper}, @code{\score} or other red tape.
+without @code{\layout}, @code{\score} or other red tape.

 
 @item indent=@var{size}\@var{unit}
 sets indentation of the first music system to @var{size},
 
 @item indent=@var{size}\@var{unit}
 sets indentation of the first music system to @var{size},

diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely
index 38115ffd5d530bf39405858fabcfe9df63ccdb4d..04f8dfe5a0763391230c2c1b014a9390af35f413 100644 (file)
--- a/Documentation/user/lilypond.tely
+++ b/Documentation/user/lilypond.tely
@@ -115,7 +115,7 @@ Copyright @copyright{} 1999--2004 by the authors
              "(For LilyPond version " (lilypond-version) ")"))
         s2
      }
              "(For LilyPond version " (lilypond-version) ")"))
         s2
      }

-     \paper {
+     \layout {

          indent = 0.0\pt
          raggedright = ##t
      }
          indent = 0.0\pt
          raggedright = ##t
      }

diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely
index e6e75a4c8e6a16661b2a938af217bbc605e5b6b8..e61c413384d244da13442dc6ff0f4fdaa56aa181 100644 (file)
--- a/Documentation/user/music-glossary.tely
+++ b/Documentation/user/music-glossary.tely
@@ -1082,7 +1082,7 @@ of the 20th century
        c'1
        \break < d' a' f''>1
     }
        c'1
        \break < d' a' f''>1
     }

-    \paper {
+    \layout {

        \context {
            \Staff
            \consists Custos_engraver
        \context {
            \Staff
            \consists Custos_engraver

diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely
index c000743bbd6826613bff0d78b6f365340192e288..7536fffb92843dec531d87e33223f5c92dc7d809 100644 (file)
--- a/Documentation/user/notation.itely
+++ b/Documentation/user/notation.itely
@@ -328,7 +328,7 @@ r1 r2 r4 r8 r16 r32 r64 r64
     r\longa*1/4 r\breve  *1/2
     r1 r2 r4 r8 r16 r32 r64 r64 
   }
     r\longa*1/4 r\breve  *1/2
     r1 r2 r4 r8 r16 r32 r64 r64 
   }

-  \paper {
+  \layout {

     raggedright = ##t
     \context {
       \Staff
     raggedright = ##t
     \context {
       \Staff


@@ -1134,7 +1134,7 @@ measure is subdivided in 2, 2, 2 and 3.  This is passed to
     #(set-time-signature 5 8 '(3 2))
     a4. g4
   }
     #(set-time-signature 5 8 '(3 2))
     a4. g4
   }

-  \paper {
+  \layout {

     \context {
       \Staff
       \consists "Measure_grouping_engraver"
     \context {
       \Staff
       \consists "Measure_grouping_engraver"


@@ -2113,7 +2113,7 @@ Metronome settings can be entered as follows
 @end example
 
 In the MIDI output, they are interpreted as a tempo change.  In the
 @end example
 
 In the MIDI output, they are interpreted as a tempo change.  In the

-paper output, a metronome marking is printed
+layout output, a metronome marking is printed

 @cindex @code{\tempo}
 @lilypond[quote,raggedright,verbatim,fragment]
   \tempo 8.=120 c''1
 @cindex @code{\tempo}
 @lilypond[quote,raggedright,verbatim,fragment]
   \tempo 8.=120 c''1


@@ -2215,7 +2215,7 @@ to @internalsref{Staff} context.  A bracket is started with
     c4\startGroup
     c4\stopGroup\stopGroup
   }
     c4\startGroup
     c4\stopGroup\stopGroup
   }

-  \paper {
+  \layout {

     \context {
       \Staff \consists "Horizontal_bracket_engraver"
 }}}
     \context {
       \Staff \consists "Horizontal_bracket_engraver"
 }}}


@@ -2900,7 +2900,7 @@ percent repeats).  For example,
 @example
   \score @{
       @var{..music..}
 @example
   \score @{
       @var{..music..}

-      \paper @{ .. @}
+      \layout @{ .. @}

   @} 
   \score @{
       \unfoldrepeats @var{..music..}
   @} 
   \score @{
       \unfoldrepeats @var{..music..}


@@ -3163,7 +3163,7 @@ mus = \drummode  { cymc cyms cymr hh | hhc hho hhho hhp | \break cb hc
     } \mus
         \context Lyrics \nam 
     >>
     } \mus
         \context Lyrics \nam 
     >>

-    \paper {
+    \layout {

     %% need to do this, because of indented @itemize
     linewidth= 9 \cm 
     \context { \Score
     %% need to do this, because of indented @itemize
     linewidth= 9 \cm 
     \context { \Score


@@ -4195,7 +4195,7 @@ minimum and maximum pitch.  To print such ambits, add the
 for example,
 
 @example
 for example,
 
 @example

-  \paper @{
+  \layout @{

     \context @{
       \Voice
       \consists Ambitus_engraver
     \context @{
       \Voice
       \consists Ambitus_engraver


@@ -4206,7 +4206,7 @@ for example,
 This results in the following output
 
 @lilypond[quote,raggedright]
 This results in the following output
 
 @lilypond[quote,raggedright]

-\paper {
+\layout {

   \context {
     \Staff
     \consists Ambitus_engraver
   \context {
     \Staff
     \consists Ambitus_engraver


@@ -5039,7 +5039,7 @@ names, for example
 @end lilypond
 
 For longer instrument names, it may be useful to increase the
 @end lilypond
 
 For longer instrument names, it may be useful to increase the

-@code{indent} setting in the @code{\paper} block.
+@code{indent} setting in the @code{\layout} block.

 
 @seealso
 
 
 @seealso
 


@@ -5382,7 +5382,7 @@ in this example disappears in the second line
 
 
 @lilypond[quote,raggedright,verbatim]
 
 
 @lilypond[quote,raggedright,verbatim]

-\paper {
+\layout {

   \context { \RemoveEmptyStaffContext }
 }
 
   \context { \RemoveEmptyStaffContext }
 }
 


@@ -5796,7 +5796,7 @@ select ancient accidentals.   Supported styles are
     >
   }
 }
     >
   }
 }

-\paper {
+\layout {

   interscoreline = 1
   \context { \Score \remove "Bar_number_engraver" }
   \context { \Staff
   interscoreline = 1
   \context { \Score \remove "Bar_number_engraver" }
   \context { \Staff


@@ -6084,7 +6084,7 @@ command, @code{n} and @code{m} have to be chosen according to the
 following table
 
 @lilypond[quote,raggedright]
 following table
 
 @lilypond[quote,raggedright]

-\paper {
+\layout {

   indent = 0.0
   \context { \Staff
     \remove Staff_symbol_engraver
   indent = 0.0
   \context { \Staff
     \remove Staff_symbol_engraver


@@ -6230,11 +6230,11 @@ like the @emph{editio vaticana}.  There are different custos glyphs
 used in different flavors of notational style.
 
 For typesetting custodes, just put a @internalsref{Custos_engraver} into the
 used in different flavors of notational style.
 
 For typesetting custodes, just put a @internalsref{Custos_engraver} into the

-@internalsref{Staff} context when declaring the @code{\paper} block,
+@internalsref{Staff} context when declaring the @code{\layout} block,

 as shown in the following example
 
 @example
 as shown in the following example
 
 @example

-\paper @{
+\layout @{

   \context @{
     \Staff
     \consists Custos_engraver
   \context @{
     \Staff
     \consists Custos_engraver


@@ -6253,7 +6253,7 @@ The result looks like this
   \break
   g'
 }
   \break
   g'
 }

-\paper {
+\layout {

   \context { \Staff \consists Custos_engraver }
   }
 }
   \context { \Staff \consists Custos_engraver }
   }
 }


@@ -6401,13 +6401,13 @@ Augmentum dots within ligatures are not handled correctly.
 
 There is limited support for white mensural ligatures.  
 
 
 There is limited support for white mensural ligatures.  
 

-To engrave white mensural ligatures, in the paper block the
+To engrave white mensural ligatures, in the layout block the

 @internalsref{Mensural_ligature_engraver} has to be put into the
 @internalsref{Voice} context, and remove the
 @internalsref{Ligature_bracket_engraver}
 
 @example
 @internalsref{Mensural_ligature_engraver} has to be put into the
 @internalsref{Voice} context, and remove the
 @internalsref{Ligature_bracket_engraver}
 
 @example

-\paper @{
+\layout @{

   \context @{
     \Voice
     \remove Ligature_bracket_engraver
   \context @{
     \Voice
     \remove Ligature_bracket_engraver


@@ -6448,7 +6448,7 @@ For example,
     s4
     \[ e1 f1 a\breve g\longa \]
   }
     s4
     \[ e1 f1 a\breve g\longa \]
   }

-  \paper {
+  \layout {

     \context {
       \Voice
       \remove Ligature_bracket_engraver
     \context {
       \Voice
       \remove Ligature_bracket_engraver


@@ -6505,7 +6505,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
 @b{Figurae@*Liquescentes Auctae} @tab
 @b{Figurae@*Liquescentes Deminutae}
 
 @b{Figurae@*Liquescentes Auctae} @tab
 @b{Figurae@*Liquescentes Deminutae}
 

-@c TODO: \paper block is identical in all of the below examples.
+@c TODO: \layout block is identical in all of the below examples.

 @c Therefore, it should somehow be included rather than duplicated all
 @c the time. --jr
 
 @c Therefore, it should somehow be included rather than duplicated all
 @c the time. --jr
 


@@ -6530,7 +6530,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \inclinatum b \]
     \noBreak s^\markup {"b"}
   }
     \[ \inclinatum b \]
     \noBreak s^\markup {"b"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.5\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.5\cm]


@@ -6549,7 +6549,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \inclinatum \auctum b \]
     \noBreak s^\markup {"e"}
   }
     \[ \inclinatum \auctum b \]
     \noBreak s^\markup {"e"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6560,7 +6560,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \inclinatum \deminutum b \]
     \noBreak s^\markup {"f"}
   }
     \[ \inclinatum \deminutum b \]
     \noBreak s^\markup {"f"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6574,7 +6574,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \virga b \]
     \noBreak s^\markup {"g"}
   }
     \[ \virga b \]
     \noBreak s^\markup {"g"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @tab
 @end lilypond
 @tab
 @tab


@@ -6590,7 +6590,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \stropha b \]
     \noBreak s^\markup {"h"}
   }
     \[ \stropha b \]
     \noBreak s^\markup {"h"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6601,7 +6601,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \stropha \auctum b \]
     \noBreak s^\markup {"i"}
   }
     \[ \stropha \auctum b \]
     \noBreak s^\markup {"i"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 
 @end lilypond
 @tab
 


@@ -6616,7 +6616,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \oriscus b \]
     \noBreak s^\markup {"j"}
   }
     \[ \oriscus b \]
     \noBreak s^\markup {"j"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @tab
 @end lilypond
 @tab
 @tab


@@ -6632,7 +6632,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ b \flexa g \]
     s^\markup {"k"}
   }
     \[ b \flexa g \]
     s^\markup {"k"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm]


@@ -6647,7 +6647,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ b \flexa \auctum \ascendens g \]
     \noBreak s^\markup {"m"}
   }
     \[ b \flexa \auctum \ascendens g \]
     \noBreak s^\markup {"m"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6658,7 +6658,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ b \flexa \deminutum g \]
     s^\markup {"n"}
   }
     \[ b \flexa \deminutum g \]
     s^\markup {"n"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6672,7 +6672,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes b \]
     s^\markup {"o"}
   }
     \[ g \pes b \]
     s^\markup {"o"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=2.0\cm]


@@ -6687,7 +6687,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes \auctum \ascendens b \]
     \noBreak s^\markup {"q"}
   }
     \[ g \pes \auctum \ascendens b \]
     \noBreak s^\markup {"q"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6698,7 +6698,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes \deminutum b \]
     s^\markup {"r"}
   }
     \[ g \pes \deminutum b \]
     s^\markup {"r"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6712,7 +6712,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \oriscus g \pes \virga b \]
     s^\markup {"s"}
   }
     \[ \oriscus g \pes \virga b \]
     s^\markup {"s"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6723,7 +6723,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \oriscus g \pes \auctum \descendens b \]
     s^\markup {"t"}
   }
     \[ \oriscus g \pes \auctum \descendens b \]
     s^\markup {"t"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 
 @end lilypond
 @tab
 


@@ -6738,7 +6738,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \quilisma g \pes b \]
     s^\markup {"u"}
   }
     \[ \quilisma g \pes b \]
     s^\markup {"u"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6749,7 +6749,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \quilisma g \pes \auctum \descendens b \]
     s^\markup {"v"}
   }
     \[ \quilisma g \pes \auctum \descendens b \]
     s^\markup {"v"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 
 @end lilypond
 @tab
 


@@ -6764,7 +6764,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \deminutum g \pes b \]
     s^\markup {"w"}
   }
     \[ \deminutum g \pes b \]
     s^\markup {"w"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6775,7 +6775,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \deminutum g \pes \auctum \descendens b \]
     s^\markup {"x"}
   }
     \[ \deminutum g \pes \auctum \descendens b \]
     s^\markup {"x"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 
 @end lilypond
 @tab
 


@@ -6790,7 +6790,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \pes b \flexa g \]
     s^\markup {"y"}
   }
     \[ a \pes b \flexa g \]
     s^\markup {"y"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6801,7 +6801,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \pes b \flexa \auctum \descendens g \]
     s^\markup {"z"}
   }
     \[ a \pes b \flexa \auctum \descendens g \]
     s^\markup {"z"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6812,7 +6812,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \pes b \flexa \deminutum g \]
     s^\markup {"A"}
   }
     \[ a \pes b \flexa \deminutum g \]
     s^\markup {"A"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6826,7 +6826,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \deminutum a \pes b \flexa g \]
     s^\markup {"B"}
   }
     \[ \deminutum a \pes b \flexa g \]
     s^\markup {"B"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6837,7 +6837,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \deminutum a \pes b \flexa \auctum \descendens g \]
     s^\markup {"C"}
   }
     \[ \deminutum a \pes b \flexa \auctum \descendens g \]
     s^\markup {"C"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6848,7 +6848,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \deminutum a \pes b \flexa \deminutum g \]
     s^\markup {"D"}
   }
     \[ \deminutum a \pes b \flexa \deminutum g \]
     s^\markup {"D"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6862,7 +6862,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \flexa g \pes b \]
     s^\markup {"E"}
   }
     \[ a \flexa g \pes b \]
     s^\markup {"E"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6873,7 +6873,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \flexa g \pes \auctum \descendens b \]
     s^\markup {"F"}
   }
     \[ a \flexa g \pes \auctum \descendens b \]
     s^\markup {"F"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6884,7 +6884,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ a \flexa g \pes \deminutum b \]
     s^\markup {"G"}
   }
     \[ a \flexa g \pes \deminutum b \]
     s^\markup {"G"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6898,7 +6898,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \virga b \inclinatum a \inclinatum g \]
     s^\markup {"H"}
   }
     \[ \virga b \inclinatum a \inclinatum g \]
     s^\markup {"H"}
   }

-  \paper { \neumeDemoPaper }
+  \layout { \neumeDemoLayout }

 }
 @end lilypond
 @tab
 }
 @end lilypond
 @tab


@@ -6910,7 +6910,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \virga b \inclinatum a \inclinatum \auctum g \]
     s^\markup {"I"}
   }
     \[ \virga b \inclinatum a \inclinatum \auctum g \]
     s^\markup {"I"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6921,7 +6921,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \virga b \inclinatum a \inclinatum \deminutum g \]
     s^\markup {"J"}
   }
     \[ \virga b \inclinatum a \inclinatum \deminutum g \]
     s^\markup {"J"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6935,7 +6935,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes a \virga b \]
     s^\markup {"K"}
   }
     \[ g \pes a \virga b \]
     s^\markup {"K"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6946,7 +6946,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes a \pes \auctum \descendens b \]
     s^\markup {"L"}
   }
     \[ g \pes a \pes \auctum \descendens b \]
     s^\markup {"L"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6957,7 +6957,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \pes a \pes \deminutum b \]
     s^\markup {"M"}
   }
     \[ g \pes a \pes \deminutum b \]
     s^\markup {"M"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 
 @item
 @end lilypond
 
 @item


@@ -6971,7 +6971,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \oriscus a \pes \virga b \]
     s^\markup {"N"}
   }
     \[ g \oriscus a \pes \virga b \]
     s^\markup {"N"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]
 @end lilypond
 @tab
 @lilypond[quote,noindent,staffsize=26,nofragment,linewidth=1.0\cm]


@@ -6982,7 +6982,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ g \oriscus a \pes \auctum \descendens b \]
     s^\markup {"O"}
   }
     \[ g \oriscus a \pes \auctum \descendens b \]
     s^\markup {"O"}
   }

-\paper { \neumeDemoPaper }}
+\layout { \neumeDemoLayout }}

 @end lilypond
 @tab
 
 @end lilypond
 @tab
 


@@ -6997,7 +6997,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published
     \[ \stropha b \stropha b \stropha a \]
     s^\markup {"P"}
   }
     \[ \stropha b \stropha b \stropha a \]
     s^\markup {"P"}
   }

-  \paper { \neumeDemoPaper }
+  \layout { \neumeDemoLayout }

 }
 @end lilypond
 @tab
 }
 @end lilypond
 @tab


@@ -7477,7 +7477,7 @@ moving the @internalsref{Timing_engraver} to @internalsref{Staff}
 context.
 
 @verbatim
 context.
 
 @verbatim

-\paper{
+\layout{

   \context{ \Score \remove "Timing_engraver" }
   \context{ \Staff \consists "Timing_engraver" }
 }       
   \context{ \Score \remove "Timing_engraver" }
   \context{ \Staff \consists "Timing_engraver" }
 }       


@@ -7503,7 +7503,7 @@ Now, each staff has its own time signature.
 @end verbatim
 
 @lilypond[quote,raggedright]
 @end verbatim
 
 @lilypond[quote,raggedright]

-\paper{
+\layout{

   \context{ \Score \remove "Timing_engraver" }
   \context{ \Staff \consists "Timing_engraver" }
 }       
   \context{ \Score \remove "Timing_engraver" }
   \context{ \Staff \consists "Timing_engraver" }
 }       


@@ -7689,7 +7689,7 @@ teaching tools in addition to great musical scores.
 
 @menu
 * Balloon help::                
 
 @menu
 * Balloon help::                

-* Blank music paper::           
+* Blank music layout::           

 * Hidden notes::     
 * Easy Notation note heads::    
 @end menu
 * Hidden notes::     
 * Easy Notation note heads::    
 @end menu


@@ -7729,10 +7729,10 @@ Examples: @inputfileref{input/regression,balloon.ly}.
 
 
 
 
 
 

-@node Blank music paper
-@subsection Blank music paper
+@node Blank music layout
+@subsection Blank music layout

 
 

-A blank music paper can be produced also by using invisible notes, and
+A blank music layout can be produced also by using invisible notes, and

 removing @code{Bar_number_engraver}.
 
 
 removing @code{Bar_number_engraver}.
 
 

diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely
index b5b6686270e54945149a2e8fe95ad621506dce03..f4a3f43eed03a22690541e6973d4619f33459b26 100644 (file)
--- a/Documentation/user/programming-interface.itely
+++ b/Documentation/user/programming-interface.itely
@@ -35,15 +35,15 @@ example, a music expression is assigned to a variable with the name
 @noindent
 
 There is also a form of scoping: in the following example, the
 @noindent
 
 There is also a form of scoping: in the following example, the

-@code{\paper} block also contains a @code{traLaLa} variable, which is
+@code{\layout} block also contains a @code{traLaLa} variable, which is

 independent of the outer @code{\traLaLa}.
 @example
   traLaLa = @{ c'4 d'4 @}
 independent of the outer @code{\traLaLa}.
 @example
   traLaLa = @{ c'4 d'4 @}

-  \paper @{ traLaLa = 1.0 @}
+  \layout @{ traLaLa = 1.0 @}

 @end example
 @c
 In effect, each input file is a scope, and all @code{\header},
 @end example
 @c
 In effect, each input file is a scope, and all @code{\header},

-@code{\midi} and @code{\paper} blocks are scopes nested inside that
+@code{\midi} and @code{\layout} blocks are scopes nested inside that

 toplevel scope.
 
 Both variables and scoping are implemented in the GUILE module system.
 toplevel scope.
 
 Both variables and scoping are implemented in the GUILE module system.


@@ -415,7 +415,7 @@ This function may also be defined as a music function:
 @section Markup programmer interface
 
 Markups implemented as special Scheme functions. When applied with as
 @section Markup programmer interface
 
 Markups implemented as special Scheme functions. When applied with as

-arguments an output definition (@code{\paper} or @code{\bookpaper}),
+arguments an output definition (@code{\layout} or @code{\paper}),

 and a list of properties and other arguments, produce a Stencil
 object.
 
 and a list of properties and other arguments, produce a Stencil
 object.
 


@@ -505,7 +505,7 @@ raise markup is called as
 
 @example
   (apply raise-markup
 
 @example
   (apply raise-markup

-         @var{\paper object}
+         @var{\layout object}

          @var{list of property alists}
          0.5
          @var{the "foo" markup})
          @var{list of property alists}
          0.5
          @var{the "foo" markup})


@@ -522,7 +522,7 @@ section, and in @file{scm/define-markup-commands.scm}.
 New markup commands can be defined
 with  the @code{def-markup-command} scheme macro.
 @lisp
 New markup commands can be defined
 with  the @code{def-markup-command} scheme macro.
 @lisp

-(def-markup-command (@var{command-name} @var{paper} @var{props} @var{arg1} @var{arg2} ...)
+(def-markup-command (@var{command-name} @var{layout} @var{props} @var{arg1} @var{arg2} ...)

             (@var{arg1-type?} @var{arg2-type?} ...)
   ..command body..)
 @end lisp
             (@var{arg1-type?} @var{arg2-type?} ...)
   ..command body..)
 @end lisp


@@ -534,8 +534,8 @@ The arguments signify
 @var{i}th command argument
 @item argi-type?
 a type predicate for the i@var{th} argument
 @var{i}th command argument
 @item argi-type?
 a type predicate for the i@var{th} argument

-@item paper
-the `paper' definition
+@item layout
+the `layout' definition

 @item props
 a list of alists, containing all active properties. 
 @end table
 @item props
 a list of alists, containing all active properties. 
 @end table


@@ -556,7 +556,7 @@ define a function using @code{def-markup-command}. The command should
 take a single argument, of markup type. Therefore, the start of the
 definition should read
 @example
 take a single argument, of markup type. Therefore, the start of the
 definition should read
 @example

-  (def-markup-command (smallcaps paper props argument) (markup?)
+  (def-markup-command (smallcaps layout props argument) (markup?)

 @end example
 
 @noindent
 @end example
 
 @noindent


@@ -565,7 +565,7 @@ What follows is the content of the command: we should interpret
 the @code{argument} as a markup, i.e.
 
 @example
 the @code{argument} as a markup, i.e.
 
 @example

-    (interpret-markup paper  @dots{} argument)
+    (interpret-markup layout  @dots{} argument)

 @end example
 
 @noindent
 @end example
 
 @noindent


@@ -590,10 +590,10 @@ that takes into account the needed translation, and uses the newly
 defined @code{\smallcaps} command:
 
 @verbatim
 defined @code{\smallcaps} command:
 
 @verbatim

-#(def-markup-command (character paper props name) (string?)
+#(def-markup-command (character layout props name) (string?)

    "Print the character name in small caps, translated to the left and
    top. Syntax: \\character #\"name\""
    "Print the character name in small caps, translated to the left and
    top. Syntax: \\character #\"name\""

-   (interpret-markup paper props 
+   (interpret-markup layout props 

     (markup "" #:translate (cons -4 2) #:smallcaps name)))
 @end verbatim
 
     (markup "" #:translate (cons -4 2) #:smallcaps name)))
 @end verbatim
 


@@ -615,9 +615,9 @@ The final result is as follows:
 @end verbatim
 
 @lilypond[raggedright]
 @end verbatim
 
 @lilypond[raggedright]

-#(def-markup-command (smallcaps paper props str) (string?)
+#(def-markup-command (smallcaps layout props str) (string?)

    "Print the string argument in small caps. Syntax: \\smallcaps #\"string\""
    "Print the string argument in small caps. Syntax: \\smallcaps #\"string\""

-   (interpret-markup paper props
+   (interpret-markup layout props

     (make-line-markup
      (map (lambda (s)
             (if (= (string-length s) 0)
     (make-line-markup
      (map (lambda (s)
             (if (= (string-length s) 0)


@@ -627,10 +627,10 @@ The final result is as follows:
                         #:tiny (string-upcase (substring s 1)))))
           (string-split str #\Space)))))
 
                         #:tiny (string-upcase (substring s 1)))))
           (string-split str #\Space)))))
 

-#(def-markup-command (character paper props name) (string?)
+#(def-markup-command (character layout props name) (string?)

    "Print the character name in small caps, translated to the left and
    top. Syntax: \\character #\"name\""
    "Print the character name in small caps, translated to the left and
    top. Syntax: \\character #\"name\""

-   (interpret-markup paper props 
+   (interpret-markup layout props 

     (markup "" #:translate (cons -4 0) #:smallcaps name)))
 
     { \fatText
     (markup "" #:translate (cons -4 0) #:smallcaps name)))
 
     { \fatText


@@ -645,9 +645,9 @@ the small caps font, by setting a string in upcase, with the first
 letter a little larger:
 
 @example
 letter a little larger:
 
 @example

-#(def-markup-command (smallcaps paper props str) (string?)
+#(def-markup-command (smallcaps layout props str) (string?)

    "Print the string argument in small caps."
    "Print the string argument in small caps."

-   (interpret-markup paper props
+   (interpret-markup layout props

     (make-line-markup
      (map (lambda (s)
             (if (= (string-length s) 0)
     (make-line-markup
      (map (lambda (s)
             (if (= (string-length s) 0)


@@ -668,7 +668,7 @@ introduces a space between markups on a line, the second markup is
 translated to the left (@code{#:translate (cons -0.6 0) ...}). Then,
 the markups built for each token are put in a line by
 @code{(make-line-markup ...)}. Finally, the resulting markup is passed
 translated to the left (@code{#:translate (cons -0.6 0) ...}). Then,
 the markups built for each token are put in a line by
 @code{(make-line-markup ...)}. Finally, the resulting markup is passed

-to the @code{interpret-markup} function, with the @code{paper} and
+to the @code{interpret-markup} function, with the @code{layout} and

 @code{props} arguments.
 
 
 @code{props} arguments.
 
 

diff --git a/Documentation/user/sound-output.itexi b/Documentation/user/sound-output.itexi
index e7d42202137fa4590e3d67f3220da77514161f87..be785d25674e3b0096ea2a3a16b1b6e826b20b44 100644 (file)
--- a/Documentation/user/sound-output.itexi
+++ b/Documentation/user/sound-output.itexi
@@ -57,17 +57,17 @@ case the tempo of quarter notes is set to 72 beats per minute.
 
 
 If there is a @code{\midi} command in a @code{\score}, only MIDI will
 
 
 If there is a @code{\midi} command in a @code{\score}, only MIDI will

-be produced.  When notation is needed too, a @code{\paper} block must
+be produced.  When notation is needed too, a @code{\layout} block must

 be added
 
 @example 
 \score @{
   @var{...music...}
   \midi @{ \tempo 4=72 @}
 be added
 
 @example 
 \score @{
   @var{...music...}
   \midi @{ \tempo 4=72 @}

-  \paper @{ @}
+  \layout @{ @}

 @}
 @end example 
 @}
 @end example 

-@cindex paper block
+@cindex layout block

 
 
 
 
 
 


@@ -88,7 +88,7 @@ setting @code{instrumentEqualizer}.
 @cindex MIDI block
 
 
 @cindex MIDI block
 
 

-The MIDI block is analogous to the paper block, but it is somewhat
+The MIDI block is analogous to the layout block, but it is somewhat

 simpler.  The @code{\midi} block can contain
 @cindex MIDI block
 
 simpler.  The @code{\midi} block can contain
 @cindex MIDI block
 


@@ -109,7 +109,7 @@ inserted, for example
 @cindex context definition
 
 Context definitions follow precisely the same syntax as within the
 @cindex context definition
 
 Context definitions follow precisely the same syntax as within the

-\paper block.  Translation modules for sound are called performers.
+\layout block.  Translation modules for sound are called performers.

 The contexts for MIDI output are defined in @file{ly/performer-init.ly}.
 
 
 The contexts for MIDI output are defined in @file{ly/performer-init.ly}.
 
 

diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely
index 3cb6f8e3d794a330e0676a8d282d693a269d1ff4..c6f4481dda6ff190250a83d02dace4b929631b38 100644 (file)
--- a/Documentation/user/tutorial.itely
+++ b/Documentation/user/tutorial.itely
@@ -1212,14 +1212,14 @@ input.  For example,
 @example
   width = 4.5\cm
   name = "Wendy"
 @example
   width = 4.5\cm
   name = "Wendy"

-  aFivePaper = \paper @{ paperheight = 21.0 \cm @}
+  aFivePaper = \layout @{ paperheight = 21.0 \cm @}

 @end example
 
 Depending on its contents, the identifier can be used in different
 places.  The following example uses the above variables
 
 @example
 @end example
 
 Depending on its contents, the identifier can be used in different
 places.  The following example uses the above variables
 
 @example

-  \paper @{
+  \layout @{

     \aFivePaper
     linewidth = \width
   @}
     \aFivePaper
     linewidth = \width
   @}

diff --git a/VERSION b/VERSION
index d4811779fb83070a6700aa35c628375629e0e75d..57dd1c437fa602c67dbeb4072badec7710df4fb4 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1,6 +1,6 @@
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3
 PACKAGE_NAME=LilyPond
 MAJOR_VERSION=2
 MINOR_VERSION=3

-PATCH_LEVEL=21
-MY_PATCH_LEVEL=
+PATCH_LEVEL=22
+MY_PATCH_LEVEL=pre-jcn2

 
 

diff --git a/buildscripts/mf-to-table.py b/buildscripts/mf-to-table.py
index 4cba2243f2b6ec3fdfdc18beeb01d7a452e5cb22..7e74af991a5ed639d8c5ab787e544553e0aa7ca3 100644 (file)
--- a/buildscripts/mf-to-table.py
+++ b/buildscripts/mf-to-table.py
@@ -194,7 +194,7 @@ def write_fontlist (file, global_info, charmetrics):
                        file.write ('\skip 8  \\break\n')
        file.write (r"""
 }
                        file.write ('\skip 8  \\break\n')
        file.write (r"""
 }

-  \paper{
+  \layout{

     interscoreline = 1.0
     indent = 0.0 \cm
     \context {
     interscoreline = 1.0
     indent = 0.0 \cm
     \context {

diff --git a/cygwin/changelog b/cygwin/changelog
index 2a306b649b25ce69b7b9ddf0c152b4715129e2ec..f400bbeeba5c7d8dab591ef6f385f652476a9665 100644 (file)
--- a/cygwin/changelog
+++ b/cygwin/changelog
@@ -1,3 +1,9 @@
+lilypond (2.3.20-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Jan Nieuwenhuizen <janneke@gnu.org>  Thu,  7 Oct 2004 00:38:49 +0200
+

 lilypond (1.9.8-1) unstable; urgency=low
 
   * New upstream release.
 lilypond (1.9.8-1) unstable; urgency=low
 
   * New upstream release.

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 87aeb14c351ad1a13546e2dcb99a16f8a48d2aeb..fe451e6709ce30c6a998f399918780d923a23be4 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,6 +1,6 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
 sdesc: "A program for printing sheet music"
 category: Publishing

-requires: bash cygwin fileutils findutils ghostscript libguile12 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir
+requires: bash cygwin fileutils findutils ghostscript libguile16 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-tiny _update-info-dir

 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.
 #requires: tetex-bin, tetex-tiny | tetex-base
 #suggests: emacs gsview lilypond-doc rxvt tetex-x11 XFree86-serv
 ldesc: "A program for printing sheet music.

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index efb4a25cf6b03a9e0c33f24402f483bdf5707bda..ffe043dec43c5e6a13b58014965e81ce6eaafcfa 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -150,7 +150,7 @@ postinstall () {
     cygwin=cygwin
     cd $src || exit 1
     install -d -m755 $inst/$cygdocdir
     cygwin=cygwin
     cd $src || exit 1
     install -d -m755 $inst/$cygdocdir

-    install -m644 $cygwin/changelog $inst/$cygdocdir/changelog.Cygwin
+    install -m644 $cygwin/changelog $inst/$packagedocdir/changelog.Cygwin

 
     cd $build || exit 1
     install -m644 $cygwin/out/README $inst/$packagedocdir/README.Cygwin
 
     cd $build || exit 1
     install -m644 $cygwin/out/README $inst/$packagedocdir/README.Cygwin

diff --git a/cygwin/mknetrel.cross b/cygwin/mknetrel.cross
index e002f44b252717c7bc2c9280c3f77272cc06a9ec..c22a48b094df6d49dfd29064d0039578be71c94c 100644 (file)
--- a/cygwin/mknetrel.cross
+++ b/cygwin/mknetrel.cross
@@ -7,22 +7,34 @@
 crosscache () {
        cat <<EOF > config.cache
 ac_cv_c_bigendian=\${ac_cv_c_bigendian=no}
 crosscache () {
        cat <<EOF > config.cache
 ac_cv_c_bigendian=\${ac_cv_c_bigendian=no}

+ac_cv_c_long_size_t=\${ac_cv_c_long_size_t=no}
+ac_cv_c_long_time_t=\${ac_cv_c_long_time_t=yes}
+ac_cv_sizeof___int64=\${ac_cv_sizeof___int64=0}

 ac_cv_sizeof_char=\${ac_cv_sizeof_char=1}
 ac_cv_sizeof_char_p=\${ac_cv_sizeof_char_p=4}
 ac_cv_sizeof_double=\${ac_cv_sizeof_double=8}
 ac_cv_sizeof_float=\${ac_cv_sizeof_float=4}
 ac_cv_sizeof_int=\${ac_cv_sizeof_int=4}
 ac_cv_sizeof_char=\${ac_cv_sizeof_char=1}
 ac_cv_sizeof_char_p=\${ac_cv_sizeof_char_p=4}
 ac_cv_sizeof_double=\${ac_cv_sizeof_double=8}
 ac_cv_sizeof_float=\${ac_cv_sizeof_float=4}
 ac_cv_sizeof_int=\${ac_cv_sizeof_int=4}

+ac_cv_sizeof_intmax_t=\${ac_cv_sizeof_intmax_t=8}
+ac_cv_sizeof_intptr_t=\${ac_cv_sizeof_intptr_t=4}

 ac_cv_sizeof_long=\${ac_cv_sizeof_long=4}
 ac_cv_sizeof_long_double=\${ac_cv_sizeof_long_double=12}
 ac_cv_sizeof_long_long=\${ac_cv_sizeof_long_long=8}
 ac_cv_sizeof_long=\${ac_cv_sizeof_long=4}
 ac_cv_sizeof_long_double=\${ac_cv_sizeof_long_double=12}
 ac_cv_sizeof_long_long=\${ac_cv_sizeof_long_long=8}

+ac_cv_sizeof_ptrdiff_t=\${ac_cv_sizeof_ptrdiff_t=4}

 ac_cv_sizeof_short=\${ac_cv_sizeof_short=2}
 ac_cv_sizeof_short=\${ac_cv_sizeof_short=2}

+ac_cv_sizeof_size_t=\${ac_cv_sizeof_size_t=4}
+ac_cv_sizeof_uintptr_t=\${ac_cv_sizeof_uintptr_t=4}
+ac_cv_sizeof_unsigned___int64=\${ac_cv_sizeof_unsigned___int64=0}
+ac_cv_sizeof_unsigned_char=\${ac_cv_sizeof_unsigned_char=1}
+ac_cv_sizeof_unsigned_int=\${ac_cv_sizeof_unsigned_int=4}
+ac_cv_sizeof_unsigned_long=\${ac_cv_sizeof_unsigned_long=4}
+ac_cv_sizeof_unsigned_long_long=\${ac_cv_sizeof_unsigned_long_long=8}
+ac_cv_sizeof_unsigned_short=\${ac_cv_sizeof_unsigned_short=2}

 ac_cv_sizeof_void_p=\${ac_cv_sizeof_void_p=4}
 ac_cv_sizeof_void_p=\${ac_cv_sizeof_void_p=4}

-ac_cv_c_long_size_t=\${ac_cv_c_long_size_t=no}
-ac_cv_c_long_time_t=\${ac_cv_c_long_time_t=yes}

 ac_16bit_type=\${ac_16bit_type=short}
 ac_32bit_type=\${ac_32bit_type=int}
 ac_64bit_type=\${ac_64bit_type=none}
 ac_16bit_type=\${ac_16bit_type=short}
 ac_32bit_type=\${ac_32bit_type=int}
 ac_64bit_type=\${ac_64bit_type=none}

-ac_cv_sys_restartable_syscalls=\${ac_cv_sys_restartable_syscalls=no}
+ac_cv_sys_restartable_syscalls=\${ac_cv_sys_restartable_syscalls=yes}

 ac_cv_sprintf_count=\${ac_cv_sprintf_count=yes}
 ac_cv_spinlocks=\${ac_cv_spinlocks=no}
 ac_cv_func_getpgrp_void=\${ac_cv_func_getpgrp_void=yes}
 ac_cv_sprintf_count=\${ac_cv_sprintf_count=yes}
 ac_cv_spinlocks=\${ac_cv_spinlocks=no}
 ac_cv_func_getpgrp_void=\${ac_cv_func_getpgrp_void=yes}

diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split
index a2ce0cb9e61e4a66dece02608697746c9ea411ef..1506b3d9f23425f68edb635d645438ea127c4245 100644 (file)
--- a/cygwin/mknetrel.split
+++ b/cygwin/mknetrel.split
@@ -44,7 +44,7 @@ devel_split () {
 
 doc_split () {
     mkdir -p ./$docprefix || exit 1
 
 doc_split () {
     mkdir -p ./$docprefix || exit 1

-    #mv $inst/$infodir ./$infodir
+    mv $inst/$infodir ./$infodir

     true
 }
 
     true
 }
 

diff --git a/input/example-1.ly b/input/example-1.ly
index b14532b9e13e11c8f0a286f6ec8dcb810333af1e..5292fcb401fee359b20eb13e68a325527af72641 100644 (file)
--- a/input/example-1.ly
+++ b/input/example-1.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 % A simple scale in LilyPond
 %
 
 % A simple scale in LilyPond
 %


@@ -17,6 +17,6 @@
   \context Voice \relative c {
     c' d e f g a b c
   }
   \context Voice \relative c {
     c' d e f g a b c
   }

-  \paper {  }  
+  \layout {  }  

   \midi { }
 }
   \midi { }
 }

diff --git a/input/example-2.ly b/input/example-2.ly
index e4705edb307435139ff344f1bba8c5de5b08c175..b2f446a12cf187d18d71f659fa1f19c228926b88 100644 (file)
--- a/input/example-2.ly
+++ b/input/example-2.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 % Some beamed and slurred notes of different taste in LilyPond
 %
 % Type:
 % Some beamed and slurred notes of different taste in LilyPond
 %
 % Type:


@@ -16,6 +16,6 @@
   \context Voice \relative c {
     a''2 ~ a4( e8[ )e] a,16[ a a a]
   }
   \context Voice \relative c {
     a''2 ~ a4( e8[ )e] a,16[ a a a]
   }

-  \paper {  }  
+  \layout {  }  

   \midi { }
 }
   \midi { }
 }

diff --git a/input/example-3.ly b/input/example-3.ly
index 8e7adfea4ea2831433deaf9d61b59bce55232dc3..265fb1b8d8d7d9f0b16c2eee894f4c3db302c5bb 100644 (file)
--- a/input/example-3.ly
+++ b/input/example-3.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 
 one = \relative c{
        c'' d e f
 
 one = \relative c{
        c'' d e f


@@ -15,7 +15,7 @@ two = \relative c{
                \one
                \two
        >>
                \one
                \two
        >>

-       \paper{}
+       \layout{}

        \midi{}
 }
 
        \midi{}
 }
 

diff --git a/input/les-nereides.ly b/input/les-nereides.ly
index 0beb14cdb1c6ba2f8dbaf5e04946441d7d1f11de..01076c2dfba302ab6fd8139b16f9f8555fba812b 100644 (file)
--- a/input/les-nereides.ly
+++ b/input/les-nereides.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 \encoding "latin1"
 \header {
     composer = "ARTHUR GRAY"
 \encoding "latin1"
 \header {
     composer = "ARTHUR GRAY"


@@ -262,7 +262,7 @@ theScore = \score{
            \bassTwo
         >>
     >>
            \bassTwo
         >>
     >>

-    \paper {
+    \layout {

        \context {
            \Score
            pedalSustainStrings = #'("Ped." "*Ped." "*")
        \context {
            \Score
            pedalSustainStrings = #'("Ped." "*Ped." "*")

diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly
index 8a6fd2f9d63901baf481435539d1cd61da9bbfee..d38dad989f00f3eec4369871a4afbabaaab92337 100644 (file)
--- a/input/mutopia-header.ly
+++ b/input/mutopia-header.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
   title =      "Title"
   subtitle =   "Subtitle"
 \header {
   title =      "Title"
   subtitle =   "Subtitle"

diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
index 8d5b5260db6ed7ede5fa52424070154194fd3147..52edd9f10e0892bdee96a427736b1aedf345d052 100644 (file)
--- a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
+++ b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly
@@ -7,7 +7,7 @@
   copyright = "Public Domain"
 }
 
   copyright = "Public Domain"
 }
 

-\version "2.3.16"
+\version "2.3.22"

 
 \include "nederlands.ly"
 
 
 \include "nederlands.ly"
 


@@ -152,7 +152,7 @@ lower = \context Staff  \relative c{
        #(override-auto-beam-setting '(end 1 8 * *)  1 4)
        #(override-auto-beam-setting '(end 1 16 * *)  1 4)
     >>
        #(override-auto-beam-setting '(end 1 8 * *)  1 4)
        #(override-auto-beam-setting '(end 1 16 * *)  1 4)
     >>

-    \paper {
+    \layout {

        \context {
            \Score
            \override SpacingSpanner #'spacing-increment = #3
        \context {
            \Score
            \override SpacingSpanner #'spacing-increment = #3

diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly
index fd3df1105ff510794ab49d7194bcb96abb606390..9f6b86462368dd158127cad59ff4e1b4aed09a4c 100644 (file)
--- a/input/mutopia/F.Schubert/morgenlied.ly
+++ b/input/mutopia/F.Schubert/morgenlied.ly
@@ -27,14 +27,14 @@ been lowered
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 manuscriptBreak = { \break }
 
 
 
 #(set-global-staff-size (/ (* 5.8 72.27) 25.4))
 
 manuscriptBreak = { \break }
 
 
 
 #(set-global-staff-size (/ (* 5.8 72.27) 25.4))
 

-\bookpaper  {
+\paper  {

 %#(set-global-staff-size (* 5.8 mm))
     linewidth = #(* mm 160)
     indent = 8\mm
 %#(set-global-staff-size (* 5.8 mm))
     linewidth = #(* mm 160)
     indent = 8\mm


@@ -168,7 +168,7 @@ pianoLH =  \relative c'' \repeat volta 2 {
           >> 
        >>
 
           >> 
        >>
 

-       \paper {
+       \layout {

            \context {
                \Lyrics
                minimumVerticalExtent = #'(-1.0 . 0)
            \context {
                \Lyrics
                minimumVerticalExtent = #'(-1.0 . 0)

diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly
index 0bf0cfc0198b5f216f1ef8ac47d5aed32b21bc09..0e836a04971da4a1881312804719da6da0ff1768 100644 (file)
--- a/input/mutopia/F.Schubert/standchen.ly
+++ b/input/mutopia/F.Schubert/standchen.ly
@@ -42,7 +42,7 @@ instrument = "Piano"
  footer = "Mutopia-2001/04/27-xx"
 } 
 
  footer = "Mutopia-2001/04/27-xx"
 } 
 

-\version "2.3.17"
+\version "2.3.22"

 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction
 
 dynamicUp = \override DynamicLineSpanner  #'direction = #1
 dynamicRevert = \revert DynamicLineSpanner #'direction


@@ -439,7 +439,7 @@ bassStaff = \context Staff = bass<<
            \bassStaff
        >>
     >>
            \bassStaff
        >>
     >>

-    \paper {
+    \layout {

                                % Use
                                %   textheight = 280.\mm
                                %   linewidth = 190.\mm
                                % Use
                                %   textheight = 280.\mm
                                %   linewidth = 190.\mm

diff --git a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
index 9329f5167c5b574f404b3fe874c2d739590434c5..0fb0728eab534a7a5162be4c02c8554f47b0b216 100644 (file)
--- a/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
+++ b/input/mutopia/J.S.Bach/baerenreiter-sarabande.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 % #(ly:set-point-and-click 'line-column)
 
 
 % #(ly:set-point-and-click 'line-column)
 


@@ -150,7 +150,7 @@ sarabandeCelloStaff = \context Staff <<
 >>
 
 % size perversions
 >>
 
 % size perversions

-smallerPaper = \paper {
+smallerPaper = \layout {

     \context { \Staff
                  fontSize = #-1
                  \override StaffSymbol  #'staff-space = #0.8
     \context { \Staff
                  fontSize = #-1
                  \override StaffSymbol  #'staff-space = #0.8


@@ -163,7 +163,7 @@ smallerPaper = \paper {
     linewidth = 146.8 \mm
 }
 
     linewidth = 146.8 \mm
 }
 

-\bookpaper {
+\paper {

   raggedbottom = ##t
   indent = 7. \mm
   linewidth =183.5 \mm
   raggedbottom = ##t
   indent = 7. \mm
   linewidth =183.5 \mm


@@ -174,7 +174,7 @@ smallerPaper = \paper {
 \score{
   \sarabandeCelloStaff
   \midi{ \tempo 4 = 40 }
 \score{
   \sarabandeCelloStaff
   \midi{ \tempo 4 = 40 }

-  \paper { }
+  \layout { }

   \header{
     opus= "" 
     piece ="Sarabande" }
   \header{
     opus= "" 
     piece ="Sarabande" }

diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly
index a0c40e148e8c07c8af1be321e03caa7e9024f6ab..65265083b55a03fc580bd9b2de5841fcef957241 100644 (file)
--- a/input/mutopia/J.S.Bach/bwv940.ly
+++ b/input/mutopia/J.S.Bach/bwv940.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 
 %{
  Header for Petites Preludes.
 
 %{
  Header for Petites Preludes.


@@ -149,7 +149,7 @@ global = {
                        \context Voice = iv \four
                >>
        >>
                        \context Voice = iv \four
                >>
        >>

-       \paper{
+       \layout{

                linewidth = 17.0 \cm  
                \context {
                    \Score
                linewidth = 17.0 \cm  
                \context {
                    \Score

diff --git a/input/mutopia/J.S.Bach/wtk1-fugue2.ly b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
index 5dc246e9eb60e690d8a88b5a67498574ab92a504..f6151ae591cf7af673326a674c26da220abfaf66 100644 (file)
--- a/input/mutopia/J.S.Bach/wtk1-fugue2.ly
+++ b/input/mutopia/J.S.Bach/wtk1-fugue2.ly
@@ -44,7 +44,7 @@ to match up.
 %}
 
 
 %}
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 
 
 
 


@@ -222,12 +222,12 @@ bassdux = \context Voice=three  \relative c' {
        \header{
            opus = "BWV 847"
        }
        \header{
            opus = "BWV 847"
        }

-       \paper {}
+       \layout {}

        \midi {
            \tempo 4 =84
        }
     }
        \midi {
            \tempo 4 =84
        }
     }

-    \bookpaper {
+    \paper {

        linewidth = 18.0 \cm
     }
 }
        linewidth = 18.0 \cm
     }
 }

diff --git a/input/mutopia/R.Schumann/romanze-op28-2.ly b/input/mutopia/R.Schumann/romanze-op28-2.ly
index 82707c02ff9be4263a4c708495f6ae7048696d5d..756c270a843f0fa8e207f7611b245705ba1b0103 100644 (file)
--- a/input/mutopia/R.Schumann/romanze-op28-2.ly
+++ b/input/mutopia/R.Schumann/romanze-op28-2.ly
@@ -5,7 +5,7 @@
 
 #(set-global-staff-size 16)
 
 
 #(set-global-staff-size 16)
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
   title = "Romanzen"
 
 \header {
   title = "Romanzen"


@@ -271,7 +271,7 @@ leftb =  \transpose c cis {
        << \global \context Voice=lva \lefta \context Voice=lvb \leftb >>
     }
   >>
        << \global \context Voice=lva \lefta \context Voice=lvb \leftb >>
     }
   >>

-  \paper {
+  \layout {

     interscoreline = 0.0
     interscorelinefill = 1
     indent = 0.5 \in
     interscoreline = 0.0
     interscorelinefill = 1
     indent = 0.5 \in

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
index 09728b4e66d8848d94161780d5b2943ac7cff871..353c773cd9e9d98ba3533bc7b3faf74fa9f03741 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
+++ b/input/mutopia/W.A.Mozart/mozart-hrn-3.ly
@@ -41,14 +41,14 @@ virtuoso that taught in Geneva.
 
 %}
 
 
 %}
 

-\version "2.3.16"
+\version "2.3.22"

 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
 \include "mozart-hrn3-romanze.ily"
 \include "mozart-hrn3-rondo.ily"
 
 
 \include "mozart-hrn3-defs.ily"
 \include "mozart-hrn3-allegro.ily"
 \include "mozart-hrn3-romanze.ily"
 \include "mozart-hrn3-rondo.ily"
 

-\bookpaper {
+\paper {

     betweensystempadding = 0.0
     betweensystemspace = 20 \mm
 }
     betweensystempadding = 0.0
     betweensystemspace = 20 \mm
 }


@@ -58,7 +58,7 @@ virtuoso that taught in Geneva.
     \score
     {
        { \transpose c' bes \allegro }
     \score
     {
        { \transpose c' bes \allegro }

-       \paper{ }
+       \layout{ }

        \header { piece = "allegro" opus = "" } 
        \midi{ \tempo 4=90 }
     }
        \header { piece = "allegro" opus = "" } 
        \midi{ \tempo 4=90 }
     }


@@ -69,7 +69,7 @@ virtuoso that taught in Geneva.
        { \transpose c' bes \romanze }
        \header { piece = "romanze" opus = "" } 
        \midi{ \tempo 4 = 70  }
        { \transpose c' bes \romanze }
        \header { piece = "romanze" opus = "" } 
        \midi{ \tempo 4 = 70  }

-       \paper{}
+       \layout{}

     }
 
 
     }
 
 


@@ -78,7 +78,7 @@ virtuoso that taught in Geneva.
        { \transpose c' bes     \rondo }
        \header { piece = "rondo" opus = "" }
        \midi{ \tempo 4 = 100 }
        { \transpose c' bes     \rondo }
        \header { piece = "rondo" opus = "" }
        \midi{ \tempo 4 = 100 }

-       \paper { }
+       \layout { }

     }
 
 
     }
 
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
index 16318c38a6514c803aec6d2734c14be0201f93ad..2b8ce84af0acdf118d56d76a50ed5479c9ef35ef 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-allegro.ily
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.22"

 \include  "mozart-hrn3-defs.ily"
 
 allegro =
 \include  "mozart-hrn3-defs.ily"
 
 allegro =

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
index bf1252958fbbf7764ecddb0e1dc2779404bec4ec..7a0442c93a8d616365ca0b80ad90e507b80eed7c 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily
@@ -4,7 +4,7 @@ longgrace = \override Stem  #'stroke-style = #'()
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 
 endlonggrace = \revert Stem #'stroke-style
 ritenuto = \markup { \italic  "rit." }
 

-\version "2.3.4"
+\version "2.3.22"

   
 cresc =  {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 
   
 cresc =  {
     #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) 


@@ -29,7 +29,7 @@ stopGraceMusic= \sequential {
     \stopGraceMusic
 }
 
     \stopGraceMusic
 }
 

-\paper {
+\layout {

     \context {
         \Score
         skipBars = ##t
     \context {
         \Score
         skipBars = ##t


@@ -51,7 +51,7 @@ stopGraceMusic= \sequential {
     }
 }
 
     }
 }
 

-\bookpaper{
+\paper{

 
     % #(define fonts my-sheet)
 
 
     % #(define fonts my-sheet)
 

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
index 15c344bae51081361e91f171f9b2bc6f10159aa5..5712ecead440f46f1438fa0b30df43ab80373ba3 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-romanze.ily
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.22"

 \include  "mozart-hrn3-defs.ily"
 
 romanze =  \relative c' {
 \include  "mozart-hrn3-defs.ily"
 
 romanze =  \relative c' {

diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
index e1b27c6741f4988d9b9bb329fb1df32a7465b6f7..95f66e94642b39b736b423d5885975f01ca10bc2 100644 (file)
--- a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
+++ b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily
@@ -1,4 +1,4 @@
-\version "2.3.4"
+\version "2.3.22"

 
 % \include "mozart-hrn3-defs.ily"
 
 
 % \include "mozart-hrn3-defs.ily"
 

diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly
index 56e201bb01b815885ec4d4e641a710dd72ec8408..44088bc735b1968cf21e6558a40a6724cd6be028 100644 (file)
--- a/input/no-notation/bar-check.ly
+++ b/input/no-notation/bar-check.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 

diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly
index 17c82f843087ea14f9c25f4dbb60d53f09dd58ee..37501a68a31a594eb821f9955cdf99d6aaf901e1 100644 (file)
--- a/input/no-notation/beam-warn.ly
+++ b/input/no-notation/beam-warn.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header        {
 
 
 \header        {
 

diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly
index 60ece6ed848ffdc417e548a75ecd72719702d91a..554c4c26b96435c4bce46e4fc5ac5dacb481f7ac 100644 (file)
--- a/input/no-notation/denneboom.ly
+++ b/input/no-notation/denneboom.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header{
 filename =      "denneboom.ly"
 enteredby =     "jcn"
 \header{
 filename =      "denneboom.ly"
 enteredby =     "jcn"


@@ -81,8 +81,8 @@ verseTwoStaff = \context Lyrics = two
        \verseTwo
 
 
        \verseTwo
 
 

-denneboomShape = \paper{ 
-       \paperTwenty
+denneboomShape = \layout{ 
+       \layoutTwenty

        indent = 20. \mm
 
        % UGH -- THIS IS HAIRY 
        indent = 20. \mm
 
        % UGH -- THIS IS HAIRY 


@@ -109,7 +109,7 @@ denneboomShape = \paper{
        \oldaddlyrics
                \context Staff { \time 3/4 \melody }
                \context Lyrics \verseOne
        \oldaddlyrics
                \context Staff { \time 3/4 \melody }
                \context Lyrics \verseOne

-       \paper{ 
+       \layout{ 

                \denneboomShape 
        }
        \midi{ \tempo 4 = 90 }
                \denneboomShape 
        }
        \midi{ \tempo 4 = 90 }

diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly
index d2aabf045207eedbe81f2c6e5cbfc19c4a6e8d61..9e99823dd2a8b145d52ba427b74bb1d94a5a1ccc 100644 (file)
--- a/input/no-notation/die-staff.ly
+++ b/input/no-notation/die-staff.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header  {
 texidoc = "a staff should really die, if no one's referencing it."
 
 \header  {
 texidoc = "a staff should really die, if no one's referencing it."

diff --git a/input/no-notation/dos-guile.ly b/input/no-notation/dos-guile.ly
index 98bf711513f18e826f42503fb69cbeb920f506fb..c78af58e6479a5d4b59d45bcbd88beed2cb80583 100644 (file)
--- a/input/no-notation/dos-guile.ly
+++ b/input/no-notation/dos-guile.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     
 
 \header{
     

diff --git a/input/no-notation/dos-ps.ly b/input/no-notation/dos-ps.ly
index cff3d02566d08ffad96f273e730f9fcef48c52fc..045d4f032718354d5f6bc1b120bb7f54ff8e3045 100644 (file)
--- a/input/no-notation/dos-ps.ly
+++ b/input/no-notation/dos-ps.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 

diff --git a/input/no-notation/dos-tex.ly b/input/no-notation/dos-tex.ly
index 136366ba24b0d227e5544d8a51909298d3360bf9..fbed6b01fcdc245ab444460fb068eed9f112a84e 100644 (file)
--- a/input/no-notation/dos-tex.ly
+++ b/input/no-notation/dos-tex.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     
 
 \header{
     

diff --git a/input/no-notation/dynamic-absolute-volume.ly b/input/no-notation/dynamic-absolute-volume.ly
index 9f7038bae155786574df3b713867a8f9bb6efcda..e10d0db04a5b6d90c744a8a39ef4e94175976b25 100644 (file)
--- a/input/no-notation/dynamic-absolute-volume.ly
+++ b/input/no-notation/dynamic-absolute-volume.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.16"
+\version "2.3.22"

 \header {
     texidoc = "@cindex Dynamic Absolute Volume
 Absolute dynamics have an effect on MIDI files.
 \header {
     texidoc = "@cindex Dynamic Absolute Volume
 Absolute dynamics have an effect on MIDI files.


@@ -20,7 +20,7 @@ a\ff
 a\fff
 a\sf
 }
 a\fff
 a\sf
 }

-\paper{ raggedright = ##t }
+\layout{ raggedright = ##t }

 \midi{
 \tempo 1 = 60
 }
 \midi{
 \tempo 1 = 60
 }

diff --git a/input/no-notation/embedded-scm.ly b/input/no-notation/embedded-scm.ly
index 27fde62281c52c8aae593db5cb74954438341c92..c45a804104ec8d6199cfa8b896d92fe833940dd1 100644 (file)
--- a/input/no-notation/embedded-scm.ly
+++ b/input/no-notation/embedded-scm.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
     
     texidoc = "@cindex Embedded scm
 \header {
     
     texidoc = "@cindex Embedded scm


@@ -16,7 +16,7 @@ output, ``hello world'' is printed to the console.
 
 \score {
        \relative c' { c }
 
 \score {
        \relative c' { c }

-       \paper {raggedright = ##t}
+       \layout {raggedright = ##t}

 }
 
 
 }
 
 

diff --git a/input/no-notation/midi-grace.ly b/input/no-notation/midi-grace.ly
index 8f967354048b56baf39fc5a5fbf179e623706eb6..01d289df2704cd4487882839bbf000a6ceaef428 100644 (file)
--- a/input/no-notation/midi-grace.ly
+++ b/input/no-notation/midi-grace.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 \header{ texidoc = "Tests MIDI output with grace notes. " }
 
 \score { 
 \header{ texidoc = "Tests MIDI output with grace notes. " }
 
 \score { 


@@ -17,7 +17,7 @@
  d4 d d d d 
        
   }
  d4 d d d d 
        
   }

-  \paper { }  
+  \layout { }  

   \midi { }
 }
 
   \midi { }
 }
 

diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/no-notation/midi-lyric-barcheck.ly
index 9e3bb45cda62e80e24809d441f056dd20391fa50..b694aa9719103cb1430e602596f529e575296015 100644 (file)
--- a/input/no-notation/midi-lyric-barcheck.ly
+++ b/input/no-notation/midi-lyric-barcheck.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
 
     texidoc = "Lyrics in MIDI are aligned to ties and beams:
 \header {
 
     texidoc = "Lyrics in MIDI are aligned to ties and beams:


@@ -19,6 +19,6 @@ this examples causes no bar checks in MIDI.
     }
     \lyricsto "A" \lyricmode\new Lyrics { bla bla | bla bla | bla bla | bla }
     >>
     }
     \lyricsto "A" \lyricmode\new Lyrics { bla bla | bla bla | bla bla | bla }
     >>

-    \paper {}
+    \layout {}

       \midi {}
     }
       \midi {}
     }

diff --git a/input/no-notation/midi-scales.ly b/input/no-notation/midi-scales.ly
index 7e9b78e136bca854f7ebe31aecb60874423de7bd..20aa031d9659af5765cf9973fe30b929bcc59a0c 100644 (file)
--- a/input/no-notation/midi-scales.ly
+++ b/input/no-notation/midi-scales.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.16"
+\version "2.3.22"

 % candidate for regression.  -gp
 \header {
   texidoc="Converting LilyPond input to MIDI and then again back with
 % candidate for regression.  -gp
 \header {
   texidoc="Converting LilyPond input to MIDI and then again back with


@@ -153,7 +153,7 @@ scales =  \relative c {
 
 \score {
   \context Voice \scales
 
 \score {
   \context Voice \scales

-  \paper { }
+  \layout { }

   \midi { }
 }
 
   \midi { }
 }
 

diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly
index 1fb03a0bac29b2aafea314d451394917db477d0a..0007bc3cff1685aaa34186083b341d53db47d48f 100644 (file)
--- a/input/no-notation/midi-transposing.ly
+++ b/input/no-notation/midi-transposing.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 
 \header { texidoc = "@cindex Transposing
 The transposing property leaves output invariant, but has effect on MIDI. "
 
 \header { texidoc = "@cindex Transposing
 The transposing property leaves output invariant, but has effect on MIDI. "


@@ -19,7 +19,7 @@ The transposing property leaves output invariant, but has effect on MIDI. "
        \set Staff.transposing = #12 c
        
   }
        \set Staff.transposing = #12 c
        
   }

-  \paper { raggedright = ##t } 
+  \layout { raggedright = ##t } 

   \midi { }
 }
 
   \midi { }
 }
 

diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly
index a6bbd7d346a8ecbb7f1470fcf31fbe9e525c136b..534cf0a5219a299edfc03e86a82563d17d5c5a09 100644 (file)
--- a/input/no-notation/midi-tuplets.ly
+++ b/input/no-notation/midi-tuplets.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 \header {
 texidoc = "
 
 \header {
 texidoc = "
 


@@ -29,7 +29,7 @@ Midi2ly tuplet test.
     \times 3/5 { c8 c8 c8 c8 c8 }
 
   }
     \times 3/5 { c8 c8 c8 c8 c8 }
 
   }

-  \paper { }  
+  \layout { }  

   \midi { }
 }
 
   \midi { }
 }
 

diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly
index 4dbdfc1db5062f8d7e55ef3f5f62a72352fa92c9..11a9bac05741b81692c55b0e5ad875ef980e2d74 100644 (file)
--- a/input/no-notation/midi-volume-equaliser.ly
+++ b/input/no-notation/midi-volume-equaliser.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after
 \header {
 texidoc = "@cindex Midi Volume Equaliser
 The full orchestra plays a notes, where groups stop one after


@@ -145,8 +145,8 @@ violoncello =  \relative c' {
     >>
   >>
 
     >>
   >>
 

-  \paper {
-       \paperSixteen
+  \layout {
+       \layoutSixteen

        indent=100.0\mm
        linewidth=150.0\mm
     \context {
        indent=100.0\mm
        linewidth=150.0\mm
     \context {

diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly
index 5df975cdd86fbd392e3045d79228d7c3f091b2b0..909466ad628f2228abc84073fd47fadea2cc1dd8 100644 (file)
--- a/input/no-notation/parse.ly
+++ b/input/no-notation/parse.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 % Test parser error
 
 
 % Test parser error
 

diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly
index b1afd88d0328cfa7f537f469f17b895b343360d9..3545a546c0f92da835c66be79054767e5ec3d0ca 100644 (file)
--- a/input/no-notation/parse2.ly
+++ b/input/no-notation/parse2.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 % Test parser error
 
 
 % Test parser error
 

diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly
index 4547254f9f543e10eb1a6ba9ba3eaaa01ccc7fc6..91c19151decab0a8a53baa6c96bb8d7be589371a 100644 (file)
--- a/input/no-notation/parse3.ly
+++ b/input/no-notation/parse3.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 % Test parser error
 
 
 % Test parser error
 

diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly
index 9319b668c3eebfbecc76dceb6f8319f241ab3a4d..852c8910d5e43831cde9c8d17771d35f393276fa 100644 (file)
--- a/input/no-notation/parse4.ly
+++ b/input/no-notation/parse4.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 % Test parser error
 
 
 % Test parser error
 

diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly
index cf513bc56d947d55a979d4f7fcedc20c3ceb5d84..059c52532ccdb6aaa843c7328e75c6742ecffedb 100644 (file)
--- a/input/no-notation/parse5.ly
+++ b/input/no-notation/parse5.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 %If you specify two different key sigs at one point, a
 %warning is printed.
 
 %If you specify two different key sigs at one point, a
 %warning is printed.
 

diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly
index 833dc8a9829575792a6bd26c7cd6e076aa1d1e57..33919a6fe1af6c1b7fb96a5c73fc0cfceec86250 100644 (file)
--- a/input/no-notation/recording.ly
+++ b/input/no-notation/recording.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events
 \header {
 
 texidoc = "The @code{Recording_group_engraver} will record events


@@ -13,7 +13,7 @@ theMusic = \context Staff  { c4 d8-. }
 #(define (notice-the-events context lst)
   (map (lambda (x) (display x) (newline))  lst))
 
 #(define (notice-the-events context lst)
   (map (lambda (x) (display x) (newline))  lst))
 

-listener = \paper {
+listener = \layout {

  \context {
    \Voice
    \type "Recording_group_engraver"
  \context {
    \Voice
    \type "Recording_group_engraver"

diff --git a/input/no-notation/safe-guile.ly b/input/no-notation/safe-guile.ly
index 820e1de7f6f8f9b2a5e0c19032068b05d0512a9a..dd1a27a4edddbd8c6a3c6179691401a33b2828f9 100644 (file)
--- a/input/no-notation/safe-guile.ly
+++ b/input/no-notation/safe-guile.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     
 
 \header{
     

diff --git a/input/no-notation/safe-include.ly b/input/no-notation/safe-include.ly
index 9ff8c8072624808e3dc856baae948db74306e895..f38c5b55cdebcc151a6ecb4a20c7c2da7b2f2a05 100644 (file)
--- a/input/no-notation/safe-include.ly
+++ b/input/no-notation/safe-include.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     
 
 \header{
     

diff --git a/input/no-notation/safe-ps.ly b/input/no-notation/safe-ps.ly
index 47ffcff1333949c772dc8a70d981740e16b9f88a..7f35f5424a71d83fb13127d5531dde869e578292 100644 (file)
--- a/input/no-notation/safe-ps.ly
+++ b/input/no-notation/safe-ps.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     texidoc = "This should not survive lilypond --safe-mode
 
 \header{
     texidoc = "This should not survive lilypond --safe-mode

diff --git a/input/no-notation/safe-tex.ly b/input/no-notation/safe-tex.ly
index 536eb2f8cbeb6604ded3c10f3ad5090a6f3dc07e..3074dce108019da3e9a618f13b7e6a55a8ccc16c 100644 (file)
--- a/input/no-notation/safe-tex.ly
+++ b/input/no-notation/safe-tex.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header{
     
 
 \header{
     

diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly
index 3dc1d27e434723df8e57f5f71b30eb8dfb758cea..eb0be02a41416d14a87e70f0083e2db5063d40dc 100644 (file)
--- a/input/no-notation/textcresc.ly
+++ b/input/no-notation/textcresc.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header{
 texidoc="crashes lily"
 }
 \header{
 texidoc="crashes lily"
 }


@@ -10,6 +10,6 @@ texidoc="crashes lily"
     c2. r8 c8 \< \break \! c1
   }
 }
     c2. r8 c8 \< \break \! c1
   }
 }

-\paper { linewidth = 5.\cm}
+\layout { linewidth = 5.\cm}

 }
 
 }
 

diff --git a/input/no-notation/to-xml.ly b/input/no-notation/to-xml.ly
index b6015038c6f434668f0f9f25eec8df302a0139b3..c383d29574014da70db3110e2cb10a5b7888c555 100644 (file)
--- a/input/no-notation/to-xml.ly
+++ b/input/no-notation/to-xml.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 fooBar =  { << c''4 \\ g'4 >> }
 
 
 fooBar =  { << c''4 \\ g'4 >> }
 

diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly
index b1007b270d1597df4c8f1c805720ae52274554de..9590e0c605b77846c59e742397b4bea1ac4b35ec 100644 (file)
--- a/input/puer-fragment.ly
+++ b/input/puer-fragment.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
     title      = "Puer natus est nobis (excerptum)"
     subtitle   = "Antiphona ad introitum VII"
 \header {
     title      = "Puer natus est nobis (excerptum)"
     subtitle   = "Antiphona ad introitum VII"


@@ -80,7 +80,7 @@ verba = \context Lyrics = "verba" \lyricmode {
   et fi -- li -- us da -- tus est no -- bis:
 }
 
   et fi -- li -- us da -- tus est no -- bis:
 }
 

-\bookpaper  {
+\paper  {

     linethickness = \staffspace / 7.0
 }
 
     linethickness = \staffspace / 7.0
 }
 


@@ -89,7 +89,7 @@ verba = \context Lyrics = "verba" \lyricmode {
     \cantus
     \lyricsto "cantus" \verba
   >>
     \cantus
     \lyricsto "cantus" \verba
   >>

-  \paper {
+  \layout {

     linewidth = 137.0\mm
     width = 137.0\mm
     indent = 0.0
     linewidth = 137.0\mm
     width = 137.0\mm
     indent = 0.0

diff --git a/input/regression/+.ly b/input/regression/+.ly
index 3c418a3b361cb557267945ed2cc6af50b7eda658..a86600b9f43609ed0df680534ef7a60e6bc7fa94 100644 (file)
--- a/input/regression/+.ly
+++ b/input/regression/+.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?
 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?

diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly
index 5f1d785d473da16141d04d50d58a05bed2cfb651..31ca460d186eef52ef8293dcbc33db27330233af 100644 (file)
--- a/input/regression/accidental-cautionary.ly
+++ b/input/regression/accidental-cautionary.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Cautionary accidentals are indicated using either
 \header {
 
 texidoc = "Cautionary accidentals are indicated using either


@@ -8,7 +8,7 @@ parentheses (default) or smaller accidentals.
 
 }
 
 
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 {
     c''4
 
 {
     c''4

diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly
index acd7f777bb41417ec3570fc7b517856b63cc1d1a..38a31fd60eef32809fd8a170c201564ea43d001e 100644 (file)
--- a/input/regression/accidental-double.ly
+++ b/input/regression/accidental-double.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
        texidoc = "If two forced accidentals happen at the same time, only one
        sharp sign is printed."
 \header {
        texidoc = "If two forced accidentals happen at the same time, only one
        sharp sign is printed."


@@ -12,7 +12,7 @@
      \context Voice=vb { \stemDown c fis! }
    >>
 
      \context Voice=vb { \stemDown c fis! }
    >>
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

         
 }
 
         
 }
 

diff --git a/input/regression/accidental-ledger.ly b/input/regression/accidental-ledger.ly
index 2a7793bf9655cbe331b69ae9cecd467e1d0771b8..95eb727896a9c0c05118209d24721520a96761fe 100644 (file)
--- a/input/regression/accidental-ledger.ly
+++ b/input/regression/accidental-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 

diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly
index e5b118e1975e93921484bf33aa90e3f6c7e4faae..03f4be8dc8984c4d55e7ae0919cf257a2d9c972f 100644 (file)
--- a/input/regression/accidental-octave.ly
+++ b/input/regression/accidental-octave.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc="
 
 \header {
 texidoc="

diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly
index 864e48438103943e41e0dd7504df836efe607281..0d24c73628198faaef5ed3a5b019139c587efe20 100644 (file)
--- a/input/regression/accidental-piano.ly
+++ b/input/regression/accidental-piano.ly
@@ -6,9 +6,9 @@ accidental."
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper
+\layout

 {
     raggedright = ##t
 }
 {
     raggedright = ##t
 }

diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly
index e9f484ef11dbf8fb2a2e5af1bbf3c4afdaa21992..ecc654112183437d03da1ebc9ae583afb5d392c2 100644 (file)
--- a/input/regression/accidental-placement.ly
+++ b/input/regression/accidental-placement.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -31,7 +31,7 @@ flats in a sixth should be staggered.  "
        <bes! c d f >    
        <bes,! c d f >
     }
        <bes! c d f >    
        <bes,! c d f >
     }

-    \paper {
+    \layout {

        raggedright = ##t
     }
 
        raggedright = ##t
     }
 

diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly
index 85b2f1bf9743b0af7bb0940e534c5458a32817c4..18fbe4db27e3abd85ef6dbf333eac65d0caa1c82 100644 (file)
--- a/input/regression/accidental-quarter.ly
+++ b/input/regression/accidental-quarter.ly
@@ -3,7 +3,7 @@
     texidoc = "Quarter tone notation is supported, including
     threequarters flat."
     }
     texidoc = "Quarter tone notation is supported, including
     threequarters flat."
     }

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
      \relative c'' {
 
 \score {
      \relative c'' {


@@ -19,5 +19,5 @@
        cisih
        cisis
     }
        cisih
        cisis
     }

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/accidental-single-double.ly b/input/regression/accidental-single-double.ly
index 4a0e97951a3cd02abdcba21f2c449284901c6ab1..59d732bfe5e089fbf28de08fc0edbaf41ad5c5a3 100644 (file)
--- a/input/regression/accidental-single-double.ly
+++ b/input/regression/accidental-single-double.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign
 \header{
 texidoc="
 A sharp sign after a double sharp sign, as well as a flat sign


@@ -20,6 +20,6 @@ gisis'4 gis gisis ges |
                \thenotes
        }
        >>
                \thenotes
        }
        >>

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly
index e0b2f54937848c422057386b77b43c552ee0a82b..5c0404eed147f71f452287c7fae7d44630c6548a 100644 (file)
--- a/input/regression/accidental-tie.ly
+++ b/input/regression/accidental-tie.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -22,7 +22,7 @@ mus =         \relative c' {
        \new NoteNames \mus
        \new Voice { \key g \major \mus }
     >>
        \new NoteNames \mus
        \new Voice { \key g \major \mus }
     >>

-    \paper {
+    \layout {

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly
index 502e98b46f730d4ef1f5c8acefdfde476c4cdda8..ffed838db658d31bbe25ab52983209beb5cce340 100644 (file)
--- a/input/regression/accidental-unbroken-tie-spacing.ly
+++ b/input/regression/accidental-unbroken-tie-spacing.ly
@@ -4,7 +4,7 @@ texidoc = "Tied accidentaled notes (which cause reminder accidentals) do not
 wreak havoc in the spacing when unbroken."
 }
 
 wreak havoc in the spacing when unbroken."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 rechts =  \relative c' {
   \clef treble
 
 rechts =  \relative c' {
   \clef treble


@@ -16,7 +16,7 @@ rechts =  \relative c' {
 \score {
   \rechts
 
 \score {
   \rechts
 

-  \paper {
+  \layout {

     raggedright = ##t
   }
 }
     raggedright = ##t
   }
 }

diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly
index c702695c5ecf02c40e4d085ffeb0f524c1516166..85c2d9c8e4e407419f113538b335ae3e6e1ec676 100644 (file)
--- a/input/regression/accidental-voice.ly
+++ b/input/regression/accidental-voice.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -38,5 +38,5 @@ voiceb =  \transpose c c' {
 
                         }
     >>
 
                         }
     >>

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/accidental.ly b/input/regression/accidental.ly
index aeaa62fabc91b476cf43b376f15535ac2bf261b8..63037e9c9540925a84205c6ffcde2d1282bf5ddb 100644 (file)
--- a/input/regression/accidental.ly
+++ b/input/regression/accidental.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -14,5 +14,5 @@ foo = \relative c''   {   \key as \major dis4 dis dis!^"force" dis? }
   << \foo 
    \context NoteNames \foo
   >>
   << \foo 
    \context NoteNames \foo
   >>

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly
index a5fdd9217b38a7b646f518c038b9d52db5129b15..016f2ca874808c1940f952bdbb518a9263ae2412 100644 (file)
--- a/input/regression/accidentals.ly
+++ b/input/regression/accidentals.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly
index 0fb8828a7fcdf7d2eaab7a86a1f68623fad420a9..e3e6733791b6242dd57c853c2e0d743ad3785795 100644 (file)
--- a/input/regression/ambitus.ly
+++ b/input/regression/ambitus.ly
@@ -6,9 +6,9 @@ signature. @code{AmbitusNoteHead} grobs also have ledger lines.
 
 "
 }
 
 "
 }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

     raggedright = ##t
     \context {
        \Voice
     raggedright = ##t
     \context {
        \Voice

diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly
index 1ac38696b146eb7a576a498cfd2165c13512d24a..0fe4c3483c3f0c249879590e70132fc6623115e8 100644 (file)
--- a/input/regression/apply-context.ly
+++ b/input/regression/apply-context.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 
 
 \header {


@@ -14,7 +14,7 @@ This example prints a bar-number during processing on stdout.
 
 }
 
 
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score {  \relative c'' {
 
 
 \score {  \relative c'' {

diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly
index 89a60daeb5523fe5f09496e2d9098bd48567508c..ef1655f12ed39d5cd6a9abaab389d0b77959e0b9 100644 (file)
--- a/input/regression/apply-output.ly
+++ b/input/regression/apply-output.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17" 
+\version "2.3.22" 

 \header {
 
 texidoc = "The @code{\applyoutput} expression is the most flexible way to
 \header {
 
 texidoc = "The @code{\applyoutput} expression is the most flexible way to


@@ -45,7 +45,7 @@ position.
    }
              
    }
    }
              
    }

-\paper { raggedright = ##t
+\layout { raggedright = ##t

 %                   outputscale = 5
                     } 
 }
 %                   outputscale = 5
                     } 
 }

diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly
index fb77e375af54f61312c9cc083d247e0dccda2b21..31f31880c26d9e19266346f28724726d04e414d2 100644 (file)
--- a/input/regression/arpeggio-bracket.ly
+++ b/input/regression/arpeggio-bracket.ly
@@ -1,6 +1,6 @@
 
 
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 A square bracket on the left indicates that the player should not
 \header{
 texidoc="
 A square bracket on the left indicates that the player should not


@@ -15,6 +15,6 @@ arpeggiate the chord.
         <fis,  d a >\arpeggio
         }
      
         <fis,  d a >\arpeggio
         }
      

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 }
 
 }
 

diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly
index 8286e2ee99b006088511aa07878d920b8511db6b..a5c9d6d17e7682477f5f61d0983464bbd3154b61 100644 (file)
--- a/input/regression/arpeggio-collision.ly
+++ b/input/regression/arpeggio-collision.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
 
 \header  {
 texidoc = "Arpeggio stays clear of accidentals and flipped note heads."


@@ -10,7 +10,7 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads."
        <fis, g d a>\arpeggio
        <fis'' g d a>\arpeggio
        }
        <fis, g d a>\arpeggio
        <fis'' g d a>\arpeggio
        }

-    \paper {
+    \layout {

         raggedright = ##t
        \context{
            \Staff
         raggedright = ##t
        \context{
            \Staff

diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly
index dc7a216bd5be8344781e1b5ca9a082a19da0a05b..c74a5c501dbfb51d7a3155a9107e018e55b7f26b 100644 (file)
--- a/input/regression/arpeggio.ly
+++ b/input/regression/arpeggio.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.
 \header{
 texidoc="
 Arpeggios are supported, both cross-staff and broken single staff.


@@ -26,5 +26,5 @@ Arpeggios are supported, both cross-staff and broken single staff.
             <g b d>\arpeggio
         }
     >>
             <g b d>\arpeggio
         }
     >>

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 }
 }

diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly
index 1e0a3dde8a7aeebfbb70b81bec1e38dd44ee08d8..eca3453f98ac11c0132a265b9c165980ebc1f92f 100644 (file)
--- a/input/regression/auto-beam-bar.ly
+++ b/input/regression/auto-beam-bar.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="No auto beams will be put over (manual) repeat bars."
 
 \header{
 texidoc="No auto beams will be put over (manual) repeat bars."


@@ -10,7 +10,7 @@ texidoc="No auto beams will be put over (manual) repeat bars."
         \time 3/4
         a'4 b' c''8 \bar ":|:" d''8
     }
         \time 3/4
         a'4 b' c''8 \bar ":|:" d''8
     }

-    \paper{
+    \layout{

    raggedright = ##t
 }
 }
    raggedright = ##t
 }
 }

diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly
index 6f22aa0e22b796b8a6447079cdbb4b48da37643e..d603233edcec86d5c461df106ee86d847c66f5d9 100644 (file)
--- a/input/regression/auto-beam-no-beam.ly
+++ b/input/regression/auto-beam-no-beam.ly
@@ -6,8 +6,8 @@
 
     }
 
 
     }
 

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly
index eae270d9551e7edd05fbcadae6f71d9f82df0402..a597b0d963d1bbadfb4bd5fe49cf712c1cf360d5 100644 (file)
--- a/input/regression/auto-beam-triplet.ly
+++ b/input/regression/auto-beam-triplet.ly
@@ -4,12 +4,12 @@
 texidoc = "Automatic beaming is also done on tuplets."
 }
 
 texidoc = "Automatic beaming is also done on tuplets."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score{
        \relative c''{
                c8 c c c
                \times 4/6 { c c c c c c}
        }
 
 \score{
        \relative c''{
                c8 c c c
                \times 4/6 { c c c c c c}
        }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 }
 }

diff --git a/input/regression/auto-beam-tuplets.ly b/input/regression/auto-beam-tuplets.ly
index 9ae040f0a7a06c0b4586e17c61d9c618b1dbdd1e..438fcb7dda1ca13937fd53e4fb7e13c63b70a8bd 100644 (file)
--- a/input/regression/auto-beam-tuplets.ly
+++ b/input/regression/auto-beam-tuplets.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "Tuplet-spanner should not put (visible) brackets on
 
 \header {
 texidoc = "Tuplet-spanner should not put (visible) brackets on


@@ -13,6 +13,6 @@ beams even if they're auto generated."
         f8[ f f ] f8[ f f ] f f f f f f 
  }
 }
         f8[ f f ] f8[ f f ] f f f f f f 
  }
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
      }
 
      }

diff --git a/input/regression/auto-beam.ly b/input/regression/auto-beam.ly
index 029c2e37c8b88e329c347dfbd1efc8a016866fb7..9ae3374b0fec1f9e40a6f5289582ac9fb8c7faa2 100644 (file)
--- a/input/regression/auto-beam.ly
+++ b/input/regression/auto-beam.ly
@@ -3,16 +3,16 @@ texidoc="Beams are place automatically; the last measure should have a single
 beam."
 }
 
 beam."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper  { raggedright = ##t } 
+\layout  { raggedright = ##t } 

 
 \score {
    \relative c'' {
     a\longa a\breve  
     a1 a2 a4 a8 a16 a32 a64 a64 
   }
 
 \score {
    \relative c'' {
     a\longa a\breve  
     a1 a2 a4 a8 a16 a32 a64 a64 
   }

-  \paper {
+  \layout {

     \context {
       \Staff
       \remove "Clef_engraver"
     \context {
       \Staff
       \remove "Clef_engraver"

diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly
index 2475209fad2db53fc6751a29aecb5f01d34d92e5..231ddc07859ffa6d20b7ee4e94c1b54efb05c8f6 100644 (file)
--- a/input/regression/auto-change.ly
+++ b/input/regression/auto-change.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -9,7 +9,7 @@ note. When central C is reached, staff is not yet switched (by default).
 
 "
 }
 
 "
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {
         \context PianoStaff <<
 
 \score {
         \context PianoStaff <<

diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly
index dc99fd557e394d219ad8e2fa3ebd6c072f851562..5ac97a0881a1b68f433de70ef3a66b2dfb99f04c 100644 (file)
--- a/input/regression/balloon.ly
+++ b/input/regression/balloon.ly
@@ -3,7 +3,7 @@
     texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
     }
     texidoc = "With balloon texts, objects in the output can be marked,
 with lines and explanatory text added."
     }

-\version "2.3.17"
+\version "2.3.22"

 
 \score  {
   {
 
 \score  {
   {


@@ -28,5 +28,5 @@ with lines and explanatory text added."
        c8
        }
   }
        c8
        }
   }

- \paper{ raggedright = ##t }
+ \layout{ raggedright = ##t }

 }
 }

diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly
index 3bdbbd10f630419951c73fd0fcba3889b6e7d811..b2e81b7d10723549107243f6b6ef7337a5b70f76 100644 (file)
--- a/input/regression/bar-check-redefine.ly
+++ b/input/regression/bar-check-redefine.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "The meaning of @code{|} is stored in the
 identifier @code{pipeSymbol}."
 \header {
     texidoc = "The meaning of @code{|} is stored in the
 identifier @code{pipeSymbol}."


@@ -6,6 +6,6 @@ identifier @code{pipeSymbol}."
 
 pipeSymbol = \bar "||"
 
 
 pipeSymbol = \bar "||"
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 { c'2 | c'2 | }
     
 { c'2 | c'2 | }
     

diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly
index fc2f9e91de2884d914b82e17ada678e346bfecea..a097b7a3aa3b7c49db4cd4c8719263fbd7019c76 100644 (file)
--- a/input/regression/bar-number.ly
+++ b/input/regression/bar-number.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -20,7 +20,7 @@ be increased.
       \override Score.BarNumber  #'padding = #3
       c1 c
   }
       \override Score.BarNumber  #'padding = #3
       c1 c
   }

-  \paper {
+  \layout {

     raggedright = ##t
     \context {
        \Score
     raggedright = ##t
     \context {
        \Score

diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly
index 8361506d88c5a24e3ff2a6f291761b99a9bcae5a..d2ffa5d47aa840b0df192c953edddda4cb0beb14 100644 (file)
--- a/input/regression/bar-scripts.ly
+++ b/input/regression/bar-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 
 \header{
 texidoc="
 


@@ -6,7 +6,7 @@ Markings can be attached to (invisible) barlines.
 "
 }
 
 "
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 onestaff = \new Staff\relative c''  {
        \set Staff.instr = instr
 
 onestaff = \new Staff\relative c''  {
        \set Staff.instr = instr

diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly
index cf052d50761d8212d3ea1338e2535dec6aa7ffff..e2bb4288072aa41b76ae077d6e4f28b316409591 100644 (file)
--- a/input/regression/beam-auto-knee.ly
+++ b/input/regression/beam-auto-knee.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{ texidoc="A knee is made automatically when a horizontal
 beam fits in a gap between note heads that is larger than a predefined
 
 \header{ texidoc="A knee is made automatically when a horizontal
 beam fits in a gap between note heads that is larger than a predefined


@@ -12,7 +12,7 @@ threshold.
      c'8[ c,,]  c8[ e']
      c,16[ e g c e g c c,,] 
   }
      c'8[ c,,]  c8[ e']
      c,16[ e g c e g c c,,] 
   }

-  \paper{
+  \layout{

       raggedright = ##t 
   }
 }
       raggedright = ##t 
   }
 }

diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly
index 500d4d32d895b663a1d63f49fa2da2bc3b7b1208..511a6cb2df4a41610ac4353cd64a515ca020358b 100644 (file)
--- a/input/regression/beam-auto.ly
+++ b/input/regression/beam-auto.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
        texidoc = "@cindex Beaming Presets
 There are presets for the @code{auto-beam} engraver in the case of common
 \header{
        texidoc = "@cindex Beaming Presets
 There are presets for the @code{auto-beam} engraver in the case of common


@@ -58,7 +58,7 @@ time signatures. " }
        c8 c c c c c c c c
        c16 c c c c c c c c c c c c c c c c c
     }
        c8 c c c c c c c c
        c16 c c c c c c c c c c c c c c c c c
     }

-    \paper{
+    \layout{

     }
 }
 
     }
 }
 

diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly
index 921fa59859b03003fa5559ac8ded32ce0737dacf..1451e653675193e46b9e414efeae4a92359446f1 100644 (file)
--- a/input/regression/beam-break.ly
+++ b/input/regression/beam-break.ly
@@ -4,8 +4,8 @@
 "
 
 }
 "
 
 }

-\version "2.3.17"
-\paper { raggedright= ##t }
+\version "2.3.22"
+\layout { raggedright= ##t }

 
 \score {  \relative c''  {
     \set Score.allowBeamBreak = ##t
 
 \score {  \relative c''  {
     \set Score.allowBeamBreak = ##t

diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly
index 3799cc84231113e285b51c75e72e50fe45cda6a0..67e6bbb377a3b5daee0122f301ad1d8faac31400 100644 (file)
--- a/input/regression/beam-center-slope.ly
+++ b/input/regression/beam-center-slope.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 
     texidoc="Simple beams on middle staffline are allowed to be
 \header{
 
     texidoc="Simple beams on middle staffline are allowed to be


@@ -41,7 +41,7 @@
         a''[ f]
         f[ a]
     }
         a''[ f]
         f[ a]
     }

-    \paper{
+    \layout{

        raggedright = ##t
        indent = 0
     }
        raggedright = ##t
        indent = 0
     }

diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly
index 239c03331b70b3306dd2876c168665de9199d0dc..9522f7b54e8ab72fcc7efda4a66f8bff76c32686 100644 (file)
--- a/input/regression/beam-concave-damped.ly
+++ b/input/regression/beam-concave-damped.ly
@@ -2,8 +2,8 @@
     texidoc = "Beams that are not strictly concave are damped
  according to their concaveness. "
 }
     texidoc = "Beams that are not strictly concave are damped
  according to their concaveness. "
 }

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly
index 4b6ec3887efc29b135e16079276119e5420bb843..d162e128294e94ccb486cfd8baf7444ad2b037f1 100644 (file)
--- a/input/regression/beam-concave.ly
+++ b/input/regression/beam-concave.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 
 texidoc = "Fully concave beams should be horizontal. Informally spoken,
 \header{
 
 texidoc = "Fully concave beams should be horizontal. Informally spoken,


@@ -59,7 +59,7 @@ rossBeams = \relative c'' {
      \rossBeams
      
    }
      \rossBeams
      
    }

-  \paper{
+  \layout{

     raggedright = ##t
     #(define debug-beam-quanting #t)
   }
     raggedright = ##t
     #(define debug-beam-quanting #t)
   }

diff --git a/input/regression/beam-cross-staff-auto-knee.ly b/input/regression/beam-cross-staff-auto-knee.ly
index 4191790eaed79cbf888d47a0538090e251e7a5da..c9900464c587103b9f74a37862679242f2c91063 100644 (file)
--- a/input/regression/beam-cross-staff-auto-knee.ly
+++ b/input/regression/beam-cross-staff-auto-knee.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 


@@ -20,7 +20,7 @@ produced with explicit staff switches)."
       s2.
     }
   >>
       s2.
     }
   >>

-  \paper{
+  \layout{

     raggedright = ##t
   }
 }
     raggedright = ##t
   }
 }

diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly
index fc8292aeea9e2cc263cef70b6102c721794982f1..f04247449bb966f497c9068fd2edebf34e77b716 100644 (file)
--- a/input/regression/beam-cross-staff-slope.ly
+++ b/input/regression/beam-cross-staff-slope.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Cross staff  (kneed) beams do not cause extreme slopes."
 }
 \header {
     texidoc = "Cross staff  (kneed) beams do not cause extreme slopes."
 }


@@ -27,6 +27,6 @@
     \context Staff = down {
         \time 3/8 \clef bass s4.*3 }
     >>
     \context Staff = down {
         \time 3/8 \clef bass s4.*3 }
     >>

-    \paper { raggedright = ##t}
+    \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/beam-cross-staff.ly b/input/regression/beam-cross-staff.ly
index a402253d7f3bdc7e2cc686fc3b09726007c81198..fbeeb4dd8a3fd1f0cf30753726af0852488b2d8a 100644 (file)
--- a/input/regression/beam-cross-staff.ly
+++ b/input/regression/beam-cross-staff.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Beams can be typeset over fixed distance aligned staves, beam
 \header{
 texidoc="
 Beams can be typeset over fixed distance aligned staves, beam

diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly
index b2b1e2af8c7a140da0216b6332237e19685a1e93..347edfe3840b83b6d258996278081a29976bddbd 100644 (file)
--- a/input/regression/beam-damp.ly
+++ b/input/regression/beam-damp.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 
 \header { texidoc = "@cindex Beam Damp
 Beams are less steep than the notes they encompass. " }
 


@@ -18,7 +18,7 @@ Beams are less steep than the notes they encompass. " }
                 d'[ c b a]
                 a[ b c d]
        }
                 d'[ c b a]
                 a[ b c d]
        }

-       \paper{
+       \layout{

                raggedright = ##t
        }
 }
                raggedright = ##t
        }
 }

diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly
index f5a32e46fab43bc91b34c68c36e74c07d7a22532..7b3def1e90e3c065d8770bfee47f8079933b6e0f 100644 (file)
--- a/input/regression/beam-default-lengths.ly
+++ b/input/regression/beam-default-lengths.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
     texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."
 
 \header{
     texidoc="Beamed stems have standard lengths if possible. Quantization is switched off in this example."


@@ -14,5 +14,5 @@
 
         f4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
     }
 
         f4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
     }

-    \paper{ raggedright = ##t}
+    \layout{ raggedright = ##t}

 }          
 }          

diff --git a/input/regression/beam-dir-functions.ly b/input/regression/beam-dir-functions.ly
index 13c182650ddaed8abb17cb5553561dcc1021f214..3a1f38cfa26cf3c67d4818b0fab3c4cf1a87d981 100644 (file)
--- a/input/regression/beam-dir-functions.ly
+++ b/input/regression/beam-dir-functions.ly
@@ -1,5 +1,5 @@
 % junkme?
 % junkme?

-\version "2.3.17"
+\version "2.3.22"

 \header {
   texidoc = "@cindex Beam Dir Functions
 
 \header {
   texidoc = "@cindex Beam Dir Functions
 


@@ -21,7 +21,7 @@ own one.
 "
 }
 
 "
 }
 

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 \score {
   \relative c'' {\time 3/4
     \override Beam  #'dir-function = #beam-dir-majority
 \score {
   \relative c'' {\time 3/4
     \override Beam  #'dir-function = #beam-dir-majority


@@ -39,7 +39,7 @@ own one.
     \override Beam  #'dir-function = #beam-dir-median
       c[ c g] 
   }
     \override Beam  #'dir-function = #beam-dir-median
       c[ c g] 
   }

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

 }
 
 %% Local variables:
 }
 
 %% Local variables:

diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly
index 30791698df73175580d39e4d6b5cfe598769852a..639aca09de779e2c95cfc44b1d7df7aa7a75499f 100644 (file)
--- a/input/regression/beam-extreme.ly
+++ b/input/regression/beam-extreme.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.
 \header{
 texidoc="
 Beams should behave reasonably well, even under extreme circumstances.


@@ -41,7 +41,7 @@ extreme = \relative c'' {
     \extreme
     %}
   }
     \extreme
     %}
   }

-  \paper{
+  \layout{

 %    raggedright = ##t
     raggedright = ##t
   }
 %    raggedright = ##t
     raggedright = ##t
   }

diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly
index 2df15583278560bfced5af7d7e25d3e42661fb20..900761d511644e6cb3b0523a92316a11bc2ee453 100644 (file)
--- a/input/regression/beam-french.ly
+++ b/input/regression/beam-french.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -16,7 +16,7 @@
             c8[ c16 e16 g8]
         }
 
             c8[ c16 e16 g8]
         }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
      }
 
 
      }
 

diff --git a/input/regression/beam-funky-beamlet.ly b/input/regression/beam-funky-beamlet.ly
index 12a4397c7197e6b3169e14d8c657ba3dc75ad42a..f153cb0aa54abeb419ff6759d4ab57574da611c5 100644 (file)
--- a/input/regression/beam-funky-beamlet.ly
+++ b/input/regression/beam-funky-beamlet.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc=" Funky kneed beams with beamlets also work. The beamlets
 \header {
 
 texidoc=" Funky kneed beams with beamlets also work. The beamlets


@@ -16,6 +16,6 @@ should be pointing to the note head.
      c16 c,,8 c16          
      
   }
      c16 c,,8 c16          
      
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
          
 }
          

diff --git a/input/regression/beam-funky.ly b/input/regression/beam-funky.ly
index 6076e327fc5f1fbf36aeff47378157c0a47318f0..28a84941b3a0f52450a6c870e82cdfc7c95ee8c5 100644 (file)
--- a/input/regression/beam-funky.ly
+++ b/input/regression/beam-funky.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     
     texidoc = "In complex configurations of knee beaming, according to
 \header {
     
     texidoc = "In complex configurations of knee beaming, according to


@@ -33,7 +33,7 @@ beam. This is in disagreement with the current algorithm."
             g''' g,,,]     }  }
             
         }
             g''' g,,,]     }  }
             
         }

-\paper { raggedright = ##t} 
+\layout { raggedright = ##t} 

 
      }
 
 
      }
 

diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly
index 0c1cef21f4dd2c314e8e4b303c8a4f11dddf2f70..8a20f5048d1c043d1f1ca48a0b232387e7c50524 100644 (file)
--- a/input/regression/beam-isknee.ly
+++ b/input/regression/beam-isknee.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
        texidoc="@cindex Beam Isknee
 
 \header{
        texidoc="@cindex Beam Isknee
 


@@ -21,7 +21,7 @@ Beams can be placed across a @code{PianoStaff}.
                s2
        }
        >>
                s2
        }
        >>

-       \paper{
+       \layout{

                raggedright = ##t
        }
 }
                raggedright = ##t
        }
 }

diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly
index 059f8bd870e6618d62256731ead5e87075414068..bfa5fb7b650c0154d707e1b86617ac924784cd6d 100644 (file)
--- a/input/regression/beam-knee-symmetry.ly
+++ b/input/regression/beam-knee-symmetry.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Point-symmetric beams should receive the same
 \header {
 
     texidoc = "Point-symmetric beams should receive the same


@@ -12,7 +12,7 @@
         a8[ b'' a,, b'']
         b8[ a,, b'' a,,]
     }
         a8[ b'' a,, b'']
         b8[ a,, b'' a,,]
     }

-    \paper{
+    \layout{

        raggedright = ##t 
     }
 }
        raggedright = ##t 
     }
 }

diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly
index 1127b77f0373cb24971566e7c58890d790bf5312..c1461614f224e2393f0622694004b7867187852e 100644 (file)
--- a/input/regression/beam-length.ly
+++ b/input/regression/beam-length.ly
@@ -1,12 +1,12 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 Beams should look the same.
 "
 }
 
 \header{
 texidoc="
 Beams should look the same.
 "
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
     
 \score { 
 
     
 \score { 

diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly
index 116c977c0c96b51d36fea57b1fe7d74aeca5cae5..e03836d03e1ae1cfd3201b528ce9f10086be4841 100644 (file)
--- a/input/regression/beam-manual-beaming.ly
+++ b/input/regression/beam-manual-beaming.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 
 
 \header {


@@ -22,7 +22,7 @@
             #'beaming = #(cons (list 0 2 4) (list 0 1 4))
             c c c]
     }
             #'beaming = #(cons (list 0 2 4) (list 0 1 4))
             c c c]
     }

-    \paper{ 
+    \layout{ 

        raggedright = ##t 
     }
 }
        raggedright = ##t 
     }
 }

diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly
index ce5636bcc04d6688a2426c459e37fe31639269c6..488291733e16f9c0c39604904d13b42d15ea5d52 100644 (file)
--- a/input/regression/beam-multiple-cross-staff.ly
+++ b/input/regression/beam-multiple-cross-staff.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Kneed beams (often happens with cross-staff beams)
 \header {
 
     texidoc = "Kneed beams (often happens with cross-staff beams)


@@ -25,6 +25,6 @@ to the last beam.
             }       
             
             >>
             }       
             
             >>

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 }
 
 }

diff --git a/input/regression/beam-over-barline.ly b/input/regression/beam-over-barline.ly
index 1504143f68795fb22c7db7bdfa62a992f1f01325..bdf90443f01303e07b10f7e2f5a732d50b2fa076 100644 (file)
--- a/input/regression/beam-over-barline.ly
+++ b/input/regression/beam-over-barline.ly
@@ -1,11 +1,11 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Explicit beams may cross barlines. "
 }
 \score {
  \relative c'' { c2.  c8[ c8 c8 c8] }
 
 \header {
 texidoc = "Explicit beams may cross barlines. "
 }
 \score {
  \relative c'' { c2.  c8[ c8 c8 c8] }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 }
 
 }

diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly
index d81db4fdc70028c387c1967db0af68c2f3c555e4..52b0aca5a18d263c70f3e73553379af58279f886 100644 (file)
--- a/input/regression/beam-position.ly
+++ b/input/regression/beam-position.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 
 texidoc=" Beams on ledgered notes should always reach the middle staff
 \header{
 
 texidoc=" Beams on ledgered notes should always reach the middle staff


@@ -22,7 +22,7 @@ note beams.  Override with @code{no-stem-extend}.  "
         f8[ f]
        
   }
         f8[ f]
        
   }

-  \paper {
+  \layout {

     raggedright = ##t
   }  
   \midi { }
     raggedright = ##t
   }  
   \midi { }

diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly
index 1ff6b91e337829f617de811379235ede2b2870e3..cfa8383c6908ef39d0e6c7c23725cde7d851f0d8 100644 (file)
--- a/input/regression/beam-postfix-notation.ly
+++ b/input/regression/beam-postfix-notation.ly
@@ -1,12 +1,12 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Beams and ties may be entered in postfix notation, separating the
     notes and the brackets with a dash."
 
 }
 \header {
 
 texidoc = "Beams and ties may be entered in postfix notation, separating the
     notes and the brackets with a dash."
 
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score
 
 
 \score

diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly
index 801c174d880621234187e3aa0eae632804060761..5cd0eff91a8ef7a4fbdb14d492a589102da184a1 100644 (file)
--- a/input/regression/beam-quant-standard.ly
+++ b/input/regression/beam-quant-standard.ly
@@ -4,9 +4,9 @@
     
 }
 
     
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper  {
+\layout  {

     raggedright = ##t
     #(define debug-beam-quanting #t)
 
     raggedright = ##t
     #(define debug-beam-quanting #t)
 

diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly
index cc4d6b41f4310c2101affb43deeb0661cb12e595..36934819c8dca4e6c01b6b226276c63d2dd45cec 100644 (file)
--- a/input/regression/beam-quanting-32nd.ly
+++ b/input/regression/beam-quanting-32nd.ly
@@ -8,7 +8,7 @@ texidoc = "Stem lengths take precedence over beam quants: `forbidden'
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
      \relative c''{ 
 
 \score {
      \relative c''{ 


@@ -27,5 +27,5 @@ c16[ d] b[ d]
 c32[ d] b[ d]
 a'32[ a] g[ g] f[ f] e[ e] d[ d] c[ c]
 }
 c32[ d] b[ d]
 a'32[ a] g[ g] f[ f] e[ e] d[ d] c[ c]
 }

-\paper {  }
+\layout {  }

 }
 }

diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly
index 8b9aad0eb9c99b871f736fc2d8880a5084b21e59..da74dee519f61fd54eb66f8b6432ce62f2836853 100644 (file)
--- a/input/regression/beam-quanting-horizontal.ly
+++ b/input/regression/beam-quanting-horizontal.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 

diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly
index 0a8ecdae308b10bf960bfa516409341f91d9f33e..fd862ecce187b8888ca981fc37cc28bea04158c8 100644 (file)
--- a/input/regression/beam-quarter.ly
+++ b/input/regression/beam-quarter.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc= "Quarter notes may be beamed: the beam is halted momentarily."
 \header
 {
     texidoc= "Quarter notes may be beamed: the beam is halted momentarily."


@@ -8,5 +8,5 @@
 \score { \relative c'' {
         c8[ c4 c8] % should warn here!
 }
 \score { \relative c'' {
         c8[ c4 c8] % should warn here!
 }

-\paper { raggedright = ##t} 
+\layout { raggedright = ##t} 

 }
 }

diff --git a/input/regression/beam-rest.ly b/input/regression/beam-rest.ly
index 68592dd40461659e50c3c867c2a93e4fd88d7921..45a9849df287797e5f2293a65949e6f3b8438c96 100644 (file)
--- a/input/regression/beam-rest.ly
+++ b/input/regression/beam-rest.ly
@@ -3,11 +3,11 @@
  texidoc = "The number of beams does not change on a rest."
 }
 
  texidoc = "The number of beams does not change on a rest."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {  \relative c, {
   \clef bass    
    e8[ r16 f d'8 e16 e16]  c8[ c16 r16 bes8 r16 c16] |
  }
 
 \score {  \relative c, {
   \clef bass    
    e8[ r16 f d'8 e16 e16]  c8[ c16 r16 bes8 r16 c16] |
  }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 }

diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly
index 4f09e3bc93b7a26069cf0e21ab2032d30d4b620d..97fb40a941cdd50f782cc2ca0566a4955e61f94b 100644 (file)
--- a/input/regression/beam-second.ly
+++ b/input/regression/beam-second.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
   texidoc="
 Engraving second intervals is tricky.  We used to have problems with seconds 
 \header{
   texidoc="
 Engraving second intervals is tricky.  We used to have problems with seconds 


@@ -14,7 +14,7 @@ seconds, you'll spot something fishy very quickly.
         b16[ c]
         a'[ b]
     }
         b16[ c]
         a'[ b]
     }

-    \paper{
+    \layout{

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly
index 0ade7d1c951b4062e4cab4c47447099fd67e335a..caaedf486ae85040371fd58b002d25e3e6375a22 100644 (file)
--- a/input/regression/beam-shortened-lengths.ly
+++ b/input/regression/beam-shortened-lengths.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
     texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."
 
 \header{
     texidoc="Beams in unnatural direction, have shortened stems, but do not look too short."


@@ -14,5 +14,5 @@
        \stemUp
         f'4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
     }
        \stemUp
         f'4  f8[ f]  f16[ f]  f32[ f]  f64[ f]  f128[ f] 
     }

-    \paper{ raggedright = ##t}
+    \layout{ raggedright = ##t}

 }          
 }          

diff --git a/input/regression/beamed-chord.ly b/input/regression/beamed-chord.ly
index 3687a54e6da620949bc3e53fc590c19892e5e1da..71321094fa101bafa24d7a4d4c1d3666c249be3d 100644 (file)
--- a/input/regression/beamed-chord.ly
+++ b/input/regression/beamed-chord.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc = "Hairy case for beam, chord, and automatic knees."
 
 \header{
 texidoc = "Hairy case for beam, chord, and automatic knees."


@@ -8,7 +8,7 @@ texidoc = "Hairy case for beam, chord, and automatic knees."
 %be fixed by uncommenting \stemUp"
 }
 
 %be fixed by uncommenting \stemUp"
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 
 \score{
 
 
 \score{

diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly
index 1fa2b95736b831dd9c3f8933554e72c661976b40..040b6a917a02e81bc1a35f45d28462aba3ae79c1 100644 (file)
--- a/input/regression/beaming-ternary-metrum.ly
+++ b/input/regression/beaming-ternary-metrum.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Automatic beaming works also in ternary time sigs."
 }
 \header {
 texidoc = "Automatic beaming works also in ternary time sigs."
 }


@@ -9,6 +9,6 @@ texidoc = "Automatic beaming works also in ternary time sigs."
 \time 6/8
  c8.[ c16 c16 c16] 
 }
 \time 6/8
  c8.[ c16 c16 c16] 
 }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/beaming.ly b/input/regression/beaming.ly
index bbd9f8ed6f07ded1494df890086d93ccbc86e846..2a0acfded8c299941dbfd46b6573beb353857ff5 100644 (file)
--- a/input/regression/beaming.ly
+++ b/input/regression/beaming.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/beams.ly b/input/regression/beams.ly
index 3294fa6b4b9efeb6108d3b49259624aa2ad869ba..89cf7c9292749d81a8308cb46b647b627534c29c 100644 (file)
--- a/input/regression/beams.ly
+++ b/input/regression/beams.ly
@@ -1,10 +1,10 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Beaming can be also given explicitly."
 }
 
 \header {
     texidoc = "Beaming can be also given explicitly."
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score { 
 \relative c'
 
 \score { 
 \relative c'

diff --git a/input/regression/break.ly b/input/regression/break.ly
index 7197d46fde37447d7163ef1b921158499b8d0b64..7530dd3ff987e0ed457dc7cf079285c0e1bb382a 100644 (file)
--- a/input/regression/break.ly
+++ b/input/regression/break.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -14,7 +14,7 @@ Breaks can be encouraged and discouraged using @code{\\break} and
        c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
        c1 \break \mark "break" c1 \break \mark "break" c1 
        }
        c1 \noBreak c1 \noBreak \mark "nobreak" c1 \noBreak
        c1 \break \mark "break" c1 \break \mark "break" c1 
        }

-       \paper {
+       \layout {

            indent = 0.0
            linewidth = 4.0\cm}
 }
            indent = 0.0
            linewidth = 4.0\cm}
 }

diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly
index 1feda799b7824891d45d3dfcc1ce41bf7eb40f7c..a2a5cd789c3f1b6b6360e0fe9b0822d600962977 100644 (file)
--- a/input/regression/breathing-sign-ancient.ly
+++ b/input/regression/breathing-sign-ancient.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly
index 3d0499d2bf4f07079862879973a93730f7a1741a..bdc50bc1badfc71b15275a8f29bed3d0bcea5e9f 100644 (file)
--- a/input/regression/breathing-sign.ly
+++ b/input/regression/breathing-sign.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Breathing signs are available in different tastes: commas (default),
 \header{
 texidoc="
 Breathing signs are available in different tastes: commas (default),

diff --git a/input/regression/chord-changes.ly b/input/regression/chord-changes.ly
index 8bff803b2e502166caf00907557061b3f4387242..122f236d34bacbcfdbc9985259c8c7f8ec54021f 100644 (file)
--- a/input/regression/chord-changes.ly
+++ b/input/regression/chord-changes.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="Property chordChanges: display chord names only when
 
 \header{
 texidoc="Property chordChanges: display chord names only when


@@ -23,5 +23,5 @@ settings = {
        >>
        \context Staff \transpose c c' \scheme
     >>
        >>
        \context Staff \transpose c c' \scheme
     >>

-    \paper{ raggedright = ##t }
+    \layout{ raggedright = ##t }

 }
 }

diff --git a/input/regression/chord-name-entry-11.ly b/input/regression/chord-name-entry-11.ly
index 69e918b6bde8cef76074bf21f07407e5a0e47e32..576853b07bfd4ce470816649d639ea303734569b 100644 (file)
--- a/input/regression/chord-name-entry-11.ly
+++ b/input/regression/chord-name-entry-11.ly
@@ -1,4 +1,4 @@
-\version "2.3.17" 
+\version "2.3.22" 

 
 \header {
 
 
 \header {
 


@@ -7,6 +7,6 @@
 
 }
 
 
 }
 

-\paper { raggedright = ##t } 
+\layout { raggedright = ##t } 

 \chordmode { c:13 c:13.11 c:m13 }
 
 \chordmode { c:13 c:13.11 c:m13 }
 

diff --git a/input/regression/chord-name-entry.ly b/input/regression/chord-name-entry.ly
index 3c0ec8f4493255c13e3d9edb568d85c8eb188d8d..85927a47d1991aaa8a149d95774d4a79c2ec3117 100644 (file)
--- a/input/regression/chord-name-entry.ly
+++ b/input/regression/chord-name-entry.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 
 
 \header {

diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly
index d08bb1d721d8368c37dad275743c686118eed4ab..fdcd44448522279417ca03bf98e78a53ce22d0ea 100644 (file)
--- a/input/regression/chord-name-exceptions.ly
+++ b/input/regression/chord-name-exceptions.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "The property @code{chordNameExceptions} can used
     to store a list of special notations for specific chords.
 
 \header { texidoc = "The property @code{chordNameExceptions} can used
     to store a list of special notations for specific chords.
 

diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly
index 4abfbc2b5ea76dc09a2818fbd787d7983c4e0063..e692c2f77d4d1e2c332686e8e82294264c9dd302 100644 (file)
--- a/input/regression/chord-name-major7.ly
+++ b/input/regression/chord-name-major7.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "The layout of the major 7 can be tuned with
 @code{majorSevenSymbol}."
 \header {
     texidoc = "The layout of the major 7 can be tuned with
 @code{majorSevenSymbol}."

diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly
index 7775c40d9ebd8d7c1bc732fdfc8d82d16aa59d23..4599afe83454232e35c594c4c54c4b93e8f32a01 100644 (file)
--- a/input/regression/chord-names-bass.ly
+++ b/input/regression/chord-names-bass.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 

diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly
index 421ef7506ab989fd66851f7a73638967675c315e..d4335fea61d68c540db2477ff2a7c024645b1da1 100644 (file)
--- a/input/regression/chord-scripts.ly
+++ b/input/regression/chord-scripts.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Scripts can also be attached to chord elements."
 \header {
 
 texidoc = "Scripts can also be attached to chord elements."

diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly
index 9a852e6f4418e0d7668cde39f652177bf8d6f880..2c9934e846a57b95b8f2dab4564088029c3f35ec 100644 (file)
--- a/input/regression/chord-tremolo-short.ly
+++ b/input/regression/chord-tremolo-short.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
   texidoc = "
   Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. 
 \header {
   texidoc = "
   Tremolo repeats can be constructed for short tremolos (total duration smaller than 1/4) too. Only some of the beams are connected to the stems. 


@@ -11,6 +11,6 @@
     \stemDown
     \repeat "tremolo"  2 { c32 e32 }
   }
     \stemDown
     \repeat "tremolo"  2 { c32 e32 }
   }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/chord-tremolo.ly b/input/regression/chord-tremolo.ly
index 63cba8e3fc7d9daa2e0138dcb461a0e04a958417..e5b8fc20d96fb46970f6eb085332220db4d8cd5b 100644 (file)
--- a/input/regression/chord-tremolo.ly
+++ b/input/regression/chord-tremolo.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -41,6 +41,6 @@ notes as well.)
   }
 
   \midi { }
   }
 
   \midi { }

-  \paper {} 
+  \layout {} 

 }
 
 }
 

diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly
index 80aba75f298241646e609417ab41660c07f9f199..a57ef63149a598f2161f78632c26438895a60cda 100644 (file)
--- a/input/regression/chords-funky-ignatzek.ly
+++ b/input/regression/chords-funky-ignatzek.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 
 
 \header {

diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly
index e1088f52102c4bd21ab1af01cb79a56d35174ae5..2c87d885aae15d2ee2bbff9e4e28ff4e2f02b1da 100644 (file)
--- a/input/regression/clef-oct.ly
+++ b/input/regression/clef-oct.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17" \header {
+\version "2.3.22" \header {

 
     texidoc = "Octavation signs may be added to clefs.  These
 octavation signs may be placed below or above (meaning an octave
 
     texidoc = "Octavation signs may be added to clefs.  These
 octavation signs may be placed below or above (meaning an octave


@@ -26,5 +26,5 @@ higher or lower), and can take any value, including 15 for two octaves."
            \clef "G^9"
            c4 
 }
            \clef "G^9"
            c4 
 }

-        \paper { raggedright = ##t  }
+        \layout { raggedright = ##t  }

             }
             }

diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly
index f9e8c79bdf9f305ab50add3ef406301743f39087..91efc8414157c270c0c26e1bb085051940ed5577 100644 (file)
--- a/input/regression/clefs.ly
+++ b/input/regression/clefs.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 


@@ -26,7 +26,7 @@ or below the clef respectively."
         \override Staff.Clef  #'full-size-change = ##t 
          \clef "treble" c'1^"full-size-change = \#t" \bar "|."
          }
         \override Staff.Clef  #'full-size-change = ##t 
          \clef "treble" c'1^"full-size-change = \#t" \bar "|."
          }

-         \paper{
+         \layout{

          raggedright = ##t
          }
 }
          raggedright = ##t
          }
 }

diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly
index ee42bf88dbc83bba04778ec33c06d38efef88f1b..657a58496989d1482e6dc9562ab19b7652c794f4 100644 (file)
--- a/input/regression/cluster-cross-staff.ly
+++ b/input/regression/cluster-cross-staff.ly
@@ -4,7 +4,7 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     \new PianoStaff <<
 
 \score {
     \new PianoStaff <<


@@ -18,7 +18,7 @@
            { \clef bass s1 * 2 }
            >>
 >>
            { \clef bass s1 * 2 }
            >>
 >>

-    \paper {
+    \layout {

        raggedright= ##t
     }
 }
        raggedright= ##t
     }
 }

diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly
index edc7604a2e35e3fe58bc57318cefa0bf31623923..779469b891aec0cf08c115cfb5ef19721162d62c 100644 (file)
--- a/input/regression/cluster.ly
+++ b/input/regression/cluster.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."
 \header {
     texidoc = "Clusters are a device to denote that a complete range of
 notes is to be played."


@@ -15,7 +15,7 @@ fragment = \relative c' {
      \new Staff \fragment
      \new Staff \applymusic #notes-to-clusters \fragment
      >>
      \new Staff \fragment
      \new Staff \applymusic #notes-to-clusters \fragment
      >>

- \paper { raggedright = ##t }
+ \layout { raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/regression/collision-2.ly b/input/regression/collision-2.ly
index 56bf5ce4da54b0c765f8daa967a9824ccdb4dc60..1d3fbb95026db3bbb7ad9d2d93b472203baf9852 100644 (file)
--- a/input/regression/collision-2.ly
+++ b/input/regression/collision-2.ly
@@ -1,8 +1,8 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Single head notes may collide. "
 }
 \header {
 texidoc = "Single head notes may collide. "
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly
index aeae1b7f58fd85fdd293a457beb22b3517bc9a7b..689d8a16176eda86019559f19400a5381905df49 100644 (file)
--- a/input/regression/collision-alignment.ly
+++ b/input/regression/collision-alignment.ly
@@ -5,9 +5,9 @@
 
 }
 
 
 }
 

-\paper  { raggedright = ##t }
+\layout  { raggedright = ##t }

 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \relative <<
     \new Staff {
 
 \relative <<
     \new Staff {

diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly
index 500a05c5ce8ecfc047fd91371740ddfad5c9f023..4f151e3c7a55ccbdbf28e90b9465d0550ce14d68 100644 (file)
--- a/input/regression/collision-dots-invert.ly
+++ b/input/regression/collision-dots-invert.ly
@@ -4,11 +4,11 @@
     dots: notes with dots should go to the right, if there could be
     confusion to which notes the dots belong."
 }
     dots: notes with dots should go to the right, if there could be
     confusion to which notes the dots belong."
 }

-\version "2.3.17"
+\version "2.3.22"

 \score { 
    \relative c'' { 
     << <a c>2\\ { <b d>4 <b d>4 }   >>
     << { <a c>2 } \\ { <b d>4. <b e>8 } >> 
   }
 \score { 
    \relative c'' { 
     << <a c>2\\ { <b d>4 <b d>4 }   >>
     << { <a c>2 } \\ { <b d>4. <b e>8 } >> 
   }

-  \paper {  raggedright = ##t } 
+  \layout {  raggedright = ##t } 

 }   
 }   

diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly
index 83d2c951758d995ce7d5cb55079bf6430397152a..c7e1dade2140288582663458becdc8fe85a4421c 100644 (file)
--- a/input/regression/collision-dots-move.ly
+++ b/input/regression/collision-dots-move.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     
     texidoc = "If collision resolution finds dotted note head must
 \header {
     
     texidoc = "If collision resolution finds dotted note head must


@@ -6,7 +6,7 @@
 
 }
 
 
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \score {
    \relative c {
 
 \score {
    \relative c {

diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly
index 613dd69b2f487b1a3bfae376f4599ec3536cce7b..ad16e28c63398bc1af40f925fc58cebafcd0b482 100644 (file)
--- a/input/regression/collision-dots.ly
+++ b/input/regression/collision-dots.ly
@@ -5,8 +5,8 @@
   on the right side."
 }
 
   on the right side."
 }
 

-\version "2.3.17"
-\paper { raggedright= ##t }
+\version "2.3.22"
+\layout { raggedright= ##t }

 
 % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down)
 \score{
 
 % todo: b2 (up) + b8 down looks strange compared to c2up + b8. (down)
 \score{

diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly
index 115bd9e769f9006fb42e2352cce631af87152f93..7f25f9d4112a536fd4c431d3113ca9aafb7044e1 100644 (file)
--- a/input/regression/collision-head-chords.ly
+++ b/input/regression/collision-head-chords.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  
 \header {
 texidoc = "Note heads in collisions should be merged if
 they have the same positions in the extreme note heads.  


@@ -12,7 +12,7 @@ they have the same positions in the extreme note heads.
 c4 
   << { c4 d4 <c d>8  <c d> <c d> } \\  { c4 c <a b>8 <b c> <c d>8 } >>
 }
 c4 
   << { c4 d4 <c d>8  <c d> <c d> } \\  { c4 c <a b>8 <b c> <c d>8 } >>
 }

-\paper {raggedright = ##t} 
+\layout {raggedright = ##t} 

 }
 
 
 }
 
 

diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly
index 8e776d82d0b37c41fe58121e0a222e017f20697c..18678270a21fa0b3103ab9a21e662333f26b1f9b 100644 (file)
--- a/input/regression/collision-heads.ly
+++ b/input/regression/collision-heads.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc =
 
 \header {
     texidoc =
 


@@ -9,7 +9,7 @@ if the black note heads are from 8th or shorter notes.
     
 }
 
     
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly
index 59ec20bcc48c53a8d6295f17ab967d59992bfb5c..91f8c388294903bf1a64b53f252fc5b30f71bc2d 100644 (file)
--- a/input/regression/collision-merge-differently-dotted.ly
+++ b/input/regression/collision-merge-differently-dotted.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     
     texidoc = "If NoteCollision has merge-differently-dotted = ##t note
 \header {
     
     texidoc = "If NoteCollision has merge-differently-dotted = ##t note


@@ -7,7 +7,7 @@ should not disappear when merging similar note heads."
     
 }
 
     
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

        
 \score {
     \context Staff \relative c'' <<
        
 \score {
     \context Staff \relative c'' <<

diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly
index bd4ac0a8e109e955b7876a71a41b7a4112ed0960..53d264e8a2b741098577a566e8d0077761c31df5 100644 (file)
--- a/input/regression/collision-merge-dots.ly
+++ b/input/regression/collision-merge-dots.ly
@@ -2,7 +2,7 @@
 
     texidoc = "When merging heads, the dots are merged too."
     }
 
     texidoc = "When merging heads, the dots are merged too."
     }

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
  {
 
 \score {
  {


@@ -11,4 +11,4 @@
     }
 }
 
     }
 }
 

-\paper { raggedright = ##t }}
+\layout { raggedright = ##t }}

diff --git a/input/regression/collision-mesh.ly b/input/regression/collision-mesh.ly
index 51ff7fa0b91cd703ddb1ce50bcc7b309f949f8a2..36fc522815e9d75ae0361ad9ccc80835c12e5ccd 100644 (file)
--- a/input/regression/collision-mesh.ly
+++ b/input/regression/collision-mesh.ly
@@ -1,10 +1,10 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
 }
 
 \header {
 texidoc = "Oppositely stemmed chords,  meshing into each other,
 are resolved."
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly
index d2e962704e9a401c0ce8c0e086066e9c118c2ef4..69a684183f88c80e62453e9455f4279064e87b60 100644 (file)
--- a/input/regression/collisions.ly
+++ b/input/regression/collisions.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 In addition to normal collision rules, there is support for polyphony, 
 \header{
 texidoc="
 In addition to normal collision rules, there is support for polyphony, 

diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly
index a667b59952751bbafa998a25d08142648156b1e6..940ee755d37a765820af6c8e489ad1bf332f65cf 100644 (file)
--- a/input/regression/completion-heads-polyphony.ly
+++ b/input/regression/completion-heads-polyphony.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was
 \header {
 
     texidoc = "Completion heads are broken across bar lines. This was


@@ -14,7 +14,7 @@ Completion heads are not fooled by polyphony with a different rhythm.
            { c2. a8 g4 f4. g4 f  }
        >>
 
            { c2. a8 g4 f4. g4 f  }
        >>
 

-       \paper {
+       \layout {

                \context{
                        \Voice
                        \remove "Note_heads_engraver"
                \context{
                        \Voice
                        \remove "Note_heads_engraver"

diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly
index d2bb2d3402dcdf14d30c5a2de975cb9583923740..a642d46d2c73551a32e1bd0281ff87335e29d46e 100644 (file)
--- a/input/regression/completion-heads.ly
+++ b/input/regression/completion-heads.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -8,7 +8,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr
 "
 }
 
 "
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 
 
 
 
 


@@ -18,7 +18,7 @@ If the @code{Note_heads_engraver} is replaced by the @code{Completion_heads_engr
 
   c2. c8 d4 e f g a b c2.. b8 a g16 f4 e d c8. c2 
   }
 
   c2. c8 d4 e f g a b c2.. b8 a g16 f4 e d c8. c2 
   }

-  \paper{
+  \layout{

     \context{
       \Voice
       \remove "Note_heads_engraver"
     \context{
       \Voice
       \remove "Note_heads_engraver"

diff --git a/input/regression/custos.ly b/input/regression/custos.ly
index 1125d894003141c814744fb4a2d88be9fd4eeb08..13b8bbc3ca72388a5c0406c74de5c1a9ac71c628 100644 (file)
--- a/input/regression/custos.ly
+++ b/input/regression/custos.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Custodes may be engraved in various styles."
 }
 \header {
     texidoc = "Custodes may be engraved in various styles."
 }


@@ -23,7 +23,7 @@
        c'1^"mensural"
        \break < d' a' f''>1
     }
        c'1^"mensural"
        \break < d' a' f''>1
     }

-    \paper {
+    \layout {

        \context {
            \Staff
            \consists Custos_engraver
        \context {
            \Staff
            \consists Custos_engraver

diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly
index 6c01d222f8ff045b1afb915dbf53c860f08f30fe..e59ffde385cb75b042c6bd13b97957893a2babd6 100644 (file)
--- a/input/regression/dot-flag-collision.ly
+++ b/input/regression/dot-flag-collision.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }
 \header {
     texidoc = "Dots move to the right when a collision with the (up)flag happens."
 }


@@ -13,7 +13,7 @@
        g''16.
        a,4. a8 a8. a16. c,16. g16.
     }
        g''16.
        a,4. a8 a8. a16. c,16. g16.
     }

-    \paper { raggedright = ##t}
+    \layout { raggedright = ##t}

 }
 
 
 }
 
 

diff --git a/input/regression/dots.ly b/input/regression/dots.ly
index 151511514c67d20ebd4bbc874edd79ab5085b8b4..7cca28d6cae7a0bcbc3e2e23d9235ee950653021 100644 (file)
--- a/input/regression/dots.ly
+++ b/input/regression/dots.ly
@@ -1,4 +1,4 @@
-\version "2.3.17" \header{
+\version "2.3.22" \header{

 
 
     texidoc=" Noteheads can have dots, and rests too.  
 
 
     texidoc=" Noteheads can have dots, and rests too.  


@@ -38,7 +38,7 @@ The priorities to print the dots are (ranked in importance):
        
        
   }
        
        
   }

-  \paper { }  
+  \layout { }  

   \midi { }
 }
 
   \midi { }
 }
 

diff --git a/input/regression/drums.ly b/input/regression/drums.ly
index 562c9ef314a8e31af02c441b88855ae377abb8dd..6718d8762c2393122d14c01c26daecc1f90776d9 100644 (file)
--- a/input/regression/drums.ly
+++ b/input/regression/drums.ly
@@ -7,7 +7,7 @@
 }
 
 
 }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }
 
 drh = \drummode { cymc4.^"crash" hhc16^"h.h." hh \repeat "unfold" 5 {hhc8 hho hhc8 hh16 hh} hhc4 r4 r2 }
 drl = \drummode {\repeat "unfold" 3 {bd4 sn8 bd bd4 << bd ss >> } bd8 tommh tommh bd toml toml bd tomfh16 tomfh }


@@ -31,7 +31,7 @@ timb = \drummode { \repeat "unfold" 2 {timh4 ssh timl8 ssh r timh r4 ssh8 timl r
        >>
     >>
        }
        >>
     >>
        }

-    \paper {}
+    \layout {}

 
     %% broken:
     \midi{ \tempo 4=120 }
 
     %% broken:
     \midi{ \tempo 4=120 }

diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly
index 34711e6f6dd8adb9e125000a60edec3bdd8d61f3..ba5fad77e8856d4c1ce4576b7b0038e7c67719da 100644 (file)
--- a/input/regression/dynamics-broken-hairpin.ly
+++ b/input/regression/dynamics-broken-hairpin.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc = "Broken crescendi should be open on one side."
 }
 \header{
 texidoc = "Broken crescendi should be open on one side."
 }


@@ -7,7 +7,7 @@ texidoc = "Broken crescendi should be open on one side."
 \score {  \relative c'' { 
     c1 \< \break c1\!  \> \break c1\!
   }
 \score {  \relative c'' { 
     c1 \< \break c1\!  \> \break c1\!
   }

-  \paper {
+  \layout {

     linewidth = 4.\cm
   }
 }
     linewidth = 4.\cm
   }
 }

diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly
index 31a088a15f73a8964cb7ae1bdb0c68f9171fbdfc..7929f33d46c04d999b1cfbcdc8738a4c5074ae6f 100644 (file)
--- a/input/regression/dynamics-glyphs.ly
+++ b/input/regression/dynamics-glyphs.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {texidoc = "Dynamic letters are kerned, and their weight
 matches that of the hairpin signs.  The dynamic scripts should be
 
 \header {texidoc = "Dynamic letters are kerned, and their weight
 matches that of the hairpin signs.  The dynamic scripts should be

diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly
index 7ee6831e291b27d8416cc9376624c40a27a8f1ca..33889ac900b8e060870abf5ffc1824cc60b687a1 100644 (file)
--- a/input/regression/dynamics-hairpin-length.ly
+++ b/input/regression/dynamics-hairpin-length.ly
@@ -6,10 +6,10 @@
     respectively."
 
 }
     respectively."
 
 }

-\version "2.3.17"
+\version "2.3.22"

 
 
 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \relative c'' { 
   c4 \< c4 \!
 
 \relative c'' { 
   c4 \< c4 \!

diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly
index 345593d85341c761d15d9df929ff37a8637a19dd..798213ab986b4fa31bd4ddd1fdf6b20c877c2c2f 100644 (file)
--- a/input/regression/dynamics-line.ly
+++ b/input/regression/dynamics-line.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc=" Dynamics appear below or above the staff.  If multiple
 dynamics are linked with (de)crescendi, they should be on the same
 \header{
 texidoc=" Dynamics appear below or above the staff.  If multiple
 dynamics are linked with (de)crescendi, they should be on the same


@@ -24,7 +24,7 @@ d\f
 a
 
 }
 a
 
 }

-\paper{
+\layout{

 }
 \midi{
 \tempo 1 = 60
 }
 \midi{
 \tempo 1 = 60

diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly
index ab099b3eee3d49a1f02421a208e1d9b09eaf81e3..c9c54a56ae2b404987e5b8322c9c09f76542a789 100644 (file)
--- a/input/regression/dynamics-unbound-hairpin.ly
+++ b/input/regression/dynamics-unbound-hairpin.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."
 
 \header {
 texidoc = "Crescendi may start off-notes, however, they should  not collapse into flat lines."


@@ -8,6 +8,6 @@ texidoc = "Crescendi may start off-notes, however, they should  not collapse int
   << f''1 { s4 s4 \< s4\! \> s4\! } >>
 }}
 
   << f''1 { s4 s4 \< s4\! \> s4\! } >>
 }}
 

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/easy-notation.ly b/input/regression/easy-notation.ly
index a23faaf66a31cc2fa544b9fb349e7afb75de1d8f..589f678f7e93d7796ce8164a73118a2547ffde57 100644 (file)
--- a/input/regression/easy-notation.ly
+++ b/input/regression/easy-notation.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     texidoc = " Easy-notation (or Ez-notation) prints names in note heads.
 
 \header {
     texidoc = " Easy-notation (or Ez-notation) prints names in note heads.


@@ -12,7 +12,7 @@ You also get ledger lines, of course."
        \override NoteHead #'note-names = ##("U" "V" "W" "X" "Y" "Z" "z")
        c'2 e'4 f' | b'1
     }
        \override NoteHead #'note-names = ##("U" "V" "W" "X" "Y" "Z" "z")
        c'2 e'4 f' | b'1
     }

-    \paper {
+    \layout {

        raggedright = ##t
     } 
 }
        raggedright = ##t
     } 
 }

diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly
index 9cee58ede142cb010ad5b05e39eda4ae5c10a2e8..7b77259076e8c6247072a35aef3c2649737c23cf 100644 (file)
--- a/input/regression/fermata-rest-position.ly
+++ b/input/regression/fermata-rest-position.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "
 Fermatas over multimeasure rests are positioned as over normal rests.
 " }
 
 
 
 \header { texidoc = "
 Fermatas over multimeasure rests are positioned as over normal rests.
 " }
 
 

-\paper {
+\layout {

     raggedright = ##t 
 }
 \relative c' {
     raggedright = ##t 
 }
 \relative c' {

diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly
index a1cc088e98f4000e8b2e36796b3da2fcc09bf752..e33dffcb77fc204403a5b186c7ece4c76b9b5370 100644 (file)
--- a/input/regression/figured-bass.ly
+++ b/input/regression/figured-bass.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "
 Figured bass is created by the FiguredBass context which eats
 \header {
     texidoc = "
 Figured bass is created by the FiguredBass context which eats


@@ -10,7 +10,7 @@ You can also type letters by entering quoted strings, which is shown in the
 last bass figure.
 
 " }
 last bass figure.
 
 " }

-\paper  { raggedright = ##t }  
+\layout  { raggedright = ##t }  

 <<
     \figures { 
        <3 [5 7]>
 <<
     \figures { 
        <3 [5 7]>

diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly
index f30eea155e57b20d51abcef7e6634c607c552507..fa687a73498cc76c9bce3a8c77380e0612bc3154 100644 (file)
--- a/input/regression/finger-chords.ly
+++ b/input/regression/finger-chords.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "With the new chord syntax, it is possible to associate
 \header {
 
 texidoc = "With the new chord syntax, it is possible to associate


@@ -7,7 +7,7 @@ fingerings uniquely with notes. This makes horizontal fingering much
 easier to process."
 
 }
 easier to process."
 
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly
index 209249af10d38a0a9675c96b79908a1b48511882..da3572be7b65ea02bbce7c96ac2df40f39c7cfa5 100644 (file)
--- a/input/regression/fingering.ly
+++ b/input/regression/fingering.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Automatic fingering tries to put fingering instructions
 \header {
 
 texidoc = "Automatic fingering tries to put fingering instructions


@@ -7,7 +7,7 @@ next to noteheads.
 "
 }
 
 "
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly
index 35ea1e8bcdcb156c9727ebdf6b9e38c5869b1662..7192135a8646e9d430eeb2536ae85779aa0917ce 100644 (file)
--- a/input/regression/follow-voice-break.ly
+++ b/input/regression/follow-voice-break.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
        texidoc = "
 The line-spanners connects to the Y position of the note  on the next line.
 \header{
        texidoc = "
 The line-spanners connects to the Y position of the note  on the next line.


@@ -19,7 +19,7 @@ printed.
                }
         \context Staff=two { \clef bass \skip 1*2 }
     >>
                }
         \context Staff=two { \clef bass \skip 1*2 }
     >>

-    \paper{
+    \layout{

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly
index 03d23a0e21f480a0b708488f85cb60098a18cf67..57550cefbc8bd8fdd2395ad38ecc0ed3aef55dff 100644 (file)
--- a/input/regression/font-magnification.ly
+++ b/input/regression/font-magnification.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "The magnification can be set for any font. Note
 that this does not change variable symbols such as beams or slurs. 
 " }
 \header { texidoc = "The magnification can be set for any font. Note
 that this does not change variable symbols such as beams or slurs. 
 " }

diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly
index 4288f353f997e7925554398b9892a359a7609d93..97b58c04fb9bbdceabbb5e1f9f292ffb55cc4f92 100644 (file)
--- a/input/regression/font-name.ly
+++ b/input/regression/font-name.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -36,6 +36,6 @@ available through (La)TeX.
             R1*21^"Wait for Utopia Italic"
             }
     
             R1*21^"Wait for Utopia Italic"
             }
     

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 
 }
 
 }

diff --git a/input/regression/font-postscript.ly b/input/regression/font-postscript.ly
index 6e1f8ba197301ebafe6b8dc4a22a79fd71217b23..539bada76d741b2aa6c11dc6e832e9a0eb8d8940 100644 (file)
--- a/input/regression/font-postscript.ly
+++ b/input/regression/font-postscript.ly
@@ -5,9 +5,9 @@
     the scheme-function @code{make-century-schoolbook-tree}."
 
 }
     the scheme-function @code{make-century-schoolbook-tree}."
 
 }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\bookpaper
+\paper

 {
     #(define text-font-defaults
       '((font-encoding . latin1)
 {
     #(define text-font-defaults
       '((font-encoding . latin1)


@@ -22,7 +22,7 @@
 % this file.
 #(system "afm2tfm `kpsewhich uncb8a.afm` uncb8a.tfm") 
 
 % this file.
 #(system "afm2tfm `kpsewhich uncb8a.afm` uncb8a.tfm") 
 

-\paper {
+\layout {

     linewidth = 160 \mm - 2.0 * 9.0 \mm
 
     
     linewidth = 160 \mm - 2.0 * 9.0 \mm
 
     

diff --git a/input/regression/generic-output-property.ly b/input/regression/generic-output-property.ly
index cffaf13fce0ef6556fae31e0b1ede15e73d29c71..4a43a17ea1273f2710804d7333cb2012c8608d4c 100644 (file)
--- a/input/regression/generic-output-property.ly
+++ b/input/regression/generic-output-property.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -24,7 +24,7 @@ setting the @code{extra-offset} of a grob.
            \mark \default
            e
 }
            \mark \default
            e
 }

-\paper{
+\layout{

        raggedright = ##t
 }
 }
        raggedright = ##t
 }
 }

diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly
index ca89998d853ce8108bdbb5c88390cf27a3d05748..77c6988e0d2e590847bbdd3eee45976ab737a2bf 100644 (file)
--- a/input/regression/glissando.ly
+++ b/input/regression/glissando.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 


@@ -23,7 +23,7 @@ The engraver does no time-keeping, so it involves some trickery to get
                \override Glissando  #'style = #'zigzag
                c4 \glissando c,, \glissando c' \glissando d
     }
                \override Glissando  #'style = #'zigzag
                c4 \glissando c,, \glissando c' \glissando d
     }

-    \paper{
+    \layout{

         linewidth = 50.\mm indent = 0
        \context{
               \Staff
         linewidth = 50.\mm indent = 0
        \context{
               \Staff

diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly
index 3ef7e50fee6693e8cbdf97e39af7fd6ec0b7a698..13b900a6905f299cfefd845fcbdc5a92bcc224ed 100644 (file)
--- a/input/regression/grace-auto-beam.ly
+++ b/input/regression/grace-auto-beam.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc = "The autobeamer is not confused by grace notes."
 \header
 {
     texidoc = "The autobeamer is not confused by grace notes."


@@ -11,6 +11,6 @@
     \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f 
         \grace a8 g16 f e f |
   }
     \grace a8 g16 f e f \grace a8 g16 f e f \grace a8 g16 f e f 
         \grace a8 g16 f e f |
   }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly
index 35be3920aae336258be941d99fa6df0846549ee7..8047ff7c6caa91d6f350f8600e37ef8e0e55bf5c 100644 (file)
--- a/input/regression/grace-bar-line.ly
+++ b/input/regression/grace-bar-line.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Bar line should come before the grace note."
 }
 \header {
 texidoc = "Bar line should come before the grace note."
 }


@@ -10,6 +10,6 @@ texidoc = "Bar line should come before the grace note."
 
 \score  { \relative c' \context Staff  { 
  f1 \grace {  a'16[ f]  } g1 }
 
 \score  { \relative c' \context Staff  { 
  f1 \grace {  a'16[ f]  } g1 }

-               \paper { raggedright = ##t}
+               \layout { raggedright = ##t}

  } 
 
  } 
 

diff --git a/input/regression/grace-bar-number.ly b/input/regression/grace-bar-number.ly
index 472145f39fa3ab5b42a6c525ecda663f9b1f065d..94e1d0af86241db899a259d0488c08bd049614c3 100644 (file)
--- a/input/regression/grace-bar-number.ly
+++ b/input/regression/grace-bar-number.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Grace notes do tricky things with timing. If a measure
 \header {
 
 texidoc = "Grace notes do tricky things with timing. If a measure


@@ -14,6 +14,6 @@ printed correctly.
 \grace c8
 c1  }
 
 \grace c8
 c1  }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly
index 9173689c1f40c8a61b6836778732e63a34714c4a..27f379d2a5e9e4effad9c76dc6fe10741caada02 100644 (file)
--- a/input/regression/grace-beam.ly
+++ b/input/regression/grace-beam.ly
@@ -6,9 +6,9 @@ Unbeamed grace notes are not put into normal beams.
 "
 }
 
 "
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 
 

-\version "2.3.17"
+\version "2.3.22"

 \score { \relative c'' { c4  d8[ \grace {  e32[  d c d] } e8]  e[  e \grace { f16 } e8 e]   }}
 
 \score { \relative c'' { c4  d8[ \grace {  e32[  d c d] } e8]  e[  e \grace { f16 } e8 e]   }}
 

diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly
index f32e1758f3e338327ca98ca723cd64916183004b..199c661fe524beabfdca50991ff01daa62bc6d74 100644 (file)
--- a/input/regression/grace-end.ly
+++ b/input/regression/grace-end.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc="@cindex Grace End
 \header {
 
     texidoc="@cindex Grace End


@@ -14,7 +14,7 @@
        c4 \grace {  d16[ d16] }
        
   }
        c4 \grace {  d16[ d16] }
        
   }

-       \paper {
+       \layout {

                raggedright = ##t
        }  
   \midi { }
                raggedright = ##t
        }  
   \midi { }

diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly
index ae6c00c7458f8ce0d165550bd7f14a1d2bbce189..965a89884e6b9dcfab9a1ec43c7116da99e98a9d 100644 (file)
--- a/input/regression/grace-nest.ly
+++ b/input/regression/grace-nest.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 


@@ -7,7 +7,7 @@ texidoc = "Grace code should not be confused by nested sequential musics, contai
      {
        c''2 { \grace  b'16  c''2 }  \bar "|."
     }
      {
        c''2 { \grace  b'16  c''2 }  \bar "|."
     }

-    \paper {
+    \layout {

 
        raggedright = ##t 
     }
 
        raggedright = ##t 
     }

diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly
index 06c06e374b30512337653d5c9b279d72c6d384d3..699c2993831f420802ed6f6e5ec7ace0852cd324 100644 (file)
--- a/input/regression/grace-nest1.ly
+++ b/input/regression/grace-nest1.ly
@@ -1,16 +1,16 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 
 \score{
  
 
 { c''2 { \grace  b'16  c''2 }  \bar "|." }
 
 
 \score{
  
 
 { c''2 { \grace  b'16  c''2 }  \bar "|." }

-  \paper {
+  \layout {

 }
  }
 
 }
  }
 

diff --git a/input/regression/grace-nest2.ly b/input/regression/grace-nest2.ly
index f2a2d4d751ec24c36a977bdb40e7212fea9f1b90..01cf6bd4d3b2f1d2171c9e2632bf4ac99215675c 100644 (file)
--- a/input/regression/grace-nest2.ly
+++ b/input/regression/grace-nest2.ly
@@ -1,10 +1,10 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
 
 \header {
 texidoc = "Grace code should not be confused by nested sequential musics, containing grace notes; practically speaking, this means that the end-bar and measure bar coincide in this example." 
 
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \context Voice {
         { \grace b'8 c''2 }
 
 \score {  \context Voice {
         { \grace b'8 c''2 }

diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly
index cb81dfb379d3997a4417d086ea95d37688c1241f..a8b63149ccd98e84e0e932ab03d2b9f8e8c9fe57 100644 (file)
--- a/input/regression/grace-nest3.ly
+++ b/input/regression/grace-nest3.ly
@@ -1,8 +1,8 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "In nested syntax, graces are still properly handled."
     }
 \header {
     texidoc = "In nested syntax, graces are still properly handled."
     }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \relative c'' {
        f1
 
 \score {  \relative c'' {
        f1

diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly
index 448f5b36d4a0432cd6bb7ee5f148be7264928e9b..64f30ca77c7024062f980b13b7f0dfd164a35386 100644 (file)
--- a/input/regression/grace-nest4.ly
+++ b/input/regression/grace-nest4.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }
 \header {
 texidoc = "Also in the nested syntax here, grace notes appear rightly."
 }


@@ -10,7 +10,7 @@ texidoc = "Also in the nested syntax here, grace notes appear rightly."
     >>
     \grace c16 c2. \bar "|."
 }
     >>
     \grace c16 c2. \bar "|."
 }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

         
 }
 
         
 }
 

diff --git a/input/regression/grace-nest5.ly b/input/regression/grace-nest5.ly
index c46f442bb480273fcbe77ab7f0f650e8dc887060..f327547ddd0a4e17a7f9ea68f607ec15bc7c3265 100644 (file)
--- a/input/regression/grace-nest5.ly
+++ b/input/regression/grace-nest5.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Graces notes may have the same duration as the main note."
     }
 \header {
     texidoc = "Graces notes may have the same duration as the main note."
     }


@@ -10,6 +10,6 @@
     \grace g e4
 }
 
     \grace g e4
 }
 

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/grace-part-combine.ly b/input/regression/grace-part-combine.ly
index 6fc6ba446e3b9e13266536ef0af1af56382d6ff8..1a4e4ab24905a97348a555cc35dcf430f955d85f 100644 (file)
--- a/input/regression/grace-part-combine.ly
+++ b/input/regression/grace-part-combine.ly
@@ -1,10 +1,10 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
 
 \header {
     texidoc = "Grace notes may be put in a @code{partcombine}r."
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 \score {
     \new Staff
 
 \score {
     \new Staff

diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly
index 0483bd1d61def86900533a66c114c5d2edd7ef5f..e16d84adf412c24e71d3d47e6d3ad9b7ae3e77f4 100644 (file)
--- a/input/regression/grace-staff-length.ly
+++ b/input/regression/grace-staff-length.ly
@@ -1,9 +1,9 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 
 \header{
 texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score{
   \context PianoStaff  \relative c'' <<
 
 \score{
   \context PianoStaff  \relative c'' <<


@@ -19,6 +19,6 @@ texidoc = "Stripped version of trip.ly.  Staves should be of correct length."
       }
     }
   >> 
       }
     }
   >> 

-  \paper { }
+  \layout { }

 }
 
 }
 

diff --git a/input/regression/grace-start.ly b/input/regression/grace-start.ly
index dfe97f8b4716850cc37b1d3885f9d6edcdcff259..79b97beb17dbd2fc604de285a682f2155f155ee5 100644 (file)
--- a/input/regression/grace-start.ly
+++ b/input/regression/grace-start.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Pieces may begin with grace notes."
 }
 \header {
 texidoc = "Pieces may begin with grace notes."
 }


@@ -9,6 +9,6 @@ texidoc = "Pieces may begin with grace notes."
  \grace {  a16[ bes]  }  c1
  \bar "||"  % test if | and || are synced. 
   }
  \grace {  a16[ bes]  }  c1
  \bar "||"  % test if | and || are synced. 
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/grace-stem-length.ly b/input/regression/grace-stem-length.ly
index 395d2b0ebbb34605e2ef1117daafe33374a1a2df..7ac92b4668cf3433387cbdc414d3e909a81cdb36 100644 (file)
--- a/input/regression/grace-stem-length.ly
+++ b/input/regression/grace-stem-length.ly
@@ -5,9 +5,9 @@ normal notes, if possible. They should never be longer, even if that
 would lead to beam quanting program. "
         
     }
 would lead to beam quanting program. "
         
     }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

     raggedright = ##t
 
 %    "debug-beam-quanting" = ##t 
     raggedright = ##t
 
 %    "debug-beam-quanting" = ##t 

diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly
index 478dfd9cc4367ba311020a3d65723e45ef75c054..b41b663bde8d7ed4addf0c82376a497270b0a71a 100644 (file)
--- a/input/regression/grace-stems.ly
+++ b/input/regression/grace-stems.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
 true; the two grace beams should be the same here.
 \header{
 texidoc = "Here @code{startGraceMusic} should set @code{no-stem-extend} to 
 true; the two grace beams should be the same here.


@@ -18,7 +18,7 @@ true; the two grace beams should be the same here.
     a4
        
   }
     a4
        
   }

-  \paper {
+  \layout {

     raggedright = ##t
   }  
   \midi { }
     raggedright = ##t
   }  
   \midi { }

diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly
index ae6a95c061ef2942c4d6f95259a3cc2a9c950404..2153536e80b5a2d15ae2f4dde69fbce6c569a7f4 100644 (file)
--- a/input/regression/grace-sync.ly
+++ b/input/regression/grace-sync.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header  {
   texidoc = "Grace notes in different voices/staves are synchronized."
 }
 \header  {
   texidoc = "Grace notes in different voices/staves are synchronized."
 }


@@ -12,6 +12,6 @@
     c4) c4 }
                \new Staff { c2 c4 c4 \bar "|." }
                >>
     c4) c4 }
                \new Staff { c2 c4 c4 \bar "|." }
                >>

-               \paper { raggedright = ##t}
+               \layout { raggedright = ##t}

  } 
 
  } 
 

diff --git a/input/regression/grace-types.ly b/input/regression/grace-types.ly
index b495ecb7bfb673d621d5950067f4f9da1afc650d..c05a44fcb1aba7b39b17d5186bcd41ec78b0e784 100644 (file)
--- a/input/regression/grace-types.ly
+++ b/input/regression/grace-types.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "There are three different kinds of grace types: the base 
 grace switches to smaller type, the appoggiatura inserts also a slur, and the
 acciaccatura inserts a slur and slashes the stem." 
     }
 
 \header {
     texidoc = "There are three different kinds of grace types: the base 
 grace switches to smaller type, the appoggiatura inserts also a slur, and the
 acciaccatura inserts a slur and slashes the stem." 
     }
 

-\paper {
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly
index 376df392385dac4cf49e3753d926a5e35d1fb67f..9301381365e076d05f1d4dc51ac9214e3efd87e7 100644 (file)
--- a/input/regression/grace-unfold-repeat.ly
+++ b/input/regression/grace-unfold-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "When grace notes are entered with unfolded repeats,
 line breaks take place before  grace  notes.
 \header {
     texidoc = "When grace notes are entered with unfolded repeats,
 line breaks take place before  grace  notes.

diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly
index 200e19d5ad9be8460018001e4f16e9194e36fdae..eb28300b8eb0a779ecf62ebd5eaf6336393f2b90 100644 (file)
--- a/input/regression/grace-volta-repeat-2.ly
+++ b/input/regression/grace-volta-repeat-2.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -7,7 +7,7 @@
 
       }
 
 
       }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {\relative c' {
 \repeat volta 2 {
 
 \score {\relative c' {
 \repeat volta 2 {

diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly
index 9bf7ecba7ba932a81e86460dc1c0fbc7e865e182..3c326e2c0f99b1aa15f7f08949c3600dad84fe1e 100644 (file)
--- a/input/regression/grace-volta-repeat.ly
+++ b/input/regression/grace-volta-repeat.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -15,7 +15,7 @@
      
      }
    }
      
      }
    }

-   \paper { raggedright = ##t}
+   \layout { raggedright = ##t}

  }
 
 
  }
 
 

diff --git a/input/regression/grace.ly b/input/regression/grace.ly
index 389dfd425a9273565b86dc1fe16a8894b6a238c9..5a00f76b5ab394e6abe6308706faf494c9b70703 100644 (file)
--- a/input/regression/grace.ly
+++ b/input/regression/grace.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -30,7 +30,7 @@ not set.  Main note scripts do not end up on the grace note.
        %%\grace  { \set Grace.graceAlignPosition = \right c16} c4
        c4 \grace  { c16 } c4
 }
        %%\grace  { \set Grace.graceAlignPosition = \right c16} c4
        c4 \grace  { c16 } c4
 }

-\paper {raggedright = ##t}
+\layout {raggedright = ##t}

 \midi{ }
 }
 
 \midi{ }
 }
 

diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly
index 9fd14f453fca2f46b01ef495628f29a6979f6ad9..0745122fee52bb0b85e8ecb4840b24fcbaee09a4 100644 (file)
--- a/input/regression/hairpin-dashed.ly
+++ b/input/regression/hairpin-dashed.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc ="Hairpin crescendi may be dashed. "
 
 \header {
 texidoc ="Hairpin crescendi may be dashed. "

diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly
index fd023f351101d2c7a85704522525c8128cf57188..922ad1787b782b3919bf0f27a5c84ca1d4d36aae 100644 (file)
--- a/input/regression/hairpin-ending.ly
+++ b/input/regression/hairpin-ending.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -12,6 +12,6 @@ into them."
 
 \score {
  \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p }
 
 \score {
  \relative c'' { c4 \> c4 c4\! c4_\ff \> c4 c4\!\p }

-\paper { raggedright = ##t} 
+\layout { raggedright = ##t} 

 }
 
 }
 

diff --git a/input/regression/hara-kiri-pianostaff.ly b/input/regression/hara-kiri-pianostaff.ly
index 3e71096bf35be495abf0796cb4a034aede416e68..d0757c1ce47a1a4cf139b83a8f5d7f2cc3e8b7df 100644 (file)
--- a/input/regression/hara-kiri-pianostaff.ly
+++ b/input/regression/hara-kiri-pianostaff.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc =
 
 
 \header { texidoc =
 


@@ -18,7 +18,7 @@ alignment; this should not confuse the mechanism.
          
 }
 
          
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
        
 \score {  \transpose c c''
 
        
 \score {  \transpose c c''


@@ -27,7 +27,7 @@ alignment; this should not confuse the mechanism.
    \new Staff {  d4 d d d s1 s1 s1 s1 }
    \new Staff {  e4 e e e s1 e4 e e e s1 }
  >>
    \new Staff {  d4 d d d s1 s1 s1 s1 }
    \new Staff {  e4 e e e s1 e4 e e e s1 }
  >>

- \paper {
+ \layout {

   \context {
    \RemoveEmptyStaffContext
   }
   \context {
    \RemoveEmptyStaffContext
   }

diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly
index ccd975e765f2613bd14cf9928da5cbeccd9b5948..0c94dd7be96813f2a52092dc03feea9dc3a01ae4 100644 (file)
--- a/input/regression/instrument-name-markup.ly
+++ b/input/regression/instrument-name-markup.ly
@@ -7,7 +7,7 @@ including alterations. "
 }
 
 
 }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 textFlat = \markup {\smaller \flat}
 
 
 textFlat = \markup {\smaller \flat}


@@ -20,7 +20,7 @@ textFlat = \markup {\smaller \flat}
     { c''1 \break c'' }
 
   }
     { c''1 \break c'' }
 
   }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/regression/instrument-name-partial.ly b/input/regression/instrument-name-partial.ly
index 5787146645f8c9f576b52e684bc4d7e094979621..e437737c782fa62bd70aebf2ab122c812338e04c 100644 (file)
--- a/input/regression/instrument-name-partial.ly
+++ b/input/regression/instrument-name-partial.ly
@@ -1,11 +1,11 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Instrument names are also printed on  partial starting measures."
 }
 
 \score {
    \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 }
 \header {
     texidoc = "Instrument names are also printed on  partial starting measures."
 }
 
 \score {
    \relative c'' { \set Staff.instrument = "foo" \partial 4 c4 c1 }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly
index f761149a031e2578f7997c6d54c49b0dd39d903a..8666125800db88c2e6215535418767fe5a3e6aa5 100644 (file)
--- a/input/regression/instrument-name.ly
+++ b/input/regression/instrument-name.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Staff margins are also markings attached to barlines.  They should be
 \header{
 texidoc="
 Staff margins are also markings attached to barlines.  They should be


@@ -19,7 +19,7 @@ PianoStaff.
       \set Staff.instrument = "Right " { c''4 }}
     \context Staff = bass { \set Staff.instrument = "Left " \clef bass c4 }>>
 
       \set Staff.instrument = "Right " { c''4 }}
     \context Staff = bass { \set Staff.instrument = "Left " \clef bass c4 }>>
 

-\paper {
+\layout {

 raggedright = ##t
 }}
 
 raggedright = ##t
 }}
 

diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly
index 0d178fdc2d4bca6a956c56ff16171ca9c2672ba4..76808121107969d5df9b9c19ad401a5b91a66169 100644 (file)
--- a/input/regression/key-clefs.ly
+++ b/input/regression/key-clefs.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "Each clef have own accidental placing rules. " }
 
 #(set-global-staff-size 16)
 \header { texidoc = "Each clef have own accidental placing rules. " }
 
 #(set-global-staff-size 16)

diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly
index cfcfd929e16d26d3ae7779c895faeae5246be2d8..5fc3fa7f17097ee1e1561bac4b257faeeb29380c 100644 (file)
--- a/input/regression/key-signature-cancellation.ly
+++ b/input/regression/key-signature-cancellation.ly
@@ -5,9 +5,9 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly
index 8803a96ad4f97bfbe5f9f44c75837e9a9fa09e88..f4d991440d3c669b452a9f1a2a5274bdab036a53 100644 (file)
--- a/input/regression/key-signature-scordatura.ly
+++ b/input/regression/key-signature-scordatura.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "By setting @code{Staff.keySignature} directly,
 key signatures can be set invidually per pitch.
 
 \header { texidoc = "By setting @code{Staff.keySignature} directly,
 key signatures can be set invidually per pitch.

diff --git a/input/regression/keys.ly b/input/regression/keys.ly
index 147d24c839e088a416b8a0d7505822aa454f0633..94cffd9e289d488d38d55527a669cf93d71f6985 100644 (file)
--- a/input/regression/keys.ly
+++ b/input/regression/keys.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Key signatures may appear on key changes, even without a barline.  
 \header{
 texidoc="
 Key signatures may appear on key changes, even without a barline.  

diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly
index ed2400edcd7e8091086a74606bf6b501ec42e4ad..073de0754b99faf0c21e90b875dd498a7f3bda80 100644 (file)
--- a/input/regression/ledger-line-shorten.ly
+++ b/input/regression/ledger-line-shorten.ly
@@ -2,9 +2,9 @@
     texidoc = "Ledger lines are shortened when they are very close. This ensures
 that  ledgers lines stay separate."
 }
     texidoc = "Ledger lines are shortened when they are very close. This ensures
 that  ledgers lines stay separate."
 }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly
index 1cca684550fead637d28e5a4aab74e35da0e96ee..432fa32b46a16aa8cbd5fac0d4b0d7bc1685b1e5 100644 (file)
--- a/input/regression/lily-in-scheme.ly
+++ b/input/regression/lily-in-scheme.ly
@@ -12,8 +12,8 @@ the @code{TextScript} grob.
           
       }
 
           
       }
 

-\version "2.3.17"
-\paper { raggedright = ##t }
+\version "2.3.22"
+\layout { raggedright = ##t }

 
 withPaddingA = #(def-music-function (location padding music) (number? ly:music?)
                 #{ \override TextScript #'padding = #$padding
 
 withPaddingA = #(def-music-function (location padding music) (number? ly:music?)
                 #{ \override TextScript #'padding = #$padding

diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly
index d52f73cfa3e3f50ba81ed15eab7eb2946433bbc5..f1b4ded3cfb0bb5674050265c3198ae7cb30e455 100644 (file)
--- a/input/regression/lyric-combine-new.ly
+++ b/input/regression/lyric-combine-new.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "With the @code{\\lyricsto} mechanism, individual lyric
 \header {
 
     texidoc = "With the @code{\\lyricsto} mechanism, individual lyric

diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly
index 18e7b9bd680c18f02ba4a81cafba7232c96305fe..f2dc8b079af3939744c5c33db54cf87fde31e404 100644 (file)
--- a/input/regression/lyric-combine-polyphonic.ly
+++ b/input/regression/lyric-combine-polyphonic.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc ="Polyphonic rhythms and rests do not disturb
 \header {
 
 texidoc ="Polyphonic rhythms and rests do not disturb


@@ -29,6 +29,6 @@ texidoc ="Polyphonic rhythms and rests do not disturb
          }
        >>
     }
          }
        >>
     }

-    \paper { raggedright = ##t}
+    \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/lyric-combine.ly b/input/regression/lyric-combine.ly
index 60a434cd51f76fcbb40f0d6c7fe16dc4da37b4b4..da93d9dc518fad5735299fc4416cfc45644a172d 100644 (file)
--- a/input/regression/lyric-combine.ly
+++ b/input/regression/lyric-combine.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
     texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be
 
 \header{
     texidoc= "Lyrics can be set to a melody automatically.  Excess lyrics will be


@@ -13,7 +13,7 @@ extenders do not assume anything about lyric lengths, so they continue
 to work."
 }
 
 to work."
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 
 
 
 
 

diff --git a/input/regression/lyric-extender-broken.ly b/input/regression/lyric-extender-broken.ly
index 846df5c8d9b479045645b879e0a3d940f4805d75..85f194af62af207eeb4a7d7c462a4de9c815ba14 100644 (file)
--- a/input/regression/lyric-extender-broken.ly
+++ b/input/regression/lyric-extender-broken.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
 
 \header
 {
 


@@ -17,7 +17,7 @@ of the melisma."
        }
        \lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
     >>
        }
        \lyricsto A \context Lyrics \lyricmode { a __ a __ ha }
     >>

-    \paper {
+    \layout {

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly
index 5dbdbe156278b6f65ef3006d229f739ecdacc76f..202e0b0d539e7e8bd03ed3ff3bda85ff64609f83 100644 (file)
--- a/input/regression/lyric-extender.ly
+++ b/input/regression/lyric-extender.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -7,7 +7,7 @@ does not extend past a rest, or past the next lyric syllable."
 
 }
 
 
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 \relative c''{
     d8( e f) r4. 
     f4
 \relative c''{
     d8( e f) r4. 
     f4

diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly
index b978584c854e403725c1dd61da311ad6940e42d8..3ace14934b131837ed875b43a0ffd64e2dad7fa0 100644 (file)
--- a/input/regression/lyric-hyphen-break.ly
+++ b/input/regression/lyric-hyphen-break.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -20,7 +20,7 @@ r c16[ c c]
        bla -- bla -- bla -- bla8 --
               bla16 -- bla -- bla 
        }>>
        bla -- bla -- bla -- bla8 --
               bla16 -- bla -- bla 
        }>>

-    \paper   {
+    \layout   {

        indent = 0.0 \cm
        linewidth = 3.4 \cm
 
        indent = 0.0 \cm
        linewidth = 3.4 \cm
 

diff --git a/input/regression/lyric-hyphen-retain.ly b/input/regression/lyric-hyphen-retain.ly
index a555b563039f6b8b6bd1b9853b5013f32077bea3..6718f10edde7211500c8ca2e295df12696b5907a 100644 (file)
--- a/input/regression/lyric-hyphen-retain.ly
+++ b/input/regression/lyric-hyphen-retain.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -38,7 +38,7 @@ c16[ c c c]
 
           bla -- bla -- bla -- bla 
        }>>
 
           bla -- bla -- bla -- bla 
        }>>

-    \paper   {
+    \layout   {

        indent = 0.0 \cm
        linewidth = 3.4 \cm
 
        indent = 0.0 \cm
        linewidth = 3.4 \cm
 

diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly
index 9f35bc78ceb970ccf6e428ee6034cdc735d0b09b..78567258939b25abad463510f969e81e58ac8693 100644 (file)
--- a/input/regression/lyric-hyphen.ly
+++ b/input/regression/lyric-hyphen.ly
@@ -1,8 +1,8 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "In lyrics, hyphens may be used."
 }
 \header {
     texidoc = "In lyrics, hyphens may be used."
 }

-\paper {
+\layout {

 
     raggedright= ##t
 }
 
     raggedright= ##t
 }

diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly
index 0c4c629ff96ab8f3add11f03051f88669de04fe9..f8aac3f37b9eb77bfa6b2ab87c85a2b37208a259 100644 (file)
--- a/input/regression/lyric-phrasing.ly
+++ b/input/regression/lyric-phrasing.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "
 \header {
 
 texidoc = "


@@ -22,5 +22,5 @@ texidoc = "
            izzz
        }
     >>
            izzz
        }
     >>

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly
index 25f4114427377fc60d8b99c56374b3b29d65dae4..1ba196fff72bc38303e98da73c4434b78a87458d 100644 (file)
--- a/input/regression/lyrics-bar.ly
+++ b/input/regression/lyrics-bar.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -23,7 +23,7 @@ lyrics do not collide with barlines.
        >>
         \new Staff { b1 b1 }
        >>
        >>
         \new Staff { b1 b1 }
        >>

-       \paper {
+       \layout {

                raggedright = ##t
                \context {
                        \Score
                raggedright = ##t
                \context {
                        \Score

diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly
index 1934bec635b475bed1c9d6fbff8f053af2fa2129..e7ae87fe0bb4b4619192c17369902699c39588f1 100644 (file)
--- a/input/regression/lyrics-melisma-beam.ly
+++ b/input/regression/lyrics-melisma-beam.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc = "Melismata are triggered by manual beams." 
 \header
 {
     texidoc = "Melismata are triggered by manual beams." 


@@ -14,5 +14,5 @@
        
        \lyricsto "" \new Lyrics \lyricmode { bla bla bla }
     >>
        
        \lyricsto "" \new Lyrics \lyricmode { bla bla bla }
     >>

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/lyrics-tenor-clef.ly b/input/regression/lyrics-tenor-clef.ly
index 081c6bcd0a279c137cb3d3dac850a2cec2b29a5f..48fa3aff7654ff9e4615e1e8d058bf61bde0c60d 100644 (file)
--- a/input/regression/lyrics-tenor-clef.ly
+++ b/input/regression/lyrics-tenor-clef.ly
@@ -2,8 +2,8 @@
     texidoc = "Lyrics are not lowered despite the presence of an octavation 8."
 }
 
     texidoc = "Lyrics are not lowered despite the presence of an octavation 8."
 }
 

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     \context {
        \Staff
        minimumVerticalExtent = ##f
     \context {
        \Staff
        minimumVerticalExtent = ##f

diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly
index 9869682c4441cd4b48b6fc225fa3c7c085e041c0..4576aa74b3cde72810c1df0bfdc87454eaa34b55 100644 (file)
--- a/input/regression/markup-note.ly
+++ b/input/regression/markup-note.ly
@@ -3,7 +3,7 @@
     texidoc = "The note markup function may be used to make metronome
  markings. It works for a variety of flag, dot and duration settings."
 }
     texidoc = "The note markup function may be used to make metronome
  markings. It works for a variety of flag, dot and duration settings."
 }

-\version "2.3.17"
+\version "2.3.22"

 
 \score {  { c4^\markup {
     \note #"1" #1
 
 \score {  { c4^\markup {
     \note #"1" #1

diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly
index a02659230557f954c1e0926369aa7fd9f4d8add4..a3586ee9978288682e46f75cda1de2d6af11cfe8 100644 (file)
--- a/input/regression/markup-score.ly
+++ b/input/regression/markup-score.ly
@@ -2,7 +2,7 @@
     texidoc = "Use \\score block as markup command."
 }
 
     texidoc = "Use \\score block as markup command."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 tuning = \markup {
     \score {
 
 tuning = \markup {
     \score {


@@ -11,7 +11,7 @@ tuning = \markup {
        } {
            \clef bass  <c, g, d g>1
        }
        } {
            \clef bass  <c, g, d g>1
        }

-       \paper { raggedright = ##t }
+       \layout { raggedright = ##t }

     }
 }
 
     }
 }
 

diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly
index a6978ad48b73af0ed4ea692c874d1fdf79ebfcff..cc2abfdba493152e23e2f349594fe4323f7d4feb 100644 (file)
--- a/input/regression/markup-stack.ly
+++ b/input/regression/markup-stack.ly
@@ -1,6 +1,6 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {texidoc="Markup scripts may be stacked."}
 \header {texidoc="Markup scripts may be stacked."}

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 \score {  { c''^\markup { "a" \column < "1" \bold "2"  "3" > } } }
 
 
 \score {  { c''^\markup { "a" \column < "1" \bold "2"  "3" > } } }
 
 

diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly
index f7c08e10225a3da1876d9cffb7f592da7a489432..be706cc4bb48be9bf47de6442cd286c522eef76d 100644 (file)
--- a/input/regression/markup-user.ly
+++ b/input/regression/markup-user.ly
@@ -7,7 +7,7 @@
 
       }
 
 
       }
 

-\version "2.3.17" % to be updated
+\version "2.3.22" % to be updated

 
 #(def-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""
 
 #(def-markup-command (upcase paper props str) (string?)
   "Upcase the string characters. Syntax: \\upcase #\"string\""


@@ -18,5 +18,5 @@
         c''-\markup \upcase #"hello world"
         % produces a "HELLO WORLD" markup
     }
         c''-\markup \upcase #"hello world"
         % produces a "HELLO WORLD" markup
     }

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/measure-grouping.ly b/input/regression/measure-grouping.ly
index 1b1504a73c21e92dcd94b93e16479ea5c663b48a..c598b74d4908cbe191e8a14b9b89d18891f471af 100644 (file)
--- a/input/regression/measure-grouping.ly
+++ b/input/regression/measure-grouping.ly
@@ -7,7 +7,7 @@ brackets above beats when the beats of a time signature are grouped.  "
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 %% TODO: should have 2/4 + 5/8 time sig style.
 
 
 %% TODO: should have 2/4 + 5/8 time sig style.


@@ -23,7 +23,7 @@ brackets above beats when the beats of a time signature are grouped.  "
             #(set-time-signature 5 8 '(3 2)) 
             g8 a4 g a4.->
         }
             #(set-time-signature 5 8 '(3 2)) 
             g8 a4 g a4.->
         }

-        \paper  {
+        \layout  {

             raggedright = ##t
             \context { \Staff
                           \consists "Measure_grouping_engraver"
             raggedright = ##t
             \context { \Staff
                           \consists "Measure_grouping_engraver"

diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly
index 4b1116624fff59afc3369b59144a14d949abaa6c..8444e939e28b13fb39ff0d046721c7d11c759825 100644 (file)
--- a/input/regression/mensural.ly
+++ b/input/regression/mensural.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     
 texidoc = "There is limited support for mensural notation: note head
 \header {
     
 texidoc = "There is limited support for mensural notation: note head

diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly
index 43fc0fb26835f29ab97dae6bd594a9e1f74e4e20..f3f53965799f7c9b81f8b516ea80b96f2969708f 100644 (file)
--- a/input/regression/metronome-marking.ly
+++ b/input/regression/metronome-marking.ly
@@ -9,10 +9,10 @@ The marking is left aligned with the time signature, if there is one.
     
     }
 
     
     }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {  \relative c'' {   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 }
 
 \score {  \relative c'' {   \tempo \breve = 100 c1 c1 \tempo 8.. = 50 c1 }

-\paper {  raggedright = ##t }
+\layout {  raggedright = ##t }

 
      }
         
 
      }
         

diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly
index fc563175f1d343e3c4450f9aee1fe32915449d29..cc52dee683ad2979c455b1ba7f5bb27f4acc0b03 100644 (file)
--- a/input/regression/mm-rests2.ly
+++ b/input/regression/mm-rests2.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly
index 09f5c958fbbc83a7ce5f19cbe5fc6fecf7493823..63a757a1aa784810587565ce3d170c190fcdc611 100644 (file)
--- a/input/regression/molecule-hacking.ly
+++ b/input/regression/molecule-hacking.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is
 
 \header { texidoc=" You can write stencil callbacks in Scheme, thus
 providing custom glyphs for notation elements.  A simple example is


@@ -50,7 +50,7 @@ GROB.  The dimensions of the stencil is not affected.
    parenthesize-stencil)
     
 
    parenthesize-stencil)
     
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 \relative c' {
     c4 e
 
 \relative c' {
     c4 e
 

diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly
index fc3c1b9513a85ca6ab19c31ae6e3be22c3328cb8..0c5173ede28bfb86cf0c9d26a3318d3df3fa1edf 100644 (file)
--- a/input/regression/multi-measure-rest-center.ly
+++ b/input/regression/multi-measure-rest-center.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
   texidoc = "The multimeasure rest is centered exactly between bar lines."
 \header
 {
   texidoc = "The multimeasure rest is centered exactly between bar lines."


@@ -14,7 +14,7 @@
 
        c'1 R1*20 c'1
     }
 
        c'1 R1*20 c'1
     }

-    \paper { raggedright = ##t} 
+    \layout { raggedright = ##t} 

 }
         
 
 }
         
 

diff --git a/input/regression/multi-measure-rest-grace.ly b/input/regression/multi-measure-rest-grace.ly
index 883597a8dc9d689d450650b125357740c195a84d..0f4d96426731f111730326b2666073326203a3df 100644 (file)
--- a/input/regression/multi-measure-rest-grace.ly
+++ b/input/regression/multi-measure-rest-grace.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 texidoc= "Multi-measure rests are centered also in the case of grace notes."
 }
 
 
 
 \header {
 texidoc= "Multi-measure rests are centered also in the case of grace notes."
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 <<
     \new Staff { R1 R1 R1*3 }
 
 <<
     \new Staff { R1 R1 R1*3 }

diff --git a/input/regression/multi-measure-rest-instr-name.ly b/input/regression/multi-measure-rest-instr-name.ly
index 50604385222791f23d24cfe1e9d4fb80523a637f..cff6c1f5872053e0c190dbdd6aa87354c817d42f 100644 (file)
--- a/input/regression/multi-measure-rest-instr-name.ly
+++ b/input/regression/multi-measure-rest-instr-name.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "There are both long and short instrument names.
 \header {
 
     texidoc = "There are both long and short instrument names.


@@ -13,7 +13,7 @@ multimeasure rests. "
        \set Staff.instr = "instr"
        {c''1 \break R1 }
     >>
        \set Staff.instr = "instr"
        {c''1 \break R1 }
     >>

-    \paper {
+    \layout {

        raggedright = ##t
        \context {
            \Staff
        raggedright = ##t
        \context {
            \Staff

diff --git a/input/regression/multi-measure-rest-multi-staff-center.ly b/input/regression/multi-measure-rest-multi-staff-center.ly
index c7ac055dd213d31461ced45648dcef758a07b31a..5fc82c9a100aba251876c5ff91313ff42fc89a6a 100644 (file)
--- a/input/regression/multi-measure-rest-multi-staff-center.ly
+++ b/input/regression/multi-measure-rest-multi-staff-center.ly
@@ -2,7 +2,7 @@
 independent on prefatory matter in other staves."
 
          }
 independent on prefatory matter in other staves."
 
          }

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     << \new Staff  { R1 } 
 
 \score {
     << \new Staff  { R1 } 


@@ -10,5 +10,5 @@ independent on prefatory matter in other staves."
 
     >>
 
 
     >>
 

-\paper { raggedright = ##t } 
+\layout { raggedright = ##t } 

 }
 }

diff --git a/input/regression/multi-measure-rest-spacing.ly b/input/regression/multi-measure-rest-spacing.ly
index 1d1dab4d94e72c0afe8c21b936629dfb8e7a6948..2b04c0ccbc677c02f37c9127aef2d934f71c829d 100644 (file)
--- a/input/regression/multi-measure-rest-spacing.ly
+++ b/input/regression/multi-measure-rest-spacing.ly
@@ -3,7 +3,7 @@
     texidoc = "By setting texts starting with a multi-measure rest, an 
 extra spacing column is created. This should not cause problems."
     }
     texidoc = "By setting texts starting with a multi-measure rest, an 
 extra spacing column is created. This should not cause problems."
     }

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     <<
 
 \score {
     <<


@@ -12,7 +12,7 @@ extra spacing column is created. This should not cause problems."
            <<  { R1*40 }  { s1*0_"bla" }>> 
        }
     >>
            <<  { R1*40 }  { s1*0_"bla" }>> 
        }
     >>

-    \paper {
+    \layout {

        raggedright = ##t
     }
  }
        raggedright = ##t
     }
  }

diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly
index c320cc3190d253583cde15fe0ecc555f29836cb3..f1787a2f3ce3d355aa378dc9ea4d677eee8f6ae0 100644 (file)
--- a/input/regression/multi-measure-rest-text.ly
+++ b/input/regression/multi-measure-rest-text.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header  {
 
 
 \header  {
 

diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly
index 404ae7afd28a08492bc7f949e8c3247f57e89b16..655cdd411b124a5ea317252403444e2a59bafdef 100644 (file)
--- a/input/regression/multi-measure-rest.ly
+++ b/input/regression/multi-measure-rest.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 
 texidoc="
 \header{
 
 texidoc="


@@ -26,7 +26,7 @@ are used then a different symbol is used.
 
 \time 8/4 R1*2
 }
 
 \time 8/4 R1*2
 }

-       \paper {
+       \layout {

        \context {
                \Score
                skipBars = ##t
        \context {
                \Score
                skipBars = ##t

diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly
index b62a5faad4fbf947c80fe9c03e1479c1a9b114ea..99255c3710c269922844731623bbd48cbb3ac27e 100644 (file)
--- a/input/regression/music-function.ly
+++ b/input/regression/music-function.ly
@@ -4,7 +4,7 @@ texidoc = "Music function are generic music transformation functions,
 which can be used to extend music syntax seamlessly."
 
 }
 which can be used to extend music syntax seamlessly."
 
 }

-\version "2.3.17"
+\version "2.3.22"

 
 #(define myBar
   (ly:make-music-function
 
 #(define myBar
   (ly:make-music-function

diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly
index 2ea736ead15c86402148465d3ddff5599d293ef7..1b4a994fa3cae8a7cd5fa0ce542f48b67a233363 100644 (file)
--- a/input/regression/music-map.ly
+++ b/input/regression/music-map.ly
@@ -10,7 +10,7 @@ dynamics are left over. These are put onto the 2nd measure."
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 #(define (notes-to-skip m)
 "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.
 
 #(define (notes-to-skip m)
 "Convert all stuff with duration (notes, lyrics, bass figures, etc.) to skips.


@@ -27,7 +27,7 @@ Scripts and dynamics are maintained.
 )
 
 
 )
 
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  } 
 
 
 foobar =  \transpose c c' { c4\>-^ c4-^ c4\!-^ c4-^  } 
 

diff --git a/input/regression/new-markup-scheme.ly b/input/regression/new-markup-scheme.ly
index f00c6dab5ff8cc225eee73f9870f11b73a3ac9dd..a1cb93cbe2f1efe14ae7f5126810ceb0a1df3514 100644 (file)
--- a/input/regression/new-markup-scheme.ly
+++ b/input/regression/new-markup-scheme.ly
@@ -5,7 +5,7 @@
     texts using a similar syntax as @code{\\markup}."
 
     }
     texts using a similar syntax as @code{\\markup}."
 
     }

-\version "2.3.17"
+\version "2.3.22"

 \score {
      {
         \fatText
 \score {
      {
         \fatText


@@ -53,7 +53,7 @@
                              #:smaller #:smaller #:smaller "A")
               #:sub "alike")
     }
                              #:smaller #:smaller #:smaller "A")
               #:sub "alike")
     }

-    \paper { 
+    \layout { 

         raggedright = ##t
         indent = #0
         \context {
         raggedright = ##t
         indent = #0
         \context {

diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly
index 2cf8708399890b47bde576e07fa1aa8e881fc3c0..d9f16534941f777b742322fac98c55202c4a154a 100644 (file)
--- a/input/regression/new-markup-syntax.ly
+++ b/input/regression/new-markup-syntax.ly
@@ -2,7 +2,7 @@
 texidoc = "With the new markup syntax, text may be written in various manners."
 }
 
 texidoc = "With the new markup syntax, text may be written in various manners."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 \score {
 
 
 \score {

diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly
index 2c1355a72b6c638c73228967fbf5b757f2dd954c..7bccbfbb945b3de7e59d8fb5ef2f119ad334fdc9 100644 (file)
--- a/input/regression/new-slur.ly
+++ b/input/regression/new-slur.ly
@@ -3,8 +3,8 @@
     texidoc = "Scoring based slur formatting."
 }
 
     texidoc = "Scoring based slur formatting."
 }
 

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##t
 %    #(define debug-slur-scoring #t)
 }
     raggedright = ##t
 %    #(define debug-slur-scoring #t)
 }

diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly
index 216515c1938ac2cea4049293ce722a67192b09a6..6a6de5e354c957a2fbe34275d57e038ea9540ddc 100644 (file)
--- a/input/regression/newaddlyrics.ly
+++ b/input/regression/newaddlyrics.ly
@@ -3,7 +3,7 @@
     texidoc = "newlyrics, multiple stanzas, multiple lyric voices."
     
 }
     texidoc = "newlyrics, multiple stanzas, multiple lyric voices."
     
 }

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 <<
     \new Staff \relative {
        d'2 d c4 bes a2 \break
 <<
     \new Staff \relative {
        d'2 d c4 bes a2 \break


@@ -26,4 +26,4 @@
     }
 >>
 
     }
 >>
 

-\version "2.3.17"
+\version "2.3.22"

diff --git a/input/regression/no-staff.ly b/input/regression/no-staff.ly
index 79a874709dc89ff12c7e132e585d7bdf238c98c4..524ade91b7fdde4161f0f20698daff7bb449b3f6 100644 (file)
--- a/input/regression/no-staff.ly
+++ b/input/regression/no-staff.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove
 % possible rename to staff-something.  -gp
 
 \header{ texidoc = "@cindex Staff Remove


@@ -9,7 +9,7 @@ corresponding engraver.
 
 \score {
    { c4 d4 e8 d8 }
 
 \score {
    { c4 d4 e8 d8 }

-  \paper {
+  \layout {

     raggedright = ##t
     \context {
       \Staff
     raggedright = ##t
     \context {
       \Staff

diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly
index 6724f703da66e42e3beb1f34e80f0b63b9a0486c..28ebf827b17ed96bc19f3cc2933d7f1c5a7faa89 100644 (file)
--- a/input/regression/non-empty-text.ly
+++ b/input/regression/non-empty-text.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
     texidoc=" By default, text is set with empty horizontal dimensions.  
 
 \header{
     texidoc=" By default, text is set with empty horizontal dimensions.  


@@ -15,7 +15,7 @@ to control the horizontal size of text.  " }
        \fatText
        c_"very wide and long text" c
     }
        \fatText
        c_"very wide and long text" c
     }

-    \paper {
+    \layout {

        linewidth = 3.0\cm
     }
 }
        linewidth = 3.0\cm
     }
 }

diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly
index 8683c15d8491c8620f0ae361cf137e33fa361dd8..4d34b5e33899794bd6dfa3fe5b83f4b19fc74ee5 100644 (file)
--- a/input/regression/note-group-bracket.ly
+++ b/input/regression/note-group-bracket.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -28,7 +28,7 @@ analysis brackets start and end.
        c4\stopGroup\stopGroup
     }
 
        c4\stopGroup\stopGroup
     }
 

-    \paper {
+    \layout {

        \context {
            \Staff \consists "Horizontal_bracket_engraver"
        }
        \context {
            \Staff \consists "Horizontal_bracket_engraver"
        }

diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly
index cfe4a863455611194bd0c29329cd9f69f8e94dae..afff8d7b769f5445a081f05fe5a59a4508c3f7bf 100644 (file)
--- a/input/regression/note-head-chord.ly
+++ b/input/regression/note-head-chord.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     texidoc = "Note heads are flipped on the stem to prevent collisions.
 
 \header {
     texidoc = "Note heads are flipped on the stem to prevent collisions.


@@ -8,7 +8,7 @@ It also works for whole heads that have invisible stems.
 
 }
 
 
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \relative c''
         \context Voice {
 
 \score {  \relative c''
         \context Voice {

diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly
index db6e9f9645c9a9487629980c60b256b383ce6841..241fcd378f11ecc42f0414d5b67bb4270e917e8d 100644 (file)
--- a/input/regression/note-head-harmonic.ly
+++ b/input/regression/note-head-harmonic.ly
@@ -6,7 +6,7 @@
   Harmonic heads do not get  dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals."
 }
 
   Harmonic heads do not get  dots. If @code{harmonicAccidentals} is unset, they also don't get accidentals."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
   {
 
 \score {
   {


@@ -18,7 +18,7 @@
     < dis'' gis''\harmonic >8
   }
 
     < dis'' gis''\harmonic >8
   }
 

-  \paper {
+  \layout {

       raggedright = ##t 
   }
 }
       raggedright = ##t 
   }
 }

diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly
index cd6e04d34d8e78c04a58fa73fa86169c2f875612..33d57086571de78f01e2df37fec419d5765902b4 100644 (file)
--- a/input/regression/note-head-style.ly
+++ b/input/regression/note-head-style.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Note head shapes may be set from several choices.  
 \header{
 texidoc="
 Note head shapes may be set from several choices.  


@@ -76,7 +76,7 @@ pattern =  <<
     \break
   }
 
     \break
   }
 

-  \paper {
+  \layout {

     indent = 0.0
     raggedright = ##t
   }
     indent = 0.0
     raggedright = ##t
   }

diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly
index 160617930916b06e15e38981b79c5e92ac416a4d..377c2138bf00ff1aea172412a0e6196464d09402 100644 (file)
--- a/input/regression/note-line.ly
+++ b/input/regression/note-line.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "Note head lines (e.g. glissando)
 
 \header {
 texidoc = "Note head lines (e.g. glissando)


@@ -21,7 +21,7 @@ sd = { \change Staff = down}
            \clef F s1*4
        }
     >>
            \clef F s1*4
        }
     >>

-\paper {
+\layout {

     linewidth = 8.0 \cm
 }
 }
     linewidth = 8.0 \cm
 }
 }

diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly
index 890b54a8672a601432dc5afb247d078698e9675f..3a049263ff7d158ce3013514c26e48779bd1c398 100644 (file)
--- a/input/regression/number-staff-lines.ly
+++ b/input/regression/number-staff-lines.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger
 
 \header{
 texidoc=" The number of stafflines of a staff can be set.  Ledger


@@ -11,7 +11,7 @@ adjusted accordingly.  "
 \context Voice \relative c {
        c' c c c | g' g g g     \bar ":|"
   }
 \context Voice \relative c {
        c' c c c | g' g g g     \bar ":|"
   }

-  \paper {
+  \layout {

 
 \context { \Staff
 \override StaffSymbol #'line-count = #3
 
 \context { \Staff
 \override StaffSymbol #'line-count = #3

diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly
index c5b55cc1b070ba2b43c5dd7be985f8153bc1640a..00881ffa8a93c6d853c351ad5c7a92ba61e20f5d 100644 (file)
--- a/input/regression/ottava-broken.ly
+++ b/input/regression/ottava-broken.ly
@@ -10,10 +10,10 @@ the end of the line (regardless of prefatory matter).
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 \relative c'''  {
     a2 b
     #(set-octavation 1)
 \relative c'''  {
     a2 b
     #(set-octavation 1)

diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly
index 516263202bbf5432529151bb031a4e84e360e590..a2aa3428a45bc43b168a16236070cf3557bcb85a 100644 (file)
--- a/input/regression/ottava.ly
+++ b/input/regression/ottava.ly
@@ -10,7 +10,7 @@ string can be tuned with @code{Staff.ottavation}.
 "
 
 }
 "
 
 }

-\version "2.3.17"
+\version "2.3.22"

 
 % . There must be a minimum distance between the octavation line and the
 %   topmost staff line, taking into account the height of the closing
 
 % . There must be a minimum distance between the octavation line and the
 %   topmost staff line, taking into account the height of the closing


@@ -32,7 +32,7 @@ string can be tuned with @code{Staff.ottavation}.
 %   by the user).  The same holds for `8va' and `15ma'.
 
 
 %   by the user).  The same holds for `8va' and `15ma'.
 
 

-\paper { raggedright = ##t} 
+\layout { raggedright = ##t} 

 \score {
   \relative c'''  {
   a b c a
 \score {
   \relative c'''  {
   a b c a

diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly
index 06393cf3e4b619125bccfe4b3624725be24c5043..3621ea66e3846fc07cbb0ab8d8883a0211859a46 100644 (file)
--- a/input/regression/page-breaks.ly
+++ b/input/regression/page-breaks.ly
@@ -1,5 +1,5 @@
 #(ly:set-point-and-click 'line-column)
 #(ly:set-point-and-click 'line-column)

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 

diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly
index 254544f7d6affb8594c6df7de7a094afbd919ba8..8cc5cf25f9103a859fd1a75b517a767ba651f28d 100644 (file)
--- a/input/regression/page-layout.ly
+++ b/input/regression/page-layout.ly
@@ -1,9 +1,9 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\header{ texidoc = "This shows how different settings on \bookpaper
-modify the general page layout. Basically \bookpaper will set the
-values for the whole paper while \paper for each \score block." }
+\header{ texidoc = "This shows how different settings on \paper
+modify the general page layout. Basically \paper will set the
+values for the whole paper while \layout for each \score block." }

 
  \header {
     title = "Title"
 
  \header {
     title = "Title"


@@ -17,7 +17,7 @@ values for the whole paper while \paper for each \score block." }
     instrument = "Instrument"
   }
 
     instrument = "Instrument"
   }
 

-\bookpaper {
+\paper {

     %hsize = 2\cm
     %vsize = 2\cm
     topmargin = 2\cm
     %hsize = 2\cm
     %vsize = 2\cm
     topmargin = 2\cm


@@ -41,7 +41,7 @@ values for the whole paper while \paper for each \score block." }
             }
         }
         \header {piece = "Piece I"}
             }
         }
         \header {piece = "Piece I"}

-        \paper {linewidth = 13\cm}
+        \layout {linewidth = 13\cm}

     }
     \score {
         \relative c'' {
     }
     \score {
         \relative c'' {


@@ -50,6 +50,6 @@ values for the whole paper while \paper for each \score block." }
             }
         }
         \header {piece = "Piece II"}
             }
         }
         \header {piece = "Piece II"}

-        \paper {linewidth = 9\cm}
+        \layout {linewidth = 9\cm}

     }
 }
     }
 }

diff --git a/input/regression/part-combine-a2.ly b/input/regression/part-combine-a2.ly
index aa1ae26b5425056807b6048e01fa76a2366d68d1..b22e7224b1a4306e027eb64123bb10ae2ee1acca 100644 (file)
--- a/input/regression/part-combine-a2.ly
+++ b/input/regression/part-combine-a2.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."
 \header {
     texidoc ="The a2 string is printed only on notes (i.e. not on rests),
 and only after chords, solo or polyphony."

diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly
index 5247dc7abc1cd897507f5bfa5970183e18eece8a..eb33aab7c7ddd8f4445076d5bf1087413364ce37 100644 (file)
--- a/input/regression/part-combine-cross.ly
+++ b/input/regression/part-combine-cross.ly
@@ -4,13 +4,13 @@
 "
     }
 
 "
     }
 

-\version "2.3.17"
+\version "2.3.22"

 
 vone =  \relative a' { g4 g f f e e d d }
 vtwo =  \relative a' { e4 e f f g g a a }
 
 \score {
    \partcombine \vone \vtwo
 
 vone =  \relative a' { g4 g f f e e d d }
 vtwo =  \relative a' { e4 e f f g g a a }
 
 \score {
    \partcombine \vone \vtwo

-   \paper { raggedright = ##t } 
+   \layout { raggedright = ##t } 

 }
  
 }
  

diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly
index b663904edaa6b74796c47cee174210dfbde3b400..a0654b1d3babc2322969ddbbaf270e0aa324c426 100644 (file)
--- a/input/regression/part-combine-global.ly
+++ b/input/regression/part-combine-global.ly
@@ -11,7 +11,7 @@ voices.
   
 "
     }
   
 "
     }

-\version "2.3.17"
+\version "2.3.22"

 
 vone =
 
 
 vone =
 

diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly
index 637775a9dadb9e220f8cf529106ee50aed2b54d6..991c36dc1130c800ba02032303b6d5ad176099e2 100644 (file)
--- a/input/regression/part-combine-mmrest-after-solo.ly
+++ b/input/regression/part-combine-mmrest-after-solo.ly
@@ -1,9 +1,9 @@
 
 \header { texidoc = " Multimeasure rests are printed after solos, both
     for solo1 and for solo2."  }
 
 \header { texidoc = " Multimeasure rests are printed after solos, both
     for solo1 and for solo2."  }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

   \new Staff 
     \partcombine
      \relative c''{ R1*2 | c4 r2.  | c2 r  | R1 }
   \new Staff 
     \partcombine
      \relative c''{ R1*2 | c4 r2.  | c2 r  | R1 }

diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly
index ef653aa061eeccf92da247ecafecf9d0d66d7c10..14c35fe5a5c39bb4f082fa9e40746cded60e38c0 100644 (file)
--- a/input/regression/part-combine-solo-end.ly
+++ b/input/regression/part-combine-solo-end.ly
@@ -4,8 +4,8 @@
     other one. Unfortunately, the multi-rest does not get printed."
 }
 
     other one. Unfortunately, the multi-rest does not get printed."
 }
 

-\version "2.3.17"
-\paper { raggedright = ##t }
+\version "2.3.22"
+\layout { raggedright = ##t }

 
 <<
     \new Staff
 
 <<
     \new Staff

diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly
index 1b6258ab45d7d0009ea64ca1b3dbfe314a434789..ef2c086171150f25e9979149645e49034e844120 100644 (file)
--- a/input/regression/part-combine-solo-global.ly
+++ b/input/regression/part-combine-solo-global.ly
@@ -5,7 +5,7 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     \new Staff
 
 \score {
     \new Staff

diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly
index bea60b2fb3bc55b521dbd558c45d4e11bbe0a56c..54a214651498909aa29ef22a0be87e0af75d2d9a 100644 (file)
--- a/input/regression/part-combine-solo.ly
+++ b/input/regression/part-combine-solo.ly
@@ -17,7 +17,7 @@ Solo 1/2 can not be used when a spanner is active, so there is no solo
 vone =  \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 }
 vtwo =  \relative g' { g4.   g8 r2          g4 r4 r2  g4 } 
 
 vone =  \relative a' { d4 r8 d8 d8 r8 d8 r8 d2 ~ d2 ~ d4 }
 vtwo =  \relative g' { g4.   g8 r2          g4 r4 r2  g4 } 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     
 
 \score {
     

diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly
index 4844cfba8c1539aa0bf2d4a3ab1df4b6d921076e..ef753bd435c903db1c076e3989ef9b304905938f 100644 (file)
--- a/input/regression/part-combine-text.ly
+++ b/input/regression/part-combine-text.ly
@@ -9,7 +9,7 @@ texts accordingly.
     }
 
 
     }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 vone =  \relative a' { R1 a2    r4 r a a a a }
 vtwo =  \relative a' { R1 f4 f4 f4 f f f a a  }
 
 vone =  \relative a' { R1 a2    r4 r a a a a }
 vtwo =  \relative a' { R1 f4 f4 f4 f f f a a  }

diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly
index ba29b30d7e6e6dc69faac111c4bbcaddb6ff6cc7..b04902ad3b57c5cb575b1415dd5db81a4298fe34 100644 (file)
--- a/input/regression/part-combine.ly
+++ b/input/regression/part-combine.ly
@@ -9,7 +9,7 @@
 "
     }
 
 "
     }
 

-\version "2.3.17"
+\version "2.3.22"

 
 vone =  \relative a' { g2 g    g  g4 g f' c c( c) c c  c ~ c
                             c2. c4   c
 
 vone =  \relative a' { g2 g    g  g4 g f' c c( c) c c  c ~ c
                             c2. c4   c


@@ -21,6 +21,6 @@ vtwo =  \relative a' { f2 f4 f f2 g4 g c, f f  f  f f~ f ~ f
 
 \score {
    \partcombine \vone \vtwo
 
 \score {
    \partcombine \vone \vtwo

-   \paper { raggedright = ##t } 
+   \layout { raggedright = ##t } 

 }
  
 }
  

diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly
index 5a6fb5fbe37b41bc43a9b767dbbf61b1c65087c8..35d2001abc79d1653559340ffe52b82b7fb835d4 100644 (file)
--- a/input/regression/pedal-bracket.ly
+++ b/input/regression/pedal-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -21,5 +21,5 @@ At a line-break, there are no vertical endings.  " }
         c4 d \unaCorda e f g
         b  | \break c b c \treCorde c
     }
         c4 d \unaCorda e f g
         b  | \break c b c \treCorde c
     }

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly
index ea78d35c5c7705530cb3d3ca9515efcbeff86fa3..260f2dbe213f125dd7a5586e7e9f88923fe3a7a8 100644 (file)
--- a/input/regression/pedal-end.ly
+++ b/input/regression/pedal-end.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Unterminated piano pedal brackets run to the end of the piece. "
 \header {
 
     texidoc = "Unterminated piano pedal brackets run to the end of the piece. "


@@ -11,5 +11,5 @@
        c4 \sustainDown
        \bar "|."
     }
        c4 \sustainDown
        \bar "|."
     }

-    \paper { raggedright  = ##t }
+    \layout { raggedright  = ##t }

 }
 }

diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly
index fff51ddd7a7914b23ece0f121aa752e135b0d7b6..327ee41bd75d4c52de1a8e3b6d1992b0016cc909 100644 (file)
--- a/input/regression/pedal-ped.ly
+++ b/input/regression/pedal-ped.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc = "The standard piano pedals style comes with Ped symbols.
 \header
 {
     texidoc = "The standard piano pedals style comes with Ped symbols.

diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly
index ad4bb8333659a8633b6008842f8b36adf063ae2c..9ef3c4ff99b7b8e96e1b31cab829bcc9f9e2978a 100644 (file)
--- a/input/regression/phrasing-slur-slur-avoid.ly
+++ b/input/regression/phrasing-slur-slur-avoid.ly
@@ -1,10 +1,10 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
     texidoc="@code{PhrasingSlur}s go over normal slurs."
 }
 
 \header{
     texidoc="@code{PhrasingSlur}s go over normal slurs."
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \relative c''{
     c8 \( (d e f) g ( a b c)
 
 \relative c''{
     c8 \( (d e f) g ( a b c)

diff --git a/input/regression/prefatory-empty-spacing.ly b/input/regression/prefatory-empty-spacing.ly
index 3ec257eabc4e36654ffdfeb19beeaedd8f310000..657234a8ef54367dc6f239683413e61cdf9ae8d1 100644 (file)
--- a/input/regression/prefatory-empty-spacing.ly
+++ b/input/regression/prefatory-empty-spacing.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -8,7 +8,7 @@ the break alignment."
     
 }
 
     
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 \score{  {
 a a a a \break
 
 \score{  {
 a a a a \break

diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly
index da438d9fa5b92bb2f6d44ceb82293897f9b80961..7fddf68ca037d745bd29bf09bf87a24a935fbf43 100644 (file)
--- a/input/regression/prefatory-spacing-matter.ly
+++ b/input/regression/prefatory-spacing-matter.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Distances between prefatory items (e.g. clef, bar,
 \header {
 
     texidoc = "Distances between prefatory items (e.g. clef, bar,


@@ -20,6 +20,6 @@ bar-line is different from the start of line.
        \key g \minor
        c1
 }
        \key g \minor
        c1
 }

-\paper  { raggedright = ##t}
+\layout  { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/property-grace-polyphony.ly b/input/regression/property-grace-polyphony.ly
index 49815116c8c240b1b4a8455331a35dcf9a7fe74a..0a4952af795488c59d21d21dd7c1c78aac63098d 100644 (file)
--- a/input/regression/property-grace-polyphony.ly
+++ b/input/regression/property-grace-polyphony.ly
@@ -5,9 +5,9 @@
     not interfere with the overrides and reverts from polyphony."
 
 }
     not interfere with the overrides and reverts from polyphony."
 
 }

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 

-\version "2.3.17"
+\version "2.3.22"

    \relative c'' {
       <<
          { \grace e8 d2 }
    \relative c'' {
       <<
          { \grace e8 d2 }

diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly
index 44c49633ada1b8b880a63de68bcb0146d414c809..849070b8f8e5c0123f2396a2da69aa036c2209fb 100644 (file)
--- a/input/regression/property-once.ly
+++ b/input/regression/property-once.ly
@@ -1,10 +1,10 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Once properties take effect during a single time step only."
 }
 
 \header {
     texidoc = "Once properties take effect during a single time step only."
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \relative c' {
     c4
 
 \relative c' {
     c4

diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly
index 9006602dfa98333fd1a978c7d8b089919bf34136..380b767d75ee8920ede7ec61e4a89d100dfcfde4 100644 (file)
--- a/input/regression/quote-cyclic.ly
+++ b/input/regression/quote-cyclic.ly
@@ -6,7 +6,7 @@ example, there are notes with each full-bar rest."
          
  
 }
          
  
 }

-\version "2.3.17"
+\version "2.3.22"

 A = \relative c' { c4 d e f | << R1            \\
                                 \quote "qB" 1 >> | }
 B = \relative c' { << R1            \\
 A = \relative c' { c4 d e f | << R1            \\
                                 \quote "qB" 1 >> | }
 B = \relative c' { << R1            \\


@@ -15,7 +15,7 @@ B = \relative c' { << R1            \\
 \addquote "qA" \A
 \addquote "qB" \B
 
 \addquote "qA" \A
 \addquote "qB" \B
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 <<
     \context Staff = "A" \A
 
 <<
     \context Staff = "A" \A

diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly
index 857fec9078907b8ebda0edaca3cb145f9bf70307..2ab18dec1a13a7ec1d260b73dffae8188ababf5a 100644 (file)
--- a/input/regression/quote-transposition.ly
+++ b/input/regression/quote-transposition.ly
@@ -10,9 +10,9 @@ quoted ones) will transposed as well.  "
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 
 \addquote clarinet  {
 
 
 \addquote clarinet  {

diff --git a/input/regression/quote.ly b/input/regression/quote.ly
index 18fc7e228fffdbc798f7b7d7fbbbbfb9c48978df..b98d960fc05b5b1d4c3405d758b903178d386f6b 100644 (file)
--- a/input/regression/quote.ly
+++ b/input/regression/quote.ly
@@ -7,8 +7,8 @@ things are quoted. In this example, a 16th rests is not quoted, since
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }
 @code{rest-event} is not in @code{quotedEventTypes}."
 
 }

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly
index 8db67b9fc68ce85bbab738e1717d5e03ed141216..fe56382b25148586b61c4d3b19d0fcb32bf79ce5 100644 (file)
--- a/input/regression/rehearsal-mark-letter.ly
+++ b/input/regression/rehearsal-mark-letter.ly
@@ -5,7 +5,7 @@ and after Z, double letters are used.  The mark may be set
 with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}."
       }
 
 with @code{\mark NUMBER}, or with @code{Score.rehearsalMark}."
       }
 

-\version "2.3.17"
+\version "2.3.22"

 \score {   \relative c'' {
   c1  \mark \default
   c1  \mark #7
 \score {   \relative c'' {
   c1  \mark \default
   c1  \mark #7

diff --git a/input/regression/rehearsal-mark-number.ly b/input/regression/rehearsal-mark-number.ly
index 4654aacc9e0168d4ec6e72d7017852ce9b9bbc8b..2e16974300194cb2130d5d01f071fc6044c9b7de 100644 (file)
--- a/input/regression/rehearsal-mark-number.ly
+++ b/input/regression/rehearsal-mark-number.ly
@@ -5,7 +5,7 @@ By setting @code{markFormatter} we may choose a different style of mark printing
          
       }
 
          
       }
 

-\version "2.3.17"
+\version "2.3.22"

 \score {
    \relative c''{
     \set Score.markFormatter = #format-mark-numbers 
 \score {
    \relative c''{
     \set Score.markFormatter = #format-mark-numbers 

diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly
index 352835f278866a97c594bdeb4b6c62a5a8ed064f..ad4c52362d8211671a399e54f1a4ecebeea149f7 100644 (file)
--- a/input/regression/repeat-fold.ly
+++ b/input/regression/repeat-fold.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly
index f0e63bd7f2a6cca4c28cfcf1734ad728f76a25cd..e4daa498fb06294ff56ca08f84dd259c681b7705 100644 (file)
--- a/input/regression/repeat-line-break.ly
+++ b/input/regression/repeat-line-break.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -7,7 +7,7 @@ bracket should be equal.
 "
 }
 
 "
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score  {
 
 
 \score  {
 

diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly
index 61cf3ca8a2bfdcc12ee3d96a0aaaf3c260e308b6..39967e90afef3a1c70ea6fc06152806da680454c 100644 (file)
--- a/input/regression/repeat-percent-skipbars.ly
+++ b/input/regression/repeat-percent-skipbars.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set."
 }
 
 
 
 \header {
 texidoc = "Percent repeats are not skipped, even when @code{skipBars} is set."
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {
      \context Staff <<
 
 \score {
      \context Staff <<

diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly
index 705f1c8ba13a9770ad2e73b4da4ad6a999272328..e29bd2bbcb74d4e74bea8756df3e6150305e7082 100644 (file)
--- a/input/regression/repeat-percent.ly
+++ b/input/regression/repeat-percent.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Measure repeats may be nested with beat repeats."
 }
 \header {
 texidoc = "Measure repeats may be nested with beat repeats."
 }

diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly
index 2fe5ea1b0224e0a46393767bd07283a58211b639..cb2bea178f54e269f7dec74a14fbbec3dd80612a 100644 (file)
--- a/input/regression/repeat-slash.ly
+++ b/input/regression/repeat-slash.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Within a bar, beat repeats denote that a music snippet should be
 played again."
 \header {
 texidoc = "Within a bar, beat repeats denote that a music snippet should be
 played again."


@@ -12,5 +12,5 @@ played again."
    \repeat "percent" 2 { g'8 g c, c  }   
    \repeat "percent" 4 { b8 b8  }
   }
    \repeat "percent" 2 { g'8 g c, c  }   
    \repeat "percent" 4 { b8 b8  }
   }

-        \paper { raggedright = ##t }
+        \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/repeat-unfold-all.ly b/input/regression/repeat-unfold-all.ly
index 86057d58ba1b21477eb058d8a5d7d745a37988d0..393099a1fa4d3291b9e6ea601ac008aee4e4d82d 100644 (file)
--- a/input/regression/repeat-unfold-all.ly
+++ b/input/regression/repeat-unfold-all.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "Volta repeats may be unfolded through the music
     function @code{\unfoldrepeats}."
 
 \header { texidoc = "Volta repeats may be unfolded through the music
     function @code{\unfoldrepeats}."


@@ -8,7 +8,7 @@
 nots = \relative c'   {
     c4 \repeat volta 2 c4 \alternative { d e  }
 }
 nots = \relative c'   {
     c4 \repeat volta 2 c4 \alternative { d e  }
 }

-\paper {raggedright = ##t} 
+\layout {raggedright = ##t} 

 
 \context Voice {
     \nots
 
 \context Voice {
     \nots

diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly
index 14ba94340c169387631c0cc703d8700a3fd3fd64..81761053adcf021329246d9f1d0da77d0a3e510d 100644 (file)
--- a/input/regression/repeat-unfold-tremolo.ly
+++ b/input/regression/repeat-unfold-tremolo.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Unfolding tremolo repeats. All fragments fill one
 \header {
 
     texidoc = "Unfolding tremolo repeats. All fragments fill one


@@ -23,5 +23,5 @@
 
        
     }
 
        
     }

-    \paper { raggedright = ##t }  
+    \layout { raggedright = ##t }  

 }
 }

diff --git a/input/regression/repeat-unfold.ly b/input/regression/repeat-unfold.ly
index 9ffa2d967099a0d8299966f053f0338aa1232d9a..f63cde71b5bb87bc180125561e89918cc5342a8c 100644 (file)
--- a/input/regression/repeat-unfold.ly
+++ b/input/regression/repeat-unfold.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly
index 87f5b2d75025f24b6c892132c3e2600be325e6b3..f375540c4255f3f79318747ecad6fad0f995e14c 100644 (file)
--- a/input/regression/repeat-volta-skip-alternatives.ly
+++ b/input/regression/repeat-volta-skip-alternatives.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "When too few alternatives are present, the first
 \header {
 
     texidoc = "When too few alternatives are present, the first

diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly
index 3ed0cc0b533f22bcbe20c3e156bb8167637f2812..3645e2daf6c3789a1ec53a872aad5d379d7b333b 100644 (file)
--- a/input/regression/repeat-volta.ly
+++ b/input/regression/repeat-volta.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -17,7 +17,7 @@ If they don't barlines should still be shown.
     % more alts than body
     \repeat volta 2 { c^"2$\\times$ 3alt" d } \alternative { e f g }
   }
     % more alts than body
     \repeat volta 2 { c^"2$\\times$ 3alt" d } \alternative { e f g }
   }

-  \paper {}
+  \layout {}

   \midi {}
 }
 
   \midi {}
 }
 

diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly
index 5ecebac1c3446570c63feda2536101e3635b7d03..263939070c1dd38c435a098eb671ce854e968638 100644 (file)
--- a/input/regression/rest-collision-beam.ly
+++ b/input/regression/rest-collision-beam.ly
@@ -2,7 +2,7 @@
     texidoc = "Rests under beams are only moved if necessary."
 }
 
     texidoc = "Rests under beams are only moved if necessary."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 fig =   \relative c' {
     <a c e>8[ r <c e a> r <e a c> r <a c e>]  r |
 
 fig =   \relative c' {
     <a c e>8[ r <c e a> r <e a c> r <a c e>]  r |


@@ -30,7 +30,7 @@ fig =   \relative c' {
       >>
   }
 
       >>
   }
 

-  \paper {
+  \layout {

       raggedright = ##t
   }
 }
       raggedright = ##t
   }
 }

diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly
index 4c38d5874287e15b0d3d2b284c2724748a05601e..7cc252579afb3fa3c1a8d21da485c757dbaed644 100644 (file)
--- a/input/regression/rest-collision.ly
+++ b/input/regression/rest-collision.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may
 \header{
 texidoc="
 Rests should not collide with beams, stems and noteheads.  Rests may


@@ -48,7 +48,7 @@ restsII = \context Staff  {
                \scales 
                \restsII 
        }
                \scales 
                \restsII 
        }

-       \paper { raggedright = ##t }
+       \layout { raggedright = ##t }

 }      
 
 
 }      
 
 

diff --git a/input/regression/rest-dot-position.ly b/input/regression/rest-dot-position.ly
index 3fbdb8129683cfbf545dfb792757b72bd04cd1ff..898b4e4dce5de70c79cc622e64549c1f67d84a76 100644 (file)
--- a/input/regression/rest-dot-position.ly
+++ b/input/regression/rest-dot-position.ly
@@ -4,7 +4,7 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 {
     \set Score.timing = ##f
 
 {
     \set Score.timing = ##f

diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly
index 46aa971efc8e6e2dd792200a0080650954f8bf8e..b94d4bd5c75944c6bc866e30e1de5e2404155b03 100644 (file)
--- a/input/regression/rest-ledger.ly
+++ b/input/regression/rest-ledger.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Whole and half rests moving outside the staff should get
 ledger lines."
 \header {
 texidoc = "Whole and half rests moving outside the staff should get
 ledger lines."

diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly
index c98265b565ee72cb8670d6dd8954857e583f00be..ec0e8ecb99e6529fc7802407c508bbc65e282a07 100644 (file)
--- a/input/regression/rest-pitch.ly
+++ b/input/regression/rest-pitch.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Rests can have pitches--these will be affected by
 \header {
 
 texidoc = "Rests can have pitches--these will be affected by


@@ -7,7 +7,7 @@ beam/rest collision resolving will leave it alone."
 
 }
 
 
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score { \relative c'' 
         {
 
 \score { \relative c'' 
         {

diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly
index 50ae630e61d5112d052b4c078e0461c38254d019..75ef3430c1d0774d5d60938e1092881c679f34d4 100644 (file)
--- a/input/regression/rest-polyphonic.ly
+++ b/input/regression/rest-polyphonic.ly
@@ -7,12 +7,12 @@ even if there is no opposite note or rest. The amount is two
     }
 
 
     }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
   \new Staff  \relative c' {
      << { r8 g''4 g8 r g4 g8 } \\
             { d,4    r   d   r   } >>
   }
 
 \score {
   \new Staff  \relative c' {
      << { r8 g''4 g8 r g4 g8 } \\
             { d,4    r   d   r   } >>
   }

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 }

diff --git a/input/regression/rest.ly b/input/regression/rest.ly
index f8eb375ffedcb1687b36786dd2829cae34dc651b..ecf431e3a88efecfa5051aa61d9ab80831ae97d4 100644 (file)
--- a/input/regression/rest.ly
+++ b/input/regression/rest.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly
index 38a9f429e4afa0ab89b97592001d6bff7afe3816..bb321df3b08f33eb9fb27da4a0a541740466cb51 100644 (file)
--- a/input/regression/rhythmic-staff.ly
+++ b/input/regression/rhythmic-staff.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
 
     texidoc = "In rhythmic staves stems should go up, and bar lines have the size for a  5 line staff. The whole note hangs from the rhythmic staff."
 }
 
 \header
 {
 
     texidoc = "In rhythmic staves stems should go up, and bar lines have the size for a  5 line staff. The whole note hangs from the rhythmic staff."
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \context RhythmicStaff
 {
 
 \context RhythmicStaff
 {

diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly
index 35c0a8b8f35acf6d9596fbb6c71176cf53e1f480..cd88fa6df121b214ba9330067cdad6ba39b4daf4 100644 (file)
--- a/input/regression/script-collision.ly
+++ b/input/regression/script-collision.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -13,6 +13,6 @@
   <<  { c4^^ }\\
      { d4_^ } >>
     }
   <<  { c4^^ }\\
      { d4_^ } >>
     }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

     }
 
     }
 

diff --git a/input/regression/script-stack-order.ly b/input/regression/script-stack-order.ly
index 506994552322dc915edc28ce33741fd047349dca..ffc39174b9c039a0fef4b5ba1f9e06ff21dc87dd 100644 (file)
--- a/input/regression/script-stack-order.ly
+++ b/input/regression/script-stack-order.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Scripts can be stacked. The order is determined by a
 priority field, but when objects have the same priority, the input
 \header {
     texidoc = "Scripts can be stacked. The order is determined by a
 priority field, but when objects have the same priority, the input


@@ -8,6 +8,6 @@ order determines the order. Objects specified first are closest to the note.
 }
 
 \score{ \relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" }
 }
 
 \score{ \relative c'' { c4^"inner up"^"outer up"_"inner down"_"outer down" }

-       \paper { raggedright = ##t}
+       \layout { raggedright = ##t}

     } 
 
     } 
 

diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly
index 87a1a19b298d7eccea7af525118d7d8b7bd78300..e3c4e2e815581748b8868b1bdfe87fad998f206d 100644 (file)
--- a/input/regression/script-stacked.ly
+++ b/input/regression/script-stacked.ly
@@ -1,6 +1,6 @@
-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 \header { 
 texidoc = "Scripts may be stacked."
 
 \header { 
 texidoc = "Scripts may be stacked."

diff --git a/input/regression/size11.ly b/input/regression/size11.ly
index 32f15ae514d7ec194012b8e3190474010c63229f..e641cc98b21733bf28b279654535fae9b8ff57b7 100644 (file)
--- a/input/regression/size11.ly
+++ b/input/regression/size11.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="

diff --git a/input/regression/size13.ly b/input/regression/size13.ly
index 38a4caa018912f7846cbeb2b51009c9768855316..8309574d70cea3638df291a3c6abcbecc08ce269 100644 (file)
--- a/input/regression/size13.ly
+++ b/input/regression/size13.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 foollilypondbook = "
 \score
 "
 foollilypondbook = "
 \score
 "

diff --git a/input/regression/size16.ly b/input/regression/size16.ly
index 57ddab0b280081bcf8766e7e7c55e502e3fe2c4d..9947569b5d8f0595c18593417e926f280989d51f 100644 (file)
--- a/input/regression/size16.ly
+++ b/input/regression/size16.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 foollilypondbook = "
 \score
 "
 foollilypondbook = "
 \score
 "

diff --git a/input/regression/size20.ly b/input/regression/size20.ly
index 856a075e10433ebb2c6596e46da7b96a85ff4ca5..e0cadd408edf240129d4b8489f2c959e16e44b9d 100644 (file)
--- a/input/regression/size20.ly
+++ b/input/regression/size20.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 foollilypondbook = "
 \score
 "
 foollilypondbook = "
 \score
 "

diff --git a/input/regression/size23.ly b/input/regression/size23.ly
index c00eb3dae92c37f443c92c44c0199b45430d6268..1116ee91ebdbafd84c1d7cd14f38caf8050487e9 100644 (file)
--- a/input/regression/size23.ly
+++ b/input/regression/size23.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 foollilypondbook = "
 \score
 "
 foollilypondbook = "
 \score
 "

diff --git a/input/regression/size26.ly b/input/regression/size26.ly
index 3152357063308cf91c127f3c5970224910d37108..2e7ee4331474c8f04a9c7e1215d133ff64b2e54f 100644 (file)
--- a/input/regression/size26.ly
+++ b/input/regression/size26.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 foollilypondbook = "
 \score
 "
 foollilypondbook = "
 \score
 "

diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly
index a1f4f70b95a6aea1d9d5d0739a0e186b28fe17ba..8f60aa233718ac27f56eac33b729ec20643d3316 100644 (file)
--- a/input/regression/slur-area.ly
+++ b/input/regression/slur-area.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     
     texidoc = "The area underneath an (up) slur is minimised to improve the shape. "
 \header {
     
     texidoc = "The area underneath an (up) slur is minimised to improve the shape. "


@@ -28,7 +28,7 @@ c,(g' c e f d b g)
 a8(a a a a a a a)
 
 }
 a8(a a a a a a a)
 
 }

-\paper{
+\layout{

 indent=0.0\mm
 }
 }
 indent=0.0\mm
 }
 }

diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly
index 0761834b82d2042a4311c0e3ea22d508102e32de..0016c11841afad8bece81550438aa1a3b63eafaf 100644 (file)
--- a/input/regression/slur-attachment.ly
+++ b/input/regression/slur-attachment.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -15,7 +15,7 @@ with beams.
                a8 a(a4)
                a4( a8) a
        }
                a8 a(a4)
                a4( a8) a
        }

-       \paper{ 
+       \layout{ 

                indent = 0.0
                linewidth = 100.\mm
        }
                indent = 0.0
                linewidth = 100.\mm
        }

diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly
index 5bcf479af41b374f7ae0cbdf0d1f93d2f6b26c74..dc14cb7345efbdf92afaee013a3ab60594c164ce 100644 (file)
--- a/input/regression/slur-broken-trend.ly
+++ b/input/regression/slur-broken-trend.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -9,7 +9,7 @@ staff.  A slur should follow the same vertical direction it would have
 in unbroken state.
 "
 }
 in unbroken state.
 "
 }

-\paper {
+\layout {

     linewidth=40.\mm
     indent=0.
 }
     linewidth=40.\mm
     indent=0.
 }

diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly
index a4b4598235f16fcf7c9c08ddf17c359bca935218..d30877bcab2e519f31822bbbb2bd9a6526c688c1 100644 (file)
--- a/input/regression/slur-cross-staff.ly
+++ b/input/regression/slur-cross-staff.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Slurs behave decently when broken across a linebreak.
 \header{
 texidoc="
 Slurs behave decently when broken across a linebreak.

diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly
index 5c9cf80afd3a5eb86a568b9e11ba31e8dedad90f..ccf9af72b64b5f87d19dfd9a11f38b541f42f27c 100644 (file)
--- a/input/regression/slur-dots.ly
+++ b/input/regression/slur-dots.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="Slurs should not get confused by augmentation dots.  With a lot
 of dots, the problems becomes more visible."
 \header{
 texidoc="Slurs should not get confused by augmentation dots.  With a lot
 of dots, the problems becomes more visible."


@@ -8,7 +8,7 @@ of dots, the problems becomes more visible."
   \relative c'' {
     c4.............( c)
   }
   \relative c'' {
     c4.............( c)
   }

-  \paper {
+  \layout {

     raggedright = ##t
   }
 }
     raggedright = ##t
   }
 }

diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly
index a160cf2bdaf8d182519f5bac588781847b4c45a3..7fd091dc005b9c06b349f44d3d05740d28828c39 100644 (file)
--- a/input/regression/slur-double.ly
+++ b/input/regression/slur-double.ly
@@ -3,9 +3,9 @@
     texidoc = "Some composers use slurs both above and below chords.
  This can be typeset by setting @code{doubleSlurs}"
 }
     texidoc = "Some composers use slurs both above and below chords.
  This can be typeset by setting @code{doubleSlurs}"
 }

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 \relative {
     \set doubleSlurs = ##t
     <c e>4 ( <d f> <c e> <d f> )
 \relative {
     \set doubleSlurs = ##t
     <c e>4 ( <d f> <c e> <d f> )

diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly
index 1900656fcc5aceb895e2bc9bebfb78339ea0001c..752f90e438a3e42500d5a7501fd4c9ee00c2d4c0 100644 (file)
--- a/input/regression/slur-extreme.ly
+++ b/input/regression/slur-extreme.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -8,7 +8,7 @@ Extreme slurs are scaled to fit the pattern, but only  symmetrically.
 Asymmetric slurs are created by setting @code{excentricity}."
 
 }
 Asymmetric slurs are created by setting @code{excentricity}."
 
 }

-\paper {
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly
index 42f82ac598b27a648fba3caf2ce9cd7ce2870a3b..8bac64709f3e82504bae189fc9964cafb47e5e6e 100644 (file)
--- a/input/regression/slur-nice.ly
+++ b/input/regression/slur-nice.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Slurs should look nice and symmetric.  The curvature may increase
 \header{
 texidoc="
 Slurs should look nice and symmetric.  The curvature may increase


@@ -19,7 +19,7 @@ run through noteheads or stems.
                \stemNeutral c ( \stemUp c \stemNeutral  c) c ( a  c) c( d,  c') c( f,  c')
                \stemDown c( f,  c')
        }
                \stemNeutral c ( \stemUp c \stemNeutral  c) c ( a  c) c( d,  c') c( f,  c')
                \stemDown c( f,  c')
        }

-       \paper{
+       \layout{

                linewidth = 120.\mm
        }
 }
                linewidth = 120.\mm
        }
 }

diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly
index 7a93119cfc311ad99fd8ee9f36bb9a9bbcad9cdb..2fddf2aa1cfc2c9d5b953200a09b9bae9355cb19 100644 (file)
--- a/input/regression/slur-rest.ly
+++ b/input/regression/slur-rest.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc ="Slurs may be placed over rest. The slur will avoid colliding with
 \header
 {
     texidoc ="Slurs may be placed over rest. The slur will avoid colliding with


@@ -15,6 +15,6 @@ the rest.
                  
 
              }
                  
 
              }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

     }
 
     }
 

diff --git a/input/regression/slur-script-inside.ly b/input/regression/slur-script-inside.ly
index 95dc0cde66f8de303b405fbecd1a760b34dfc01a..6a64d90ee4fca8262a95676293e2f8861e4f54cb 100644 (file)
--- a/input/regression/slur-script-inside.ly
+++ b/input/regression/slur-script-inside.ly
@@ -7,9 +7,9 @@
 }
 
 
 }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \relative c''{
     \clef alto
 
 \relative c''{
     \clef alto

diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly
index ff0b90b6bd4d24376b8a29a9b94fc7d0a746721e..e216d11f3c1219ea8b51f189593029cc2ddb4286 100644 (file)
--- a/input/regression/slur-script.ly
+++ b/input/regression/slur-script.ly
@@ -8,8 +8,8 @@
     For different configurations, the scripts can be moved manually."
     }
 
     For different configurations, the scripts can be moved manually."
     }
 

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##t
 }
 \relative
     raggedright = ##t
 }
 \relative

diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly
index 3d22bbcf7ce81ac4582406ed670b8f6535d742d8..475ed9ceafbc28f3401dfa8189abff5a776b2cb3 100644 (file)
--- a/input/regression/slur-symmetry-1.ly
+++ b/input/regression/slur-symmetry-1.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."
 \header
 {
   texidoc = "Symmetric figures should lead to symmetric slurs."


@@ -14,7 +14,7 @@
                        e,(e e e) e(d d e) e(c c e) e(b b e)
                }
        >>
                        e,(e e e) e(d d e) e(c c e) e(b b e)
                }
        >>

-       \paper{
+       \layout{

                raggedright = ##t
        }
 }
                raggedright = ##t
        }
 }

diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly
index dfd4c7c95349f7ebe921400c2c1d96c3ab91c940..a53861b460a18463d72193e195a6fccfb45946ad 100644 (file)
--- a/input/regression/slur-symmetry.ly
+++ b/input/regression/slur-symmetry.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header
 {
     texidoc = "Symmetric figures should lead to symmetric slurs."
 \header
 {
     texidoc = "Symmetric figures should lead to symmetric slurs."


@@ -15,7 +15,7 @@
                        f'8(f f) f(g f) f(a f) f(b f)
                }
        >>
                        f'8(f f) f(g f) f(a f) f(b f)
                }
        >>

-       \paper{
+       \layout{

                raggedright = ##t
        }
 }
                raggedright = ##t
        }
 }

diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly
index e16f2e1896ed9fec8772b93cef46f192dfaecdb4..f1aaa05b31ac1942ef58d82f56213b434b7d789a 100644 (file)
--- a/input/regression/slur-tilt.ly
+++ b/input/regression/slur-tilt.ly
@@ -5,10 +5,10 @@ shifted horizontally slightly. Without this correction, slurs will
 point into one note head, and point over another note head."
  
 }
 point into one note head, and point over another note head."
  
 }

-\paper {
+\layout {

     raggedright = ##t
 }
     raggedright = ##t
 }

-\version "2.3.17"
+\version "2.3.22"

 
 \relative c'' {
     \time 2/4
 
 \relative c'' {
     \time 2/4

diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly
index 1af76315f4db1fc8ab3961723422b0e32be77930..b9a069c25f80ef6130bc53ce934375b3c182bc60 100644 (file)
--- a/input/regression/spacing-accidental-staffs.ly
+++ b/input/regression/spacing-accidental-staffs.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { 
 texidoc = "Accidentals in different staves do not affect the
 
 \header { 
 texidoc = "Accidentals in different staves do not affect the


@@ -14,7 +14,7 @@ spacing of the quarter notes here."
  }
    { \key d \major cis4 cis4 cis4 cis!4  } >>
 
  }
    { \key d \major cis4 cis4 cis4 cis!4  } >>
 

-   \paper { raggedright = ##t} 
+   \layout { raggedright = ##t} 

  }
 
 
  }
 
 

diff --git a/input/regression/spacing-accidental-stretch.ly b/input/regression/spacing-accidental-stretch.ly
index 3c650e530991388209e44722add27c7852cdca70..8dffb58cfd410d89ece8f165c4d4575ba6957d57 100644 (file)
--- a/input/regression/spacing-accidental-stretch.ly
+++ b/input/regression/spacing-accidental-stretch.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     texidoc = "Accidentals do not influence the amount of stretchable space.
 
 \header {
     texidoc = "Accidentals do not influence the amount of stretchable space.


@@ -15,6 +15,6 @@ The accidental does add a little non-stretchable space.
      }
 
      %% not raggedright!!
      }
 
      %% not raggedright!!

-     \paper {  linewidth = 14.\cm
+     \layout {  linewidth = 14.\cm

      }
 }
      }
 }

diff --git a/input/regression/spacing-accidental.ly b/input/regression/spacing-accidental.ly
index 43c9e3dd97e8d309b78b500c4a94d575ab914bad..5e073088ab38802612ad9e1578ffb291479a2a9d 100644 (file)
--- a/input/regression/spacing-accidental.ly
+++ b/input/regression/spacing-accidental.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "Accidentals sticking out to the left
 
 \header {
 texidoc = "Accidentals sticking out to the left


@@ -11,7 +11,7 @@ of a note will take a little more space, but only if the spacing is tight."
     c2 c2 cis2 cis2 |
     c8 c8 cis8 cis8 cis c c c]
 }
     c2 c2 cis2 cis2 |
     c8 c8 cis8 cis8 cis c c c]
 }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 
 }
 
 
 }
 

diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly
index 64a667d9c2dfe5f759727c3956a3399fed4a2297..aab2fa9d1ffc2f5af6009ea3b04ef8d62676eff9 100644 (file)
--- a/input/regression/spacing-bar-stem.ly
+++ b/input/regression/spacing-bar-stem.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Downstem notes following a barline are
 printed with some extra space. This is an optical correction similar
 \header {
 texidoc = "Downstem notes following a barline are
 printed with some extra space. This is an optical correction similar


@@ -21,6 +21,6 @@ su = \override Stem  #'direction = #1
 \sd c4 \su c4
 \sd f c,4  c'4 cis4 \stemUp c4
 }
 \sd c4 \su c4
 \sd f c,4  c'4 cis4 \stemUp c4
 }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/spacing-clef-first-note.ly b/input/regression/spacing-clef-first-note.ly
index c2391e119ebda172510aa13d9eed5f5c610270b6..99974b7824e140b1016d7026a47c63007de77491 100644 (file)
--- a/input/regression/spacing-clef-first-note.ly
+++ b/input/regression/spacing-clef-first-note.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Clef changes at the start of a line get much more space
 \header {
 
     texidoc = "Clef changes at the start of a line get much more space


@@ -17,7 +17,7 @@ than clef changes halfway the line."
            c'4 c'4 c'4 
        }
     >>
            c'4 c'4 c'4 
        }
     >>

-    \paper {
+    \layout {

        raggedright = ##t
        \context {
            \Staff
        raggedright = ##t
        \context {
            \Staff

diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly
index c81178da2972b0c255af08bd09645a8892c8b4e2..019254ca9a076704e8e87311f1af5d719487258c 100644 (file)
--- a/input/regression/spacing-end-of-line.ly
+++ b/input/regression/spacing-end-of-line.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     
     texidoc ="Broken engraving of a bar at the end of a line does not upset 
 \header {
     
     texidoc ="Broken engraving of a bar at the end of a line does not upset 


@@ -13,7 +13,7 @@
     \time 3/4 \break
     e2 e4 | e2 e4 \time 4/4 \break
 }
     \time 3/4 \break
     e2 e4 | e2 e4 \time 4/4 \break
 }

-\paper {
+\layout {

     raggedright = ##t }  
 }
 
     raggedright = ##t }  
 }
 

diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly
index fdcd19a6d9c7a0eeeffc356d7d366c9e45b07c30..83908e40b4b85ed21423370c83e952eb9a20e508 100644 (file)
--- a/input/regression/spacing-ended-voice.ly
+++ b/input/regression/spacing-ended-voice.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."
 \header { texidoc = "
 A voicelet (a very short voice to get polyphonic chords correct)
 should not confuse the spacing engine."


@@ -17,6 +17,6 @@ should not confuse the spacing engine."
   >>
   c4
 }}
   >>
   c4
 }}

-  \paper { raggedright = ##t }
+  \layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly
index 5d2266776971d507418b2dc2abbf7e7a8ba26df1..d4ef823bc335fa4cc7150871774c32fd853e3364 100644 (file)
--- a/input/regression/spacing-folded-clef.ly
+++ b/input/regression/spacing-folded-clef.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "A clef can be folded below notes in a different staff, if
 this does not disrupt the flow of the notes."
 \header {
 texidoc = "A clef can be folded below notes in a different staff, if
 this does not disrupt the flow of the notes."


@@ -9,6 +9,6 @@ this does not disrupt the flow of the notes."
        \new Staff { \clef bass c,2 \clef treble  c'2 }
        >>
 
        \new Staff { \clef bass c,2 \clef treble  c'2 }
        >>
 

-       \paper { raggedright = ##t}
+       \layout { raggedright = ##t}

        }
 
        }
 

diff --git a/input/regression/spacing-folded-clef2.ly b/input/regression/spacing-folded-clef2.ly
index f870f9b736f28cf293e3f5a772e6329544e4fa73..5ee0680b5d292829ba5f2ec6fcfbdf9a8f238db3 100644 (file)
--- a/input/regression/spacing-folded-clef2.ly
+++ b/input/regression/spacing-folded-clef2.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if
 \header {
 
 texidoc = "A clef can be folded below notes in a different staff, if


@@ -11,7 +11,7 @@ show where columns are in the score."
        \new Staff { \clef bass c,2 \clef treble  c'2 }
        >>
 
        \new Staff { \clef bass c,2 \clef treble  c'2 }
        >>
 

-       \paper { raggedright = ##t
+       \layout { raggedright = ##t

 
        \context { \Score
          \override NonMusicalPaperColumn #'print-function = #Paper_column::print
 
        \context { \Score
          \override NonMusicalPaperColumn #'print-function = #Paper_column::print

diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly
index 1399d6982232821477dab370fd7e768f7c4a19ab..3be4767f17daebaba18ce06536ca12ca3e19441f 100644 (file)
--- a/input/regression/spacing-grace-duration.ly
+++ b/input/regression/spacing-grace-duration.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Spacing uses the duration of the notes, but disregards
 \header {
 
     texidoc = "Spacing uses the duration of the notes, but disregards


@@ -18,6 +18,6 @@
 
 }
 
 
 }
 

-        \paper { raggedright = ##t}
+        \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/spacing-grace.ly b/input/regression/spacing-grace.ly
index 897886fd5a57e81698c83c85cef6f4aaf52065fe..07f26bd6b5461a8d0106433a02a27a67781064b6 100644 (file)
--- a/input/regression/spacing-grace.ly
+++ b/input/regression/spacing-grace.ly
@@ -1,12 +1,12 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
   texidoc = "Grace note spacing. Should it be tuned? "
 }
        
 \score {
   \context Voice \relative c'' { \grace {  c16[ d] } c4 }
 \header {
   texidoc = "Grace note spacing. Should it be tuned? "
 }
        
 \score {
   \context Voice \relative c'' { \grace {  c16[ d] } c4 }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 
 }
 
 
 }
 

diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly
index 831567d1f78cbefce5aba1cf3bdb7d487843c767..18ecdf9afb39f1540357916d810a746db7c11b50 100644 (file)
--- a/input/regression/spacing-knee.ly
+++ b/input/regression/spacing-knee.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "For knees, the spacing correction is such that the
 \header {
 
     texidoc = "For knees, the spacing correction is such that the


@@ -16,7 +16,7 @@ width of the note heads and the thickness of the stem.
  \override Stem  #'thickness = #10 
  g''8[ g g'' g''] 
     }
  \override Stem  #'thickness = #10 
  g''8[ g g'' g''] 
     }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

      }
 
 
      }
 
 

diff --git a/input/regression/spacing-multi-tuplet.ly b/input/regression/spacing-multi-tuplet.ly
index 119cf96b733585458718afcd986a3f8d16e0a99b..f1a9c78289706c224b7d8165b2fcf46c73840b39 100644 (file)
--- a/input/regression/spacing-multi-tuplet.ly
+++ b/input/regression/spacing-multi-tuplet.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc = "Concurrent tuplets should be equidistant on all staffs.
 
 \header{
 texidoc = "Concurrent tuplets should be equidistant on all staffs.
 


@@ -27,7 +27,7 @@ multipart =  \relative c'{
        \multipart 
     }
 
        \multipart 
     }
 

-%    \paper { raggedright = ##t }
+%    \layout { raggedright = ##t }

 
 }
 
 
 }
 

diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly
index 4a773cca7f16dc05e0bad74a3abb5e47c4429a41..55171f4e6046c410012bb576f39f10350fdb7650 100644 (file)
--- a/input/regression/spacing-note-flags.ly
+++ b/input/regression/spacing-note-flags.ly
@@ -12,10 +12,10 @@ texidoc = "The flags of 8th notes take some space, but not
     a8[ a8 a8 a8]
     a8 a8 a8 a8
 }
     a8[ a8 a8 a8]
     a8 a8 a8 a8
 }

-\paper {
+\layout {

 raggedright = ##t
     }
      }
 
 raggedright = ##t
     }
      }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

diff --git a/input/regression/spacing-ragged-last.ly b/input/regression/spacing-ragged-last.ly
index 1fcf51cedb0ce9c6832a5b87b842cdfd4126b7c2..f26488726f3af10a150519630b23ac42c7e34f3c 100644 (file)
--- a/input/regression/spacing-ragged-last.ly
+++ b/input/regression/spacing-ragged-last.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -11,7 +11,7 @@
 
 \score  {
      \relative c'' \new Staff { \repeat unfold 20 { c1 } }
 
 \score  {
      \relative c'' \new Staff { \repeat unfold 20 { c1 } }

-    \paper{
+    \layout{

        raggedlast = ##t
     }
 }
        raggedlast = ##t
     }
 }

diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly
index 1a6e1877e813df0633c6661b9b609d62b995e555..152798a7e6f8a8a373a682956bac25625621a8b8 100644 (file)
--- a/input/regression/spacing-rest.ly
+++ b/input/regression/spacing-rest.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this 
 \header {
     texidoc = "Rests get a little less space, since they are narrower.
 However, the quarter rest in feta font is relatively wide, causing this 


@@ -10,7 +10,7 @@ effect to be very small.
     \time 12/4
     r4 c4 c4 c4 r4 r4 c4
 }
     \time 12/4
     r4 c4 c4 c4 r4 r4 c4
 }

-\paper {
+\layout {

 raggedright = ##t
     }
      }
 raggedright = ##t
     }
      }

diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly
index f8aae35bb0aa64468d07125b7d12af0364cb4313..906027d7d2c335c290d1c06e77d1d79350f0eee6 100644 (file)
--- a/input/regression/spacing-short-notes.ly
+++ b/input/regression/spacing-short-notes.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     
 texidoc = "Notes that are shorter than the common shortest note get a
 \header {
     
 texidoc = "Notes that are shorter than the common shortest note get a


@@ -20,6 +20,6 @@ eighth note. "
 
 }
 
 
 }
 

-        \paper { raggedright = ##t}
+        \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/spacing-stem-bar.ly b/input/regression/spacing-stem-bar.ly
index f95a750c323ed0c6ed8da4ad3e28885d2b6a34fe..2cea117024259fb103d58e9863292a5bcd03ff02 100644 (file)
--- a/input/regression/spacing-stem-bar.ly
+++ b/input/regression/spacing-stem-bar.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Upstem notes before a barline are printed with some extra
 \header {
 
 texidoc = "Upstem notes before a barline are printed with some extra


@@ -24,6 +24,6 @@ a a a
 c c c
 e e e
 }
 c c c
 e e e
 }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/spacing-stem-direction.ly b/input/regression/spacing-stem-direction.ly
index 6a04aa416ea23803c9b39cd6f5de974cdc1c75e8..2c0bc7ff0a63788ea0c62dc3a86a79c5fd7ddaef 100644 (file)
--- a/input/regression/spacing-stem-direction.ly
+++ b/input/regression/spacing-stem-direction.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 


@@ -18,7 +18,7 @@ much to correct."
        \time 16/4  c''4 c c,  c' d, c' e, c' f, c' g c a c b c
        
   }
        \time 16/4  c''4 c c,  c' d, c' e, c' f, c' g c a c b c
        
   }

-  \paper {
+  \layout {

     raggedright = ##t
   }  
 }
     raggedright = ##t
   }  
 }

diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly
index 074fbc3dfb7eba041ed52cc38d9bcb5039d72e35..a956db17427ce8e1ae14263dea6de825985bf11a 100644 (file)
--- a/input/regression/spacing-stem-same-direction.ly
+++ b/input/regression/spacing-stem-same-direction.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
        texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and works only if
 \header {
        texidoc = "For juxtaposed chords with the same direction, a
 slight optical correction is used. It is constant, and works only if


@@ -12,6 +12,6 @@ two chords have no common head-positions range."
   f8[
       e f e]  f[ d f d]  f[ c f c]  f[ b, f' b,]  f'[ a, f' a,]
 }
   f8[
       e f e]  f[ d f d]  f[ c f c]  f[ b, f' b,]  f'[ a, f' a,]
 }

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly
index 599e40e51e2379c1eee0c7eb6ebefea25bb59e1b..8e26bcf623d0bdcfa5bb7a6b604ff72d96565724 100644 (file)
--- a/input/regression/spacing-to-grace.ly
+++ b/input/regression/spacing-to-grace.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc ="Space from a normal note (or barline) to a grace note is
 \header {
 
     texidoc ="Space from a normal note (or barline) to a grace note is


@@ -17,6 +17,6 @@
                  }  
 
     }
                  }  
 
     }

-    \paper { raggedright = ##t}
+    \layout { raggedright = ##t}

     }
 
     }
 

diff --git a/input/regression/spacing-very-tight.ly b/input/regression/spacing-very-tight.ly
index cb08e7d9c972951b3fa825f95ea09a0970cbbcdf..137f2f4ae5f569a8f0ecc66e8586877ed5729c06 100644 (file)
--- a/input/regression/spacing-very-tight.ly
+++ b/input/regression/spacing-very-tight.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "
  When tightly spaced, the spaces between elements (hinterfleisch?) 
 \header {
 texidoc = "
  When tightly spaced, the spaces between elements (hinterfleisch?) 


@@ -17,7 +17,7 @@ texidoc = "
         \relative c''{ 
                r1 e4 f, e' f,
        }
         \relative c''{ 
                r1 e4 f, e' f,
        }

-       \paper { 
+       \layout { 

                linewidth = 25.0 \mm
                indent = 0.0\mm
        }
                linewidth = 25.0 \mm
                indent = 0.0\mm
        }

diff --git a/input/regression/span-bar-break.ly b/input/regression/span-bar-break.ly
index 80f29290cfa27f7b46820fe6a7c81bb127f2da36..29dba5e70b270db8adb203d499d48e29c95c5522 100644 (file)
--- a/input/regression/span-bar-break.ly
+++ b/input/regression/span-bar-break.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -15,5 +15,5 @@ barline is drawn between the staves, but the @code{:|} is not."
     }
     \context Staff=down { r r }
   >>
     }
     \context Staff=down { r r }
   >>

-  \paper{ raggedright = ##t }
+  \layout{ raggedright = ##t }

 }
 }

diff --git a/input/regression/span-bar.ly b/input/regression/span-bar.ly
index 841d6237fb50155b7050261f96200628006d97e3..d830e2b4aaba5af426c64f73f4aa6fbe235b939e 100644 (file)
--- a/input/regression/span-bar.ly
+++ b/input/regression/span-bar.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.
 \header {
   texidoc = "Span bars are drawn only between staff bar lines. By setting 
 bar lines to transparent, they are shown only between systems.


@@ -26,7 +26,7 @@ between systems.
       f1 f1 f1 f1
     }
   >>
       f1 f1 f1 f1
     }
   >>

-  \paper {
+  \layout {

     \context {
       \Staff
     }
     \context {
       \Staff
     }

diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly
index 5805014b90bae57eb68c3fe5da8912f40e313ff4..4dc1a9687daa0dbe2f843150bb7613b53fd2161e 100644 (file)
--- a/input/regression/staccato-pos.ly
+++ b/input/regression/staccato-pos.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 
 
 \header{
 


@@ -16,7 +16,7 @@ to it.  "
        \stemDown
        e,-. d-. c-. b-. a-. g-.    
     }
        \stemDown
        e,-. d-. c-. b-. a-. g-.    
     }

-    \paper {
+    \layout {

        raggedright = ##t
     }  
 }
        raggedright = ##t
     }  
 }

diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly
index 378c989edfad62bdea88d61d19c4552e0f899f53..7d047bef9a3f8f809cd9ec94621b42f481ca0b07 100644 (file)
--- a/input/regression/staff-halfway.ly
+++ b/input/regression/staff-halfway.ly
@@ -2,12 +2,12 @@
 \header { texidoc = " Staves starting and ending halfway include clefs
     and bar lines.  " }
 
 \header { texidoc = " Staves starting and ending halfway include clefs
     and bar lines.  " }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     \new StaffGroup  \relative c''  <<
        \new Staff { c4  c c c \bar "||" c c c c }
        { \skip 4 \new Staff { c c c } }
     >>
 
 \score {
     \new StaffGroup  \relative c''  <<
        \new Staff { c4  c c c \bar "||" c c c c }
        { \skip 4 \new Staff { c c c } }
     >>

-       \paper {}              
+       \layout {}             

         }
         }

diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly
index ce091fc631bec54439e59eed27db290bd54635e9..12a07075dfe494faeff65aa7fc5eadc3c5162926 100644 (file)
--- a/input/regression/staff-mixed-size.ly
+++ b/input/regression/staff-mixed-size.ly
@@ -7,7 +7,7 @@ large on smaller staves."
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
   <<
 
 \score {
   <<


@@ -26,7 +26,7 @@ large on smaller staves."
     }
   >>
 
     }
   >>
 

-  \paper {
+  \layout {

     #(paper-set-staff-size 6)
     raggedright = ##t
   }
     #(paper-set-staff-size 6)
     raggedright = ##t
   }

diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly
index caa0ee6484e730288057a566f92d577780b5c2b8..ad3234d74e5e315318da7753415087d5997e8389 100644 (file)
--- a/input/regression/staff-tweak.ly
+++ b/input/regression/staff-tweak.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}.
 
 \header {
 texidoc = "The staff is a grob (graphical object) which may be adjusted as well, for example, to have 6 thick lines and a slightly large @code{staff-space}.


@@ -19,7 +19,7 @@ mus =  \relative c' { c4 g' d'8 d d d }
     }
     \mus
   >>
     }
     \mus
   >>

-  \paper  {
+  \layout  {

     raggedright = ##t
   }
 }
     raggedright = ##t
   }
 }

diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly
index bcdc2fd77b2437f17a7cd3447e153150b25405a1..ce4b520080ee096cb54ceeb1bcd3a7f2e26eee03 100644 (file)
--- a/input/regression/stanza-number.ly
+++ b/input/regression/stanza-number.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column."
 
 \header {
 texidoc = "Stanza numbers are put left of their lyric. They are aligned in a column."


@@ -19,7 +19,7 @@ texidoc = "Stanza numbers are put left of their lyric. They are aligned in a col
     }
 >>
 
     }
 >>
 

-\paper { raggedright = ##t } 
+\layout { raggedright = ##t } 

 }
 
 
 }
 
 

diff --git a/input/regression/stem-direction.ly b/input/regression/stem-direction.ly
index bbba000f09a87c97159e241d77ef113b10fb73aa..33dfe7be8191413ca6dbad371c0bc413d3f09109 100644 (file)
--- a/input/regression/stem-direction.ly
+++ b/input/regression/stem-direction.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -13,7 +13,7 @@ notes, and up for low notes.
 "
 }
 
 "
 }
 

-\paper {
+\layout {

     raggedright = ##t
 }  
 \context Voice \relative c {
     raggedright = ##t
 }  
 \context Voice \relative c {

diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly
index 332970160e9b5fac73dd202a32c584d0284fef56..15972edcf6ef67fd07ebdb33a56edaa8bdc63927 100644 (file)
--- a/input/regression/stem-shorten.ly
+++ b/input/regression/stem-shorten.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     
 
 \header {
     


@@ -18,7 +18,7 @@
        <g, e'>2 <b e g> <c e g> <d f g>
        
     } 
        <g, e'>2 <b e g> <c e g> <d f g>
        
     } 

-    \paper  {
+    \layout  {

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly
index 21af427667bbab467dbba203bd0c08ec5738a868..ccecee6aaefd0081b01c29fd30049dd1546b00f7 100644 (file)
--- a/input/regression/stem-spacing.ly
+++ b/input/regression/stem-spacing.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -15,7 +15,7 @@ In this example, space for opposite pointed stems is adjusted.
        \time 12/4  c''4 c c c  a f' f, a 
        
   }
        \time 12/4  c''4 c c c  a f' f, a 
        
   }

-  \paper {
+  \layout {

     raggedright = ##t
   }  
 }
     raggedright = ##t
   }  
 }


@@ -26,7 +26,7 @@ In this example, space for opposite pointed stems is adjusted.
        \time 12/4  c''4 c c c  a f' f, a 
        
   }
        \time 12/4  c''4 c c c  a f' f, a 
        
   }

-  \paper {
+  \layout {

     raggedright = ##t
     \context { \Score
     \override SpacingSpanner #'stem-spacing-correction = #0.0
     raggedright = ##t
     \context { \Score
     \override SpacingSpanner #'stem-spacing-correction = #0.0

diff --git a/input/regression/stem-tremolo.ly b/input/regression/stem-tremolo.ly
index 9befb9ecb7902519d034b7ae3489e8b6b9b220fd..119a8467f8978cc544ba7ae63631f34218a62f53 100644 (file)
--- a/input/regression/stem-tremolo.ly
+++ b/input/regression/stem-tremolo.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments
 \header{
 texidoc="
 Stem tremolos or rolls are tremolo signs that look like beam segments

diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly
index 2a1481162e18dc790c13b23ce42fe991f9e5477c..6e0f44731a55e2924922c5d04a9fc4a3266aa218 100644 (file)
--- a/input/regression/system-extents.ly
+++ b/input/regression/system-extents.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "The size of every system is correctly determined; this 
 \header {
 
     texidoc = "The size of every system is correctly determined; this 


@@ -7,7 +7,7 @@
     }
          
 
     }
          
 

-\paper { 
+\layout { 

     \context {
        \Score
        \override System #'print-function = #box-grob-stencil
     \context {
        \Score
        \override System #'print-function = #box-grob-stencil

diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly
index d98cbe4556d38217506c2c5f44bcb6ac3408fd94..26bc2d5e2f145c6f7a3adbb617d513a911eaa76f 100644 (file)
--- a/input/regression/system-overstrike.ly
+++ b/input/regression/system-overstrike.ly
@@ -1,11 +1,11 @@
-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "By setting betweensystempadding to a negative
 value, it is possible to eliminate the anti-collision constraints.
 Then  setting @code{betweensystemspace} to a low (nonzero) value,
 print  systems in overstrike. "
 }
 
 \header { texidoc = "By setting betweensystempadding to a negative
 value, it is possible to eliminate the anti-collision constraints.
 Then  setting @code{betweensystemspace} to a low (nonzero) value,
 print  systems in overstrike. "
 }
 

-\bookpaper {
+\paper {

     raggedbottom =##t
     betweensystempadding = - 4\cm
     betweensystemspace = 3\mm
     raggedbottom =##t
     betweensystempadding = - 4\cm
     betweensystemspace = 3\mm

diff --git a/input/regression/system-start-bracket.ly b/input/regression/system-start-bracket.ly
index bac4921adb52b1d7ef42c7aa3144e83d36498ca6..3471a0fe120ada01cc7558a21e000da82c9e130a 100644 (file)
--- a/input/regression/system-start-bracket.ly
+++ b/input/regression/system-start-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc =
 "
 \header {
     texidoc =
 "


@@ -16,6 +16,6 @@ The piano brace should be shifted horizontally if it  is enclosed in a bracket.
           >>
     >>
     }
           >>
     >>
     }

-    \paper {raggedright = ##t}
+    \layout {raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/tablature-string-tunings.ly b/input/regression/tablature-string-tunings.ly
index 29fa3bb6e69a5e838257a0be7421fd5d66fa2d3e..2fdd185aaf3b7e120e00ebc4297ac8c8153c00ef 100644 (file)
--- a/input/regression/tablature-string-tunings.ly
+++ b/input/regression/tablature-string-tunings.ly
@@ -6,7 +6,7 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score  {
      \new TabStaff {
 
 \score  {
      \new TabStaff {

diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly
index 702a47304eec12eb58861fae220215521481fa9e..f2403290a236b17e8e913551b03cc0aecc9b947e 100644 (file)
--- a/input/regression/tablature.ly
+++ b/input/regression/tablature.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header{ texidoc = "@cindex Tabulature
 A sample tablature, with both normal staff and tab.
 
 \header{ texidoc = "@cindex Tabulature
 A sample tablature, with both normal staff and tab.

diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly
index 004f3086311adca4bfca1a1b3fef1f8b210d20ec..f3d2046cf3c496de9c7b583cd3a9e1604226cea3 100644 (file)
--- a/input/regression/tag-filter.ly
+++ b/input/regression/tag-filter.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "The @code{\\tag} command marks music expressions with a
 \header {
 
 texidoc = "The @code{\\tag} command marks music expressions with a


@@ -11,7 +11,7 @@ notes and fingerings, but the score has not."
 
 }
 
 
 }
 

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 common =
  \relative c''  {
 
 common =
  \relative c''  {

diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly
index 9a7537193d2f983c28a6bd7c79c0051f2990e653..6a0d2480ed4faa9833f7c667d57a10a85e9afc92 100644 (file)
--- a/input/regression/text-spanner.ly
+++ b/input/regression/text-spanner.ly
@@ -1,9 +1,9 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc= "Text spanners should not repeat start text when broken."
 }
 \header {
     texidoc= "Text spanners should not repeat start text when broken."
 }

-\paper {
+\layout {

     raggedright = ##t 
 }
 
     raggedright = ##t 
 }
 

diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly
index 20d0c58b3b47db541e521837fad15ec639820673..008c1cafb9e4c7a3dde560b47a7c75804208493b 100644 (file)
--- a/input/regression/tie-busy-grobs.ly
+++ b/input/regression/tie-busy-grobs.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Tie engraver uses @code{busyGrobs} to keep track of
 \header {
 
 texidoc = "Tie engraver uses @code{busyGrobs} to keep track of


@@ -19,7 +19,7 @@ one may have collisions between ties and beams.
        { \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
     >>
 
        { \voiceThree  { b,8 ~ b8 ~ b8 ~  b8 }}
     >>
 

-    \paper {
+    \layout {

        raggedright = ##t
     }
 }
        raggedright = ##t
     }
 }

diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly
index 041dbeca067bd65bcf130c219dbe91fd41aaafc2..d131301b7952d5fcb985033252526fa69b705c20 100644 (file)
--- a/input/regression/tie-chord.ly
+++ b/input/regression/tie-chord.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
 texidoc="
 When tying chords, the outer slurs point outwards, the inner slurs
 \header{
 texidoc="
 When tying chords, the outer slurs point outwards, the inner slurs

diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly
index 281014106bc3f25102f607daa5a7f01f4643d14d..c6ba819c651a0fe00e99d71a9397c1537cf0e883 100644 (file)
--- a/input/regression/tie-dots.ly
+++ b/input/regression/tie-dots.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "Ties should not collide with dots."
 }
 \header {
 texidoc = "Ties should not collide with dots."
 }

diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly
index 1af16e9f996aacf180f5ea1d7b90a1059a41dc8d..68024f651c1959c86c04bd6f344752d55ee8144f 100644 (file)
--- a/input/regression/tie-grace.ly
+++ b/input/regression/tie-grace.ly
@@ -1,10 +1,10 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "Tieing a grace to the to a following grace or main note works."
 }
 
 \header {
     texidoc = "Tieing a grace to the to a following grace or main note works."
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \context Voice \relative c'' {
     c4 \grace { c8 ~ c16 ~ } c4 
 
 \score {  \context Voice \relative c'' {
     c4 \grace { c8 ~ c16 ~ } c4 

diff --git a/input/regression/tie.ly b/input/regression/tie.ly
index f8b364cefa7a42dfa7c7768cee6ff7919a1a1876..8cead6d0e7c16f54a7c816d950623c4cac21c19a 100644 (file)
--- a/input/regression/tie.ly
+++ b/input/regression/tie.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header{
 texidoc="
 
 \header{
 texidoc="


@@ -7,7 +7,7 @@ Ties are strictly horizontal.  They are placed in between note heads.
 The horizontal middle should not overlap with a staffline.
 "
 }
 The horizontal middle should not overlap with a staffline.
 "
 }

-\paper{
+\layout{

     raggedright= ##t 
 }
 
     raggedright= ##t 
 }
 

diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly
index dfd918ca41720dbf0cb22fd442503b74c0c01d68..f5791322f61a1025bd1d07a66557bf60c00d1d81 100644 (file)
--- a/input/regression/trill-spanner.ly
+++ b/input/regression/trill-spanner.ly
@@ -2,8 +2,8 @@
     texidoc = "Trill spanner"
 }
 
     texidoc = "Trill spanner"
 }
 

-\version "2.3.17"
-\paper {
+\version "2.3.22"
+\layout {

     raggedright = ##T
 }
 \relative \new Voice {
     raggedright = ##T
 }
 \relative \new Voice {

diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly
index e697258f3edd38caf12d484357ce71204c6d0ac4..11496631e5ede2beb37615a91b4fd5a49318b092 100644 (file)
--- a/input/regression/tuplet-beam.ly
+++ b/input/regression/tuplet-beam.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "In combination with a beam, the bracket of the tuplet
 \header {
 
 texidoc = "In combination with a beam, the bracket of the tuplet


@@ -7,7 +7,7 @@ bracket is removed. This only happens if there is one beam, as long as
 the bracket."
 
 }
 the bracket."
 
 }

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \context Voice\relative c'' {
 \times 2/3 { r  c8[ c8] }
 
 \score {  \context Voice\relative c'' {
 \times 2/3 { r  c8[ c8] }

diff --git a/input/regression/tuplet-gap.ly b/input/regression/tuplet-gap.ly
index 2296bc873642c5ed52d56724626433e193900838..046e68675d90f25bbbdeadef27409cd4a9b1a511 100644 (file)
--- a/input/regression/tuplet-gap.ly
+++ b/input/regression/tuplet-gap.ly
@@ -5,9 +5,9 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

    indent = 0.0\mm
    raggedright = ##t
 }
    indent = 0.0\mm
    raggedright = ##t
 }

diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly
index 1138d18c5cae9b0396ec2c885e4a7c6fe7619d50..51e62b3b0be16e0cede37a7c4ab3f8834d20585e 100644 (file)
--- a/input/regression/tuplet-nest.ly
+++ b/input/regression/tuplet-nest.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 \header {
 
 
 \header {


@@ -35,6 +35,6 @@
       }
     }
   }
       }
     }
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/regression/tuplet-properties.ly b/input/regression/tuplet-properties.ly
index afa2e1ed5da1cf05115128824cd7bff1899316fb..243dc200c0780591535a129e9d767ca2749d1945 100644 (file)
--- a/input/regression/tuplet-properties.ly
+++ b/input/regression/tuplet-properties.ly
@@ -6,7 +6,7 @@ for instance, bracketed (B) and non-bracketed (NB).
 }
  
 
 }
  
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 \score { 
 
 
 \score { 

diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly
index 9a8322c7e8d5f373adc037eac3013807b075be1f..5216c7887e786ae7b8fa03bbe4dc0a51db3b812e 100644 (file)
--- a/input/regression/tuplet-rest.ly
+++ b/input/regression/tuplet-rest.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "Tuplets may contain rests. "
 \header {
 
     texidoc = "Tuplets may contain rests. "

diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly
index f5f42ca695d541d491d9b14fd20035261c8ad9d5..c8e7ed6cca87072c44f314f971b49de9c044e2d0 100644 (file)
--- a/input/regression/tuplet-slope.ly
+++ b/input/regression/tuplet-slope.ly
@@ -12,7 +12,7 @@ The bracket direction is determined by the dominating stem direction.
 }
 
 
 }
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
      \relative c' {
 
 \score {
      \relative c' {


@@ -22,7 +22,7 @@ The bracket direction is determined by the dominating stem direction.
        \times 4/5 { bes'''4 bes,, b c cis }
        \times 4/5 { a''4 b b c cis }
     }
        \times 4/5 { bes'''4 bes,, b c cis }
        \times 4/5 { a''4 b b c cis }
     }

-    \paper {
+    \layout {

        raggedright = ##t 
     }
 }
        raggedright = ##t 
     }
 }

diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly
index 7c4440ab6c24c795966a1b530371071fa70fe451..75fb5f5691c37beec6f9e658117733155a6fa3ee 100644 (file)
--- a/input/regression/tuplet-staffline-collision.ly
+++ b/input/regression/tuplet-staffline-collision.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = "Horizontal tuplet brackets are shifted vertically
 \header {
 
 texidoc = "Horizontal tuplet brackets are shifted vertically


@@ -7,7 +7,7 @@ to avoid staff line collisions."
 
 }
 
 
 }
 

-    \paper { raggedright= ##t }
+    \layout { raggedright= ##t }

 
 \score {  \context Voice\relative c'' {
 \times 2/3 { b'4 b b }
 
 \score {  \context Voice\relative c'' {
 \times 2/3 { b'4 b b }

diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly
index 28d1feb841ca97b7f27c0768887be83a1e81bc5e..71adc1c51b042a482bc55eed9c7111705177be98 100644 (file)
--- a/input/regression/tuplets.ly
+++ b/input/regression/tuplets.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
     
 texidoc="
 \header{
     
 texidoc="


@@ -16,7 +16,7 @@ direction as the bracket. The endings can be adjusted with
 "
 
 }
 "
 
 }

-\paper { raggedright= ##t }
+\layout { raggedright= ##t }

 
 \score{
         \context Voice \relative c'' {
 
 \score{
         \context Voice \relative c'' {

diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly
index 5480c026cd065453db9c20b9d6300e12eb35485e..58da177a1ceebbbfb2db793d49ada94caaf59827 100644 (file)
--- a/input/regression/voice-follower.ly
+++ b/input/regression/voice-follower.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 \header { texidoc= "
 
 
 \header { texidoc= "


@@ -19,7 +19,7 @@ can be printed automatically. This is enabled if the property
        }
        \context Staff = two {\clef bass \skip 1*2 }
     >>
        }
        \context Staff = two {\clef bass \skip 1*2 }
     >>

-    \paper{ 
+    \layout{ 

        raggedright = ##t 
     }
 }
        raggedright = ##t 
     }
 }

diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly
index 803655614e92b3248258d158c0d919a8a96c3203..5bf5e3e865e05a6f98f07cf6e731eef8de8bfdfb 100644 (file)
--- a/input/regression/volta-broken-left-edge.ly
+++ b/input/regression/volta-broken-left-edge.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc ="Broken volta spanners behave correctly at their left edge in all cases."
 
 \header {
 texidoc ="Broken volta spanners behave correctly at their left edge in all cases."


@@ -118,6 +118,6 @@ f f\break
        }
 
     >>
        }
 
     >>

-       \paper { raggedright =##t }
+       \layout { raggedright =##t }

 }
 
 }
 

diff --git a/input/regression/volta-multi-staff.ly b/input/regression/volta-multi-staff.ly
index 321d90de0957479ca610efbda2e8a59ea12cd67d..212e7992106d666db606404ed98196ed60ca0728 100644 (file)
--- a/input/regression/volta-multi-staff.ly
+++ b/input/regression/volta-multi-staff.ly
@@ -4,7 +4,7 @@
     also over other staves than the topmost one in a score."
 
 }
     also over other staves than the topmost one in a score."
 
 }

-\version "2.3.17"
+\version "2.3.22"

 
 
 vmus =  { \repeat volta 2 c1 \alternative { d e } } 
 
 
 vmus =  { \repeat volta 2 c1 \alternative { d e } } 


@@ -24,5 +24,5 @@ vmus =  { \repeat volta 2 c1 \alternative { d e } }
        >>
     >>
 
        >>
     >>
 

-    \paper { raggedright = ##t }
+    \layout { raggedright = ##t }

 }
 }

diff --git a/input/screech-boink.ly b/input/screech-boink.ly
index 2472caeb0b1c5af809ce7c6dcec94f6976d80fe1..adcf9412a6770d28a968fd46f9364590317731b9 100644 (file)
--- a/input/screech-boink.ly
+++ b/input/screech-boink.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"
 \header {
     title = "Screech and boink"
     subtitle = "Random complex notation"


@@ -53,7 +53,7 @@
     >>
     \midi { \tempo 8 = 60 }
 
     >>
     \midi { \tempo 8 = 60 }
 

-    \paper {
+    \layout {

        raggedright = ##t 
 
        \context {
        raggedright = ##t 
 
        \context {

diff --git a/input/simple-song.ly b/input/simple-song.ly
index 57de8e3a54e30acf7455bb2286aec63ac3598950..3469c058b1a4b4886a00b390680fff14bc3ca9f2 100644 (file)
--- a/input/simple-song.ly
+++ b/input/simple-song.ly
@@ -15,5 +15,5 @@
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
 >>
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.

-\version "2.3.16"
+\version "2.3.22"

     
     

diff --git a/input/simple.ly b/input/simple.ly
index 6ba928be6d88f8902d1bd6171ed52684e03ac514..84ae567fe0f0d71db238de96648ca581d13edef9 100644 (file)
--- a/input/simple.ly
+++ b/input/simple.ly
@@ -4,4 +4,4 @@
 }
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.
 }
 
 %% Optional helper for automatic updating by convert-ly.  May be omitted.

-\version "2.3.16"
+\version "2.3.22"

diff --git a/input/template/piano-4-voices.ly b/input/template/piano-4-voices.ly
index 83b26f8fb56cdc5c7618861b216e61cf972990d6..676dded68e0283e70e6bba7627f1c093cb8f27e4 100644 (file)
--- a/input/template/piano-4-voices.ly
+++ b/input/template/piano-4-voices.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header {
   texidoc ="Polyphonic piano music."
 
 \header {
   texidoc ="Polyphonic piano music."


@@ -37,6 +37,6 @@ lowerTwo = \relative c {
       \context Voice = two \lowerTwo
     >>  
   >>
       \context Voice = two \lowerTwo
     >>  
   >>

-  \paper { }  
+  \layout { }  

   \midi { }  
 }
   \midi { }  
 }

diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly
index 3273ef5882ac01f6a42d89c419b19e4f52e8a5bc..13a5e9066c0e565bd65340b0b4bad00be16f64d4 100644 (file)
--- a/input/template/piano-lyrics.ly
+++ b/input/template/piano-lyrics.ly
@@ -1,4 +1,4 @@
-\version "2.3.16"
+\version "2.3.22"

 
 \header {
   texidoc ="Lyrics between two staffs."
 
 \header {
   texidoc ="Lyrics between two staffs."


@@ -27,7 +27,7 @@ text = \lyricmode {
       \lower
     >>  
   >>
       \lower
     >>  
   >>

-  \paper {
+  \layout {

     \context {
       \GrandStaff
       \accepts "Lyrics"
     \context {
       \GrandStaff
       \accepts "Lyrics"

diff --git a/input/test/+.ly b/input/test/+.ly
index 263904d85f05e0f75d21967c1ec5223a214ae096..51f5d4c9ba76fb584d8ec338aff6c38392a0075c 100644 (file)
--- a/input/test/+.ly
+++ b/input/test/+.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?
 %% +.ly: Be the first .ly file for lys-to-tely.py.
 %% Better to make lys-to-tely.py include "introduction.texi" or
 %% other .texi documents too?

diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly
index 0c1cf13f4ed81598c421495ab9171a7331ab0df5..576b5d3d130876fe2c9b01975f579b573c77af48 100644 (file)
--- a/input/test/add-staccato.ly
+++ b/input/test/add-staccato.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -29,7 +29,7 @@ it is not necessary to use scm constructs (see @code{separate-staccato.ly}).
   \relative c'' {
     a b \applymusic #(lambda (x) (music-map add-staccato x)) { c c } 
   }
   \relative c'' {
     a b \applymusic #(lambda (x) (music-map add-staccato x)) { c c } 
   }

-  \paper{ raggedright = ##t }
+  \layout{ raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly
index 476cd630dc91d1f512d17d444743a52d8bcc8f01..e7f91e3947087679835aee28a248f44566292b64 100644 (file)
--- a/input/test/add-text-script.ly
+++ b/input/test/add-text-script.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc= "@cindex make-music Fingering
 
 \header {
 texidoc= "@cindex make-music Fingering


@@ -29,7 +29,7 @@ create, then write a function that will structure the music for you.
 
 \score {
   \applymusic #(lambda (x)  (add-text-script x "6") (display-music x) x )  { c'4-3 }
 
 \score {
   \applymusic #(lambda (x)  (add-text-script x "6") (display-music x) x )  { c'4-3 }

-       \paper{ raggedright = ##t }
+       \layout{ raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly
index af7841b06b15633166405bbabeaa94a41a076630..a50e447b95c397f466b70eb925bf0c1adce15c83 100644 (file)
--- a/input/test/ambitus-mixed.ly
+++ b/input/test/ambitus-mixed.ly
@@ -6,9 +6,9 @@ ambitus must be moved manually to prevent collisions."
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 

-\paper {
+\layout {

     raggedright = ##t
 }
 
     raggedright = ##t
 }
 

diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly
index fe30aabbc24c772080836e238c2e316759f5d065..9065b083ae41f02452e9e2fb9f65884ff325e964 100644 (file)
--- a/input/test/ancient-accidentals.ly
+++ b/input/test/ancient-accidentals.ly
@@ -6,7 +6,7 @@ are collected here.
 "
 }
 
 "
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \relative c'' {
       \time 5/4
 
 \relative c'' {
       \time 5/4

diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly
index 1772eab2eb114a74afcd26fce98267279ca41d74..c6041b31e0f2b6333457e8b897671e908ab82f8c 100644 (file)
--- a/input/test/ancient-font.ly
+++ b/input/test/ancient-font.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {
 % TODO: split ancient-font into seperate files; possibly in
 % different locations.
 \header {


@@ -210,7 +210,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
   >>
 >>
 
   >>
 >>
 

-\bookpaper {
+\paper {

        linethickness = #(/ staffspace 5.0)
 }
 
        linethickness = #(/ staffspace 5.0)
 }
 


@@ -219,7 +219,7 @@ lowerStaff = \context MensuralStaff = lowerStaff <<
        \upperStaff
        \lowerStaff
     >>
        \upperStaff
        \lowerStaff
     >>

-    \paper {
+    \layout {

 % do we want to keep these settings? -gp
        linewidth = 17.25\cm
        textheight = 26.0\cm
 % do we want to keep these settings? -gp
        linewidth = 17.25\cm
        textheight = 26.0\cm

diff --git a/input/test/ancient-time.ly b/input/test/ancient-time.ly
index e1408b642bff5083d62cf478e81cedc177f5ad78..4839e9499dcddbb0432aa7f861798be7072efc1f 100644 (file)
--- a/input/test/ancient-time.ly
+++ b/input/test/ancient-time.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {
 % TODO: move stuff from ancient-font into here?  See comment
 % for ancient-font.ly
 \header {


@@ -12,6 +12,6 @@ Time signatures may also be engraved in an old style.
     \override Staff.TimeSignature  #'style = #'neomensural
     s1 
   }
     \override Staff.TimeSignature  #'style = #'neomensural
     s1 
   }

-       \paper {raggedright = ##t}
+       \layout {raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/bar-always.ly b/input/test/bar-always.ly
index 5f851616e7660efe9cbdd52076f6582bc48e86e2..ed04916ddd9829b3700f72b1637fbd9dff631691 100644 (file)
--- a/input/test/bar-always.ly
+++ b/input/test/bar-always.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "@cindex Bars Always
 \header {
 
     texidoc = "@cindex Bars Always


@@ -14,6 +14,6 @@ By setting @code{barAlways} and @code{defaultBarType}, barlines may be inserted
                \set Score.barAlways = ##t
                \set Score.defaultBarType = ":|:"
                c4 c4 c4 c4 }
                \set Score.barAlways = ##t
                \set Score.defaultBarType = ":|:"
                c4 c4 c4 c4 }

-       \paper{raggedright = ##t}
+       \layout{raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/bar-lines-lyric-only.ly b/input/test/bar-lines-lyric-only.ly
index 63bd0493bd1769b8338a0e752fefe40390f6be43..395ea93bc780e37cc60bc17c8fe3968a9f8e4120 100644 (file)
--- a/input/test/bar-lines-lyric-only.ly
+++ b/input/test/bar-lines-lyric-only.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "@cindex Bar line lyric only
 You can move @code{Bar_engraver} and @code{Span_bar_engraver} to 
 a different engraving context, if you want, for example, bar lines 
 \header { texidoc = "@cindex Bar line lyric only
 You can move @code{Bar_engraver} and @code{Span_bar_engraver} to 
 a different engraving context, if you want, for example, bar lines 


@@ -15,7 +15,7 @@ on lyrics. "
     >>
 
 
     >>
 
 

-    \paper  {
+    \layout  {

        raggedright = ##t
        \context {
            \Lyrics
        raggedright = ##t
        \context {
            \Lyrics

diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly
index d0bc57bf16195cefa0abd85c2056773860813136..77c81a0fb1367ca1a8833f35b5a75873087aa7d1 100644 (file)
--- a/input/test/bar-lines.ly
+++ b/input/test/bar-lines.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     
 
 \header {
     


@@ -7,7 +7,7 @@
 
 }
 
 
 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \relative {
     c4 \bar "|" \mark \markup {  \simple #"|" }
 
 \relative {
     c4 \bar "|" \mark \markup {  \simple #"|" }

diff --git a/input/test/bar-number-every-five-reset.ly b/input/test/bar-number-every-five-reset.ly
index 4c6f8097710a6c99e94ea2294076682d8102675f..20991b4f2b257521961b90651061a9a956b2f71b 100644 (file)
--- a/input/test/bar-number-every-five-reset.ly
+++ b/input/test/bar-number-every-five-reset.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     texidoc = "@cindex Bar Number Every Fifth Reset
 
 \header {
     texidoc = "@cindex Bar Number Every Fifth Reset


@@ -26,5 +26,5 @@ resetBarnum = \context Score \applycontext
             \bar "|."
         }
     >>
             \bar "|."
         }
     >>

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

 }
 }

diff --git a/input/test/bar-number-regular-interval.ly b/input/test/bar-number-regular-interval.ly
index a9c26f294e9e4b6daefb640bdd3f0a2fd1260ce5..37ce520d8d1646aab01f3dde3ff2f41f774b89d9 100644 (file)
--- a/input/test/bar-number-regular-interval.ly
+++ b/input/test/bar-number-regular-interval.ly
@@ -5,7 +5,7 @@ Bar numbers can also be printed inside boxes.
 
 " }
 
 
 " }
 

-\version "2.3.18"
+\version "2.3.22"

 
 \score {
     \context Staff  \transpose  c c' {
 
 \score {
     \context Staff  \transpose  c c' {

diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly
index 3ee5e910e2ebd4b71f3052a7150d15948138521d..372617bcea30ea82d1f0a97ed13f53981899b9f3 100644 (file)
--- a/input/test/bar-number-show-all.ly
+++ b/input/test/bar-number-show-all.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
     texidoc="@cindex Bar Number Show All
 By default, bar numbers are printed only in the first measure.  This 
 \header{
     texidoc="@cindex Bar Number Show All
 By default, bar numbers are printed only in the first measure.  This 


@@ -14,7 +14,7 @@ setting can be overridden, so that bar numbers on start of every measure.
        \break
        c c c
     }
        \break
        c c c
     }

-       \paper{ raggedright = ##t }
+       \layout{ raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/test/beam-alternate.ly b/input/test/beam-alternate.ly
index 25b62a3b8f89a03926dada070f8d11b5b19b5618..c01686fa40d97e86bc46425821a6f14641d2feec 100644 (file)
--- a/input/test/beam-alternate.ly
+++ b/input/test/beam-alternate.ly
@@ -8,13 +8,13 @@
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 wipeNote = {
     \once \override NoteHead #'transparent = ##t
     \once \override Stem #'transparent = ##t 
 }
 
 wipeNote = {
     \once \override NoteHead #'transparent = ##t
     \once \override Stem #'transparent = ##t 
 }

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 
 \relative c''<< {
 
 
 \relative c''<< {

diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly
index 48175df505bdcddd8618e8577f29838d2770085c..060c05fb8f9556cb7922be5faeb424577c1aba71 100644 (file)
--- a/input/test/beam-auto-4-8.ly
+++ b/input/test/beam-auto-4-8.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % keep for now, although merging into beam-auto-override is a possibility.
 \header {
        texidoc = "@cindex Auto Beaming 4/8
 % keep for now, although merging into beam-auto-override is a possibility.
 \header {
        texidoc = "@cindex Auto Beaming 4/8


@@ -30,7 +30,7 @@ You can override the automatic beaming settings.
      c8 c c c16 c
 
   }
      c8 c c c16 c
 
   }

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

 }
     
 
 }
     
 

diff --git a/input/test/beam-auto-override.ly b/input/test/beam-auto-override.ly
index 76a52809bd390eff5a621b1b61a87d2c1a79172b..955ac000547c321f33fda64d8f1d9f2a3be15632 100644 (file)
--- a/input/test/beam-auto-override.ly
+++ b/input/test/beam-auto-override.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "@cindex Auto Beaming Override
 \header {
 
     texidoc = "@cindex Auto Beaming Override


@@ -42,7 +42,7 @@ The @code{autoBeaming} can also be turned off.
        \set autoBeaming = ##f
        c8 c c c
     }
        \set autoBeaming = ##f
        c8 c c c
     }

-    \paper{raggedright = ##t}
+    \layout{raggedright = ##t}

 }
 
 
 }
 
 

diff --git a/input/test/beam-control.ly b/input/test/beam-control.ly
index d22d236232b3e3477b3ce0a9bf63f4599e0458ff..b38b1ba9885f41dbfe6c92bbe6f110ed7b81bd9f 100644 (file)
--- a/input/test/beam-control.ly
+++ b/input/test/beam-control.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
     texidoc="@cindex Beam Position Control
 
 \header{
     texidoc="@cindex Beam Position Control
 


@@ -16,6 +16,6 @@ Beam positions may be controlled manually, by overriding the @code{positions} se
        \override Beam  #'positions = #'(0 . 1)
         c[ c]
   }
        \override Beam  #'positions = #'(0 . 1)
         c[ c]
   }

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/beam-count.ly b/input/test/beam-count.ly
index 630baa5bdeff421955b33295b231821d80e46d5b..4f61b81fef26ae53b8e24884d94197eec042d218 100644 (file)
--- a/input/test/beam-count.ly
+++ b/input/test/beam-count.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{
        texidoc="@cindex Beam Count
 
 \header{
        texidoc="@cindex Beam Count
 


@@ -8,7 +8,7 @@ two sets of four 32nds are joined, as if they were 8th notes.
 
 " }
 
 
 " }
 

-\paper { raggedright = ##t}  
+\layout { raggedright = ##t}  

 
 \relative {
   #(override-auto-beam-setting '(end * * * *)  1 4)
 
 \relative {
   #(override-auto-beam-setting '(end * * * *)  1 4)

diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly
index 2c8af66bb7802960c38309640ecc4ba27ad2420b..9f008ca2befa57251716e3af1f8633a67ad4b077 100644 (file)
--- a/input/test/boxed-stencil.ly
+++ b/input/test/boxed-stencil.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.18"
+\version "2.3.22"

 \header {
 texidoc = "@cindex Boxed Stencil
 
 \header {
 texidoc = "@cindex Boxed Stencil
 


@@ -24,6 +24,6 @@ grob. " }
 
       c4. c4 \mark "F" c1 
    }
 
       c4. c4 \mark "F" c1 
    }

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/caps.ly b/input/test/caps.ly
index 21edc20f460577023f86c635bbf004cd4d52712d..bb47ee8f53c3ae86788d05e5939e995a50ef95c0 100644 (file)
--- a/input/test/caps.ly
+++ b/input/test/caps.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
 texidoc = "@cindex Capital Letters
 The font can be changed to small caps.
 \header {
 texidoc = "@cindex Capital Letters
 The font can be changed to small caps.


@@ -13,6 +13,6 @@ shapeNorm = \revert LyricText #'font-shape
   \context Lyrics \lyricmode { 
     what4 is4 \shapeSC The8  Ma -- trix? }
   >>
   \context Lyrics \lyricmode { 
     what4 is4 \shapeSC The8  Ma -- trix? }
   >>

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/chord-names-german.ly b/input/test/chord-names-german.ly
index 5c84ea914969e9e1f6488620e669c2fe8cfb5047..eebc2e60ea0f8a20b6f4c9adaa61c8b59bab40ec 100644 (file)
--- a/input/test/chord-names-german.ly
+++ b/input/test/chord-names-german.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 
 \header  {
     texidoc = "@cindex Chord Names German
 The english naming of chords (default) can be changed to german 


@@ -17,7 +17,7 @@ scm = \chordmode {
 } 
 
 
 } 
 
 

-\paper {
+\layout {

     raggedright = ##t 
     \context {\ChordNames \consists Instrument_name_engraver }
 }
     raggedright = ##t 
     \context {\ChordNames \consists Instrument_name_engraver }
 }

diff --git a/input/test/chord-names-jazz.ly b/input/test/chord-names-jazz.ly
index fff26712c3123dbd96c6905196a91229f31dce2a..045aeb3b8b5add42e10c8f54c3c414a7bf20feda 100644 (file)
--- a/input/test/chord-names-jazz.ly
+++ b/input/test/chord-names-jazz.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The
 \header {
 
 texidoc = " Chord names are generated from a list pitches.  The


@@ -141,7 +141,7 @@ banterProperties = \sequential {
        
        \new Staff  \transpose c c' { \chs }
     >>
        
        \new Staff  \transpose c c' { \chs }
     >>

-    \paper {
+    \layout {

        indent = 3.\cm
        \context { 
            \ChordNames
        indent = 3.\cm
        \context { 
            \ChordNames

diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly
index c7502a5aabe0f43a534e3c98685fe902d4717387..8a22a8ec252749cef287b97f8554f19d289fb6f0 100644 (file)
--- a/input/test/coriolan-margin.ly
+++ b/input/test/coriolan-margin.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 
 % Ugh, we need to override some LaTeX titling stuff
 
 
 % Ugh, we need to override some LaTeX titling stuff


@@ -102,7 +102,7 @@ violoncello =  \relative c' {
 
 
 % ugf, must be here?
 
 
 % ugf, must be here?

-\bookpaper {
+\paper {

     indent=10.0\mm
     linewidth=150.0\mm
 }
     indent=10.0\mm
     linewidth=150.0\mm
 }


@@ -138,7 +138,7 @@ violoncello =  \relative c' {
          \context Staff ="violoncello" \violoncello
        >>
       >>
          \context Staff ="violoncello" \violoncello
        >>
       >>

-      \paper {
+      \layout {

          \context {
              \RemoveEmptyStaffContext
          }
          \context {
              \RemoveEmptyStaffContext
          }


@@ -149,7 +149,7 @@ violoncello =  \relative c' {
       }
     }
     % this is ignored?
       }
     }
     % this is ignored?

-    \bookpaper {
+    \paper {

        indent=10.0\mm
        linewidth=150.0\mm
     }
        indent=10.0\mm
        linewidth=150.0\mm
     }

diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly
index da84a5767949e7476fd502dda690941481dfda72..89546f3b29367086eac5bacbef41094a4850ffbf 100644 (file)
--- a/input/test/divisiones.ly
+++ b/input/test/divisiones.ly
@@ -9,7 +9,7 @@ Choices are @code{divisioMinima}, @code{divisioMaior},
 
 " }
 
 
 " }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \include "gregorian-init.ly"
 
 
 \include "gregorian-init.ly"
 

diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly
index ba1befbcadfa38fc8b96128d3f906ec5c39f283c..4391e1249db3584e00ad9d6abe6db782bb2b4fb8 100644 (file)
--- a/input/test/dynamic-extra.ly
+++ b/input/test/dynamic-extra.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % probably should be merged into refman.
 \header{
     texidoc = "@cindex Dynamic Piu Forte
 % probably should be merged into refman.
 \header{
     texidoc = "@cindex Dynamic Piu Forte


@@ -15,7 +15,7 @@ piuf =        \markup {  \italic "pi\\`u" \dynamic "f" }
        
        c2\< c2\!
        }
        
        c2\< c2\!
        }

-\paper{raggedright = ##t}
+\layout{raggedright = ##t}

     }
 
 
     }
 
 

diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly
index a875fdaa032c1232baf05460f299fbb24db57346..6a5f10e958f4b8d2983038a23c441472a44d2f14 100644 (file)
--- a/input/test/embedded-postscript.ly
+++ b/input/test/embedded-postscript.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
   texidoc = "@cindex Embedded Postscript
 By inserting the @TeX{} command \embeddedps, you can
 \header {
   texidoc = "@cindex Embedded Postscript
 By inserting the @TeX{} command \embeddedps, you can


@@ -17,7 +17,7 @@ insert postscript directly into the output.
     s2
     a'1
   }
     s2
     a'1
   }

-  \paper { linewidth = 70 * 5 \pt
+  \layout { linewidth = 70 * 5 \pt

 %      raggedright = ##t 
        }
 }
 %      raggedright = ##t 
        }
 }

diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly
index 9130a6f7f8c9115cb9726d103a42123fc42bb127..7404e94086fcfeb541568be7b5b679b77fa326f8 100644 (file)
--- a/input/test/embedded-tex.ly
+++ b/input/test/embedded-tex.ly
@@ -1,12 +1,12 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header{ texidoc="@cindex Embedded Tex
 You can embed Tex commands in your score. "}
 
 \header{ texidoc="@cindex Embedded Tex
 You can embed Tex commands in your score. "}
 

-\paper { raggedright = ##t} 
+\layout { raggedright = ##t} 

 
 
 
 

-\paper {
+\layout {

     raggedright = ##t
     inputencoding = "TeX"
 }
     raggedright = ##t
     inputencoding = "TeX"
 }

diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly
index 8ec1f9af1a01f2dd3b4dda75c2378333162f55d7..6ef81e49124204dcd2a185fa1e0f487b1acb2120 100644 (file)
--- a/input/test/engraver-contexts.ly
+++ b/input/test/engraver-contexts.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In
 \header {
     
 texidoc ="In polyphonic notation, many voices can share a staff: In

diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly
index eb0c7eece0665998cb63aa92d9a0d56959b4ac64..ae3742df65a7db69c6b3bdbc82954066ecdf9935 100644 (file)
--- a/input/test/engraver-one-by-one.ly
+++ b/input/test/engraver-one-by-one.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     
 texidoc = "The notation problem, creating a certain symbol,
 \header {
     
 texidoc = "The notation problem, creating a certain symbol,


@@ -22,7 +22,7 @@ Staff context.
 "
 
     }
 "
 
     }

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 
 \include "engraver-example.lyinc"
 
 
 \include "engraver-example.lyinc"
 


@@ -128,7 +128,7 @@ MyVoice = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
       }
       \context { \MyStaff }
       \context { \MyVoice }
       }


@@ -142,7 +142,7 @@ MyStaff = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -156,7 +156,7 @@ MyStaff = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -169,7 +169,7 @@ MyVoice = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -182,7 +182,7 @@ MyVoice = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -198,7 +198,7 @@ MyVoice= \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -213,7 +213,7 @@ MyStaff = \context {
 
 \score {
   \topVoice
 
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }


@@ -226,7 +226,7 @@ MyStaff = \context {
 }
 \score {
   \topVoice
 }
 \score {
   \topVoice

-  \paper {
+  \layout {

       \context { \MyStaff }
       \context { \MyVoice }
             }
       \context { \MyStaff }
       \context { \MyVoice }
             }

diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly
index e16bd428b185afed58b2f86cb174b30ecfc30242..524f94bc64f44fdb652f7b04a3d47961f00197de 100644 (file)
--- a/input/test/extra-staff.ly
+++ b/input/test/extra-staff.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 % definitely wil be renamed to something.
 %{
 
 % definitely wil be renamed to something.
 %{


@@ -43,7 +43,7 @@ a piece. "
                        c
                }
        >>
                        c
                }
        >>

-       \paper {
+       \layout {

                raggedright = ##t
                \context{
                        \Score
                raggedright = ##t
                \context{
                        \Score

diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly
index 630fcc7f80f586769676c84453c84bafbd16e097..f5db28fd7c7bb4a0661640d5cfb977dee19b9a7c 100644 (file)
--- a/input/test/fret-diagram.ly
+++ b/input/test/fret-diagram.ly
@@ -3,7 +3,7 @@
   texidoc = "Frets are supported as markup commands."
 }
 
   texidoc = "Frets are supported as markup commands."
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     <<
 
 \score {
     <<


@@ -48,5 +48,5 @@
   g' ^\markup \override #'(dot-color . white) {\fret-diagram-terse #'"3 5;2 3 5;2 4 5;2 4 5;3 5;2 3;" }
   }
     >>
   g' ^\markup \override #'(dot-color . white) {\fret-diagram-terse #'"3 5;2 3 5;2 4 5;2 4 5;3 5;2 3;" }
   }
     >>

-  \paper{ raggedright = ##t }
+  \layout{ raggedright = ##t }

 }
 }

diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly
index 5d4bc3dc031700d110dad613d742679733fbd09b..143d155aa5637b2d6af33cf336764ccaaa4b6ab2 100644 (file)
--- a/input/test/gregorian-scripts.ly
+++ b/input/test/gregorian-scripts.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc  = "@cindex Gregorian Scripts
 
 \header {
     texidoc  = "@cindex Gregorian Scripts
 


@@ -26,7 +26,7 @@ FIXME: episem stops one notehead too early.
 
 \include "gregorian-init.ly"
 
 
 \include "gregorian-init.ly"
 

-\bookpaper {
+\paper {

     linethickness = \staffspace / 5.0
 }
 
     linethickness = \staffspace / 5.0
 }
 


@@ -47,7 +47,7 @@ FIXME: episem stops one notehead too early.
       \[ a \episemInitium \pes b \flexa a \episemFinis \]
     }
   }
       \[ a \episemInitium \pes b \flexa a \episemFinis \]
     }
   }

-  \paper {
+  \layout {

     linewidth = 70.0
     width = 60.0
     indent = 0.0
     linewidth = 70.0
     width = 60.0
     indent = 0.0

diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly
index 4acd45978f42ac4c17778fffc9a478a1e8c90202..b57de97de8b7437be551cc5017a32ee885044bc0 100644 (file)
--- a/input/test/header-ifelse.ly
+++ b/input/test/header-ifelse.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 
 #(if (not (defined? 'pieceTagLine))
 
 
 #(if (not (defined? 'pieceTagLine))


@@ -16,6 +16,6 @@ This example puts the current version in the title via Scheme.
 " 
 }
 
 " 
 }
 

-\paper {raggedright=##t}
+\layout {raggedright=##t}

 { c'4 }
 
 { c'4 }
 

diff --git a/input/test/hymn.ly b/input/test/hymn.ly
index b08b0ba4fb13ec8a6606e932bf7082329f994c82..d652cdbdff1c9aedfbc915f366a2af16e12456b5 100644 (file)
--- a/input/test/hymn.ly
+++ b/input/test/hymn.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "
 
 
 \header { texidoc = "
 


@@ -24,7 +24,7 @@ texts, so they should be switched off.
                                d2 a
                        }
        >>
                                d2 a
                        }
        >>

-       \paper{
+       \layout{

                linewidth=140.\mm
                \context {
                        \Voice
                linewidth=140.\mm
                \context {
                        \Voice

diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly
index f5cafed39e182a02fd243b8c87349f31b6339c4a..e6913eb427ec642edea4ef45957ce7bdb0b541fd 100644 (file)
--- a/input/test/instrument-name-grandstaff.ly
+++ b/input/test/instrument-name-grandstaff.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }
 \header { texidoc = "@cindex Instrument Name Grandstaff
 You can have a name for the whole @code{GrandStaff} in addition to 
 individual @code{Staff}s. " }


@@ -12,7 +12,7 @@ individual @code{Staff}s. " }
     \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>>
 
 
     \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>>
 
 

-\paper {
+\layout {

 raggedright = ##t
 \context { \GrandStaff \consists "Instrument_name_engraver" }
 }}
 raggedright = ##t
 \context { \GrandStaff \consists "Instrument_name_engraver" }
 }}

diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly
index 8ce903dc35540796b015b0bf760494de2d9361d2..ff886b40056ebc1327da45fc8949f99b5a57bf01 100644 (file)
--- a/input/test/ligature-vaticana.ly
+++ b/input/test/ligature-vaticana.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc      = "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, and
 
 \header { texidoc      = "@cindex Ancient Vaticana
 Vaticana ligature uses four staff lines, special clef, and


@@ -21,7 +21,7 @@ verba = \context Lyrics = "verba" \lyricmode {
   Al- le- lu- ia.
 }
 
   Al- le- lu- ia.
 }
 

-\bookpaper {
+\paper {

     linethickness = \staffspace / 7.0
 }
 
     linethickness = \staffspace / 7.0
 }
 


@@ -30,7 +30,7 @@ verba = \context Lyrics = "verba" \lyricmode {
     \cantus
     \lyricsto "cantus" \verba
   >>
     \cantus
     \lyricsto "cantus" \verba
   >>

-  \paper {
+  \layout {

     linewidth = 137.0 \mm
     width = 137.0 \mm
     indent = 0.0
     linewidth = 137.0 \mm
     width = 137.0 \mm
     indent = 0.0

diff --git a/input/test/lilypond-testpage.ly b/input/test/lilypond-testpage.ly
index bd3b27e227e19167fa3a5ab0dbdef0d3a1eb0843..cee7c62e25f91e9b17a29199c683047ec992e8b1 100644 (file)
--- a/input/test/lilypond-testpage.ly
+++ b/input/test/lilypond-testpage.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % MERGE with title.ly -gp
 
 %{
 % MERGE with title.ly -gp
 
 %{

diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly
index fb6fbd2dd2b5e49e8c7b13711a824c1277af1058..4c4681bc6c2d3ff18d9cb6226ed69315a721e466 100644 (file)
--- a/input/test/mensural-ligatures.ly
+++ b/input/test/mensural-ligatures.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 
 % TODO:
 % check with ancient- stuff.  rename, merge, something.  -gp
 


@@ -32,7 +32,7 @@ voice =  \transpose c c' {
   \bar "||"
 }
 
   \bar "||"
 }
 

-\bookpaper {
+\paper {

     linethickness = \staffspace / 5.0
 }
 \score {
     linethickness = \staffspace / 5.0
 }
 \score {


@@ -48,7 +48,7 @@ voice =  \transpose c c' {
            >>
        >>
     >>
            >>
        >>
     >>

-    \paper {
+    \layout {

        \context {
            \Voice
            \name MensuralVoice
        \context {
            \Voice
            \name MensuralVoice

diff --git a/input/test/mensural-note-heads.ly b/input/test/mensural-note-heads.ly
index a50885ffd08f0c04d5196b24c05fd3a7d08c794c..c48af157c066377c29384fba8e3fe23f8bf432c5 100644 (file)
--- a/input/test/mensural-note-heads.ly
+++ b/input/test/mensural-note-heads.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads
 
 \header {
     texidoc ="@cindex Ancient Mensural Note Heads


@@ -14,6 +14,6 @@ Mensural notes may also have note heads. "
                c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 
                }
        }
                c\longa*1/4 c\breve*1/2 c1 c2 c4 c8 
                }
        }

-       \paper{raggedright=##t}
+       \layout{raggedright=##t}

 }
 
 }
 

diff --git a/input/test/move-specific-text.ly b/input/test/move-specific-text.ly
index d265a5d973df2eb85442a0684a5a0d407cb39465..e507d055db84279c9a4727dae7301653effbcd74 100644 (file)
--- a/input/test/move-specific-text.ly
+++ b/input/test/move-specific-text.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % possible rename to scheme- or something like that.  -gp
 \header { texidoc = "@cindex Scheme Move Text
 Objects, like text, can be moved around by using some Scheme code.
 % possible rename to scheme- or something like that.  -gp
 \header { texidoc = "@cindex Scheme Move Text
 Objects, like text, can be moved around by using some Scheme code.


@@ -15,6 +15,6 @@ Objects, like text, can be moved around by using some Scheme code.
       'extra-offset '(-3.5 . -4.5))
     a^2^"m.d."
   }
       'extra-offset '(-3.5 . -4.5))
     a^2^"m.d."
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/music-box.ly b/input/test/music-box.ly
index 30bc3c923cda56812d52cc320eeb3f7a23d6066b..e791fc71f9e79992ff75d65d12caf9822bd6eb2d 100644 (file)
--- a/input/test/music-box.ly
+++ b/input/test/music-box.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp
 \include "deutsch.ly"
 % possible rename to scheme- something.  -gp
 % TODO: ask if it needs to have so many empty bars in the middle.  -gp


@@ -53,7 +53,7 @@ using Scheme functions to avoid typing work. " }
 
 
 
 
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 pat =  \transpose c c' \repeat unfold 2 {
   << { \context Staff=up {r8 e16 f g e f g } }
 
 pat =  \transpose c c' \repeat unfold 2 {
   << { \context Staff=up {r8 e16 f g e f g } }


@@ -122,7 +122,7 @@ endc =  {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata }
      }
    >>
    
      }
    >>
    

-   \paper {
+   \layout {

        \context {
           \PianoStaff
           \override VerticalAlignment #'forced-distance = #10
        \context {
           \PianoStaff
           \override VerticalAlignment #'forced-distance = #10

diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly
index f183c9ba62804ecda5775f0be8c953f6331d222b..921778be309dbea814073c347d37a1b7b979b105 100644 (file)
--- a/input/test/music-creation.ly
+++ b/input/test/music-creation.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 % possible rename to scheme- something.  -gp
 \header { texidoc = "@cindex Scheme Music Creation
 
 % possible rename to scheme- something.  -gp
 \header { texidoc = "@cindex Scheme Music Creation


@@ -25,6 +25,6 @@ fooMusic = #(seq-music-list
                    (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))))
      
 \score { \fooMusic 
                    (make-note (list (make-note-req (ly:make-pitch 1 1 0) (ly:make-duration 2 0))))))
      
 \score { \fooMusic 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 
 }
 

diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly
index ea8c028067224a2156d09c42ee3aa0ff343f4759..01252b618c630628ccb26db3f908791c1144bc68 100644 (file)
--- a/input/test/no-bar-lines.ly
+++ b/input/test/no-bar-lines.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove
 % possible rename to bar-lines-foo.  -gp
 
 \header{ texidoc = "@cindex Bar Lines Remove


@@ -13,7 +13,7 @@ have been removed.
     a b c d
     d c b a
   }
     a b c d
     d c b a
   }

-  \paper {
+  \layout {

     raggedright = ##t
     \context {
       \Staff
     raggedright = ##t
     \context {
       \Staff

diff --git a/input/test/no-key-at-end-of-line.ly b/input/test/no-key-at-end-of-line.ly
index 2a41a5c68c35d5f5b0ce9ccd2f3b56ad4e37dc60..05c77a6bc2328b690e9221300085cd8e1614f42f 100644 (file)
--- a/input/test/no-key-at-end-of-line.ly
+++ b/input/test/no-key-at-end-of-line.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
     texidoc = "@cindex Key Signature End of Line
 \header {
 
     texidoc = "@cindex Key Signature End of Line

diff --git a/input/test/ossia.ly b/input/test/ossia.ly
index fb871f646c73bbcf98235911448734579212b709..cccd687df12e8a853849c3b3b5392a76f3f120cd 100644 (file)
--- a/input/test/ossia.ly
+++ b/input/test/ossia.ly
@@ -4,7 +4,7 @@
     @code{RemoveEmptyStaffContext} take out the unused parts.
 " }
 
     @code{RemoveEmptyStaffContext} take out the unused parts.
 " }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
     \relative c''
 
 \score {
     \relative c''


@@ -30,7 +30,7 @@
     >>
     
 
     >>
     
 

-    \paper {
+    \layout {

        raggedright= ##t
        \context {\RemoveEmptyStaffContext}
        \context {
        raggedright= ##t
        \context {\RemoveEmptyStaffContext}
        \context {

diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly
index 242d4bcda70baa7837420b0b076e325b35506f69..cbb652ba3d10ce074a3e374aa3aa2ee704e38b23 100644 (file)
--- a/input/test/partial-blank.ly
+++ b/input/test/partial-blank.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % check with invisible-notes or blank-notes.  possible rename. -gp
 \header{ texidoc = "@cindex Partial Blank
 When entering partially typeset music (i.e. for students to be 
 % check with invisible-notes or blank-notes.  possible rename. -gp
 \header{ texidoc = "@cindex Partial Blank
 When entering partially typeset music (i.e. for students to be 


@@ -28,6 +28,6 @@ mel =  \relative c' {c16 d16 e8 a4 g2 e8 d c2. g'1 e4 d c2}
   >>
   \new Staff  {\clef F s1*4}
 >>
   >>
   \new Staff  {\clef F s1*4}
 >>

-\paper {}
+\layout {}

 }
 
 }
 

diff --git a/input/test/piano-staff-distance.ly b/input/test/piano-staff-distance.ly
index 69c9e4190866e57efce58116c30084ad183c915b..2785622a677a2cddfecccbc12f860b8f70f1baf0 100644 (file)
--- a/input/test/piano-staff-distance.ly
+++ b/input/test/piano-staff-distance.ly
@@ -8,7 +8,7 @@ Currently, this is for testing purposes.  "
 
 }
 
 
 }
 

-\version "2.3.17"
+\version "2.3.22"

 
 #(define ((futz-alignment-callback distance count) grob axis)
 
 
 #(define ((futz-alignment-callback distance count) grob axis)
 


@@ -64,5 +64,5 @@ DISTANCE; then call the original callback.  "
            \skip 1 }
 
     >>
            \skip 1 }
 
     >>

-    \paper { raggedright = ##T } 
+    \layout { raggedright = ##T } 

 }
 }

diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly
index a7d576269b3ccd584063a89ae48c32215f373e1c..110acb9ab4554c137d7e706f872390abd1a46daa 100644 (file)
--- a/input/test/preset-extent.ly
+++ b/input/test/preset-extent.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "
 
 @cindex Preset Extent
 \header { texidoc = "
 
 @cindex Preset Extent


@@ -18,7 +18,7 @@ they are spaced so widely.
        \override LyricText  #'X-extent = #'(-10.0 . 10.0)
  bar baz
        }
        \override LyricText  #'X-extent = #'(-10.0 . 10.0)
  bar baz
        }

-    \paper { raggedright = ##t}
+    \layout { raggedright = ##t}

 }
     
 
 }
     
 

diff --git a/input/test/rests.ly b/input/test/rests.ly
index b4335fe34a7e81902785ae4adb58050af8aebfee..b2ff7abaf1f6d5e7401fef1b84f451ba6aadc691 100644 (file)
--- a/input/test/rests.ly
+++ b/input/test/rests.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {
     texidoc = "@cindex Rests
 
 \header {
     texidoc = "@cindex Rests
 


@@ -8,7 +8,7 @@ Rests may be used in various styles.
 "
 }
 
 "
 }
 

-\paper {
+\layout {

     indent = 0.0
     raggedright = ##t
 }
     indent = 0.0
     raggedright = ##t
 }

diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly
index ef0bc4049ec712fe86a92362229715a45fd1c81b..8129c4a96b573306cc7de4272449220422a827f1 100644 (file)
--- a/input/test/reverse-music.ly
+++ b/input/test/reverse-music.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 % possible rename to scheme-something.
 \header { texidoc="@cindex Scheme Reverse Music
 Symmetric, or palindromical music can be produced, first, by printing
 % possible rename to scheme-something.
 \header { texidoc="@cindex Scheme Reverse Music
 Symmetric, or palindromical music can be produced, first, by printing


@@ -35,7 +35,7 @@ music =  \relative c'' { c4 d4( e4 f4 }
     \music
     \applymusic #reverse-music \music
   }
     \music
     \applymusic #reverse-music \music
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 
 }
 
 

diff --git a/input/test/script-abbreviations.ly b/input/test/script-abbreviations.ly
index 7d1f1101f0af7e1e9f86e4a870d591c14882fb0c..a03c20d3949421e9efa4756b5bfe77bfe0fccf3e 100644 (file)
--- a/input/test/script-abbreviations.ly
+++ b/input/test/script-abbreviations.ly
@@ -1,7 +1,7 @@
 
 % this chart is used in the manual too.
 
 
 % this chart is used in the manual too.
 

-\version "2.3.17"
+\version "2.3.22"

 \header { texidoc = "@cindex Script Abbreviations
 
 Some articulations may be entered using an abbreviation.
 \header { texidoc = "@cindex Script Abbreviations
 
 Some articulations may be entered using an abbreviation.

diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly
index 50eb0e0d59928c5df4be70a51e55f99967e548c3..63feb218138168f4c69a1fdd1174327db5311fab 100644 (file)
--- a/input/test/script-chart.ly
+++ b/input/test/script-chart.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 % this chart is used in the manual too.
 
 
 % this chart is used in the manual too.
 


@@ -48,7 +48,7 @@ This chart shows all articulations, or scripts, that feta font contains.
         coda__                  varcoda__
       }
     >>
         coda__                  varcoda__
       }
     >>

-    \paper {
+    \layout {

       linewidth = 5.1\in
       indent = 0.0\mm
     }
       linewidth = 5.1\in
       indent = 0.0\mm
     }

diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly
index e33dd09b21f36556617fc771989a3e642b6b02ce..0570d16d01a318ad15c397ecbb76e10283c8811e 100644 (file)
--- a/input/test/slur-dash.ly
+++ b/input/test/slur-dash.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {texidoc = "@cindex Slur, dotted
 The appearance of slurs may be changed from solid to dotted or dashed.
 "
 \header {texidoc = "@cindex Slur, dotted
 The appearance of slurs may be changed from solid to dotted or dashed.
 "


@@ -15,7 +15,7 @@ The appearance of slurs may be changed from solid to dotted or dashed.
                \slurSolid
                c( d e  c) |
        }
                \slurSolid
                c( d e  c) |
        }

-       \paper{ raggedright=##t }
+       \layout{ raggedright=##t }

 }
 
 
 }
 
 

diff --git a/input/test/slur-manual.ly b/input/test/slur-manual.ly
index 1023eca39a754730d7891de5115068ed628c59f2..e02ad498882f302ef608ca598635e8c4b56ec038 100644 (file)
--- a/input/test/slur-manual.ly
+++ b/input/test/slur-manual.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 \header {
 
 
 \header {
 
 


@@ -38,6 +38,6 @@
            f' c as' f c'4)
        }>>
     >>
            f' c as' f c'4)
        }>>
     >>

-    \paper {  }
+    \layout {  }

 }
 
 }
 

diff --git a/input/test/slur-minimum-length.ly b/input/test/slur-minimum-length.ly
index ed40122d0c8e0cfe1ae60bb85008499096738244..f1234b9ab8b68531c1da2fb32265e449f4c2ae5a 100644 (file)
--- a/input/test/slur-minimum-length.ly
+++ b/input/test/slur-minimum-length.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "@cindex Slur Minimum Length
 By setting the minimum length of a slur, notes are more separated. " 
 
 \header { texidoc = "@cindex Slur Minimum Length
 By setting the minimum length of a slur, notes are more separated. " 

diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly
index 986f41f28f66f1adf8e140b5405063319bc7b815..d75f19657c01c0b2e265f57d0626445bb3d1447a 100644 (file)
--- a/input/test/smart-transpose.ly
+++ b/input/test/smart-transpose.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 texidoc="@cindex Smart Transpose
 
 \header {
 texidoc="@cindex Smart Transpose


@@ -73,7 +73,7 @@ music =  \relative c' { c4 d  e f g a b  c }
     \transpose c deses \music
     \applymusic #naturalise \transpose c deses \music
   }
     \transpose c deses \music
     \applymusic #naturalise \transpose c deses \music
   }

-  \paper { raggedright = ##t}
+  \layout { raggedright = ##t}

 }
 
 
 }
 
 

diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly
index becdc5b1256fd7276fba0ffb4502f5d7c714be9b..9c6a256088c65f4a9130dd8bd8e2954245bc8885 100644 (file)
--- a/input/test/staff-bracket.ly
+++ b/input/test/staff-bracket.ly
@@ -1,4 +1,4 @@
-\version "2.3.17" 
+\version "2.3.22" 

 
 \header{ texidoc="@cindex Nested Staff Groups
 Staffs can be nested in various combinations. Here, @code{StaffGroup}
 
 \header{ texidoc="@cindex Nested Staff Groups
 Staffs can be nested in various combinations. Here, @code{StaffGroup}


@@ -40,6 +40,6 @@ and @code{InnerChoirStaff}, the brackets are shifted leftwards.
 
 >>
 
 
 >>
 

- \paper { raggedright = ##t}
+ \layout { raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/staff-container.ly b/input/test/staff-container.ly
index 5c65a4321efd0595b77007ceaddb0d5ca4cecf52..b4205e4f585baa4ba967222bf61d4a480c2923f5 100644 (file)
--- a/input/test/staff-container.ly
+++ b/input/test/staff-container.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -36,7 +36,7 @@ what you would expect.)
        }
     >>
 
        }
     >>
 

-    \paper {
+    \layout {

        \context {
            \Score
            \accepts StaffContainer
        \context {
            \Score
            \accepts StaffContainer

diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly
index 6a7fbfd7df2000f27f65dcbc24042b694d23684c..5bb326096ad404ae76c81a6aa6c929b1f71d5b7a 100644 (file)
--- a/input/test/staff-lines.ly
+++ b/input/test/staff-lines.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -30,5 +30,5 @@ lower = \relative c {
         \lower
     }
   >>
         \lower
     }
   >>

-  \paper { raggedright=##t}  
+  \layout { raggedright=##t}  

 }
 }

diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly
index 2ffaf4ec1ce7f16d5da8db4ee771712ebe56d149..56a0e42be89a8400d0e319b2103b1f05ac2d28f0 100644 (file)
--- a/input/test/staff-size.ly
+++ b/input/test/staff-size.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "@cindex Staff Size
 
 
 \header { texidoc = "@cindex Staff Size
 


@@ -7,7 +7,7 @@ must be scaled."
 
 }
 
 
 }
 

-\paper { raggedright = ##t}
+\layout { raggedright = ##t}

 
 \relative c' <<
 %    \new Staff \relative c'' { \dynamicDown c4 \ff c c c }
 
 \relative c' <<
 %    \new Staff \relative c'' { \dynamicDown c4 \ff c c c }

diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly
index b82ba038286156f96fcacd59aba82acc5cc6da19..f8bef2a08451f82e950a94ca9c28e0bc23fae3d9 100644 (file)
--- a/input/test/stem-extend.ly
+++ b/input/test/stem-extend.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "@cindex Stem Extend
 Extending stems to the center line may be prevented using @code{no-stem-extend}.
 
 \header { texidoc = "@cindex Stem Extend
 Extending stems to the center line may be prevented using @code{no-stem-extend}.


@@ -21,6 +21,6 @@ Extending stems to the center line may be prevented using @code{no-stem-extend}.
        >>
        
   }
        >>
        
   }

-  \paper { raggedright = ##t}  
+  \layout { raggedright = ##t}  

 }
 
 }
 

diff --git a/input/test/tablature-hammer.ly b/input/test/tablature-hammer.ly
index c25a112a62b0aee44bdc2bc0f338bbe1785768a5..b406d2fcc7e1539d793f6d4fd03b57a03fa35d6a 100644 (file)
--- a/input/test/tablature-hammer.ly
+++ b/input/test/tablature-hammer.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 \header {texidoc = "@cindex Tablature hammer
 A hammer in tablature can be faked with slurs. "
 } 
 \header {texidoc = "@cindex Tablature hammer
 A hammer in tablature can be faked with slurs. "
 } 


@@ -12,6 +12,6 @@ A hammer in tablature can be faked with slurs. "
                d(c)
   }
   >>
                d(c)
   }
   >>

-       \paper{ raggedright = ##t}
+       \layout{ raggedright = ##t}

 }
 
 }
 

diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly
index 84857d29c6d1fd6c5cbc2ac776312e9c47132e24..a39915bf90f1b3e227c6ae62b864d9af2264a833 100644 (file)
--- a/input/test/temporary-stave.ly
+++ b/input/test/temporary-stave.ly
@@ -1,5 +1,5 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 


@@ -22,7 +22,7 @@ time and key signatures and clef at the beginning of the extra stave.
       c4 d e f |
     }
   }
       c4 d e f |
     }
   }

-  \paper {
+  \layout {

     \context {
       \Score
       \consists Span_bar_engraver
     \context {
       \Score
       \consists Span_bar_engraver

diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly
index 49404f9c2a4bd3a55dc054f10e2809286e90e1ed..eed87a02fcd7889c3505d806c68ae792fa2459b7 100644 (file)
--- a/input/test/text-rotate.ly
+++ b/input/test/text-rotate.ly
@@ -16,7 +16,7 @@ output for printing of the source of this example (commenting one line).
 
     }
 
 
     }
 

-\version "2.3.17"
+\version "2.3.22"

 
 \score {
 \new Staff  \relative c'' {
 
 \score {
 \new Staff  \relative c'' {


@@ -27,7 +27,7 @@ output for printing of the source of this example (commenting one line).
 
     c4 c4 }
 
 
     c4 c4 }
 

-\paper { raggedright = ##t }
+\layout { raggedright = ##t }

 }
 
 
 }
 
 

diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly
index 5d6dfeed862aea7b956229413dc727682035646b..f559a594ccf8047d5545e381b97bda59ae1d82b6 100644 (file)
--- a/input/test/text-spanner.ly
+++ b/input/test/text-spanner.ly
@@ -1,12 +1,12 @@
 
 

-\version "2.3.17"
+\version "2.3.22"

 
 \header { texidoc = "@cindex text spanner
 Text spanners can be used in the similar manner than markings for pedals
 or octavation.
 "
       }
 
 \header { texidoc = "@cindex text spanner
 Text spanners can be used in the similar manner than markings for pedals
 or octavation.
 "
       }

-\paper{ raggedright = ##t}
+\layout{ raggedright = ##t}

 
 \relative c''{
     \override TextSpanner  #'edge-text = #'("bla" . "blu")
 
 \relative c''{
     \override TextSpanner  #'edge-text = #'("bla" . "blu")

diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly
index 272bf352074517bbb7a05bcf3a7692963f32e6e2..1a6279c70a03099ccd39979dea055f78d6989971 100644 (file)
--- a/input/test/title-markup.ly
+++ b/input/test/title-markup.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 %{
    Markup titles also available for direct PostScript output:
 
 %{
    Markup titles also available for direct PostScript output:


@@ -25,7 +25,7 @@ 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)
     #(define page-breaking ly:optimal-page-breaks)
     %% Ughr, this breaks TeX output...
     %% fonts = #(make-century-schoolbook-tree 1.0)


@@ -94,7 +94,7 @@ spaceTest = \markup { "two space chars" }
        \context Staff  \relative c' {
            c2-\sizeTest c2-\spaceTest
        }
        \context Staff  \relative c' {
            c2-\sizeTest c2-\spaceTest
        }

-       \paper {
+       \layout {

            #(paper-set-staff-size (* 11.0 pt)) 
        }
     }
            #(paper-set-staff-size (* 11.0 pt)) 
        }
     }


@@ -118,7 +118,7 @@ spaceTest = \markup { "two space chars" }
            opus = "opus 1"
            piece = "Second"
        }
            opus = "opus 1"
            piece = "Second"
        }

-       \paper {
+       \layout {

        }
     }
 }
        }
     }
 }

diff --git a/input/test/version-output.ly b/input/test/version-output.ly
index f6d4ed13054c5b75caa328f64ae2b6f3e8d34c6c..4c05b067cf52d4abad05d818d4ef9a8e530d136b 100644 (file)
--- a/input/test/version-output.ly
+++ b/input/test/version-output.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 
 \header {
 
 
 \header {
 

diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly
index 42e8a888b1a0f5483aaf010ed6a9ffb8e587b76a..06c29dc599cbb2e167002fa7c3e95f842b9041da 100644 (file)
--- a/input/test/vertical-extent.ly
+++ b/input/test/vertical-extent.ly
@@ -1,4 +1,4 @@
-\version "2.3.17"
+\version "2.3.22"

 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "
 % TODO: huh?  what's this file about?  -gp
 
 \header { texidoc = "


@@ -20,7 +20,7 @@ Vertical extents may increased by setting @code{minimumVerticalExtent},
       g1
     }
   >>
       g1
     }
   >>

-  \paper{
+  \layout{

       raggedright = ##t
   }
 }
       raggedright = ##t
   }
 }

diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly
index e0b26a8b9a2e7a9891d395e0c4ac70306c363c67..16575669e6e26091a68f90ee457f7bc94192fdb5 100644 (file)
--- a/input/twinkle-pop.ly
+++ b/input/twinkle-pop.ly
@@ -1,5 +1,5 @@
 #(ly:set-option 'old-relative)
 #(ly:set-option 'old-relative)

-\version "2.3.16"
+\version "2.3.22"

 \header{
 filename =      "twinkle-pop.ly"
 xtitle =        "Ah, vous dirais-je, maman "
 \header{
 filename =      "twinkle-pop.ly"
 xtitle =        "Ah, vous dirais-je, maman "


@@ -54,7 +54,7 @@ text = \lyricmode{
        \header{
                title = "Ah, vous dirais-je, maman "
        }
        \header{
                title = "Ah, vous dirais-je, maman "
        }

-        \paper {  }
+        \layout {  }

 }
 
 \score {
 }
 
 \score {


@@ -66,6 +66,6 @@ text = \lyricmode{
        \header{
                piece = "clarinet in B$\flat$"
        }
        \header{
                piece = "clarinet in B$\flat$"
        }

-        \paper {  }
+        \layout {  }

 }
 
 }
 

diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly
index b529b999114052862065a83e7b06d6e465d4cf1d..7455c39d97fc1043080749048633f00ee175184f 100644 (file)
--- a/input/wilhelmus.ly
+++ b/input/wilhelmus.ly
@@ -1,4 +1,4 @@
-\version "2.3.18"
+\version "2.3.22"

 
 \header {
   texidoc = "Wilhelmus van Nassouwe"
 
 \header {
   texidoc = "Wilhelmus van Nassouwe"


@@ -55,7 +55,7 @@ pipeSymbol = {
 
 myBreak = { \bar "" \break }
 
 
 myBreak = { \bar "" \break }
 

-\paper {
+\layout {

   indent = 0.0\mm
   linewidth = 120.0\mm
   textheight = 270.0\mm
   indent = 0.0\mm
   linewidth = 120.0\mm
   textheight = 270.0\mm


@@ -145,7 +145,7 @@ oneHalfNoteTime = \markup {
   \column < { \number "1" } { \smaller \smaller \note #"2" #-0.5 } >
 }
 
   \column < { \number "1" } { \smaller \smaller \note #"2" #-0.5 } >
 }
 

-\paper {
+\layout {

   raggedright = ##t
 
   \context {
   raggedright = ##t
 
   \context {


@@ -185,7 +185,7 @@ oneHalfNoteTime = \markup {
       \text
     }
   >>
       \text
     }
   >>

-  \paper {}
+  \layout {}

   \midi {}
 }
 
   \midi {}
 }
 

diff --git a/lily/accidental.cc b/lily/accidental.cc
index 0c62beee98ac81bcccd092d1d2f8625ef5cba9c4..696673d9d6ea3ed203133a0b54601f35f35e8310 100644 (file)
--- a/lily/accidental.cc
+++ b/lily/accidental.cc
@@ -204,7 +204,7 @@ Accidental_interface::print (SCM smob)
                                 (ly_symbol2scm ("font-size"),
                                  scm_int2num (-2))),
                     ac);
                                 (ly_symbol2scm ("font-size"),
                                  scm_int2num (-2))),
                     ac);

-      fm = select_font (me->get_paper (), ac);
+      fm = select_font (me->get_layout (), ac);

     }
   else
     fm = Font_interface::get_default_font (me);
     }
   else
     fm = Font_interface::get_default_font (me);

diff --git a/lily/ambitus.cc b/lily/ambitus.cc
index e8124d145f929b23874686f092b6efba8ec49d59..3c40cce7a1ab1758a5c5337ab0fd98aabb5c95e8 100644 (file)
--- a/lily/ambitus.cc
+++ b/lily/ambitus.cc
@@ -49,9 +49,9 @@ Ambitus::print (SCM smob)
       
       if (pmin < pmax)
        {
       
       if (pmin < pmax)
        {

-         Real linethickness = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"))
+         Real linethickness = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"))

            * robust_scm2double (me->get_property ("thickness"), 1.0); 
            * robust_scm2double (me->get_property ("thickness"), 1.0); 

-         Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+         Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

          Interval x_extent = 0.5 * linethickness *Interval (-1,1);
          Interval y_extent = Interval (pmin, pmax);
          Box line_box (x_extent, y_extent);
          Interval x_extent = 0.5 * linethickness *Interval (-1,1);
          Interval y_extent = Interval (pmin, pmax);
          Box line_box (x_extent, y_extent);

diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc
index a6595c95cfc1033521e2063466afbbba152654ae..3b9fcc2ff0eddf98796e98fd3f4399843db98b83 100644 (file)
--- a/lily/arpeggio.cc
+++ b/lily/arpeggio.cc
@@ -123,7 +123,7 @@ Arpeggio::brew_chord_bracket (SCM smob)
       heads.unite (iv  +  ss->relative_coordinate (common, Y_AXIS)  -  my_y);
     }
 
       heads.unite (iv  +  ss->relative_coordinate (common, Y_AXIS)  -  my_y);
     }
 

-  Real lt =  me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt =  me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
   Real dy = heads.length () + sp;
   Real x = 0.7;
   Real sp = 1.5 * Staff_symbol_referencer::staff_space (me);
   Real dy = heads.length () + sp;
   Real x = 0.7;

diff --git a/lily/balloon.cc b/lily/balloon.cc
index 272be12b7fa861eb263a0fe57e91a39f375339a9..2906383d70d7fe0d18699eaeba763a7d0ed675fb 100644 (file)
--- a/lily/balloon.cc
+++ b/lily/balloon.cc
@@ -60,7 +60,7 @@ Balloon_interface::print (SCM smob)
   SCM chain = Font_interface::text_font_alist_chain (me);
   chain = scm_cons (me->get_property ("balloon-text-props"), chain);
 
   SCM chain = Font_interface::text_font_alist_chain (me);
   chain = scm_cons (me->get_property ("balloon-text-props"), chain);
 

-  SCM text = Text_interface::interpret_markup (me->get_paper ()->self_scm (),
+  SCM text = Text_interface::interpret_markup (me->get_layout ()->self_scm (),

                                          chain, bt);
 
   Stencil *text_stil = unsmob_stencil (text);
                                          chain, bt);
 
   Stencil *text_stil = unsmob_stencil (text);

diff --git a/lily/bar-line.cc b/lily/bar-line.cc
index 4a4a4513b572a42dc3c92c06eeb1a718e863b1d6..d2f50ca0733a6db951fbc91ad6deb97e262e5f9a 100644 (file)
--- a/lily/bar-line.cc
+++ b/lily/bar-line.cc
@@ -52,7 +52,7 @@ Bar_line::compound_barline (Grob*me, String str, Real h)
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 
   Real hair = robust_scm2double (me->get_property ("hair-thickness"), 1);
   Real fatline = robust_scm2double (me->get_property ("thick-thickness"), 1);
 

-  Real staffline = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real staffline = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;
   Real staff_space = Staff_symbol_referencer::staff_space (me);
 
   kern *= staffline;


@@ -150,7 +150,7 @@ Bar_line::simple_barline (Grob *me,
                          Real w,
                          Real h) 
 {
                          Real w,
                          Real h) 
 {

-  Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

   
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
 }
   
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)), blot);
 }

diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc
index f7938d36abb73b4116c7475a023627a6db0136bc..1315c2dba720813d0ed4cc4cd4f8147446a34e86 100644 (file)
--- a/lily/beam-quanting.cc
+++ b/lily/beam-quanting.cc
@@ -285,7 +285,7 @@ Beam::quanting (SCM smob)
 
 #if DEBUG_QUANTING
   SCM inspect_quants = me->get_property ("inspect-quants");
 
 #if DEBUG_QUANTING
   SCM inspect_quants = me->get_property ("inspect-quants");

-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))

       && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);
       && scm_is_pair (inspect_quants))
     {
       Drul_array<Real> ins = ly_scm2interval (inspect_quants);


@@ -311,7 +311,7 @@ Beam::quanting (SCM smob)
                    ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
                                                       qscores[best_idx].yr)));
 #if DEBUG_QUANTING
                    ly_interval2scm (Drul_array<Real> (qscores[best_idx].yl,
                                                       qscores[best_idx].yr)));
 #if DEBUG_QUANTING

-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting"))))

     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
       
     {
       qscores[best_idx].score_card_ += to_string ("i%d", best_idx);
       

diff --git a/lily/beam.cc b/lily/beam.cc
index abe86359f175b5a9849dc444f8ae8b2d62790aad..dcf2e1893a10f58a5e773e9f2c8fa4ddd818954a 100644 (file)
--- a/lily/beam.cc
+++ b/lily/beam.cc
@@ -353,7 +353,7 @@ Beam::print (SCM grob)
   Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
   
   Stencil the_beam;
   Real gap_length = robust_scm2double (me->get_property ("gap"), 0.0);
   
   Stencil the_beam;

-  Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   
   for (int i = 0; i<= stems.size (); i++)
     {
   
   for (int i = 0; i<= stems.size (); i++)
     {


@@ -415,7 +415,7 @@ Beam::print (SCM grob)
        w += stem_width/ 2 ;
       
 
        w += stem_width/ 2 ;
       
 

-      Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+      Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

       Stencil whole = Lookup::beam (slope, w, thick, blot);
       Stencil gapped;
 
       Stencil whole = Lookup::beam (slope, w, thick, blot);
       Stencil gapped;
 


@@ -509,7 +509,7 @@ Beam::print (SCM grob)
 
 #if (DEBUG_QUANTING)
   SCM quant_score = me->get_property ("quant-score");
 
 #if (DEBUG_QUANTING)
   SCM quant_score = me->get_property ("quant-score");

-  if (to_boolean (me->get_paper ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))
+  if (to_boolean (me->get_layout ()->lookup_variable (ly_symbol2scm ("debug-beam-quanting")))

       && scm_is_string (quant_score))
     {
       
       && scm_is_string (quant_score))
     {
       


@@ -524,7 +524,7 @@ Beam::print (SCM grob)
       Direction stem_dir = stems.size() ? to_dir (stems[0]->get_property ("direction")) : UP;
     
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
       Direction stem_dir = stems.size() ? to_dir (stems[0]->get_property ("direction")) : UP;
     
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup

-        (me->get_paper ()->self_scm (), properties, quant_score));
+        (me->get_layout ()->self_scm (), properties, quant_score));

       the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 0);
     }
 #endif
       the_beam.add_at_edge (Y_AXIS, stem_dir, tm, 1.0, 0);
     }
 #endif

diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc
index fa2db2c8550c811a60d68d74a19ee9d3e553928d..044a898d07bb837d5967390de2889c52706d5bd5 100644 (file)
--- a/lily/bezier-bow.cc
+++ b/lily/bezier-bow.cc
@@ -59,7 +59,7 @@ height   <indent>
 
   Although this might seem cand_idates to SCM-ify, it is not all clear
   which parameters (ie. h_inf, r_0, F (.)) should be candidates for
 
   Although this might seem cand_idates to SCM-ify, it is not all clear
   which parameters (ie. h_inf, r_0, F (.)) should be candidates for

-  this.  At present h_inf and r_0 come from paper settings, but we did
+  this.  At present h_inf and r_0 come from layout settings, but we did

   no experiments for determining the best combinations of F, h_inf and
   r_0.
 
   no experiments for determining the best combinations of F, h_inf and
   r_0.
 

diff --git a/lily/book-paper-def.cc b/lily/book-paper-def.cc
deleted file mode 100644 (file)
index 4584fe9..0000000
--- a/lily/book-paper-def.cc
+++ /dev/null
@@ -1,133 +0,0 @@
-/* 
-  book-paper-def.cc -- implement Output_def
-
-  source file of the GNU LilyPond music typesetter
-
-  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
-*/
-
-#include "dimensions.hh"
-#include "font-metric.hh"
-#include "ly-module.hh"
-#include "output-def.hh"
-#include "modified-font-metric.hh"
-#include "virtual-font-metric.hh"
-
-Real
-output_scale (Output_def *od)
-{
-  return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
-}
-
-/* TODO: should add nesting for Output_def here too. */
-Font_metric *
-find_scaled_font (Output_def *mod,
-                 Font_metric *f, Real m, SCM input_enc_name)
-{
-  if (mod->parent_)
-    return find_scaled_font (mod->parent_, f, m, input_enc_name);
-  
-  Real lookup_mag = m;
-  if (!dynamic_cast<Virtual_font_metric*> (f))
-    lookup_mag /= output_scale (mod);
-
-  SCM font_table = mod->lookup_variable (ly_symbol2scm ("scaled-fonts"));
-  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
-    {
-      font_table = scm_c_make_hash_table (11);
-      mod->set_variable (ly_symbol2scm ("scaled-fonts"), font_table);
-    }
-
-  SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F);
-  if (sizes != SCM_BOOL_F)
-    {
-      SCM met = scm_assoc (scm_make_real (lookup_mag), sizes);
-      if (scm_is_pair (met))
-       return unsmob_metrics (scm_cdr (met));
-    }
-  else
-    sizes = SCM_EOL;
-  
-  /* Hmm. We're chaining font - metrics.  Should consider whether to
-     merge virtual-font and scaled_font.  */
-  SCM val = SCM_EOL;
-  if (Virtual_font_metric * vf = dynamic_cast<Virtual_font_metric*> (f))
-    {
-      /* For fontify_atom (), the magnification and name must be known
-        at the same time. That's impossible for
-        
-        Scaled (Virtual_font (Font1,Font2))
-        
-        so we replace by
-        
-        Virtual_font (Scaled (Font1), Scaled (Font2))  */
-      SCM lst = SCM_EOL;
-      SCM *t = &lst;
-      for (SCM s = vf->get_font_list (); scm_is_pair (s); s = scm_cdr (s))
-       {
-         Font_metric *scaled = find_scaled_font (mod,
-                                                 unsmob_metrics (scm_car (s)),
-                                                 m, input_enc_name);
-         *t = scm_cons (scaled->self_scm (), SCM_EOL);
-         t = SCM_CDRLOC (*t);
-       }
-
-      vf = new Virtual_font_metric (lst);
-      val = vf->self_scm ();
-    }
-  else
-    {
-      val = Modified_font_metric::make_scaled_font_metric (input_enc_name,
-                                                          f, lookup_mag);
-    }
-
-  sizes = scm_acons (scm_make_real (lookup_mag), val, sizes);
-  scm_gc_unprotect_object (val);
-  scm_hashq_set_x (font_table, f->self_scm (), sizes);
-  return unsmob_metrics (val);
-}
-
-/* TODO: this is a nasty interface. During formatting,
-   the Output_def should be scaled to the output_scale_
-   specified in the toplevel Output_def.  */
-Output_def * 
-scale_output_def (Output_def *o, Real amount)
-{
-  SCM proc = ly_scheme_function ("scale-paper");
-  SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount));
-  scm_gc_protect_object (new_pap);
-
-  return unsmob_output_def (new_pap);
-}
-
-LY_DEFINE (ly_bookpaper_fonts, "ly:bookpaper-fonts",
-          1, 0, 0,
-          (SCM bp),
-          "Return fonts scaled up BP")
-{
-  Output_def *b = unsmob_output_def (bp);
-
-  SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
-  
-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "bookpaper");
-
-  SCM ell = SCM_EOL;
-  if (scm_hash_table_p (font_table) == SCM_BOOL_T)
-    {
-      SCM func = ly_scheme_function ("hash-table->alist");
-
-      for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s);
-          s = scm_cdr (s))
-       {
-         SCM entry = scm_car (s);
-         for (SCM t = scm_cdr (entry); scm_is_pair (t); t = scm_cdr (t))
-           {
-             Font_metric *fm = unsmob_metrics (scm_cdar (t));
-
-             if (dynamic_cast<Modified_font_metric*> (fm))
-               ell = scm_cons (fm->self_scm (), ell);
-           }
-       }
-    }
-  return ell;
-}

diff --git a/lily/book.cc b/lily/book.cc
index 94f17bff529628ade4e3833966d08e3f865486e4..e9f7eee3757a823d9090306f8f09f30aaacec233 100644 (file)
--- a/lily/book.cc
+++ b/lily/book.cc
@@ -26,7 +26,7 @@
 Book::Book ()
   : Input ()
 {
 Book::Book ()
   : Input ()
 {

-  bookpaper_ = 0;
+  paper_ = 0;

   header_ = SCM_EOL;
   assert (!scores_.size ());
   smobify_self ();
   header_ = SCM_EOL;
   assert (!scores_.size ());
   smobify_self ();


@@ -47,8 +47,8 @@ Book::mark_smob (SCM s)
   for (int i = 0; i < score_count; i++)
     scm_gc_mark (book->scores_[i]->self_scm ());
 
   for (int i = 0; i < score_count; i++)
     scm_gc_mark (book->scores_[i]->self_scm ());
 

-  if (book->bookpaper_)
-    scm_gc_mark (book->bookpaper_->self_scm ());
+  if (book->paper_)
+    scm_gc_mark (book->paper_->self_scm ());

   return book->header_;
 }
 
   return book->header_;
 }
 


@@ -72,11 +72,11 @@ Book::process (String outname, Output_def *default_def)
     return 0;
     
   Paper_book *paper_book = new Paper_book ();
     return 0;
     
   Paper_book *paper_book = new Paper_book ();

-  Real scale = scm_to_double (bookpaper_->c_variable ("outputscale"));
+  Real scale = scm_to_double (paper_->c_variable ("outputscale"));

   
   

-  Output_def * scaled_bookdef = scale_output_def (bookpaper_, scale);
+  Output_def * scaled_bookdef = scale_output_def (paper_, scale);

 
 

-  paper_book->bookpaper_ = scaled_bookdef;
+  paper_book->paper_ = scaled_bookdef;

   scm_gc_unprotect_object (scaled_bookdef->self_scm());
   
   paper_book->header_ = header_;
   scm_gc_unprotect_object (scaled_bookdef->self_scm());
   
   paper_book->header_ = header_;


@@ -85,7 +85,7 @@ Book::process (String outname, Output_def *default_def)
   for (int i = 0; i < score_count; i++)
     {
       SCM systems = scores_[i]->book_rendering (outname,
   for (int i = 0; i < score_count; i++)
     {
       SCM systems = scores_[i]->book_rendering (outname,

-                                               paper_book->bookpaper_,
+                                               paper_book->paper_,

                                                default_def);
       
       /* If the score is empty, generate no output.  Should we
                                                default_def);
       
       /* If the score is empty, generate no output.  Should we


@@ -103,16 +103,16 @@ Book::process (String outname, Output_def *default_def)
 }
 
 LY_DEFINE(ly_make_book, "ly:make-book",
 }
 
 LY_DEFINE(ly_make_book, "ly:make-book",

-         2, 0, 1, (SCM bookpaper, SCM header, SCM scores),
-         "Make a \\book of @var{bookpaper} and @var{header} (which may be #f as well)  "
+         2, 0, 1, (SCM paper, SCM header, SCM scores),
+         "Make a \\book of @var{paper} and @var{header} (which may be #f as well)  "

          "containing @code{\\scores}.")
 {
          "containing @code{\\scores}.")
 {

-  Output_def * odef = unsmob_output_def (bookpaper);
-  SCM_ASSERT_TYPE (odef, bookpaper,
+  Output_def * odef = unsmob_output_def (paper);
+  SCM_ASSERT_TYPE (odef, paper,

                   SCM_ARG1, __FUNCTION__, "Output_def");
 
   Book *book = new Book;
                   SCM_ARG1, __FUNCTION__, "Output_def");
 
   Book *book = new Book;

-  book->bookpaper_ = odef;
+  book->paper_ = odef;

 
   if (ly_c_module_p (header))
     book->header_ = header;
 
   if (ly_c_module_p (header))
     book->header_ = header;

diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc
index 2fe726b5b861e0c2de1956bb400f4151b62df5b4..212913f4ae4195a7878edfa960e8a7d91449ea58 100644 (file)
--- a/lily/break-algorithm.cc
+++ b/lily/break-algorithm.cc
@@ -28,8 +28,8 @@ Break_algorithm::find_break_indices () const
     if (Item::is_breakable (all[i]))
       retval.push (i);
 
     if (Item::is_breakable (all[i]))
       retval.push (i);
 

-  if (linewidth_ <=0)
-    while (retval.size () >2)
+  if (linewidth_ <= 0)
+    while (retval.size () > 2)

       retval.del (1);
 
   return retval;
       retval.del (1);
 
   return retval;


@@ -46,7 +46,7 @@ Break_algorithm::find_breaks () const
     if (Item::is_breakable (all[i]))
       retval.push (all[i]);
 
     if (Item::is_breakable (all[i]))
       retval.push (all[i]);
 

-  if (linewidth_ <=0)
+  if (linewidth_ <= 0)

     while (retval.size () >2)
       retval.del (1);
 
     while (retval.size () >2)
       retval.del (1);
 


@@ -92,7 +92,7 @@ void
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;
 Break_algorithm::set_pscore (Paper_score*s)
 {
   pscore_ = s;

-  linewidth_ = s->paper_->get_dimension (ly_symbol2scm ("linewidth"));
+  linewidth_ = s->layout_->get_dimension (ly_symbol2scm ("linewidth"));

 }
 
 Array<Column_x_positions>
 }
 
 Array<Column_x_positions>

diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc
index 511fbd8373bcd68c396c29818f51f38b209e0f97..98966e2bf4e25f67bd138b4281d1cdc32ec5efe8 100644 (file)
--- a/lily/breathing-sign.cc
+++ b/lily/breathing-sign.cc
@@ -55,7 +55,7 @@ Breathing_sign::divisio_minima (SCM smob)
   else
     staff_size = 0.0;
 
   else
     staff_size = 0.0;
 

-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   /*
    * Draw a small vertical line through the uppermost (or, depending
 
   /*
    * Draw a small vertical line through the uppermost (or, depending


@@ -88,7 +88,7 @@ Breathing_sign::divisio_maior (SCM smob)
   else
     staff_size = 0.0;
 
   else
     staff_size = 0.0;
 

-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   /*
    * Draw a vertical line that is vertically centered in the staff
 
   /*
    * Draw a vertical line that is vertically centered in the staff


@@ -128,7 +128,7 @@ Breathing_sign::divisio_maxima (SCM smob)
   else
     staff_size = 0.0;
 
   else
     staff_size = 0.0;
 

-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   // like a "|" type bar
   Interval xdim (0, thickness);
 
   // like a "|" type bar
   Interval xdim (0, thickness);


@@ -158,7 +158,7 @@ Breathing_sign::finalis (SCM smob)
   else
     staff_size = 0.0;
 
   else
     staff_size = 0.0;
 

-  Real blotdiameter = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blotdiameter = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   // like a "||" type bar
   Interval xdim (0, thickness);
 
   // like a "||" type bar
   Interval xdim (0, thickness);

diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc
index d81246dccd1893a9428740e3993d5e2ce4e21621..13b7686c3fc3d689a39786db25fabae19f0e5a9e 100644 (file)
--- a/lily/dynamic-text-spanner.cc
+++ b/lily/dynamic-text-spanner.cc
@@ -60,7 +60,7 @@ Dynamic_text_spanner::print (SCM smob)
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
   Spanner *spanner = dynamic_cast<Spanner*> (me);
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);

-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();

 
   Interval span_points;
   Drul_array<bool> broken;
 
   Interval span_points;
   Drul_array<bool> broken;


@@ -111,7 +111,7 @@ Dynamic_text_spanner::print (SCM smob)
          SCM text = index_get_cell (edge_text, d);
 
          if (Text_interface::markup_p (text)) 
          SCM text = index_get_cell (edge_text, d);
 
          if (Text_interface::markup_p (text)) 

-           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, text));
+           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text));

          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);
          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);

diff --git a/lily/font-interface.cc b/lily/font-interface.cc
index 23a12a46d05a1c7a02e48cb44b80bb9aecd86ff2..01b5cf9c11d4dbb28ebcf971fe1702cad64df0f9 100644 (file)
--- a/lily/font-interface.cc
+++ b/lily/font-interface.cc
@@ -23,7 +23,7 @@ Font_interface::get_default_font (Grob *me)
     {
       SCM chain = music_font_alist_chain (me);
       
     {
       SCM chain = music_font_alist_chain (me);
       

-      fm = select_font (me->get_paper (), chain);
+      fm = select_font (me->get_layout (), chain);

       me->set_property ("font", fm->self_scm ());
     }
   
       me->set_property ("font", fm->self_scm ());
     }
   


@@ -45,7 +45,7 @@ SCM
 Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults
 Font_interface::music_font_alist_chain (Grob *g)
 {
   SCM defaults

-    = g->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));

   return g->get_property_alist_chain (defaults);
 }
 
   return g->get_property_alist_chain (defaults);
 }
 


@@ -53,7 +53,7 @@ SCM
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults
 Font_interface::text_font_alist_chain (Grob *g)
 {
   SCM defaults

-    = g->get_paper ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));
+    = g->get_layout ()->lookup_variable (ly_symbol2scm ("text-font-defaults"));

   return g->get_property_alist_chain (defaults);
 }
 
   return g->get_property_alist_chain (defaults);
 }
 

diff --git a/lily/font-select.cc b/lily/font-select.cc
index 8472b5acb921bb031dd8af16633e5b5c9acb7092..6e3348a335787ba40fdc39b8c79db2bfc004abeb 100644 (file)
--- a/lily/font-select.cc
+++ b/lily/font-select.cc
@@ -32,13 +32,13 @@ LY_DEFINE (ly_paper_get_font, "ly:paper-get-font", 2, 0, 0,
 }
 
 LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,
 }
 
 LY_DEFINE (ly_paper_get_number, "ly:paper-get-number", 2, 0, 0,

-          (SCM paper_smob, SCM name),
-          "Return the paper variable @var{name}.")
+          (SCM layout_smob, SCM name),
+          "Return the layout variable @var{name}.")

 {
 {

-  Output_def *paper = unsmob_output_def (paper_smob);
-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-                  __FUNCTION__, "paper definition");
-  return scm_make_real (paper->get_dimension (name));
+  Output_def *layout = unsmob_output_def (layout_smob);
+  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
+                  __FUNCTION__, "layout definition");
+  return scm_make_real (layout->get_dimension (name));

 }
 
 bool
 }
 
 bool


@@ -55,7 +55,7 @@ wild_compare (SCM field_val, SCM val)
   design size is specced in advance.
  */
 Font_metric *
   design size is specced in advance.
  */
 Font_metric *

-get_font_by_design_size (Output_def *paper, Real requested,
+get_font_by_design_size (Output_def *layout, Real requested,

                         SCM font_vector, SCM input_encoding)
 {
   int n = SCM_VECTOR_LENGTH (font_vector);
                         SCM font_vector, SCM input_encoding)
 {
   int n = SCM_VECTOR_LENGTH (font_vector);


@@ -87,16 +87,16 @@ get_font_by_design_size (Output_def *paper, Real requested,
 
   Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector,
                                                               i)));
 
   Font_metric *fm = unsmob_metrics (scm_force (SCM_VECTOR_REF (font_vector,
                                                               i)));

-  return find_scaled_font (paper, fm, requested / size, input_encoding);
+  return find_scaled_font (layout, fm, requested / size, input_encoding);

 
 }
 
 Font_metric*
 
 }
 
 Font_metric*

-get_font_by_mag_step (Output_def *paper, Real requested_step,
+get_font_by_mag_step (Output_def *layout, Real requested_step,

                      SCM font_vector, Real default_size,
                      SCM input_encoding)
 {
                      SCM font_vector, Real default_size,
                      SCM input_encoding)
 {

-  return get_font_by_design_size (paper, default_size
+  return get_font_by_design_size (layout, default_size

                                  * pow (2.0, requested_step / 6.0),
                                  font_vector, input_encoding);
 }
                                  * pow (2.0, requested_step / 6.0),
                                  font_vector, input_encoding);
 }


@@ -108,13 +108,13 @@ properties_to_font_size_family (SCM fonts, SCM alist_chain)
 }
 
 Font_metric *
 }
 
 Font_metric *

-select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
+select_encoded_font (Output_def *layout, SCM chain, SCM input_encoding)

 {
   SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
   if (!scm_is_pair (name) || !scm_is_string (scm_cdr (name)))
     {
 {
   SCM name = ly_assoc_chain (ly_symbol2scm  ("font-name"), chain);
   
   if (!scm_is_pair (name) || !scm_is_string (scm_cdr (name)))
     {

-      SCM fonts = paper->lookup_variable (ly_symbol2scm ("fonts"));
+      SCM fonts = layout->lookup_variable (ly_symbol2scm ("fonts"));

       name = properties_to_font_size_family (fonts, chain);
     }
   else
       name = properties_to_font_size_family (fonts, chain);
     }
   else


@@ -128,7 +128,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
                   : 1);
       Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
                   
                   : 1);
       Font_metric *fm = all_fonts_global->find_font (ly_scm2string (name));
                   

-      return find_scaled_font (paper, fm, rmag, input_encoding);
+      return find_scaled_font (layout, fm, rmag, input_encoding);

     }
   else if (scm_instance_p (name))
     {
     }
   else if (scm_instance_p (name))
     {


@@ -140,7 +140,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
       if (scm_is_pair (font_size))
        req = scm_to_double (scm_cdr (font_size));
 
       if (scm_is_pair (font_size))
        req = scm_to_double (scm_cdr (font_size));
 

-      return get_font_by_mag_step (paper, req, vec, scm_to_double (base_size),
+      return get_font_by_mag_step (layout, req, vec, scm_to_double (base_size),

                                   input_encoding);
     }
 
                                   input_encoding);
     }
 


@@ -149,7 +149,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding)
 }
 
 Font_metric *
 }
 
 Font_metric *

-select_font (Output_def *paper, SCM chain)
+select_font (Output_def *layout, SCM chain)

 {
 {

-  return select_encoded_font (paper, chain, SCM_EOL);
+  return select_encoded_font (layout, chain, SCM_EOL);

 }
 }

diff --git a/lily/gourlay-breaking.cc b/lily/gourlay-breaking.cc
index cd971e6e5e000040c971d34d698c1255ae31ec0c..98c3cb761c95f10ec364c5b1ab3d935e3ea1b832 100644 (file)
--- a/lily/gourlay-breaking.cc
+++ b/lily/gourlay-breaking.cc
@@ -83,8 +83,8 @@ Gourlay_breaking::do_solve () const
   Break_node first_node ;
   optimal_paths.push (first_node);
 
   Break_node first_node ;
   optimal_paths.push (first_node);
 

-  bool ragged_right = to_boolean (pscore_->paper_->c_variable ("raggedright"));
-  bool ragged_last = to_boolean (pscore_->paper_->c_variable ("raggedlast"));
+  bool ragged_right = to_boolean (pscore_->layout_->c_variable ("raggedright"));
+  bool ragged_last = to_boolean (pscore_->layout_->c_variable ("raggedlast"));

 
   Real worst_force = 0.0;
   for (int break_idx = 1; break_idx< breaks.size (); break_idx++) 
 
   Real worst_force = 0.0;
   for (int break_idx = 1; break_idx< breaks.size (); break_idx++) 


@@ -110,7 +110,7 @@ Gourlay_breaking::do_solve () const
          cp.cols_ = line;
 
          Interval line_dims
          cp.cols_ = line;
 
          Interval line_dims

-           = line_dimensions_int (pscore_->paper_, optimal_paths[start_idx].line_);
+           = line_dimensions_int (pscore_->layout_, optimal_paths[start_idx].line_);

          Simple_spacer_wrapper * sp = generate_spacing_problem (line, line_dims);
          bool last_line = break_idx == breaks.size ()-1;
          bool ragged = ragged_right
          Simple_spacer_wrapper * sp = generate_spacing_problem (line, line_dims);
          bool last_line = break_idx == breaks.size ()-1;
          bool ragged = ragged_right

diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc
index 75c9c7bc1e7b6182cbfa1ad3a6b1c33379c1222d..d3a0d0a05f83d5d2c2f53f561b7b9657f3857ae5 100644 (file)
--- a/lily/grob-scheme.cc
+++ b/lily/grob-scheme.cc
@@ -58,28 +58,28 @@ LY_DEFINE (ly_spanner_get_bound, "ly:spanner-get-bound",
 
 /* TODO: make difference between scaled and unscalead variable in
    calling (i.e different funcs.) */
 
 /* TODO: make difference between scaled and unscalead variable in
    calling (i.e different funcs.) */

-LY_DEFINE (ly_grob_paper, "ly:grob-paper",
+LY_DEFINE (ly_grob_layout, "ly:grob-layout",

           1, 0, 0, (SCM g),
           1, 0, 0, (SCM g),

-          "Get @code{\\paper} definition from grob @var{g}.")
+          "Get @code{\\layout} definition from grob @var{g}.")

 {
   Grob * sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
 {
   Grob * sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 

-  return sc->get_paper ()->self_scm ();
+  return sc->get_layout ()->self_scm ();

 }
 
 LY_DEFINE (ly_grob_alist_chain, "ly:grob-alist-chain",
           1, 1, 0, (SCM g, SCM global),
           "Get an alist chain for grob @var{g}, with @var{global} as the "
           "global default. If unspecified, @code{font-defaults} "
 }
 
 LY_DEFINE (ly_grob_alist_chain, "ly:grob-alist-chain",
           1, 1, 0, (SCM g, SCM global),
           "Get an alist chain for grob @var{g}, with @var{global} as the "
           "global default. If unspecified, @code{font-defaults} "

-          "from the paper block is taken. ")
+          "from the layout block is taken. ")

 {
   Grob *sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
   if (global == SCM_UNDEFINED)
     global
 {
   Grob *sc = unsmob_grob (g);
   SCM_ASSERT_TYPE (sc, g, SCM_ARG1, __FUNCTION__, "grob");
 
   if (global == SCM_UNDEFINED)
     global

-      = sc->get_paper ()->lookup_variable (ly_symbol2scm ("font-defaults"));
+      = sc->get_layout ()->lookup_variable (ly_symbol2scm ("font-defaults"));

 
   return sc->get_property_alist_chain (global);
 }
 
   return sc->get_property_alist_chain (global);
 }

diff --git a/lily/grob.cc b/lily/grob.cc
index eec5868c4fdd71bb1bbd77a1c57718d2fc66f412..54b62eff8e2c39090b68fc28431aa43ab642c097 100644 (file)
--- a/lily/grob.cc
+++ b/lily/grob.cc
@@ -151,9 +151,9 @@ robust_relative_extent (Grob*me, Grob*refp, Axis a)
 }
 
 Output_def *
 }
 
 Output_def *

-Grob::get_paper () const
+Grob::get_layout () const

 {
 {

- return pscore_ ? pscore_->paper_ : 0;
+ return pscore_ ? pscore_->layout_ : 0;

 }
 
 
 }
 
 

diff --git a/lily/include/book.hh b/lily/include/book.hh
index 2a81201e5d2ae1be4230a9b8b2dcb5edc83401eb..7f3eca8607f47b9b5e1737b1997da1d084437f8e 100644 (file)
--- a/lily/include/book.hh
+++ b/lily/include/book.hh
@@ -20,7 +20,7 @@ class Book : public Input
 
 public:
   SCM header_;
 
 public:
   SCM header_;

-  Output_def *bookpaper_;
+  Output_def *paper_;

   
   Link_array<Score> scores_;
   Book ();
   
   Link_array<Score> scores_;
   Book ();

diff --git a/lily/include/grob.hh b/lily/include/grob.hh
index b653ec25d3f7856b64824f18ca53aab12e5f3bdb..52f4a0feecb4dd6445570cac91233aa75128f14b 100644 (file)
--- a/lily/include/grob.hh
+++ b/lily/include/grob.hh
@@ -86,7 +86,7 @@ public:
   void warning (String) const;
   void programming_error (String) const;
   
   void warning (String) const;
   void programming_error (String) const;
   

-  Output_def *get_paper () const;
+  Output_def *get_layout () const;

   void add_dependency (Grob*);    
   virtual System *get_system () const;
 
   void add_dependency (Grob*);    
   virtual System *get_system () const;
 

diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh
index 2ebfb7f41723783b98d20b964c62164e4c20091d..b3f8ddd33e9cb94de4c561af3362563156cffcf1 100644 (file)
--- a/lily/include/lily-parser.hh
+++ b/lily/include/lily-parser.hh
@@ -55,7 +55,7 @@ public:
   Lily_parser (Sources *sources);
   Lily_parser (Lily_parser const&);
 
   Lily_parser (Sources *sources);
   Lily_parser (Lily_parser const&);
 

-  DECLARE_SCHEME_CALLBACK (paper_description, ());
+  DECLARE_SCHEME_CALLBACK (layout_description, ());

 
   Input here_input () const;
   Input pop_spot ();
 
   Input here_input () const;
   Input pop_spot ();


@@ -79,8 +79,8 @@ SCM ly_parser_print_score (SCM, SCM);
 SCM ly_parser_bookify (SCM, SCM);
 SCM ly_parser_scorify (SCM, SCM);
 
 SCM ly_parser_bookify (SCM, SCM);
 SCM ly_parser_scorify (SCM, SCM);
 

-Output_def *get_paper (Lily_parser *parser);
+Output_def *get_layout (Lily_parser *parser);

 Output_def *get_midi (Lily_parser *parser);
 Output_def *get_midi (Lily_parser *parser);

-Output_def *get_bookpaper (Lily_parser *parser);
+Output_def *get_paper (Lily_parser *parser);

 
 #endif /* MY_LILY_PARSER_HH */
 
 #endif /* MY_LILY_PARSER_HH */

diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh
index fd531f86ec2208589d826d2aa84cceafd0817aaf..e6cf9c85db16f8ed719541dd33d4ffbf1198511e 100644 (file)
--- a/lily/include/lily-proto.hh
+++ b/lily/include/lily-proto.hh
@@ -115,7 +115,6 @@ class Paper_book;
 class Paper_column;
 class Paper_outputter;
 class Paper_score;
 class Paper_column;
 class Paper_outputter;
 class Paper_score;

-class Paper_stream;

 class Paper_system;
 class Performance;
 class Performer;
 class Paper_system;
 class Performance;
 class Performer;

diff --git a/lily/include/main.hh b/lily/include/main.hh
index a36d29c69936f5f47d8a3789fc0189d8bfdc52ea..3e055091acb6e8059356a03ec550796c20e82509 100644 (file)
--- a/lily/include/main.hh
+++ b/lily/include/main.hh
@@ -28,7 +28,7 @@ extern String init_name_global;
 
 /* options */
 extern Array<String> dump_header_fieldnames_global;
 
 /* options */
 extern Array<String> dump_header_fieldnames_global;

-extern bool no_paper_global_b;
+extern bool no_layout_global_b;

 extern String output_format_global;
 extern String output_name_global;
 extern bool safe_global_b;
 extern String output_format_global;
 extern String output_name_global;
 extern bool safe_global_b;

diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh
index 9f264e744d05df903c88bfd838e44f1d40f055c3..c3cd7639f07f8c2890db7c67895d30a310ac070c 100644 (file)
--- a/lily/include/modified-font-metric.hh
+++ b/lily/include/modified-font-metric.hh
@@ -11,7 +11,7 @@
 
 #include "font-metric.hh"
 
 
 #include "font-metric.hh"
 

-/* Perhaps junk this, and move this to paper_def as interface? */
+/* Perhaps junk this, and move this to layout_def as interface? */

 struct Modified_font_metric : public Font_metric
 {
 public:
 struct Modified_font_metric : public Font_metric
 {
 public:

diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh
index 0f60d9b5572946ec612e33057a7eeea690633d63..1a7df747d7b3d17dcf0b864782fabd1c64075c2c 100644 (file)
--- a/lily/include/output-def.hh
+++ b/lily/include/output-def.hh
@@ -21,10 +21,10 @@
 
   This devolved into a rather empty class. The distinction between
   various instances is made in the parser, which creates
 
   This devolved into a rather empty class. The distinction between
   various instances is made in the parser, which creates

-  midi/paper/bookpaper blocks depending on the keyword read.
+  midi/layout/paper blocks depending on the keyword read.

 
   The data structure is set up as recursive: the definitions not
 
   The data structure is set up as recursive: the definitions not

-  supplied in paper are looked up in bookpaper. This is done through
+  supplied in layout are looked up in paper. This is done through

   the parent_ field of Output_def. However, such nesting is limited to
   two levels,
 
   the parent_ field of Output_def. However, such nesting is limited to
   two levels,
 


@@ -32,7 +32,7 @@
   of output block.
 
   * Second, because the prime benefit of multiple levels
   of output block.
 
   * Second, because the prime benefit of multiple levels

-  (eg. bookpaper containing paper for a score, containing paper of a
+  (eg. paper containing layout for a score, containing layout of a

   \score embedded in \markup) requires scaling the Stencils (eg. the
   one coming from score at markup level)
   
   \score embedded in \markup) requires scaling the Stencils (eg. the
   one coming from score at markup level)
   


@@ -68,8 +68,8 @@ void set_tempo (Output_def*def, Moment moment, int count_per_minute_i);
 Interval line_dimensions_int (Output_def*def, int);
  
 
 Interval line_dimensions_int (Output_def*def, int);
  
 

-Font_metric *select_encoded_font (Output_def *paper, SCM input_encoding, SCM chain);
-Font_metric *select_font (Output_def *paper, SCM chain);
+Font_metric *select_encoded_font (Output_def *layout, SCM input_encoding, SCM chain);
+Font_metric *select_font (Output_def *layout, SCM chain);

 
 DECLARE_UNSMOB (Output_def, output_def);
 
 
 DECLARE_UNSMOB (Output_def, output_def);
 

diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh
index 72fa47dff3407ca4a45f59462da8b12a3bf2d679..a770536b6f87ac80213c2bbd4bc00d60ab47496d 100644 (file)
--- a/lily/include/paper-book.hh
+++ b/lily/include/paper-book.hh
@@ -38,7 +38,7 @@ class Paper_book
 public:
   SCM header_;
   Array<Score_systems> score_systems_;
 public:
   SCM header_;
   Array<Score_systems> score_systems_;

-  Output_def *bookpaper_;
+  Output_def *paper_;

   
   Paper_book ();
 
   
   Paper_book ();
 

diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh
index 2adfdafb38b248699ba4a4831b1ff9cf0220d383..8cc83e06444a6d517720a5ebde51f82c9860d4ad 100644 (file)
--- a/lily/include/paper-score.hh
+++ b/lily/include/paper-score.hh
@@ -16,11 +16,11 @@
 #include "lily-guile.hh"
 #include "protected-scm.hh"
 
 #include "lily-guile.hh"
 #include "protected-scm.hh"
 

-/* PAPER output */
+/* LAYOUT output */

 class Paper_score : public Music_output
 {
 public:
 class Paper_score : public Music_output
 {
 public:

-  Output_def *paper_;
+  Output_def *layout_;

   System *system_;
 
   Paper_score ();
   System *system_;
 
   Paper_score ();

diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc
index bd08ed8354e6b4a86c49563a64d2a20db2ee4613..447aeb08baea1f9f63b71d38c2c05f7666a167f7 100644 (file)
--- a/lily/ligature-engraver.cc
+++ b/lily/ligature-engraver.cc
@@ -58,7 +58,7 @@
  * Mensural_ligature_engraver) to the proper translator
  * (e.g. VoiceContext) to choose between various representations.
  * Since adding/removing an engraver to a translator is a global
  * Mensural_ligature_engraver) to the proper translator
  * (e.g. VoiceContext) to choose between various representations.
  * Since adding/removing an engraver to a translator is a global

- * action in the paper block, you can not mix various representations
+ * action in the layout block, you can not mix various representations

  * _within_ the same score.  Hence, for selecting a representation,
  * one would rather like to have a property that can be set e.g. for
  * several staves individually.  However, it seems that this approach
  * _within_ the same score.  Hence, for selecting a representation,
  * one would rather like to have a property that can be set e.g. for
  * several staves individually.  However, it seems that this approach

diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc
index 23daaa4ba4d11586ef987fe4bcf3256a5b059d1e..aa3376dbe57136b8dba0845e9e1120476461faa9 100644 (file)
--- a/lily/lily-lexer.cc
+++ b/lily/lily-lexer.cc
@@ -32,7 +32,6 @@ static Keyword_ent the_key_tab[] = {
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"book", BOOK},
   {"alternative", ALTERNATIVE},
   {"bar", BAR},
   {"book", BOOK},

-  {"bookpaper", BOOKPAPER},

   {"change", CHANGE},
   {"chords", CHORDS},
   {"chordmode", CHORDMODE},
   {"change", CHANGE},
   {"chords", CHORDS},
   {"chordmode", CHORDMODE},


@@ -49,6 +48,7 @@ static Keyword_ent the_key_tab[] = {
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},
   {"grobdescriptions", GROBDESCRIPTIONS},
   {"header", HEADER},
   {"key", KEY},

+  {"layout", LAYOUT},

   {"lyricmode", LYRICMODE},
   {"lyricsto", LYRICSTO},
   {"lyrics", LYRICS},
   {"lyricmode", LYRICMODE},
   {"lyricsto", LYRICSTO},
   {"lyrics", LYRICS},

diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc
index 1ca471d53b9656f2aea8fe203f7738e280b14eea..355791e7191c0865ab5560d88d3f37b9ec4ad887 100644 (file)
--- a/lily/lily-parser.cc
+++ b/lily/lily-parser.cc
@@ -374,14 +374,14 @@ LY_DEFINE (ly_parser_parse_string, "ly:parser-parse-string",
 }
 
 Output_def*
 }
 
 Output_def*

-get_paper (Lily_parser *parser)
+get_layout (Lily_parser *parser)

 {
 {

-  SCM id = parser->lexer_->lookup_identifier ("$defaultpaper");
-  Output_def *paper = unsmob_output_def (id);
-  paper = paper ? paper->clone () : new Output_def;
-  paper->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
+  SCM id = parser->lexer_->lookup_identifier ("$defaultlayout");
+  Output_def *layout = unsmob_output_def (id);
+  layout = layout ? layout->clone () : new Output_def;
+  layout->set_variable (ly_symbol2scm ("is-layout"), SCM_BOOL_T);

 
 

-  return paper;
+  return layout;

 }
 
 
 }
 
 


@@ -389,22 +389,22 @@ Output_def*
 get_midi (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultmidi");
 get_midi (Lily_parser *parser)
 {
   SCM id = parser->lexer_->lookup_identifier ("$defaultmidi");

-  Output_def *paper = unsmob_output_def (id);
-  paper = paper ? paper->clone () : new Output_def;
-  paper->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
-  return paper;
+  Output_def *layout = unsmob_output_def (id);
+  layout = layout ? layout->clone () : new Output_def;
+  layout->set_variable (ly_symbol2scm ("is-midi"), SCM_BOOL_T);
+  return layout;

 }
 
 
 Output_def*
 }
 
 
 Output_def*

-get_bookpaper (Lily_parser *parser)
+get_paper (Lily_parser *parser)

 {
 {

-  SCM id = parser->lexer_->lookup_identifier ("$defaultbookpaper");
-  Output_def *paper = unsmob_output_def (id);
+  SCM id = parser->lexer_->lookup_identifier ("$defaultpaper");
+  Output_def *layout = unsmob_output_def (id);

 
 

-  paper = paper ? dynamic_cast<Output_def*> (paper->clone ()) : new Output_def;
-  paper->set_variable (ly_symbol2scm ("is-bookpaper"), SCM_BOOL_T);
-  return paper;
+  layout = layout ? dynamic_cast<Output_def*> (layout->clone ()) : new Output_def;
+  layout->set_variable (ly_symbol2scm ("is-paper"), SCM_BOOL_T);
+  return layout;

 }
 
 
 }
 
 


@@ -434,19 +434,19 @@ LY_DEFINE (ly_parser_print_score, "ly:parser-print-score",
   (*c)++;
 
   SCM os = scm_makfrom0str (outname.to_string ().to_str0 ());
   (*c)++;
 
   SCM os = scm_makfrom0str (outname.to_string ().to_str0 ());

-  SCM bookpaper = get_bookpaper (parser)->self_scm ();
+  SCM paper = get_paper (parser)->self_scm ();

   for (int i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),
   for (int i = 0; i < score->defs_.size (); i++)
     default_rendering (score->get_music (), score->defs_[i]->self_scm (),

-                      bookpaper,
+                      paper,

                       header, os);
 
   if (score->defs_.is_empty ())
     {
                       header, os);
 
   if (score->defs_.is_empty ())
     {

-      Output_def *paper = get_paper (parser);
-      default_rendering (score->get_music(), paper->self_scm (),
-                        get_bookpaper (parser)->self_scm (),
+      Output_def *layout = get_layout (parser);
+      default_rendering (score->get_music(), layout->self_scm (),
+                        get_paper (parser)->self_scm (),

                         header, os);
                         header, os);

-      scm_gc_unprotect_object (paper->self_scm ());
+      scm_gc_unprotect_object (layout->self_scm ());

     }
   return SCM_UNSPECIFIED;
 }
     }
   return SCM_UNSPECIFIED;
 }


@@ -476,13 +476,13 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
 {
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   Book *book = unsmob_book (book_smob);
 {
   Lily_parser *parser = unsmob_my_lily_parser (parser_smob);
   Book *book = unsmob_book (book_smob);

-  Output_def *bp = unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultbookpaper"));
+  Output_def *bp = unsmob_output_def (parser->lexer_->lookup_identifier ("$defaultpaper"));

   
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "Lilypond parser");
   SCM_ASSERT_TYPE (book, book_smob, SCM_ARG2, __FUNCTION__, "Book");
   
   /*  ugh. changing argument.*/
   
   SCM_ASSERT_TYPE (parser, parser_smob, SCM_ARG1, __FUNCTION__, "Lilypond parser");
   SCM_ASSERT_TYPE (book, book_smob, SCM_ARG2, __FUNCTION__, "Book");
   
   /*  ugh. changing argument.*/

-  book->bookpaper_ = bp;
+  book->paper_ = bp;

   
   File_name outname (parser->output_basename_);
   int *c = &parser->book_count_;
   
   File_name outname (parser->output_basename_);
   int *c = &parser->book_count_;


@@ -490,16 +490,16 @@ LY_DEFINE (ly_parser_print_book, "ly:parser-print-book",
     outname.base_ += "-" + to_string (*c);
   (*c)++;
 
     outname.base_ += "-" + to_string (*c);
   (*c)++;
 

-  Output_def *paper = get_paper (parser);
+  Output_def *layout = get_layout (parser);

 
 

-  Paper_book* pb = book->process (outname.to_string (), paper);
+  Paper_book* pb = book->process (outname.to_string (), layout);

   if (pb)
     {
       pb->output (outname.to_string ());
       scm_gc_unprotect_object (pb->self_scm ());
     }
 
   if (pb)
     {
       pb->output (outname.to_string ());
       scm_gc_unprotect_object (pb->self_scm ());
     }
 

-  scm_gc_unprotect_object (paper->self_scm ());
+  scm_gc_unprotect_object (layout->self_scm ());

   return SCM_UNSPECIFIED;
 }
 
   return SCM_UNSPECIFIED;
 }
 

diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc
index 36e35ef6eb6159a5690ea623387b73655fde0617..5a3a851a7cb64ba612572ab7a7e9fcc24fe1b7c9 100644 (file)
--- a/lily/line-spanner.cc
+++ b/lily/line-spanner.cc
@@ -117,7 +117,7 @@ Line_spanner::line_stencil (Grob *me,
                                             ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       
                                             ly_symbol2scm ("fetaMusic")),
                                    SCM_UNDEFINED);
       

-      Font_metric *fm = select_font (me->get_paper (),
+      Font_metric *fm = select_font (me->get_layout (),

                                     scm_cons (style_alist,
                                              alist_chain));
       Stencil m = fm->find_by_name ("scripts-trill-element");
                                     scm_cons (style_alist,
                                              alist_chain));
       Stencil m = fm->find_by_name ("scripts-trill-element");

diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc
index bae1d9bbfe25c17fb8a37c31b609e71aa796c3fa..51fc9d4b1aac934858e1d7e54d7a276d2a4773f6 100644 (file)
--- a/lily/lyric-extender.cc
+++ b/lily/lyric-extender.cc
@@ -34,7 +34,7 @@ Lyric_extender::print (SCM smob)
     common = common->common_refpoint (right_text, X_AXIS);
   
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);
     common = common->common_refpoint (right_text, X_AXIS);
   
   common = common->common_refpoint (me->get_bound (RIGHT), X_AXIS);

-  Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));  
+  Real sl = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));  

   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
 
   Link_array<Grob> heads (Pointer_group_interface__extract_grobs (me, (Grob*)0,
                                                                  "heads"));
 

diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc
index 3a2ea9e68f6d084512347e8983a663d37e4db5f7..5af5bf7f7de0a75e654232707b79698463c26fa3 100644 (file)
--- a/lily/lyric-hyphen.cc
+++ b/lily/lyric-hyphen.cc
@@ -44,7 +44,7 @@ Hyphen_spanner::print (SCM smob)
     }
   while (flip (&d) != LEFT);
   
     }
   while (flip (&d) != LEFT);
   

-  Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt ;
   Real h = robust_scm2double (me->get_property ("height"), 0.5);
 
   Real th = robust_scm2double (me->get_property ("thickness"), 1) * lt ;
   Real h = robust_scm2double (me->get_property ("height"), 0.5);
 

diff --git a/lily/main.cc b/lily/main.cc
index 4e057419529405b30a1d8633ce7c1e7052e0e858..de3741ed3ff85fc1927d59dd7e1f84d3e54415d1 100644 (file)
--- a/lily/main.cc
+++ b/lily/main.cc
@@ -42,8 +42,8 @@ Array<String> dump_header_fieldnames_global;
 /* Name of initialisation file. */
 String init_name_global;
 
 /* Name of initialisation file. */
 String init_name_global;
 

-/* Do not calculate and write paper output? */
-bool no_paper_global_b = false;
+/* Do not calculate and write layout output? */
+bool no_layout_global_b = false;

 
 /* Selected output format.
    One of tex, ps, scm, as. */
 
 /* Selected output format.
    One of tex, ps, scm, as. */


@@ -132,7 +132,7 @@ static Long_option_init options_static[] =
     {_i ("FIELD"), "header", 'H',  _i ("write header field to BASENAME.FIELD")},
     {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
     {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},
     {_i ("FIELD"), "header", 'H',  _i ("write header field to BASENAME.FIELD")},
     {_i ("DIR"), "include", 'I',  _i ("add DIR to search path")},
     {_i ("FILE"), "init", 'i',  _i ("use FILE as init file")},

-    {0, "no-paper", 'm',  _i ("produce MIDI output only")},
+    {0, "no-layout", 'm',  _i ("produce MIDI output only")},

     {_i ("FILE"), "output", 'o',  _i ("write output to FILE")},
     {0, "preview", 'p',  _i ("generate a preview")},
     {0, "png", 0,  _i ("generate PNG")},
     {_i ("FILE"), "output", 'o',  _i ("write output to FILE")},
     {0, "preview", 'p',  _i ("generate a preview")},
     {0, "png", 0,  _i ("generate PNG")},


@@ -435,7 +435,7 @@ parse_argv (int argc, char **argv)
          safe_global_b = true;
          break;
        case 'm':
          safe_global_b = true;
          break;
        case 'm':

-         no_paper_global_b = true;
+         no_layout_global_b = true;

          break;
        case 'p':
          make_preview = true;
          break;
        case 'p':
          make_preview = true;

diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc
index b6996ca74e3bad24427240ebc09132004c44d4f2..75bb7b2c3beb5a08b555762c53a395277fadd913 100644 (file)
--- a/lily/measure-grouping-engraver.cc
+++ b/lily/measure-grouping-engraver.cc
@@ -73,7 +73,7 @@ Measure_grouping_engraver::process_music ()
        
       Rational where (0);
       for (SCM s = grouping; scm_is_pair (s);
        
       Rational where (0);
       for (SCM s = grouping; scm_is_pair (s);

-          where += Rational (scm_to_int (scm_car (s))) * bl,
+          where += Rational ((int) scm_to_int (scm_car (s))) * bl,

           s = scm_cdr (s)
           )
        {
           s = scm_cdr (s)
           )
        {

diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc
index da419df21f209392afc633fca93388dda10accff..04e468c2afce4ad21581e435be5e333b021ae766 100644 (file)
--- a/lily/mensural-ligature-engraver.cc
+++ b/lily/mensural-ligature-engraver.cc
@@ -344,7 +344,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature,
                                                  Array<Grob_info> primitives)
 {
   Real thickness = robust_scm2double (ligature->get_property ("thickness"), 1.4);
                                                  Array<Grob_info> primitives)
 {
   Real thickness = robust_scm2double (ligature->get_property ("thickness"), 1.4);

-  thickness *= ligature->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  thickness *= ligature->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

 
   Real head_width =
     Font_interface::get_default_font (ligature)->
 
   Real head_width =
     Font_interface::get_default_font (ligature)->

diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc
index 25c0419997511b1c7fd3a744539d654e42725c84..b50bd7c5575782147862137d627370405792d3eb 100644 (file)
--- a/lily/mensural-ligature.cc
+++ b/lily/mensural-ligature.cc
@@ -169,7 +169,7 @@ internal_brew_primitive (Grob *me)
       int join_left = scm_to_int (join_left_scm);
       if (!join_left)
        programming_error (_f ("Mensural_ligature: (join_left == 0)"));
       int join_left = scm_to_int (join_left_scm);
       if (!join_left)
        programming_error (_f ("Mensural_ligature: (join_left == 0)"));

-      Real blotdiameter = (me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+      Real blotdiameter = (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));

       Interval x_extent = Interval (0, thickness);
       Interval y_extent = (join_left > 0) ?
        Interval (-join_left * 0.5 * staff_space, 0) :
       Interval x_extent = Interval (0, thickness);
       Interval y_extent = (join_left > 0) ?
        Interval (-join_left * 0.5 * staff_space, 0) :

diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc
index 1b57cd7e520cf78059ffe0159c0f59eff158b253..3a7cf73125bffc6cb2176ae6051312c8bd4409f4 100644 (file)
--- a/lily/multi-measure-rest.cc
+++ b/lily/multi-measure-rest.cc
@@ -139,7 +139,7 @@ Multi_measure_rest::symbol_stencil (Grob *me, Real space)
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Font_metric *musfont
 
   Real staff_space = Staff_symbol_referencer::staff_space (me);
   Font_metric *musfont

-    = select_font (me->get_paper (), alist_chain);
+    = select_font (me->get_layout (), alist_chain);

 
   SCM sml = me->get_property ("use-breve-rest");
   if (measures == 1)
 
   SCM sml = me->get_property ("use-breve-rest");
   if (measures == 1)


@@ -185,7 +185,7 @@ Multi_measure_rest::big_rest (Grob *me, Real width)
 
 
   Real ss = Staff_symbol_referencer::staff_space (me);
 
 
   Real ss = Staff_symbol_referencer::staff_space (me);

-  Real slt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real slt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   Real y = slt * thick_thick/2 * ss;
   Real ythick = hair_thick * slt * ss;
   Box b (Interval (0,  0 >? (width - 2 * ythick)), Interval (-y, y));
   Real y = slt * thick_thick/2 * ss;
   Real ythick = hair_thick * slt * ss;
   Box b (Interval (0,  0 >? (width - 2 * ythick)), Interval (-y, y));

diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc
index dac41046659fe9cd0e5f719fde43d62dcb9bfc61..59b640e64be6c96ef333b2c794a59b84748de21f 100644 (file)
--- a/lily/ottava-bracket.cc
+++ b/lily/ottava-bracket.cc
@@ -45,7 +45,7 @@ Ottava_bracket::print (SCM smob)
   Interval span_points;
   
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);
   Interval span_points;
   
   Grob *common = me->get_bound (LEFT)->common_refpoint (me->get_bound (RIGHT), X_AXIS);

-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();

   
   Drul_array<bool> broken;
   Direction d = LEFT;
   
   Drul_array<bool> broken;
   Direction d = LEFT;


@@ -73,7 +73,7 @@ Ottava_bracket::print (SCM smob)
   SCM markup = me->get_property ("text");
   Stencil text;
   if (Text_interface::markup_p (markup)) 
   SCM markup = me->get_property ("text");
   Stencil text;
   if (Text_interface::markup_p (markup)) 

-    text = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, markup));
+    text = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, markup));

 
 
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),
 
 
   Drul_array<Real> shorten = robust_scm2interval (me->get_property ("shorten-pair"),

diff --git a/lily/output-def.cc b/lily/output-def.cc
index bd05a9fbc1cf935f241a5d0177362ffa67f7881c..8a1c87707c7b4a0dd4561ff7c215b79544deb645 100644 (file)
--- a/lily/output-def.cc
+++ b/lily/output-def.cc
@@ -53,7 +53,7 @@ Output_def::mark_smob (SCM m)
   Output_def *mo = (Output_def*) SCM_CELL_WORD_1 (m);
 
   /* FIXME: why is this necessary?
   Output_def *mo = (Output_def*) SCM_CELL_WORD_1 (m);
 
   /* FIXME: why is this necessary?

-     all bookpaper_ should be protected by themselves. */
+     all paper_ should be protected by themselves. */

   if (mo->parent_)
     scm_gc_mark (mo->parent_->self_scm ());
 
   if (mo->parent_)
     scm_gc_mark (mo->parent_->self_scm ());
 


@@ -125,7 +125,7 @@ Output_def::set_variable (SCM sym, SCM val)
   scm_module_define (scope_, sym, val);
 }
 
   scm_module_define (scope_, sym, val);
 }
 

-LY_DEFINE (ly_paper_lookup, "ly:output-def-lookup",
+LY_DEFINE (ly_layout_lookup, "ly:output-def-lookup",

           2, 0, 0, (SCM pap, SCM sym),
           "Lookup @var{sym} in @var{pap}. "
           "Return the value or @code{'()} if undefined.")
           2, 0, 0, (SCM pap, SCM sym),
           "Lookup @var{sym} in @var{pap}. "
           "Return the value or @code{'()} if undefined.")


@@ -186,7 +186,7 @@ LY_DEFINE (ly_output_description, "ly:output-description",
 }
   
 /* FIXME.  This is broken until we have a generic way of
 }
   
 /* FIXME.  This is broken until we have a generic way of

-   putting lists inside the \paper block.  */
+   putting lists inside the \layout block.  */

 Interval
 line_dimensions_int (Output_def *def, int n)
 {
 Interval
 line_dimensions_int (Output_def *def, int n)
 {


@@ -195,19 +195,19 @@ line_dimensions_int (Output_def *def, int n)
   return Interval (ind, lw);
 }
 
   return Interval (ind, lw);
 }
 

-LY_DEFINE (ly_paper_def_p, "ly:paper-def?",
+LY_DEFINE (ly_layout_def_p, "ly:layout-def?",

           1, 0, 0, (SCM def),
           1, 0, 0, (SCM def),

-          "Is @var{def} a paper definition?")
+          "Is @var{def} a layout definition?")

 {
   return ly_bool2scm (unsmob_output_def (def));
 }
 
 {
   return ly_bool2scm (unsmob_output_def (def));
 }
 

-LY_DEFINE (ly_bookpaper_outputscale, "ly:bookpaper-outputscale",
+LY_DEFINE (ly_paper_outputscale, "ly:paper-outputscale",

          1, 0, 0, (SCM bp),
          "Get outputscale for BP.")
 {
   Output_def *b = unsmob_output_def (bp);
          1, 0, 0, (SCM bp),
          "Get outputscale for BP.")
 {
   Output_def *b = unsmob_output_def (bp);

-  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "bookpaper");
+  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");

   return scm_make_real (output_scale (b));
 }
 
   return scm_make_real (output_scale (b));
 }
 

diff --git a/lily/paper-book.cc b/lily/paper-book.cc
index fa3d4ee73f2669a25e7a0d03b7bbd79bfc9bf56c..8a62290fc178d40265de171a7d855a9b1ed08468 100644 (file)
--- a/lily/paper-book.cc
+++ b/lily/paper-book.cc
@@ -24,7 +24,7 @@ Paper_book::Paper_book ()
   systems_ = SCM_BOOL_F;
   header_ = SCM_EOL;
   
   systems_ = SCM_BOOL_F;
   header_ = SCM_EOL;
   

-  bookpaper_ = 0;
+  paper_ = 0;

   smobify_self ();
 }
 
   smobify_self ();
 }
 


@@ -43,8 +43,8 @@ Paper_book::mark_smob (SCM smob)
   for (int i = 0; i < b->score_systems_.size (); i++)
     b->score_systems_[i].gc_mark ();
 
   for (int i = 0; i < b->score_systems_.size (); i++)
     b->score_systems_[i].gc_mark ();
 

-  if (b->bookpaper_)
-    scm_gc_mark (b->bookpaper_->self_scm ());
+  if (b->paper_)
+    scm_gc_mark (b->paper_->self_scm ());

   scm_gc_mark (b->header_);
   scm_gc_mark (b->pages_);
   return b->systems_;
   scm_gc_mark (b->header_);
   scm_gc_mark (b->pages_);
   return b->systems_;


@@ -259,7 +259,7 @@ LY_DEFINE (ly_paper_book_pages, "ly:paper-book-pages",
 
 LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
          1, 0, 0, (SCM book),
 
 LY_DEFINE (ly_paper_book_scopes, "ly:paper-book-scopes",
          1, 0, 0, (SCM book),

-         "Return pages in paper book @var{book}.")
+         "Return pages in layout book @var{book}.")

 {
   Paper_book *pb = unsmob_paper_book(book);
   SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book");
 {
   Paper_book *pb = unsmob_paper_book(book);
   SCM_ASSERT_TYPE(pb, book, SCM_ARG1, __FUNCTION__, "Paper_book");


@@ -278,18 +278,18 @@ LY_DEFINE (ly_paper_book_systems, "ly:paper-book-systems",
   return unsmob_paper_book (pb)->systems ();
 }
 
   return unsmob_paper_book (pb)->systems ();
 }
 

-LY_DEFINE (ly_paper_book_book_paper, "ly:paper-book-book-paper",
+LY_DEFINE (ly_paper_book_paper, "ly:paper-book-paper",

          1, 0, 0, (SCM pb),
          "Return pages in book PB.")
 {
          1, 0, 0, (SCM pb),
          "Return pages in book PB.")
 {

-  return unsmob_paper_book (pb)->bookpaper_->self_scm ();
+  return unsmob_paper_book (pb)->paper_->self_scm ();

 }
 
 /* TODO: resurrect more complex user-tweaks for titling?  */
 Stencil
 Paper_book::book_title ()
 {
 }
 
 /* TODO: resurrect more complex user-tweaks for titling?  */
 Stencil
 Paper_book::book_title ()
 {

-  SCM title_func = bookpaper_->lookup_variable (ly_symbol2scm ("book-title"));
+  SCM title_func = paper_->lookup_variable (ly_symbol2scm ("book-title"));

   Stencil title;
 
   SCM scopes = SCM_EOL;
   Stencil title;
 
   SCM scopes = SCM_EOL;


@@ -300,7 +300,7 @@ Paper_book::book_title ()
   SCM tit = SCM_EOL;
   if (ly_c_procedure_p (title_func))
     tit = scm_call_2 (title_func,
   SCM tit = SCM_EOL;
   if (ly_c_procedure_p (title_func))
     tit = scm_call_2 (title_func,

-                    bookpaper_->self_scm (),
+                    paper_->self_scm (),

                     scopes);
 
   if (unsmob_stencil (tit))
                     scopes);
 
   if (unsmob_stencil (tit))


@@ -315,7 +315,7 @@ Paper_book::book_title ()
 Stencil
 Paper_book::score_title (int i)
 {
 Stencil
 Paper_book::score_title (int i)
 {

-  SCM title_func = bookpaper_->lookup_variable (ly_symbol2scm ("score-title"));
+  SCM title_func = paper_->lookup_variable (ly_symbol2scm ("score-title"));

 
   Stencil title;
 
 
   Stencil title;
 


@@ -331,7 +331,7 @@ Paper_book::score_title (int i)
   SCM tit = SCM_EOL;
   if (ly_c_procedure_p (title_func))
     tit = scm_call_2 (title_func,
   SCM tit = SCM_EOL;
   if (ly_c_procedure_p (title_func))
     tit = scm_call_2 (title_func,

-                    bookpaper_->self_scm (),
+                    paper_->self_scm (),

                     scopes);
 
   if (unsmob_stencil (tit))
                     scopes);
 
   if (unsmob_stencil (tit))


@@ -405,7 +405,7 @@ Paper_book::pages ()
     return pages_;
 
   pages_ = SCM_EOL;
     return pages_;
 
   pages_ = SCM_EOL;

-  SCM proc = bookpaper_->c_variable ("page-breaking");
+  SCM proc = paper_->c_variable ("page-breaking");

   pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
   return pages_;
 }
   pages_ = scm_apply_0 (proc, scm_list_2 (systems (), self_scm ()));
   return pages_;
 }

diff --git a/lily/paper-column.cc b/lily/paper-column.cc
index 02ab4224f5daf7ab77c8bf60df61a8a386c2d7d3..d4d5a03e7eee5fcb568a3785205d5fec06891604 100644 (file)
--- a/lily/paper-column.cc
+++ b/lily/paper-column.cc
@@ -117,7 +117,7 @@ Paper_column::print (SCM p)
   String r = to_string (Paper_column::get_rank (me));
   SCM properties = Font_interface::text_font_alist_chain (me);
 
   String r = to_string (Paper_column::get_rank (me));
   SCM properties = Font_interface::text_font_alist_chain (me);
 

-  SCM scm_mol = Text_interface::interpret_markup (me->get_paper ()->self_scm (),
+  SCM scm_mol = Text_interface::interpret_markup (me->get_layout ()->self_scm (),

                                             properties,
                                             scm_makfrom0str (r.to_str0 ()));
   Stencil t = *unsmob_stencil (scm_mol);
                                             properties,
                                             scm_makfrom0str (r.to_str0 ()));
   Stencil t = *unsmob_stencil (scm_mol);

diff --git a/lily/paper-def.cc b/lily/paper-def.cc
new file mode 100644 (file)
index 0000000..1bc6bab
--- /dev/null
+++ b/lily/paper-def.cc
@@ -0,0 +1,134 @@
+/* 
+  paper-def.cc -- implement Paper_def
+
+  source file of the GNU LilyPond music typesetter
+
+  (c) 2004 Han-Wen Nienhuys <hanwen@xs4all.nl>
+*/
+
+#include "dimensions.hh"
+#include "font-metric.hh"
+#include "ly-module.hh"
+#include "output-def.hh"
+#include "modified-font-metric.hh"
+#include "virtual-font-metric.hh"
+
+Real
+output_scale (Output_def *od)
+{
+  return scm_to_double (od->lookup_variable (ly_symbol2scm ("outputscale")));
+}
+
+/* TODO: should add nesting for Output_def here too. */
+Font_metric *
+find_scaled_font (Output_def *mod,
+                 Font_metric *f, Real m, SCM input_enc_name)
+{
+  if (mod->parent_)
+    return find_scaled_font (mod->parent_, f, m, input_enc_name);
+  
+  Real lookup_mag = m;
+  if (!dynamic_cast<Virtual_font_metric*> (f))
+    lookup_mag /= output_scale (mod);
+
+  SCM font_table = mod->lookup_variable (ly_symbol2scm ("scaled-fonts"));
+  if (scm_hash_table_p (font_table) != SCM_BOOL_T)
+    {
+      font_table = scm_c_make_hash_table (11);
+      mod->set_variable (ly_symbol2scm ("scaled-fonts"), font_table);
+    }
+
+  
+  SCM sizes = scm_hashq_ref (font_table, f->self_scm (), SCM_BOOL_F);
+  if (sizes != SCM_BOOL_F)
+    {
+      SCM met = scm_assoc (scm_make_real (lookup_mag), sizes);
+      if (scm_is_pair (met))
+       return unsmob_metrics (scm_cdr (met));
+    }
+  else
+    sizes = SCM_EOL;
+  
+  /* Hmm. We're chaining font - metrics.  Should consider whether to
+     merge virtual-font and scaled_font.  */
+  SCM val = SCM_EOL;
+  if (Virtual_font_metric * vf = dynamic_cast<Virtual_font_metric*> (f))
+    {
+      /* For fontify_atom (), the magnification and name must be known
+        at the same time. That's impossible for
+        
+        Scaled (Virtual_font (Font1,Font2))
+        
+        so we replace by
+        
+        Virtual_font (Scaled (Font1), Scaled (Font2))  */
+      SCM lst = SCM_EOL;
+      SCM *t = &lst;
+      for (SCM s = vf->get_font_list (); scm_is_pair (s); s = scm_cdr (s))
+       {
+         Font_metric *scaled = find_scaled_font (mod,
+                                                 unsmob_metrics (scm_car (s)),
+                                                 m, input_enc_name);
+         *t = scm_cons (scaled->self_scm (), SCM_EOL);
+         t = SCM_CDRLOC (*t);
+       }
+
+      vf = new Virtual_font_metric (lst);
+      val = vf->self_scm ();
+    }
+  else
+    {
+      val = Modified_font_metric::make_scaled_font_metric (input_enc_name,
+                                                          f, lookup_mag);
+    }
+
+  sizes = scm_acons (scm_make_real (lookup_mag), val, sizes);
+  scm_gc_unprotect_object (val);
+  scm_hashq_set_x (font_table, f->self_scm (), sizes);
+  return unsmob_metrics (val);
+}
+
+/* TODO: this is a nasty interface. During formatting,
+   the Output_def should be scaled to the output_scale_
+   specified in the toplevel Output_def.  */
+Output_def * 
+scale_output_def (Output_def *o, Real amount)
+{
+  SCM proc = ly_scheme_function ("scale-layout");
+  SCM new_pap = scm_call_2 (proc, o->self_scm (), scm_double2num (amount));
+  scm_gc_protect_object (new_pap);
+
+  return unsmob_output_def (new_pap);
+}
+
+LY_DEFINE (ly_paper_fonts, "ly:paper-fonts",
+          1, 0, 0,
+          (SCM bp),
+          "Return fonts scaled up BP")
+{
+  Output_def *b = unsmob_output_def (bp);
+
+  SCM font_table = b->lookup_variable (ly_symbol2scm ("scaled-fonts"));
+  
+  SCM_ASSERT_TYPE (b, bp, SCM_ARG1, __FUNCTION__, "paper");
+
+  SCM ell = SCM_EOL;
+  if (scm_hash_table_p (font_table) == SCM_BOOL_T)
+    {
+      SCM func = ly_scheme_function ("hash-table->alist");
+
+      for (SCM s = scm_call_1 (func, font_table); scm_is_pair (s);
+          s = scm_cdr (s))
+       {
+         SCM entry = scm_car (s);
+         for (SCM t = scm_cdr (entry); scm_is_pair (t); t = scm_cdr (t))
+           {
+             Font_metric *fm = unsmob_metrics (scm_cdar (t));
+
+             if (dynamic_cast<Modified_font_metric*> (fm))
+               ell = scm_cons (fm->self_scm (), ell);
+           }
+       }
+    }
+  return ell;
+}

diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc
index 3acadd7f0c0f57b2ef02737e503b731d6f4cc411..43c6e842b9af1ac7986b80e8e93aa30bc5dae67f 100644 (file)
--- a/lily/paper-outputter.cc
+++ b/lily/paper-outputter.cc
@@ -113,7 +113,7 @@ Paper_outputter::output_stencil (Stencil stil)
 Paper_outputter *
 get_paper_outputter (String outname, String f) 
 {
 Paper_outputter *
 get_paper_outputter (String outname, String f) 
 {

-  progress_indication (_f ("Paper output to `%s'...",
+  progress_indication (_f ("Layout output to `%s'...",

                           outname == "-" ? String ("<stdout>") : outname));
   return new Paper_outputter (outname, f);
 }
                           outname == "-" ? String ("<stdout>") : outname));
   return new Paper_outputter (outname, f);
 }

diff --git a/lily/paper-score.cc b/lily/paper-score.cc
index 9d58682b0c3638c5a8309630a6e122057a22d4f1..c1487c89b26553f459d265502939296ee297e198 100644 (file)
--- a/lily/paper-score.cc
+++ b/lily/paper-score.cc
@@ -25,7 +25,7 @@
 
 Paper_score::Paper_score ()
 {
 
 Paper_score::Paper_score ()
 {

-  paper_ = 0;
+  layout_ = 0;

   system_ = 0;
 }
 
   system_ = 0;
 }
 

diff --git a/lily/parser.yy b/lily/parser.yy
index 078c19e098b7da04e3af1e4b9fd38d28bd30ba34..c942eef02b41ba015015667b278f9451ddcd6032 100644 (file)
--- a/lily/parser.yy
+++ b/lily/parser.yy
@@ -253,7 +253,6 @@ or
 %token ALTERNATIVE
 %token BAR
 %token BOOK
 %token ALTERNATIVE
 %token BAR
 %token BOOK

-%token BOOKPAPER

 %token CHANGE
 %token CHORDMODIFIERS
 %token CHORDS
 %token CHANGE
 %token CHORDMODIFIERS
 %token CHORDS


@@ -277,6 +276,7 @@ or
 %token HYPHEN
 %token INVALID
 %token KEY
 %token HYPHEN
 %token INVALID
 %token KEY

+%token LAYOUT

 %token LYRICS
 %token LYRICMODE
 %token MARK
 %token LYRICS
 %token LYRICMODE
 %token MARK


@@ -394,7 +394,7 @@ or
 %type <music>  tempo_event
 
 %type <outputdef>      output_def_body output_def_head
 %type <music>  tempo_event
 
 %type <outputdef>      output_def_body output_def_head

-%type <outputdef> output_def book_paper_block 
+%type <outputdef> output_def paper_block 

 
 %type <scm>    Music_list
 %type <scm>    chord_body_elements
 
 %type <scm>    Music_list
 %type <scm>    chord_body_elements


@@ -486,8 +486,8 @@ toplevel_expression:
                        id = ly_symbol2scm ("$defaultpaper");
                else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
                        id = ly_symbol2scm ("$defaultmidi");
                        id = ly_symbol2scm ("$defaultpaper");
                else if ($1->c_variable ("is-midi") == SCM_BOOL_T)
                        id = ly_symbol2scm ("$defaultmidi");

-               else if ($1->c_variable ("is-bookpaper") == SCM_BOOL_T)
-                       id = ly_symbol2scm ("$defaultbookpaper");
+               else if ($1->c_variable ("is-layout") == SCM_BOOL_T)
+                       id = ly_symbol2scm ("$defaultlayout");

 
                THIS->lexer_->set_identifier (id, od->self_scm ());
                scm_gc_unprotect_object (od->self_scm ());
 
                THIS->lexer_->set_identifier (id, od->self_scm ());
                scm_gc_unprotect_object (od->self_scm ());


@@ -638,17 +638,17 @@ book_block:
 
 /* FIXME:
    * Use 'handlers' like for toplevel-* stuff?
 
 /* FIXME:
    * Use 'handlers' like for toplevel-* stuff?

-   * grok \paper and \midi?  */
+   * grok \layout and \midi?  */

 book_body:
        {
                $$ = new Book;
                $$->set_spot (THIS->here_input ());
 book_body:
        {
                $$ = new Book;
                $$->set_spot (THIS->here_input ());

-               $$->bookpaper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ());
-               scm_gc_unprotect_object ($$->bookpaper_->self_scm ());
+               $$->paper_ = dynamic_cast<Output_def*> (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ());
+               scm_gc_unprotect_object ($$->paper_->self_scm ());

                $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); 
        }
                $$->header_ = THIS->lexer_->lookup_identifier ("$globalheader"); 
        }

-       | book_body book_paper_block {
-               $$->bookpaper_ = $2;
+       | book_body paper_block {
+               $$->paper_ = $2;

                scm_gc_unprotect_object ($2->self_scm ());
        }
        | book_body score_block {
                scm_gc_unprotect_object ($2->self_scm ());
        }
        | book_body score_block {


@@ -660,7 +660,7 @@ book_body:
                $$->header_ = $2;
        }
        | book_body error {
                $$->header_ = $2;
        }
        | book_body error {

-               $$->bookpaper_ = 0;
+               $$->paper_ = 0;

                $$->scores_.clear();
        }
        ;
                $$->scores_.clear();
        }
        ;


@@ -694,9 +694,9 @@ score_body:
                $$->header_ = $2;
        }
        | score_body output_def {
                $$->header_ = $2;
        }
        | score_body output_def {

-               if ($2->lookup_variable (ly_symbol2scm ("is-bookpaper")) == SCM_BOOL_T)
+               if ($2->lookup_variable (ly_symbol2scm ("is-paper")) == SCM_BOOL_T)

                {
                {

-                       THIS->parser_error (_("\\bookpaper cannot be in \\score. Use \\paper instead"));
+                       THIS->parser_error (_("\\paper cannot be in \\score. Use \\layout instead"));

                
                }
                else
                
                }
                else


@@ -715,13 +715,13 @@ score_body:
        OUTPUT DEF
 */
 
        OUTPUT DEF
 */
 

-book_paper_block:
+paper_block:

        output_def {
                $$ = $1;
        output_def {
                $$ = $1;

-               if ($$->lookup_variable (ly_symbol2scm ("is-bookpaper")) != SCM_BOOL_T)
+               if ($$->lookup_variable (ly_symbol2scm ("is-paper")) != SCM_BOOL_T)

                {
                {

-                       THIS->parser_error (_("Need \\bookpaper for bookpaper block."));
-                       $$ = get_bookpaper (THIS);
+                       THIS->parser_error (_("Need \\paper for paper block."));
+                       $$ = get_paper (THIS);

                }
        }
        ;
                }
        }
        ;


@@ -737,8 +737,8 @@ output_def:
        ;
 
 output_def_head:
        ;
 
 output_def_head:

-       BOOKPAPER {
-               $$ = get_bookpaper (THIS);
+       PAPER {
+               $$ = get_paper (THIS);

                $$->input_origin_ = THIS->here_input ();
                THIS->lexer_->add_scope ($$->scope_);
        }
                $$->input_origin_ = THIS->here_input ();
                THIS->lexer_->add_scope ($$->scope_);
        }


@@ -747,8 +747,8 @@ output_def_head:
                $$ = p;
                THIS->lexer_->add_scope (p->scope_);
        }
                $$ = p;
                THIS->lexer_->add_scope (p->scope_);
        }

-       | PAPER         {
-               Output_def *p = get_paper (THIS);
+       | LAYOUT        {
+               Output_def *p = get_layout (THIS);

 
                THIS->lexer_->add_scope (p->scope_);
                $$ = p;
 
                THIS->lexer_->add_scope (p->scope_);
                $$ = p;

diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc
index e93de9941d146e7ce882600d78d01d6b937144c7..0b28780dcc6287c00fafc54fb2d56534c5f38009 100644 (file)
--- a/lily/score-engraver.cc
+++ b/lily/score-engraver.cc
@@ -111,7 +111,7 @@ Score_engraver::initialize ()
    
 
   pscore_ = new Paper_score;
    
 
   pscore_ = new Paper_score;

-  pscore_->paper_ = dynamic_cast<Output_def*> (get_output_def ());
+  pscore_->layout_ = dynamic_cast<Output_def*> (get_output_def ());

 
   SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
 
 
   SCM props = updated_grob_properties (context (), ly_symbol2scm ("System"));
 

diff --git a/lily/score.cc b/lily/score.cc
index 15160896accbd55fbc5814cd1634a9200d0626fa..0622d64f7a31be897f7aa866d413e57de29fd15f 100644 (file)
--- a/lily/score.cc
+++ b/lily/score.cc
@@ -167,7 +167,7 @@ default_rendering (SCM music, SCM outdef,
   Output_def *bpd = unsmob_output_def (book_outputdef);
 
   /* ugh.  */
   Output_def *bpd = unsmob_output_def (book_outputdef);
 
   /* ugh.  */

-  if (bpd->c_variable ("is-bookpaper") == SCM_BOOL_T)
+  if (bpd->c_variable ("is-paper") == SCM_BOOL_T)

     {
       Real scale = scm_to_double (bpd->c_variable ("outputscale"));
       
     {
       Real scale = scm_to_double (bpd->c_variable ("outputscale"));
       


@@ -193,7 +193,7 @@ default_rendering (SCM music, SCM outdef,
          /* ugh, this is strange, Paper_book without a Book object. */
          Paper_book *paper_book = new Paper_book ();
          paper_book->header_ = header;
          /* ugh, this is strange, Paper_book without a Book object. */
          Paper_book *paper_book = new Paper_book ();
          paper_book->header_ = header;

-         paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef);
+         paper_book->paper_ = unsmob_output_def (scaled_bookdef);

          
          Score_systems sc;
          sc.systems_ = systems;
          
          Score_systems sc;
          sc.systems_ = systems;


@@ -215,12 +215,12 @@ default_rendering (SCM music, SCM outdef,
 Format score, return systems. OUTNAME is still passed to create a midi
 file.
 
 Format score, return systems. OUTNAME is still passed to create a midi
 file.
 

-PAPERBOOK should be scaled already.
+LAYOUTBOOK should be scaled already.

 
 */
 SCM
 Score::book_rendering (String outname,
 
 */
 SCM
 Score::book_rendering (String outname,

-                      Output_def *paperbook,
+                      Output_def *layoutbook,

                       Output_def *default_def)
 {
   if (error_found_)
                       Output_def *default_def)
 {
   if (error_found_)


@@ -229,8 +229,8 @@ Score::book_rendering (String outname,
   SCM scaled_bookdef = SCM_EOL;
   Real scale = 1.0;
 
   SCM scaled_bookdef = SCM_EOL;
   Real scale = 1.0;
 

-  if (paperbook && paperbook->c_variable ("is-bookpaper") == SCM_BOOL_T)
-    scale = scm_to_double (paperbook->c_variable ("outputscale"));
+  if (layoutbook && layoutbook->c_variable ("is-paper") == SCM_BOOL_T)
+    scale = scm_to_double (layoutbook->c_variable ("outputscale"));

   
   SCM out = scm_makfrom0str (outname.to_str0 ());
   SCM systems = SCM_EOL;
   
   SCM out = scm_makfrom0str (outname.to_str0 ());
   SCM systems = SCM_EOL;


@@ -239,15 +239,15 @@ Score::book_rendering (String outname,
     {
       Output_def *def = outdef_count ? defs_[i] : default_def;
       SCM scaled = SCM_EOL;
     {
       Output_def *def = outdef_count ? defs_[i] : default_def;
       SCM scaled = SCM_EOL;

-      if (def->c_variable ("is-paper") == SCM_BOOL_T)
+      if (def->c_variable ("is-layout") == SCM_BOOL_T)

        {
          def = scale_output_def (def, scale);
        {
          def = scale_output_def (def, scale);

-         def->parent_ = paperbook;
+         def->parent_ = layoutbook;

          scaled = def->self_scm ();
          scm_gc_unprotect_object (scaled);
        }
 
          scaled = def->self_scm ();
          scm_gc_unprotect_object (scaled);
        }
 

-      /* TODO: fix or junk --no-paper.  */
+      /* TODO: fix or junk --no-layout.  */

       SCM context = ly_run_translator (music_, def->self_scm ());
       if (dynamic_cast<Global_context*> (unsmob_context (context)))
        {
       SCM context = ly_run_translator (music_, def->self_scm ());
       if (dynamic_cast<Global_context*> (unsmob_context (context)))
        {


@@ -267,13 +267,13 @@ Score::book_rendering (String outname,
 
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
 
 
 LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",

-          2, 0, 0, (SCM score, SCM paper),
-          "Run @var{score} through @var{paper}, an output definition, "
+          2, 0, 0, (SCM score, SCM layout),
+          "Run @var{score} through @var{layout}, an output definition, "

           "scaled to correct outputscale already, "
           "scaled to correct outputscale already, "

-          "return a list of paper-lines.")
+          "return a list of layout-lines.")

 {
   Score * sc = unsmob_score (score);
 {
   Score * sc = unsmob_score (score);

-  Output_def *od = unsmob_output_def (paper);
+  Output_def *od = unsmob_output_def (layout);

 
   if (sc->error_found_)
     {
 
   if (sc->error_found_)
     {


@@ -281,14 +281,14 @@ LY_DEFINE (ly_score_embedded_format, "ly:score-embedded-format",
     }
   
   SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");
     }
   
   SCM_ASSERT_TYPE (sc, score, SCM_ARG1, __FUNCTION__, "Score");

-  SCM_ASSERT_TYPE (od, paper, SCM_ARG2, __FUNCTION__, "Output_def");
+  SCM_ASSERT_TYPE (od, layout, SCM_ARG2, __FUNCTION__, "Output_def");

 
   Output_def * score_def  = 0;
 
 
   Output_def * score_def  = 0;
 

-  /* UGR, FIXME, these are default \paper blocks once again.  They
+  /* UGR, FIXME, these are default \layout blocks once again.  They

      suck. */
   for (int i = 0; !score_def && i < sc->defs_.size (); i++)
      suck. */
   for (int i = 0; !score_def && i < sc->defs_.size (); i++)

-    if (sc->defs_[i]->c_variable ("is-paper") == SCM_BOOL_T)
+    if (sc->defs_[i]->c_variable ("is-layout") == SCM_BOOL_T)

       score_def = sc->defs_[i];
 
   if (!score_def)
       score_def = sc->defs_[i];
 
   if (!score_def)

diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc
index 4cc4490aafa4934b6c9ef4edd3b2c4fbf2d3a16c..c9ec0236e31781def60c3b51eaa95921dcefa873 100644 (file)
--- a/lily/slur-scoring.cc
+++ b/lily/slur-scoring.cc
@@ -287,7 +287,7 @@ Slur_score_state::fill (Grob *me)
     }
 
   staff_space_ = Staff_symbol_referencer::staff_space (me);
     }
 
   staff_space_ = Staff_symbol_referencer::staff_space (me);

-  Real lt = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) *  lt;
   
   dir_ = get_grob_direction (me);
   thickness_ = robust_scm2double (me->get_property ("thickness"), 1.0) *  lt;
   
   dir_ = get_grob_direction (me);


@@ -399,7 +399,7 @@ Slur_score_state::get_best_curve ()
 
 #if DEBUG_SLUR_SCORING
   SCM inspect_quants = slur_->get_property ("inspect-quants");
 
 #if DEBUG_SLUR_SCORING
   SCM inspect_quants = slur_->get_property ("inspect-quants");

-  if (to_boolean (slur_->get_paper ()
+  if (to_boolean (slur_->get_layout ()

                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_pair (inspect_quants))
     {
                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_pair (inspect_quants))
     {

diff --git a/lily/slur.cc b/lily/slur.cc
index 7d1c78afa54a9f2f02e90c50a1c9fd4e20344998..15ebe93eac582efcdd7a21286080593035ea96f8 100644 (file)
--- a/lily/slur.cc
+++ b/lily/slur.cc
@@ -81,7 +81,7 @@ Slur::print (SCM smob)
 #if DEBUG_SLUR_SCORING
   SCM quant_score = me->get_property ("quant-score");
 
 #if DEBUG_SLUR_SCORING
   SCM quant_score = me->get_property ("quant-score");
 

-  if (to_boolean (me->get_paper ()
+  if (to_boolean (me->get_layout ()

                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_string (quant_score))
     {
                  ->lookup_variable (ly_symbol2scm ("debug-slur-scoring")))
       && scm_is_string (quant_score))
     {


@@ -89,7 +89,7 @@ Slur::print (SCM smob)
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup
       SCM properties = Font_interface::text_font_alist_chain (me);
 
       Stencil tm = *unsmob_stencil (Text_interface::interpret_markup

-                                   (me->get_paper ()->self_scm (), properties,
+                                   (me->get_layout ()->self_scm (), properties,

                                     quant_score));
       a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0);
     }
                                     quant_score));
       a.add_at_edge (Y_AXIS, get_grob_direction (me), tm, 1.0, 0);
     }

diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc
index f5636231233b354e4b6a02e4f4083a4e390c9202..841bf43676fa45798832d5c1e9e56fc666e2b478 100644 (file)
--- a/lily/spacing-spanner.cc
+++ b/lily/spacing-spanner.cc
@@ -627,7 +627,7 @@ Spacing_spanner::musical_column_spacing (Grob *me, Item * lc, Item *rc, Real inc
   */
   compound_fixed_note_space = compound_fixed_note_space <? compound_note_space;
 
   */
   compound_fixed_note_space = compound_fixed_note_space <? compound_note_space;
 

-  bool packed = to_boolean (me->get_paper ()->c_variable ("packed"));
+  bool packed = to_boolean (me->get_layout ()->c_variable ("packed"));

   Real strength, distance;
 
   /*
   Real strength, distance;
 
   /*

diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc
index cb53c0af52f5438549ae3f220570d2b11d42e58b..c9c21e500c72cc68e3d39ea9c277899eea5af08f 100644 (file)
--- a/lily/staff-symbol-referencer.cc
+++ b/lily/staff-symbol-referencer.cc
@@ -63,7 +63,7 @@ Staff_symbol_referencer::line_thickness (Grob *me)
   Grob *st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::get_line_thickness (st);
   Grob *st = get_staff_symbol (me);
   if (st)
     return Staff_symbol::get_line_thickness (st);

-  return me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  return me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

 }
 
 Real
 }
 
 Real

diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc
index 9a5db7c46b79b0ae554aa0436d34d078f61f4215..e6b73143fea5770213d3627c05789003ed88f857 100644 (file)
--- a/lily/staff-symbol.cc
+++ b/lily/staff-symbol.cc
@@ -38,7 +38,7 @@ Staff_symbol::print (SCM smob)
 
     --hwn.
    */
 
     --hwn.
    */

-  Real t = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real t = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
   
   Direction d = LEFT;
   t *= robust_scm2double (me->get_property ("thickness"), 1.0);
   
   Direction d = LEFT;


@@ -112,7 +112,7 @@ Staff_symbol::staff_space (Grob*me)
 Real
 Staff_symbol::get_line_thickness (Grob* me)
 {
 Real
 Staff_symbol::get_line_thickness (Grob* me)
 {

-  Real lt =  me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+  Real lt =  me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

 
   return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }
 
   return robust_scm2double (me->get_property ("thickness"), 1.0) * lt;
 }

diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc
index 8f275069d43311458956ee0265791309a7870003..646b18b4e5d7fde9ed3636a61265e9abb2b7bd8d 100644 (file)
--- a/lily/stem-tremolo.cc
+++ b/lily/stem-tremolo.cc
@@ -72,7 +72,7 @@ Stem_tremolo::raw_stencil (Grob *me)
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real thick = robust_scm2double (me->get_property ("beam-thickness"),1);
   Real width = robust_scm2double (me->get_property ("beam-width"),1);
   Real ss = Staff_symbol_referencer::staff_space (me);
   Real thick = robust_scm2double (me->get_property ("beam-thickness"),1);
   Real width = robust_scm2double (me->get_property ("beam-width"),1);

-  Real blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+  Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   width *= ss;
   thick *= ss;
 
   width *= ss;
   thick *= ss;

diff --git a/lily/stem.cc b/lily/stem.cc
index 1039631a395da5f4040637ae0553819c9774d75a..c7242f4af40541bcc083008c8f46907eb5cb6be9 100644 (file)
--- a/lily/stem.cc
+++ b/lily/stem.cc
@@ -668,7 +668,7 @@ Stem::print (SCM smob)
   // URG
   Real stem_width = thickness (me);
   Real blot =
   // URG
   Real stem_width = thickness (me);
   Real blot =

-       me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter"));
+       me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter"));

 
   Box b = Box (Interval (-stem_width/2, stem_width/2),
               Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));
 
   Box b = Box (Interval (-stem_width/2, stem_width/2),
               Interval (stem_y[DOWN]*dy, stem_y[UP]*dy));

diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc
index 1b04631d108a78b3b0b6c08b04fd2495b79fba8d..ec7a346dfb894f1ddc1cd02f7f07f8fe62c91ef1 100644 (file)
--- a/lily/system-start-delimiter.cc
+++ b/lily/system-start-delimiter.cc
@@ -63,7 +63,7 @@ Will not fix it since I'm not sure.
 Stencil
 System_start_delimiter::simple_bar (Grob*me,Real h) 
 {
 Stencil
 System_start_delimiter::simple_bar (Grob*me,Real h) 
 {

-  Real lt =me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")) ;
+  Real lt =me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")) ;

   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)),
                                   lt);
   Real w = lt * robust_scm2double (me->get_property ("thickness"), 1);
   return Lookup::round_filled_box (Box (Interval (0,w), Interval (-h/2, h/2)),
                                   lt);


@@ -170,7 +170,7 @@ System_start_delimiter::staff_brace (Grob*me, Real y)
   SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("fetaBraces"));
   
   SCM alist = scm_list_n (fam, SCM_UNDEFINED);
   SCM fam = scm_cons (ly_symbol2scm ("font-encoding"), ly_symbol2scm ("fetaBraces"));
   
   SCM alist = scm_list_n (fam, SCM_UNDEFINED);

-  fm = select_font (me->get_paper (), scm_list_n (alist, SCM_UNDEFINED));
+  fm = select_font (me->get_layout (), scm_list_n (alist, SCM_UNDEFINED));

   
 
   int lo = 0;
   
 
   int lo = 0;

diff --git a/lily/text-item.cc b/lily/text-item.cc
index f0ec373d60be8dfd026398351edd473723789137..032bb09ae12b15f7af20992252a90e144885e5d4 100644 (file)
--- a/lily/text-item.cc
+++ b/lily/text-item.cc
@@ -20,13 +20,13 @@
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4)
 SCM
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_string, 4)
 SCM

-Text_interface::interpret_string (SCM paper_smob,
+Text_interface::interpret_string (SCM layout_smob,

                             SCM props, SCM input_encoding, SCM markup)
 {
                             SCM props, SCM input_encoding, SCM markup)
 {

-  Output_def *paper = unsmob_output_def (paper_smob);
+  Output_def *layout = unsmob_output_def (layout_smob);

   
   

-  SCM_ASSERT_TYPE (paper, paper_smob, SCM_ARG1,
-                  __FUNCTION__, "Paper definition");
+  SCM_ASSERT_TYPE (layout, layout_smob, SCM_ARG1,
+                  __FUNCTION__, "Layout definition");

   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
                   __FUNCTION__, "string");
   SCM_ASSERT_TYPE (input_encoding == SCM_EOL || scm_is_symbol (input_encoding),
   SCM_ASSERT_TYPE (scm_is_string (markup), markup, SCM_ARG3,
                   __FUNCTION__, "string");
   SCM_ASSERT_TYPE (input_encoding == SCM_EOL || scm_is_symbol (input_encoding),


@@ -35,14 +35,14 @@ Text_interface::interpret_string (SCM paper_smob,
   String str = ly_scm2string (markup);
   if (!scm_is_symbol (input_encoding))
     {
   String str = ly_scm2string (markup);
   if (!scm_is_symbol (input_encoding))
     {

-      SCM enc = paper->lookup_variable (ly_symbol2scm ("inputencoding"));
+      SCM enc = layout->lookup_variable (ly_symbol2scm ("inputencoding"));

       if (scm_is_string (enc))
        input_encoding = scm_string_to_symbol (enc);
       else if (scm_is_symbol (enc))
        input_encoding = enc;
     }
   
       if (scm_is_string (enc))
        input_encoding = scm_string_to_symbol (enc);
       else if (scm_is_symbol (enc))
        input_encoding = enc;
     }
   

-  Font_metric *fm = select_encoded_font (paper, props, input_encoding);
+  Font_metric *fm = select_encoded_font (layout, props, input_encoding);

 
   SCM lst = SCM_EOL;      
   Box b;
 
   SCM lst = SCM_EOL;      
   Box b;


@@ -67,10 +67,10 @@ Text_interface::interpret_string (SCM paper_smob,
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3)
 SCM
 
 MAKE_SCHEME_CALLBACK (Text_interface, interpret_markup, 3)
 SCM

-Text_interface::interpret_markup (SCM paper_smob, SCM props, SCM markup)
+Text_interface::interpret_markup (SCM layout_smob, SCM props, SCM markup)

 {
   if (scm_is_string (markup))
 {
   if (scm_is_string (markup))

-    return interpret_string (paper_smob, props, SCM_EOL, markup);
+    return interpret_string (layout_smob, props, SCM_EOL, markup);

   else if (scm_is_pair (markup))
     {
       SCM func = scm_car (markup);
   else if (scm_is_pair (markup))
     {
       SCM func = scm_car (markup);


@@ -78,7 +78,7 @@ Text_interface::interpret_markup (SCM paper_smob, SCM props, SCM markup)
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
       
       if (!markup_p (markup))
        programming_error ("Markup head has no markup signature.");
       

-      return scm_apply_2 (func, paper_smob, props, args);
+      return scm_apply_2 (func, layout_smob, props, args);

     }
   return SCM_EOL;
 }
     }
   return SCM_EOL;
 }


@@ -91,7 +91,7 @@ Text_interface::print (SCM grob)
   
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);
   
   SCM t = me->get_property ("text");
   SCM chain = Font_interface::text_font_alist_chain (me);

-  return interpret_markup (me->get_paper ()->self_scm (), chain, t);
+  return interpret_markup (me->get_layout ()->self_scm (), chain, t);

 }
 
 /* Ugh. Duplicated from Scheme.  */
 }
 
 /* Ugh. Duplicated from Scheme.  */

diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc
index dd216a5d0dd53502ef9fee83169c334c460542c0..41d7bd3cc625a9fd19a7114841e2f7dc149c0360 100644 (file)
--- a/lily/text-spanner.cc
+++ b/lily/text-spanner.cc
@@ -42,7 +42,7 @@ Text_spanner::print (SCM smob)
   /* Ugh, must be same as Hairpin::print.  */
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);
   /* Ugh, must be same as Hairpin::print.  */
 
   Grob *common = spanner->get_bound (LEFT)->common_refpoint (spanner->get_bound (RIGHT), X_AXIS);

-  Output_def * paper = me->get_paper ();
+  Output_def * layout = me->get_layout ();

 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");
 
   SCM flare = me->get_property ("bracket-flare");
   SCM shorten = me->get_property ("shorten-pair");


@@ -94,7 +94,7 @@ Text_spanner::print (SCM smob)
          SCM text = index_get_cell (edge_text, d);
 
          if (Text_interface::markup_p (text)) 
          SCM text = index_get_cell (edge_text, d);
 
          if (Text_interface::markup_p (text)) 

-           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (paper->self_scm (), properties, text));
+           edge[d] = *unsmob_stencil (Text_interface::interpret_markup (layout->self_scm (), properties, text));

          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);
          
          if (!edge[d].is_empty ())
            edge[d].align_to (Y_AXIS, CENTER);

diff --git a/lily/time-signature.cc b/lily/time-signature.cc
index 40976eb31101c3d4d226427310f1fe7392ad594d..f8e7dcf1ab1b054528a1bcff91779ed124fc6134 100644 (file)
--- a/lily/time-signature.cc
+++ b/lily/time-signature.cc
@@ -101,9 +101,9 @@ Time_signature::numbered_time_signature (Grob*me,int num, int den)
                                         ly_symbol2scm ("fetaNumber"))),
                    chain);
                                
                                         ly_symbol2scm ("fetaNumber"))),
                    chain);
                                

-  SCM sn = Text_interface::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sn = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,

                                        scm_makfrom0str (to_string (num).to_str0 ()));
                                        scm_makfrom0str (to_string (num).to_str0 ()));

-  SCM sd = Text_interface::interpret_markup (me->get_paper ()->self_scm (), chain,
+  SCM sd = Text_interface::interpret_markup (me->get_layout ()->self_scm (), chain,

                                        scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);
                                        scm_makfrom0str (to_string (den).to_str0 ()));
 
   Stencil n = *unsmob_stencil (sn);

diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc
index 52550d2b7e6fb56cb4c1fb209a885b27b3243493..1f313e84a93482ccb492b92d37438b2f58b58481 100644 (file)
--- a/lily/tuplet-bracket.cc
+++ b/lily/tuplet-bracket.cc
@@ -168,7 +168,7 @@ Tuplet_bracket::print (SCM smob)
   
   SCM number = me->get_property ("text");
 
   
   SCM number = me->get_property ("text");
 

-  Output_def *pap = me->get_paper ();
+  Output_def *pap = me->get_layout ();

   Stencil num;
  if (scm_is_string (number) && number_visibility)
     {
   Stencil num;
  if (scm_is_string (number) && number_visibility)
     {

diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc
index 3d73a4d810c422a0a6657fd8ec25fa9d888c2778..41a54ec74b58e4acc9a4240ee97503432e472025 100644 (file)
--- a/lily/vaticana-ligature-engraver.cc
+++ b/lily/vaticana-ligature-engraver.cc
@@ -155,7 +155,7 @@ Vaticana_ligature_engraver::align_heads (Array<Grob_info> primitives,
     dynamic_cast<Item*> (primitives[0].grob_)->get_column ();
 
   Real join_thickness =
     dynamic_cast<Item*> (primitives[0].grob_)->get_column ();
 
   Real join_thickness =

-    thickness * column->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+    thickness * column->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

 
   /*
    * Amount of extra space two put between some particular
 
   /*
    * Amount of extra space two put between some particular

diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc
index 3c0d309964b224b7517717820bf7f54edc2aaa36..7cc2263c44e8a44e432ac69aee4d1e0576ccf136 100644 (file)
--- a/lily/vaticana-ligature.cc
+++ b/lily/vaticana-ligature.cc
@@ -207,10 +207,10 @@ vaticana_brew_primitive (Grob *me)
   Real thickness = robust_scm2double ( me->get_property ("thickness"), 1);
 
   Real line_thickness =
   Real thickness = robust_scm2double ( me->get_property ("thickness"), 1);
 
   Real line_thickness =

-    thickness * me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness"));
+    thickness * me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness"));

 
   Real blotdiameter =
 
   Real blotdiameter =

-    (me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")));
+    (me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")));

 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 
 
   int pos = Staff_symbol_referencer::get_rounded_position (me);
 

diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc
index 6d21a715625a4a63cd05749245e4afca9b53533e..5b476be78886ef783c508eb882a5b09e2beb5042 100644 (file)
--- a/lily/virtual-font-metric.cc
+++ b/lily/virtual-font-metric.cc
@@ -15,7 +15,7 @@ source file of the GNU LilyPond music typesetter
 
 
 /*
 
 
 /*

-  passing DEF is ughish. Should move into paperdef?
+  passing DEF is ughish. Should move into layoutdef?

   */
 Virtual_font_metric::Virtual_font_metric (SCM font_list)
 {
   */
 Virtual_font_metric::Virtual_font_metric (SCM font_list)
 {

diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc
index 8fd54a281a83debe36657496e2c3f5f889423478..9b96d0f950a0c61df69e5636527b5e754f9036e0 100644 (file)
--- a/lily/volta-bracket.cc
+++ b/lily/volta-bracket.cc
@@ -60,7 +60,7 @@ Volta_bracket_interface::print (SCM smob)
     (strcmp (cs,":|")!=0 && strcmp (cs,"|:")!=0 && strcmp (cs,"|.")!=0
      && strcmp (cs,":|:")!=0 && strcmp (cs,".|")!=0);
 
     (strcmp (cs,":|")!=0 && strcmp (cs,"|:")!=0 && strcmp (cs,"|.")!=0
      && strcmp (cs,":|:")!=0 && strcmp (cs,".|")!=0);
 

-  Output_def * paper =me->get_paper ();
+  Output_def * layout =me->get_layout ();

   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);
   Real half_space = 0.5;
 
   Item * bound = dynamic_cast<Spanner*> (me)->get_bound (LEFT);


@@ -100,7 +100,7 @@ Volta_bracket_interface::print (SCM smob)
     {
       SCM text = me->get_property ("text");
       SCM properties = me->get_property_alist_chain (SCM_EOL);
     {
       SCM text = me->get_property ("text");
       SCM properties = me->get_property_alist_chain (SCM_EOL);

-      SCM snum  = Text_interface::interpret_markup (paper->self_scm (), properties, text);
+      SCM snum  = Text_interface::interpret_markup (layout->self_scm (), properties, text);

       Stencil num = *unsmob_stencil (snum);
 
       mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()
       Stencil num = *unsmob_stencil (snum);
 
       mol.add_at_edge (X_AXIS, LEFT, num, - num.extent (X_AXIS).length ()

diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly
deleted file mode 100644 (file)
index 9ff72cf..0000000
--- a/ly/book-paper-defaults.ly
+++ /dev/null
@@ -1,83 +0,0 @@
-\version "2.3.16"
-
-\bookpaper {
-
-    %%%%%%%%%%%%%%
-    %%%%
-    %%%% WARNING
-
-    %%% if you  add any new dimensions, don't forget to update
-    %%% the dimension-variables variable. see paper.scm
-    
-    unit = #(ly:unit)
-    mm = 1.0
-    in = 25.4
-    pt = #(/  in 72.27)
-    cm = #(* 10 mm)
-
-    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
-    %% input encoding in EMACS? -- jcn
-    %%%%inputencoding = #"TeX"
-    inputencoding = #"latin1"
-    printpagenumber = ##t
-
-    %%
-    %% 20pt staff, 5 pt = 1.75 mm
-    %%
-
-    outputscale = #1.7573
-    
-    #(define-public score-title default-score-title)
-    #(define-public user-title default-user-title)
-    #(define-public book-title default-book-title)
-
-    %
-    % ugh. hard coded?
-    %
-
-    #(paper-set-staff-size (* 20.0 pt))
-
-    %
-    % this dimension includes the extent of the
-    % staves themselves.
-    %
-    betweensystemspace = #(* 20 mm)
-
-    %
-    % fixed space between systems.
-    %
-    betweensystempadding = #(* 4 mm)
-
-    aftertitlespace = 5 \mm
-    beforetitlespace = 10 \mm
-    betweentitlespace = 2 \mm
-
-
-    raggedbottom = ##f
-
-    %
-    % looks best for shorter scores.
-    %
-    raggedlastbottom= ##t
-
-    %% ugh.  Should use /etc/papersize and set explicitely for
-    %% documentation.
-    papersize = "a4"
-
-    #(define font-defaults
-      '((font-encoding . fetaMusic)))
-
-    #(define text-font-defaults
-      '((font-encoding . ec)
-       (baseline-skip . 2)
-       (word-space . 0.6)))
-
-    #(define page-breaking ly:optimal-page-breaks)
-    #(define page-music-height default-page-music-height )
-    #(define page-make-stencil default-page-make-stencil )
-
-    #(define make-header plain-header)
-    #(define make-footer plain-footer)
-    #(set-paper-dimension-variables (current-module))
-   
-}

diff --git a/ly/declarations-init.ly b/ly/declarations-init.ly
index a82f358560b4055d4fb984391f4f5a6bb3034ac4..37df2db9df4482df873f7e3706397805d7678e85 100644 (file)
--- a/ly/declarations-init.ly
+++ b/ly/declarations-init.ly
@@ -68,11 +68,11 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 
 \include "grace-init.ly"
 \include "midi-init.ly"
 
 \include "grace-init.ly"
 \include "midi-init.ly"

-\include "book-paper-defaults.ly"
+\include "paper-defaults.ly"

 
 

-\paper {
-    mm = #(ly:output-def-lookup $defaultbookpaper 'mm)
-    unit = #(ly:output-def-lookup $defaultbookpaper 'unit)
+\layout {
+    mm = #(ly:output-def-lookup $defaultpaper 'mm)
+    unit = #(ly:output-def-lookup $defaultpaper 'unit)

 
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)
 
     in = #(* 25.4 mm)
     pt = #(/  in 72.27)


@@ -88,7 +88,7 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP)
 #(set-default-paper-size "a4")
 
 
 #(set-default-paper-size "a4")
 
 

-partCombineListener = \paper {
+partCombineListener = \layout {

     \context {
        \Voice
        \consists Note_heads_engraver
     \context {
        \Voice
        \consists Note_heads_engraver

diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly
index 18ef7078063793106d8ef7533c99e8366fa60130..7ba26f49444060b2c5c0631eed79258b8a147c96 100644 (file)
--- a/ly/engraver-init.ly
+++ b/ly/engraver-init.ly
@@ -398,7 +398,7 @@ AncientRemoveEmptyStaffContext = \context {
     You cannot explicitly instantiate a Score context (since it is
     not contained in any other context).  It is instantiated
     automatically when an output definition (a @code{\score} or
     You cannot explicitly instantiate a Score context (since it is
     not contained in any other context).  It is instantiated
     automatically when an output definition (a @code{\score} or

-    @code{\paper} block) is processed."
+    @code{\layout} block) is processed."

     
     \consists "Repeat_acknowledge_engraver"
     \consists "Staff_collecting_engraver"
     
     \consists "Repeat_acknowledge_engraver"
     \consists "Staff_collecting_engraver"

diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly
index 32099830c7bdba770396686895b05fb45e00d07f..be626b2999b3950088c4999848bbab45c733d98a 100644 (file)
--- a/ly/gregorian-init.ly
+++ b/ly/gregorian-init.ly
@@ -136,10 +136,10 @@ episemFinis = #(make-span-event 'TextSpanEvent STOP)
 %climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
 
 %
 %climacus = #(def-climacus-function startSequentialMusic stopSequentialMusic)
 
 %

-% example paper block for gregorian chant notation
+% example layout block for gregorian chant notation

 %
 
 %
 

-neumeDemoPaper = \paper {
+neumeDemoLayout = \layout {

     interscoreline = 1
     \context {
        \Score
     interscoreline = 1
     \context {
        \Score

diff --git a/ly/init.ly b/ly/init.ly
index d0f73b4281176db720955f1e1f5365b43d2426cb..2e3e849bd9a45c94086d49bc3acf7aa736498dee 100644 (file)
--- a/ly/init.ly
+++ b/ly/init.ly
@@ -31,5 +31,5 @@
 
 #(if (pair? toplevel-scores)
   (ly:parser-print-book parser
 
 #(if (pair? toplevel-scores)
   (ly:parser-print-book parser

-   (apply ly:make-book $defaultbookpaper $globalheader (reverse toplevel-scores))))
+   (apply ly:make-book $defaultpaper $globalheader (reverse toplevel-scores))))

 
 

diff --git a/ly/paper-defaults.ly b/ly/paper-defaults.ly
new file mode 100644 (file)
index 0000000..2302613
--- /dev/null
+++ b/ly/paper-defaults.ly
@@ -0,0 +1,80 @@
+\version "2.3.16"
+
+\paper {
+
+    %%%% WARNING
+
+    %%% if you  add any new dimensions, don't forget to update
+    %%% the dimension-variables variable. see paper.scm
+    
+    unit = #(ly:unit)
+    mm = 1.0
+    in = 25.4
+    pt = #(/  in 72.27)
+    cm = #(* 10 mm)
+
+    %% This is weird; `everyone' uses LATIN1?  How does I select TeX
+    %% input encoding in EMACS? -- jcn
+    %%%%inputencoding = #"TeX"
+    inputencoding = #"latin1"
+    printpagenumber = ##t
+
+    %%
+    %% 20pt staff, 5 pt = 1.75 mm
+    %%
+
+    outputscale = #1.7573
+    
+    #(define-public score-title default-score-title)
+    #(define-public user-title default-user-title)
+    #(define-public book-title default-book-title)
+
+    %%
+    %% ugh. hard coded?
+    %%
+
+    #(layout-set-staff-size (* 20.0 pt))
+
+    %%
+    %% this dimension includes the extent of the
+    %% staves themselves.
+    %%
+    betweensystemspace = #(* 20 mm)
+
+    %%
+    %% fixed space between systems.
+    %%
+    betweensystempadding = #(* 4 mm)
+
+    aftertitlespace = 5 \mm
+    beforetitlespace = 10 \mm
+    betweentitlespace = 2 \mm
+
+
+    raggedbottom = ##f
+
+    %%
+    %% looks best for shorter scores.
+    %%
+    raggedlastbottom= ##t
+
+    %% ugh.  Should use /etc/papersize and set explicitely for
+    %% documentation.
+    papersize = "a4"
+
+    #(define font-defaults
+      '((font-encoding . fetaMusic)))
+
+    #(define text-font-defaults
+      '((font-encoding . ec)
+       (baseline-skip . 2)
+       (word-space . 0.6)))
+
+    #(define page-breaking ly:optimal-page-breaks)
+    #(define page-music-height default-page-music-height )
+    #(define page-make-stencil default-page-make-stencil )
+
+    #(define make-header plain-header)
+    #(define make-footer plain-footer)
+    #(set-paper-dimension-variables (current-module))
+}

diff --git a/scm/beam.scm b/scm/beam.scm
index 0ac7f7f81f105265393acf90c22fc34466e2582b..7ab4637d4194533e0c3d060fc1eb2947bef1b449 100644 (file)
--- a/scm/beam.scm
+++ b/scm/beam.scm
@@ -68,8 +68,8 @@
   (let*
       ((posns (ly:grob-property beam 'positions))
        (thick (ly:grob-property beam 'thickness))
   (let*
       ((posns (ly:grob-property beam 'positions))
        (thick (ly:grob-property beam 'thickness))

-       (paper (ly:grob-paper beam))
-       (lthick (ly:output-def-lookup paper 'linethickness))
+       (layout (ly:grob-layout beam))
+       (lthick (ly:output-def-lookup layout 'linethickness))

        (staff-thick lthick) ; fixme.
        (quant->coord (lambda (p q)
                       (if (= 2 (abs q))
        (staff-thick lthick) ; fixme.
        (quant->coord (lambda (p q)
                       (if (= 2 (abs q))

diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm
index e5e930b99e340ca5fcf88322d573298aa8d75a52..8c276a97be9b3702b06f183cf4919d9688b2a4b8 100644 (file)
--- a/scm/define-grobs.scm
+++ b/scm/define-grobs.scm
@@ -163,7 +163,7 @@
        (font-family . number)
 
        ;; We must do this, other BFs in
        (font-family . number)
 
        ;; We must do this, other BFs in

-       ;; paper16 become too small.
+       ;; layout16 become too small.

        (font-size . -4)
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface
        (font-size . -4)
        (kern . 0.2)
        (meta . ((interfaces . (text-interface                                                  rhythmic-grob-interface

diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm
index cf55fb61abffef788b19dd1aa4786b29c34f4936..9f4c1b9b45292062577ad4bf7531356735946938 100644 (file)
--- a/scm/define-markup-commands.scm
+++ b/scm/define-markup-commands.scm
@@ -11,18 +11,18 @@
 ;;     syntax, description and example. 
 
 
 ;;     syntax, description and example. 
 
 

-(def-markup-command (stencil paper props stil) (ly:stencil?)
+(def-markup-command (stencil layout props stil) (ly:stencil?)

   "Stencil as markup"
   stil)
 
 
   "Stencil as markup"
   stil)
 
 

-(def-markup-command (score paper props score) (ly:score?)
+(def-markup-command (score layout props score) (ly:score?)

   (let*
   (let*

-      ((systems (ly:score-embedded-format score paper)))
+      ((systems (ly:score-embedded-format score layout)))

 
     (if (= 0 (vector-length systems))
        (begin
 
     (if (= 0 (vector-length systems))
        (begin

-         (ly:warn "No systems found in \\score markup. Did you forget \\paper?")
+         (ly:warn "No systems found in \\score markup. Did you forget \\layout?")

          empty-markup)
        (begin
          (let*
          empty-markup)
        (begin
          (let*


@@ -31,15 +31,15 @@
            (ly:stencil-align-to! stencil Y CENTER)
            stencil)))))
 
            (ly:stencil-align-to! stencil Y CENTER)
            stencil)))))
 

-(def-markup-command (simple paper props str) (string?)
+(def-markup-command (simple layout props str) (string?)

   "A simple text string; @code{\\markup @{ foo @}} is equivalent with
 @code{\\markup @{ \\simple #\"foo\" @}}."
   "A simple text string; @code{\\markup @{ foo @}} is equivalent with
 @code{\\markup @{ \\simple #\"foo\" @}}."

-    (interpret-markup paper props str))
+    (interpret-markup layout props str))

 
 

-(def-markup-command (encoded-simple paper props sym str) (symbol? string?)
+(def-markup-command (encoded-simple layout props sym str) (symbol? string?)

   "A text string, encoded with encoding @var{sym}. See
 @usermanref{Text encoding} for more information."
   "A text string, encoded with encoding @var{sym}. See
 @usermanref{Text encoding} for more information."

-  (Text_interface::interpret_string paper
+  (Text_interface::interpret_string layout

                               props sym str))
 
 
                               props sym str))
 
 


@@ -51,7 +51,7 @@
   (make-simple-markup ""))
 
 
   (make-simple-markup ""))
 
 

-(def-markup-command (postscript paper props str) (string?)
+(def-markup-command (postscript layout props str) (string?)

 
   "This inserts @var{str} directly into the output as a PostScript
 command string.  Due to technicalities of the output backends,
 
   "This inserts @var{str} directly into the output as a PostScript
 command string.  Due to technicalities of the output backends,


@@ -86,15 +86,15 @@ gsave /ecrm10 findfont
    (list 'embedded-ps str)
    '(0 . 0) '(0 . 0)  ))
 
    (list 'embedded-ps str)
    '(0 . 0) '(0 . 0)  ))
 

-;;(def-markup-command (fill-line paper props line-width markups)
+;;(def-markup-command (fill-line layout props line-width markups)

 ;;  (number? markup-list?)
 ;; no parser tag -- should make number? markuk-list? thingy
 ;;  (number? markup-list?)
 ;; no parser tag -- should make number? markuk-list? thingy

-(def-markup-command (fill-line paper props markups)
+(def-markup-command (fill-line layout props markups)

   (markup-list?)
   "Put @var{markups} in a horizontal line of width @var{line-width}.
    The markups are spaced/flushed to fill the entire line."
 
   (markup-list?)
   "Put @var{markups} in a horizontal line of width @var{line-width}.
    The markups are spaced/flushed to fill the entire line."
 

-  (let* ((stencils (map (lambda (x) (interpret-markup paper props x))
+  (let* ((stencils (map (lambda (x) (interpret-markup layout props x))

                        markups))
         (text-width (apply + (map interval-length
                                   (map (lambda (x)
                        markups))
         (text-width (apply + (map interval-length
                                   (map (lambda (x)


@@ -108,7 +108,7 @@ gsave /ecrm10 findfont
                        (/ (- line-width text-width)
                           (if (= word-count 1) 2 (- word-count 1)))))
        (line-stencils (if (= word-count 1)
                        (/ (- line-width text-width)
                           (if (= word-count 1) 2 (- word-count 1)))))
        (line-stencils (if (= word-count 1)

-                          (map (lambda (x) (interpret-markup paper props x))
+                          (map (lambda (x) (interpret-markup layout props x))

                                (list (make-simple-markup "")
                                      (make-stencil-markup (car stencils))
                                      (make-simple-markup "")))
                                (list (make-simple-markup "")
                                      (make-stencil-markup (car stencils))
                                      (make-simple-markup "")))


@@ -116,33 +116,33 @@ gsave /ecrm10 findfont
     (stack-stencil-line fill-space line-stencils)))
   
 (define (font-markup qualifier value)
     (stack-stencil-line fill-space line-stencils)))
   
 (define (font-markup qualifier value)

-  (lambda (paper props arg)
-    (interpret-markup paper
+  (lambda (layout props arg)
+    (interpret-markup layout

                      (prepend-alist-chain qualifier value props)
                       arg)))
 
                      (prepend-alist-chain qualifier value props)
                       arg)))
 

-(def-markup-command (line paper props args) (markup-list?)
+(def-markup-command (line layout props args) (markup-list?)

   "Put @var{args} in a horizontal line.  The property @code{word-space}
 determines the space between each markup in @var{args}."
   (stack-stencil-line
    (chain-assoc-get 'word-space props)
   "Put @var{args} in a horizontal line.  The property @code{word-space}
 determines the space between each markup in @var{args}."
   (stack-stencil-line
    (chain-assoc-get 'word-space props)

-   (map (lambda (m) (interpret-markup paper props m)) args)))
+   (map (lambda (m) (interpret-markup layout props m)) args)))

 
 

-(def-markup-command (combine paper props m1 m2) (markup? markup?)
+(def-markup-command (combine layout props m1 m2) (markup? markup?)

   "Print two markups on top of each other."
   (let*
   "Print two markups on top of each other."
   (let*

-      ((s1 (interpret-markup paper props m1))
-       (s2 (interpret-markup paper props m2)))
+      ((s1 (interpret-markup layout props m1))
+       (s2 (interpret-markup layout props m2)))

             
     (ly:stencil-add s1 s2)))
 
             
     (ly:stencil-add s1 s2)))
 

-(def-markup-command (finger paper props arg) (markup?)
+(def-markup-command (finger layout props arg) (markup?)

   "Set the argument as small numbers."
   "Set the argument as small numbers."

-  (interpret-markup paper
+  (interpret-markup layout

                     (cons '((font-size . -5) (font-encoding . fetaNumber)) props)
                     arg))
 
                     (cons '((font-size . -5) (font-encoding . fetaNumber)) props)
                     arg))
 

-(def-markup-command (fontsize paper props mag arg) (number? markup?)
+(def-markup-command (fontsize layout props mag arg) (number? markup?)

   "This sets the relative font size, e.g.
 @example
 A \\fontsize #2 @{ B C @} D
   "This sets the relative font size, e.g.
 @example
 A \\fontsize #2 @{ B C @} D


@@ -152,11 +152,11 @@ A \\fontsize #2 @{ B C @} D
 This will enlarge the B and the C by two steps.
 "
   (interpret-markup
 This will enlarge the B and the C by two steps.
 "
   (interpret-markup

-   paper 
+   layout 

    (prepend-alist-chain 'font-size mag props)
    arg))
 
    (prepend-alist-chain 'font-size mag props)
    arg))
 

-(def-markup-command (magnify paper props sz arg) (number? markup?)
+(def-markup-command (magnify layout props sz arg) (number? markup?)

   "This sets the font magnification for the its argument. In the following
 example, the middle A will be 10% larger:
 @example
   "This sets the font magnification for the its argument. In the following
 example, the middle A will be 10% larger:
 @example


@@ -167,124 +167,124 @@ Note: magnification only works if a font-name is explicitly selected.
 Use @code{\\fontsize} otherwise."
 
   (interpret-markup
 Use @code{\\fontsize} otherwise."
 
   (interpret-markup

-   paper 
+   layout 

    (prepend-alist-chain 'font-magnification sz props)
    arg))
 
    (prepend-alist-chain 'font-magnification sz props)
    arg))
 

-(def-markup-command (bold paper props arg) (markup?)
+(def-markup-command (bold layout props arg) (markup?)

   "Switch to bold font-series"
   "Switch to bold font-series"

-  (interpret-markup paper (prepend-alist-chain 'font-series 'bold props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-series 'bold props) arg))

 
 

-(def-markup-command (sans paper props arg) (markup?)
+(def-markup-command (sans layout props arg) (markup?)

   "Switch to the sans serif family"
   "Switch to the sans serif family"

-  (interpret-markup paper (prepend-alist-chain 'font-family 'sans props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-family 'sans props) arg))

 
 

-(def-markup-command (number paper props arg) (markup?)
+(def-markup-command (number layout props arg) (markup?)

   "Set font family to @code{number}, which yields the font used for
 time signatures and fingerings.  This font only contains numbers and
 some punctuation. It doesn't have any letters.  "
   "Set font family to @code{number}, which yields the font used for
 time signatures and fingerings.  This font only contains numbers and
 some punctuation. It doesn't have any letters.  "

-  (interpret-markup paper (prepend-alist-chain 'font-encoding 'fetaNumber props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-encoding 'fetaNumber props) arg))

 
 

-(def-markup-command (roman paper props arg) (markup?)
+(def-markup-command (roman layout props arg) (markup?)

   "Set font family to @code{roman}."
   "Set font family to @code{roman}."

-  (interpret-markup paper (prepend-alist-chain 'font-family 'roman props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-family 'roman props) arg))

 
 

-(def-markup-command (huge paper props arg) (markup?)
+(def-markup-command (huge layout props arg) (markup?)

   "Set font size to +2."
   "Set font size to +2."

-  (interpret-markup paper (prepend-alist-chain 'font-size 2 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size 2 props) arg))

 
 

-(def-markup-command (large paper props arg) (markup?)
+(def-markup-command (large layout props arg) (markup?)

   "Set font size to +1."
   "Set font size to +1."

-  (interpret-markup paper (prepend-alist-chain 'font-size 1 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size 1 props) arg))

 
 

-(def-markup-command (normalsize paper props arg) (markup?)
+(def-markup-command (normalsize layout props arg) (markup?)

   "Set font size to default."
   "Set font size to default."

-  (interpret-markup paper (prepend-alist-chain 'font-size 0 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size 0 props) arg))

 
 

-(def-markup-command (small paper props arg) (markup?)
+(def-markup-command (small layout props arg) (markup?)

   "Set font size to -1."
   "Set font size to -1."

-  (interpret-markup paper (prepend-alist-chain 'font-size -1 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size -1 props) arg))

 
 

-(def-markup-command (tiny paper props arg) (markup?)
+(def-markup-command (tiny layout props arg) (markup?)

   "Set font size to -2."
   "Set font size to -2."

-  (interpret-markup paper (prepend-alist-chain 'font-size -2 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size -2 props) arg))

 
 

-(def-markup-command (teeny paper props arg) (markup?)
+(def-markup-command (teeny layout props arg) (markup?)

   "Set font size to -3."
   "Set font size to -3."

-  (interpret-markup paper (prepend-alist-chain 'font-size -3 props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-size -3 props) arg))

 
 

-(def-markup-command (caps paper props arg) (markup?)
+(def-markup-command (caps layout props arg) (markup?)

   "Set @code{font-shape} to @code{caps}."
   "Set @code{font-shape} to @code{caps}."

-  (interpret-markup paper (prepend-alist-chain 'font-shape 'caps props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-shape 'caps props) arg))

 
 

-;(def-markup-command (latin-i paper props arg) (markup?)
+;(def-markup-command (latin-i layout props arg) (markup?)

 ;  "TEST latin1 encoding."
 ;  "TEST latin1 encoding."

-;  (interpret-markup paper (prepend-alist-chain 'font-shape 'latin1 props) arg))
+;  (interpret-markup layout (prepend-alist-chain 'font-shape 'latin1 props) arg))

 
 

-(def-markup-command (dynamic paper props arg) (markup?)
+(def-markup-command (dynamic layout props arg) (markup?)

   "Use the dynamic font.  This font only contains @b{s}, @b{f}, @b{m},
 @b{z}, @b{p}, and @b{r}.  When producing phrases, like ``pi@`{u} @b{f}'', the
 normal words (like ``pi@`{u}'') should be done in a different font.  The
 recommend font for this is bold and italic"
   (interpret-markup
   "Use the dynamic font.  This font only contains @b{s}, @b{f}, @b{m},
 @b{z}, @b{p}, and @b{r}.  When producing phrases, like ``pi@`{u} @b{f}'', the
 normal words (like ``pi@`{u}'') should be done in a different font.  The
 recommend font for this is bold and italic"
   (interpret-markup

-   paper (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))
+   layout (prepend-alist-chain 'font-encoding 'fetaDynamic props) arg))

 
 

-(def-markup-command (italic paper props arg) (markup?)
+(def-markup-command (italic layout props arg) (markup?)

   "Use italic @code{font-shape} for @var{arg}. "
   "Use italic @code{font-shape} for @var{arg}. "

-  (interpret-markup paper (prepend-alist-chain 'font-shape 'italic props) arg))
+  (interpret-markup layout (prepend-alist-chain 'font-shape 'italic props) arg))

 
 

-(def-markup-command (typewriter paper props arg) (markup?)
+(def-markup-command (typewriter layout props arg) (markup?)

   "Use @code{font-family} typewriter for @var{arg}."
   (interpret-markup
   "Use @code{font-family} typewriter for @var{arg}."
   (interpret-markup

-   paper (prepend-alist-chain 'font-family 'typewriter props) arg))
+   layout (prepend-alist-chain 'font-family 'typewriter props) arg))

 
 

-(def-markup-command (upright paper props arg) (markup?)
+(def-markup-command (upright layout props arg) (markup?)

   "Set font shape to @code{upright}."
   (interpret-markup
   "Set font shape to @code{upright}."
   (interpret-markup

-   paper (prepend-alist-chain 'font-shape 'upright props) arg))
+   layout (prepend-alist-chain 'font-shape 'upright props) arg))

 
 

-(def-markup-command (doublesharp paper props) ()
+(def-markup-command (doublesharp layout props) ()

   "Draw a double sharp symbol."
 
   "Draw a double sharp symbol."
 

-  (interpret-markup paper props (markup #:musicglyph "accidentals-4")))
-(def-markup-command (sesquisharp paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals-4")))
+(def-markup-command (sesquisharp layout props) ()

   "Draw a 3/2 sharp symbol."
   "Draw a 3/2 sharp symbol."

-  (interpret-markup paper props (markup #:musicglyph "accidentals-3")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals-3")))

 
 

-(def-markup-command (sharp paper props) ()
+(def-markup-command (sharp layout props) ()

   "Draw a sharp symbol."
   "Draw a sharp symbol."

-  (interpret-markup paper props (markup #:musicglyph "accidentals-2")))
-(def-markup-command (semisharp paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals-2")))
+(def-markup-command (semisharp layout props) ()

   "Draw a semi sharp symbol."
   "Draw a semi sharp symbol."

-  (interpret-markup paper props (markup #:musicglyph "accidentals-1")))
-(def-markup-command (natural paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals-1")))
+(def-markup-command (natural layout props) ()

   "Draw a natural symbol."
 
   "Draw a natural symbol."
 

-  (interpret-markup paper props (markup #:musicglyph "accidentals-0")))
-(def-markup-command (semiflat paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals-0")))
+(def-markup-command (semiflat layout props) ()

   "Draw a semiflat."
   "Draw a semiflat."

-  (interpret-markup paper props (markup #:musicglyph "accidentals--1")))
-(def-markup-command (flat paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals--1")))
+(def-markup-command (flat layout props) ()

   "Draw a flat symbol."
   
   "Draw a flat symbol."
   

-  (interpret-markup paper props (markup #:musicglyph "accidentals--2")))
-(def-markup-command (sesquiflat paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals--2")))
+(def-markup-command (sesquiflat layout props) ()

   "Draw a 3/2 flat symbol."
   
   "Draw a 3/2 flat symbol."
   

-  (interpret-markup paper props (markup #:musicglyph "accidentals--3")))
-(def-markup-command (doubleflat paper props) ()
+  (interpret-markup layout props (markup #:musicglyph "accidentals--3")))
+(def-markup-command (doubleflat layout props) ()

   "Draw a double flat symbol."
 
   "Draw a double flat symbol."
 

-  (interpret-markup paper props (markup #:musicglyph "accidentals--4")))
+  (interpret-markup layout props (markup #:musicglyph "accidentals--4")))

 
 
 
 

-(def-markup-command (column paper props args) (markup-list?)
+(def-markup-command (column layout props args) (markup-list?)

   "Stack the markups in @var{args} vertically."
   (stack-lines
    -1 0.0 (chain-assoc-get 'baseline-skip props)
   "Stack the markups in @var{args} vertically."
   (stack-lines
    -1 0.0 (chain-assoc-get 'baseline-skip props)

-   (map (lambda (m) (interpret-markup paper props m)) args)))
+   (map (lambda (m) (interpret-markup layout props m)) args)))

 
 

-(def-markup-command (dir-column paper props args) (markup-list?)
+(def-markup-command (dir-column layout props args) (markup-list?)

   "Make a column of args, going up or down, depending on the setting
 of the @code{#'direction} layout property."
   (let* ((dir (chain-assoc-get 'direction props)))
   "Make a column of args, going up or down, depending on the setting
 of the @code{#'direction} layout property."
   (let* ((dir (chain-assoc-get 'direction props)))


@@ -292,72 +292,72 @@ of the @code{#'direction} layout property."
      (if (number? dir) dir -1)
      0.0
       (chain-assoc-get 'baseline-skip props)
      (if (number? dir) dir -1)
      0.0
       (chain-assoc-get 'baseline-skip props)

-     (map (lambda (x) (interpret-markup paper props x)) args))))
+     (map (lambda (x) (interpret-markup layout props x)) args))))

 
 

-(def-markup-command (center-align paper props args) (markup-list?)
+(def-markup-command (center-align layout props args) (markup-list?)

   "Put @code{args} in a centered column. "
   "Put @code{args} in a centered column. "

-  (let* ((mols (map (lambda (x) (interpret-markup paper props x)) args))
+  (let* ((mols (map (lambda (x) (interpret-markup layout props x)) args))

          (cmols (map (lambda (x) (ly:stencil-align-to! x X CENTER)) mols)))
     (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) mols)))
 
          (cmols (map (lambda (x) (ly:stencil-align-to! x X CENTER)) mols)))
     (stack-lines -1 0.0 (chain-assoc-get 'baseline-skip props) mols)))
 

-(def-markup-command (vcenter paper props arg) (markup?)
+(def-markup-command (vcenter layout props arg) (markup?)

   "Align @code{arg} to its center. "
   "Align @code{arg} to its center. "

-  (let* ((mol (interpret-markup paper props arg)))
+  (let* ((mol (interpret-markup layout props arg)))

     (ly:stencil-align-to! mol Y CENTER)
     mol))
 
     (ly:stencil-align-to! mol Y CENTER)
     mol))
 

-(def-markup-command (right-align paper props arg) (markup?)
-  (let* ((m (interpret-markup paper props arg)))
+(def-markup-command (right-align layout props arg) (markup?)
+  (let* ((m (interpret-markup layout props arg)))

     (ly:stencil-align-to! m X RIGHT)
     m))
 
     (ly:stencil-align-to! m X RIGHT)
     m))
 

-(def-markup-command (left-align paper props arg) (markup?)
+(def-markup-command (left-align layout props arg) (markup?)

   "Align @var{arg} on its left edge. "
   
   "Align @var{arg} on its left edge. "
   

-  (let* ((m (interpret-markup paper props arg)))
+  (let* ((m (interpret-markup layout props arg)))

     (ly:stencil-align-to! m X LEFT)
     m))
 
     (ly:stencil-align-to! m X LEFT)
     m))
 

-(def-markup-command (general-align paper props axis dir arg)  (integer? number? markup?)
+(def-markup-command (general-align layout props axis dir arg)  (integer? number? markup?)

   "Align @var{arg} in @var{axis} direction to the @var{dir} side."
   "Align @var{arg} in @var{axis} direction to the @var{dir} side."

-  (let* ((m (interpret-markup paper props arg)))
+  (let* ((m (interpret-markup layout props arg)))

 
     (ly:stencil-align-to! m axis dir)
     m
   ))
 
 
     (ly:stencil-align-to! m axis dir)
     m
   ))
 

-(def-markup-command (halign paper props dir arg) (number? markup?)
+(def-markup-command (halign layout props dir arg) (number? markup?)

   "Set horizontal alignment. If @var{dir} is @code{-1}, then it is
 left-aligned, while @code{+1} is right. Values in between interpolate
 alignment accordingly."
 
   
   "Set horizontal alignment. If @var{dir} is @code{-1}, then it is
 left-aligned, while @code{+1} is right. Values in between interpolate
 alignment accordingly."
 
   

-  (let* ((m (interpret-markup paper props arg)))
+  (let* ((m (interpret-markup layout props arg)))

     (ly:stencil-align-to! m X dir)
     m))
 
     (ly:stencil-align-to! m X dir)
     m))
 

-(def-markup-command (musicglyph paper props glyph-name) (string?)
+(def-markup-command (musicglyph layout props glyph-name) (string?)

   "This is converted to a musical symbol, e.g. @code{\\musicglyph
 #\"accidentals-0\"} will select the natural sign from the music font.
 See @usermanref{The Feta font} for  a complete listing of the possible glyphs.
 "
   (ly:find-glyph-by-name
   "This is converted to a musical symbol, e.g. @code{\\musicglyph
 #\"accidentals-0\"} will select the natural sign from the music font.
 See @usermanref{The Feta font} for  a complete listing of the possible glyphs.
 "
   (ly:find-glyph-by-name

-   (ly:paper-get-font paper (cons '((font-encoding . fetaMusic))
+   (ly:paper-get-font layout (cons '((font-encoding . fetaMusic))

                                   props))
    glyph-name))
 
 
                                   props))
    glyph-name))
 
 

-(def-markup-command (lookup paper props glyph-name) (string?)
+(def-markup-command (lookup layout props glyph-name) (string?)

   "Lookup a glyph by name."
   "Lookup a glyph by name."

-  (ly:find-glyph-by-name (ly:paper-get-font paper props)
+  (ly:find-glyph-by-name (ly:paper-get-font layout props)

                          glyph-name))
 
                          glyph-name))
 

-(def-markup-command (char paper props num) (integer?)
+(def-markup-command (char layout props num) (integer?)

   "Produce a single character, e.g. @code{\\char #65} produces the 
 letter 'A'."
   "Produce a single character, e.g. @code{\\char #65} produces the 
 letter 'A'."

-  (ly:get-glyph (ly:paper-get-font paper props) num))
+  (ly:get-glyph (ly:paper-get-font layout props) num))

 
 

-(def-markup-command (raise paper props amount arg) (number? markup?)
+(def-markup-command (raise layout props amount arg) (number? markup?)

   "
 This  raises  @var{arg}, by the distance @var{amount}.
 A negative @var{amount} indicates lowering:
   "
 This  raises  @var{arg}, by the distance @var{amount}.
 A negative @var{amount} indicates lowering:


@@ -376,14 +376,14 @@ positions it next to the staff cancels any shift made with
 and/or @code{extra-offset} properties. "
 
   
 and/or @code{extra-offset} properties. "
 
   

-  (ly:stencil-translate-axis (interpret-markup paper props arg)
+  (ly:stencil-translate-axis (interpret-markup layout props arg)

                               amount Y))
 
                               amount Y))
 

-(def-markup-command (fraction paper props arg1 arg2) (markup? markup?)
+(def-markup-command (fraction layout props arg1 arg2) (markup? markup?)

   "Make a fraction of two markups."
   
   "Make a fraction of two markups."
   

-  (let* ((m1 (interpret-markup paper props arg1))
-         (m2 (interpret-markup paper props arg2)))
+  (let* ((m1 (interpret-markup layout props arg1))
+         (m2 (interpret-markup layout props arg2)))

     (ly:stencil-align-to! m1 X CENTER)
     (ly:stencil-align-to! m2 X CENTER)    
     (let* ((x1 (ly:stencil-extent m1 X))
     (ly:stencil-align-to! m1 X CENTER)
     (ly:stencil-align-to! m2 X CENTER)    
     (let* ((x1 (ly:stencil-extent m1 X))


@@ -400,11 +400,11 @@ and/or @code{extra-offset} properties. "
 
 ;; TODO: better syntax.
 
 
 ;; TODO: better syntax.
 

-(def-markup-command (note-by-number paper props log dot-count dir) (number? number? number?)
+(def-markup-command (note-by-number layout props log dot-count dir) (number? number? number?)

   "Construct a note symbol, with stem.  By using fractional values for
 @var{dir}, you can obtain longer or shorter stems."
   
   "Construct a note symbol, with stem.  By using fractional values for
 @var{dir}, you can obtain longer or shorter stems."
   

-  (let* ((font (ly:paper-get-font paper (cons '((font-encoding . fetaMusic)) props)))
+  (let* ((font (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) props)))

         (size (chain-assoc-get 'font-size props 0))
          (stem-length (* (magstep size) (max 3 (- log 1))))
          (head-glyph (ly:find-glyph-by-name
         (size (chain-assoc-get 'font-size props 0))
          (stem-length (* (magstep size) (max 3 (- log 1))))
          (head-glyph (ly:find-glyph-by-name


@@ -475,25 +475,25 @@ and/or @code{extra-offset} properties. "
                 (if dots (string-length dots) 0)))
         (error "This is not a valid duration string:" duration-string))))
 
                 (if dots (string-length dots) 0)))
         (error "This is not a valid duration string:" duration-string))))
 

-(def-markup-command (note paper props duration dir) (string? number?)
+(def-markup-command (note layout props duration dir) (string? number?)

   "This produces a note with a stem pointing in @var{dir} direction, with
 the @var{duration} for the note head type and augmentation dots. For
 example, @code{\\note #\"4.\" #-0.75} creates a dotted quarter note, with
 a shortened down stem."
   
   (let ((parsed (parse-simple-duration duration)))
   "This produces a note with a stem pointing in @var{dir} direction, with
 the @var{duration} for the note head type and augmentation dots. For
 example, @code{\\note #\"4.\" #-0.75} creates a dotted quarter note, with
 a shortened down stem."
   
   (let ((parsed (parse-simple-duration duration)))

-    (note-by-number-markup paper props (car parsed) (cadr parsed) dir)))
+    (note-by-number-markup layout props (car parsed) (cadr parsed) dir)))

 
 

-(def-markup-command (normal-size-super paper props arg) (markup?)
+(def-markup-command (normal-size-super layout props arg) (markup?)

   "Set @var{arg} in superscript with a normal font size."
   
   (ly:stencil-translate-axis (interpret-markup
   "Set @var{arg} in superscript with a normal font size."
   
   (ly:stencil-translate-axis (interpret-markup

-                               paper
+                               layout

                                props arg)
                               (* 0.5  (chain-assoc-get 'baseline-skip props))
                               Y))
 
                                props arg)
                               (* 0.5  (chain-assoc-get 'baseline-skip props))
                               Y))
 

-(def-markup-command (super paper props arg) (markup?)
+(def-markup-command (super layout props arg) (markup?)

   "
 @cindex raising text
 @cindex lowering text
   "
 @cindex raising text
 @cindex lowering text


@@ -514,13 +514,13 @@ Raising and lowering texts can be done with @code{\\super} and
   
   (ly:stencil-translate-axis
    (interpret-markup
   
   (ly:stencil-translate-axis
    (interpret-markup

-    paper
+    layout

     (cons `((font-size . ,(- (chain-assoc-get 'font-size props 0) 3))) props)
     arg)
    (* 0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 
     (cons `((font-size . ,(- (chain-assoc-get 'font-size props 0) 3))) props)
     arg)
    (* 0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 

-(def-markup-command (translate paper props offset arg) (number-pair? markup?)
+(def-markup-command (translate layout props offset arg) (number-pair? markup?)

   "This translates an object. Its first argument is a cons of numbers
 @example
 A \\translate #(cons 2 -3) @{ B C @} D
   "This translates an object. Its first argument is a cons of numbers
 @example
 A \\translate #(cons 2 -3) @{ B C @} D


@@ -532,42 +532,42 @@ that.
 
 "
   
 
 "
   

-  (ly:stencil-translate (interpret-markup  paper props arg)
+  (ly:stencil-translate (interpret-markup  layout props arg)

                          offset))
 
                          offset))
 

-(def-markup-command (sub paper props arg) (markup?)
+(def-markup-command (sub layout props arg) (markup?)

   "Set @var{arg} in subscript."
   
   (ly:stencil-translate-axis
    (interpret-markup
   "Set @var{arg} in subscript."
   
   (ly:stencil-translate-axis
    (interpret-markup

-    paper
+    layout

     (cons `((font-size . ,(- (chain-assoc-get 'font-size props 0) 3))) props)
     arg)
    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 
     (cons `((font-size . ,(- (chain-assoc-get 'font-size props 0) 3))) props)
     arg)
    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 

-(def-markup-command (normal-size-sub paper props arg) (markup?)
+(def-markup-command (normal-size-sub layout props arg) (markup?)

   "Set @var{arg} in subscript, in a normal font size."
 
   (ly:stencil-translate-axis
   "Set @var{arg} in subscript, in a normal font size."
 
   (ly:stencil-translate-axis

-   (interpret-markup paper props arg)
+   (interpret-markup layout props arg)

    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 
    (* -0.5 (chain-assoc-get 'baseline-skip props))
    Y))
 

-(def-markup-command (hbracket paper props arg) (markup?)
+(def-markup-command (hbracket layout props arg) (markup?)

   "Draw horizontal brackets around @var{arg}."  
   (let ((th 0.1) ;; todo: take from GROB.
   "Draw horizontal brackets around @var{arg}."  
   (let ((th 0.1) ;; todo: take from GROB.

-        (m (interpret-markup paper props arg)))
+        (m (interpret-markup layout props arg)))

     (bracketify-stencil m X th (* 2.5 th) th)))
 
     (bracketify-stencil m X th (* 2.5 th) th)))
 

-(def-markup-command (bracket paper props arg) (markup?)
+(def-markup-command (bracket layout props arg) (markup?)

   "Draw vertical brackets around @var{arg}."  
   (let ((th 0.1) ;; todo: take from GROB.
   "Draw vertical brackets around @var{arg}."  
   (let ((th 0.1) ;; todo: take from GROB.

-        (m (interpret-markup paper props arg)))
+        (m (interpret-markup layout props arg)))

     (bracketify-stencil m Y th (* 2.5 th) th)))
 
 ;; todo: fix negative space
     (bracketify-stencil m Y th (* 2.5 th) th)))
 
 ;; todo: fix negative space

-(def-markup-command (hspace paper props amount) (number?)
+(def-markup-command (hspace layout props amount) (number?)

   "This produces a invisible object taking horizontal space.
 @example 
 \\markup @{ A \\hspace #2.0 B @} 
   "This produces a invisible object taking horizontal space.
 @example 
 \\markup @{ A \\hspace #2.0 B @} 


@@ -579,7 +579,7 @@ normally inserted before elements on a line.
       (ly:make-stencil "" (cons 0 amount) '(-1 . 1) )
       (ly:make-stencil "" (cons amount amount) '(-1 . 1))))
 
       (ly:make-stencil "" (cons 0 amount) '(-1 . 1) )
       (ly:make-stencil "" (cons amount amount) '(-1 . 1))))
 

-(def-markup-command (override paper props new-prop arg) (pair? markup?)
+(def-markup-command (override layout props new-prop arg) (pair? markup?)

   "Add the first argument in to the property list.  Properties may be
 any sort of property supported by @internalsref{font-interface} and
 @internalsref{text-interface}, for example
   "Add the first argument in to the property list.  Properties may be
 any sort of property supported by @internalsref{font-interface} and
 @internalsref{text-interface}, for example


@@ -589,40 +589,40 @@ any sort of property supported by @internalsref{font-interface} and
 @end verbatim
 
 "
 @end verbatim
 
 "

-  (interpret-markup paper (cons (list new-prop) props) arg))
+  (interpret-markup layout (cons (list new-prop) props) arg))

 
 

-(def-markup-command (smaller paper props arg) (markup?)
+(def-markup-command (smaller layout props arg) (markup?)

   "Decrease the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
         (entry (cons 'font-size (- fs 1))))
   "Decrease the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
         (entry (cons 'font-size (- fs 1))))

-    (interpret-markup paper (cons (list entry) props) arg)))
+    (interpret-markup layout (cons (list entry) props) arg)))

 
 
 
 

-(def-markup-command (bigger paper props arg) (markup?)
+(def-markup-command (bigger layout props arg) (markup?)

   "Increase the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
          (entry (cons 'font-size (+ fs 1))))
   "Increase the font size relative to current setting"
   (let* ((fs (chain-assoc-get 'font-size props 0))
          (entry (cons 'font-size (+ fs 1))))

-    (interpret-markup paper (cons (list entry) props) arg)))
+    (interpret-markup layout (cons (list entry) props) arg)))

 
 (def-markup-command larger (markup?)
   bigger-markup)
 
 
 
 (def-markup-command larger (markup?)
   bigger-markup)
 
 

-(def-markup-command (box paper props arg) (markup?)
+(def-markup-command (box layout props arg) (markup?)

   "Draw a box round @var{arg}.  Looks at @code{thickness} and
 @code{box-padding} properties to determine line thickness and padding
 around the markup."
   (let ((th (chain-assoc-get 'thickness props  0.1))
         (pad (chain-assoc-get 'box-padding props 0.2))
   "Draw a box round @var{arg}.  Looks at @code{thickness} and
 @code{box-padding} properties to determine line thickness and padding
 around the markup."
   (let ((th (chain-assoc-get 'thickness props  0.1))
         (pad (chain-assoc-get 'box-padding props 0.2))

-        (m (interpret-markup paper props arg)))
+        (m (interpret-markup layout props arg)))

     (box-stencil m th pad)))
 
 ;FIXME: is this working? 
     (box-stencil m th pad)))
 
 ;FIXME: is this working? 

-(def-markup-command (strut paper props) ()
+(def-markup-command (strut layout props) ()

   
   "Create a box of the same height as the space in the current font."
   
   
   "Create a box of the same height as the space in the current font."
   

-  (let ((m (Text_interface::interpret_markup paper props " ")))
+  (let ((m (Text_interface::interpret_markup layout props " ")))

     (ly:stencil-set-extent! m X '(1000 . -1000))
     m))
 
     (ly:stencil-set-extent! m X '(1000 . -1000))
     m))
 


@@ -647,16 +647,16 @@ around the markup."
       (make-string 1 (vector-ref number->mark-letter-vector n)))))
 
 
       (make-string 1 (vector-ref number->mark-letter-vector n)))))
 
 

-(def-markup-command (markletter paper props num) (integer?)
+(def-markup-command (markletter layout props num) (integer?)

    "Make a markup letter for @var{num}.  The letters start with A to Z
  (skipping I), and continues with double letters."
  
    "Make a markup letter for @var{num}.  The letters start with A to Z
  (skipping I), and continues with double letters."
  

-   (Text_interface::interpret_markup paper props (number->markletter-string num)))
+   (Text_interface::interpret_markup layout props (number->markletter-string num)))

 
 
 
 
 
 
 
 

-(def-markup-command (bracketed-y-column paper props indices args)
+(def-markup-command (bracketed-y-column layout props indices args)

   (list? markup-list?)
   "Make a column of the markups in @var{args}, putting brackets around
 the elements marked in @var{indices}, which is a list of numbers."
   (list? markup-list?)
   "Make a column of the markups in @var{args}, putting brackets around
 the elements marked in @var{indices}, which is a list of numbers."


@@ -718,7 +718,7 @@ the elements marked in @var{indices}, which is a list of numbers."
       ((stencils
        (map (lambda (x)
               (interpret-markup
       ((stencils
        (map (lambda (x)
               (interpret-markup

-               paper
+               layout

                props
                x)) args))
        (leading
                props
                x)) args))
        (leading

diff --git a/scm/document-translation.scm b/scm/document-translation.scm
index 222ee0985164ac90413bd6c08454c2dfc39a469c..2eac4bfae1fde4e053c8374d22fc48bf2855ce8d 100644 (file)
--- a/scm/document-translation.scm
+++ b/scm/document-translation.scm
@@ -74,8 +74,8 @@
 
      (if in-which-contexts
         (let*
 
      (if in-which-contexts
         (let*

-            ((paper-alist (ly:output-description $defaultpaper))
-             (context-description-alist (map cdr paper-alist))
+            ((layout-alist (ly:output-description $defaultlayout))
+             (context-description-alist (map cdr layout-alist))

              (contexts
               (apply append
                      (map
              (contexts
               (apply append
                      (map


@@ -261,11 +261,11 @@
 
 (define (all-contexts-doc)
   (let* (
 
 (define (all-contexts-doc)
   (let* (

-        (paper-alist
-         (sort (ly:output-description $defaultpaper)
+        (layout-alist
+         (sort (ly:output-description $defaultlayout)

                (lambda (x y) (symbol<? (car x) (car y)))))
                (lambda (x y) (symbol<? (car x) (car y)))))

-        (names (sort (map symbol->string (map car paper-alist)) string<?))
-        (contexts (map cdr paper-alist))
+        (names (sort (map symbol->string (map car layout-alist)) string<?))
+        (contexts (map cdr layout-alist))

         )
 
     (make <texi-node>
         )
 
     (make <texi-node>

diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm
index cd701d279b48d75d4bb724672e7014b0afea14e9..968d8132d1e0eddd0f4d3b811965ab88296c23d2 100644 (file)
--- a/scm/framework-gnome.scm
+++ b/scm/framework-gnome.scm
@@ -99,9 +99,9 @@
 
 
 (define (gnome-main book)
 
 
 (define (gnome-main book)

-  (let* ((book-paper (ly:paper-book-book-paper book))
-        (hsize (ly:output-def-lookup book-paper 'hsize))
-        (vsize (ly:output-def-lookup book-paper 'vsize))
+  (let* ((paper (ly:paper-book-paper book))
+        (hsize (ly:output-def-lookup paper 'hsize))
+        (vsize (ly:output-def-lookup paper 'vsize))

         (page-width (inexact->exact (ceiling (* OUTPUT-SCALE hsize))))
         (page-height (inexact->exact (ceiling (* OUTPUT-SCALE vsize))))
         ;;(page-width (inexact->exact (ceiling hsize)))
         (page-width (inexact->exact (ceiling (* OUTPUT-SCALE hsize))))
         (page-height (inexact->exact (ceiling (* OUTPUT-SCALE vsize))))
         ;;(page-width (inexact->exact (ceiling hsize)))

diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm
index bb04b7efbf0106421494906bc657e8087ca46f38..b341102007be006ffe5f433c97fe54f3ba40f76d 100644 (file)
--- a/scm/framework-ps.scm
+++ b/scm/framework-ps.scm
@@ -45,8 +45,8 @@
    (equal? (substring fontname 0 2) "cm")
    (equal? (substring fontname 0 2) "ec")))
 
    (equal? (substring fontname 0 2) "cm")
    (equal? (substring fontname 0 2) "ec")))
 

-(define (load-fonts bookpaper)
-  (let* ((fonts (ly:bookpaper-fonts bookpaper))
+(define (load-fonts paper)
+  (let* ((fonts (ly:paper-fonts paper))

         (font-names (uniq-list (sort (map ly:font-filename fonts) string<?)))
         (pfas (map
                (lambda (x)
         (font-names (uniq-list (sort (map ly:font-filename fonts) string<?)))
         (pfas (map
                (lambda (x)


@@ -68,9 +68,9 @@
   
     (string-join pfas "\n")))
 
   
     (string-join pfas "\n")))
 

-(define (define-fonts bookpaper)
+(define (define-fonts paper)

 
 

-  (define font-list (ly:bookpaper-fonts bookpaper))
+  (define font-list (ly:paper-fonts paper))

   (define (define-font command fontname scaling)
     (string-append
      "/" command " { /" fontname " findfont "
   (define (define-font command fontname scaling)
     (string-append
      "/" command " { /" fontname " findfont "


@@ -100,7 +100,7 @@
           (plain (ps-font-command font #f))
           (designsize (ly:font-design-size font))
           (magnification (* (ly:font-magnification font)))
           (plain (ps-font-command font #f))
           (designsize (ly:font-design-size font))
           (magnification (* (ly:font-magnification font)))

-          (ops (ly:output-def-lookup bookpaper 'outputscale))
+          (ops (ly:output-def-lookup paper 'outputscale))

           (scaling (* ops magnification designsize)))
 
       ;; Bluesky pfbs have UPCASE names (sigh.)
           (scaling (* ops magnification designsize)))
 
       ;; Bluesky pfbs have UPCASE names (sigh.)


@@ -142,8 +142,8 @@
 
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name
 
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name

-(define (output-variables paper)
-  ;; FIXME: duplicates output-paper's scope-entry->string, mostly
+(define (output-variables layout)
+  ;; FIXME: duplicates output-layout's scope-entry->string, mostly

   (define (value->string  val)
     (cond
      ((string? val) (string-append "(" val ")"))
   (define (value->string  val)
     (cond
      ((string? val) (string-append "(" val ")"))


@@ -154,7 +154,7 @@
   (define (output-entry ps-key ly-key)
     (string-append
      "/" ps-key " "
   (define (output-entry ps-key ly-key)
     (string-append
      "/" ps-key " "

-     (value->string (ly:output-def-lookup paper ly-key)) " def \n"))
+     (value->string (ly:output-def-lookup layout ly-key)) " def \n"))

 
   (string-append
    "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"
 
   (string-append
    "/lily-output-units " (number->string mm-to-bigpoint) " def %% milimeter \n"


@@ -163,7 +163,7 @@
    (output-entry "paper-size" 'papersize)
    (output-entry "staff-height" 'staffheight)  ;junkme.
    "/output-scale "
    (output-entry "paper-size" 'papersize)
    (output-entry "staff-height" 'staffheight)  ;junkme.
    "/output-scale "

-   (number->string (ly:output-def-lookup paper 'outputscale))
+   (number->string (ly:output-def-lookup layout 'outputscale))

    " lily-output-units mul def \n"
    (output-entry "page-height" 'vsize)
    (output-entry "page-width" 'hsize)
    " lily-output-units mul def \n"
    (output-entry "page-height" 'vsize)
    (output-entry "page-width" 'hsize)


@@ -187,53 +187,53 @@
   (ly:outputter-dump-stencil outputter page)
   (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
 
   (ly:outputter-dump-stencil outputter page)
   (ly:outputter-dump-string outputter "} stop-system \nshowpage\n"))
 

-(define (eps-header bookpaper bbox)
+(define (eps-header paper bbox)

   (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
                 "%%Creator: creator time-stamp\n"
                 "%%BoundingBox: "
                 (string-join (map number->string bbox) " ") "\n"
                 "%%Orientation: "
   (string-append "%!PS-Adobe-2.0 EPSF-2.0\n"
                 "%%Creator: creator time-stamp\n"
                 "%%BoundingBox: "
                 (string-join (map number->string bbox) " ") "\n"
                 "%%Orientation: "

-                (if (eq? (ly:output-def-lookup bookpaper 'landscape) #t)
+                (if (eq? (ly:output-def-lookup paper 'landscape) #t)

                     "Landscape\n"
                     "Portrait\n")
                 "%%EndComments\n"))
 
                     "Landscape\n"
                     "Portrait\n")
                 "%%EndComments\n"))
 

-(define (page-header bookpaper page-count)
+(define (page-header paper page-count)

   (string-append "%!PS-Adobe-3.0\n"
                 "%%Creator: creator time-stamp\n"
                 "%%Pages: " (number->string page-count) "\n"
                 "%%PageOrder: Ascend\n"
                 "%%Orientation: "
   (string-append "%!PS-Adobe-3.0\n"
                 "%%Creator: creator time-stamp\n"
                 "%%Pages: " (number->string page-count) "\n"
                 "%%PageOrder: Ascend\n"
                 "%%Orientation: "

-                (if (eq? (ly:output-def-lookup bookpaper 'landscape) #t)
+                (if (eq? (ly:output-def-lookup paper 'landscape) #t)

                     "Landscape\n"
                     "Portrait\n")
                     "Landscape\n"
                     "Portrait\n")

-                "%%DocumentPaperSizes: "
-                (ly:output-def-lookup bookpaper 'papersize) "\n"))
+                "%%DocumentLayoutSizes: "
+                (ly:output-def-lookup paper 'papersize) "\n"))

 
 

-(define (preamble bookpaper)
+(define (preamble paper)

   (list
   (list

-   (output-variables bookpaper)
+   (output-variables paper)

    (ly:gulp-file "music-drawing-routines.ps")
    (ly:gulp-file "lilyponddefs.ps")
    (ly:gulp-file "music-drawing-routines.ps")
    (ly:gulp-file "lilyponddefs.ps")

-   (load-fonts bookpaper)
-   (define-fonts bookpaper)
+   (load-fonts paper)
+   (define-fonts paper)

 
 
    ))
 
 (define-public (output-framework outputter book scopes fields basename)
 
 
    ))
 
 (define-public (output-framework outputter book scopes fields basename)

-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))

         (pages (ly:paper-book-pages book))
         (pages (ly:paper-book-pages book))

-        (landscape? (eq? (ly:output-def-lookup bookpaper 'landscape) #t))
-        (page-number (1- (ly:output-def-lookup bookpaper 'firstpagenumber)))
+        (landscape? (eq? (ly:output-def-lookup paper 'landscape) #t))
+        (page-number (1- (ly:output-def-lookup paper 'firstpagenumber)))

         (page-count (length pages)))
     
   (for-each
    (lambda (x)
      (ly:outputter-dump-string outputter x))
    (cons
         (page-count (length pages)))
     
   (for-each
    (lambda (x)
      (ly:outputter-dump-string outputter x))
    (cons

-    (page-header bookpaper page-count)
-    (preamble bookpaper)))
+    (page-header paper page-count)
+    (preamble paper)))

   
   (for-each
    (lambda (page)
   
   (for-each
    (lambda (page)


@@ -244,9 +244,9 @@
   (ly:outputter-dump-string outputter "%%Trailer\n%%EOF\n")))
 
 (define-public (output-preview-framework outputter book scopes fields basename)
   (ly:outputter-dump-string outputter "%%Trailer\n%%EOF\n")))
 
 (define-public (output-preview-framework outputter book scopes fields basename)

-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))

         (systems (ly:paper-book-systems book))
         (systems (ly:paper-book-systems book))

-        (scale  (ly:output-def-lookup bookpaper 'outputscale ))
+        (scale  (ly:output-def-lookup paper 'outputscale ))

         (titles (take-while ly:paper-system-title? systems))
         (non-title (find (lambda (x)
                            (not (ly:paper-system-title? x))) systems))
         (titles (take-while ly:paper-system-title? systems))
         (non-title (find (lambda (x)
                            (not (ly:paper-system-title? x))) systems))


@@ -261,14 +261,14 @@
    (lambda (x)
      (ly:outputter-dump-string outputter x))
    (cons
    (lambda (x)
      (ly:outputter-dump-string outputter x))
    (cons

-    (eps-header bookpaper
+    (eps-header paper

                (map
                 (lambda (x)
                   (inexact->exact
                    (round (* x scale mm-to-bigpoint))))
                 (list (car xext) (car yext)
                       (cdr xext) (cdr yext))))
                (map
                 (lambda (x)
                   (inexact->exact
                    (round (* x scale mm-to-bigpoint))))
                 (list (car xext) (car yext)
                       (cdr xext) (cdr yext))))

-    (preamble bookpaper)))
+    (preamble paper)))

 
 
   (ly:outputter-dump-string outputter
 
 
   (ly:outputter-dump-string outputter


@@ -281,7 +281,7 @@
 
 (define-public (convert-to-pdf book name)
   (let*
 
 (define-public (convert-to-pdf book name)
   (let*

-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))

        (size (ly:output-def-lookup defs 'papersize)))
 
     (if (equal? name "-")
        (size (ly:output-def-lookup defs 'papersize)))
 
     (if (equal? name "-")


@@ -291,7 +291,7 @@
   
 (define-public (convert-to-png book name)
   (let*
   
 (define-public (convert-to-png book name)
   (let*

-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))

        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png (if (number? resolution) resolution 90)
        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png (if (number? resolution) resolution 90)

diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm
index f9b9e454e11f876c9f182b7c1ff19e12b2238dc9..eb7e867cb9ef2d6181c97b57ce69cac0a01ab382 100644 (file)
--- a/scm/framework-tex.scm
+++ b/scm/framework-tex.scm
@@ -47,10 +47,10 @@
    (string-encode-integer
     (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
 
    (string-encode-integer
     (inexact->exact (round (* 1000 (ly:font-magnification font)))))))
 

-(define (font-load-command bookpaper font)
+(define (font-load-command paper font)

   (let* ((coding-alist (ly:font-encoding-alist font))
   (let* ((coding-alist (ly:font-encoding-alist font))

-        (font-encoding (assoc-get 'output-name coding-alist))
-        )
+        (font-encoding (assoc-get 'output-name coding-alist)))
+    

     (string-append
      "\\font\\lilypond" (tex-font-command font) "="
      (ly:font-filename font)
     (string-append
      "\\font\\lilypond" (tex-font-command font) "="
      (ly:font-filename font)


@@ -58,7 +58,7 @@
      (ly:number->string (inexact->exact
                         (round (* 1000
                                   (ly:font-magnification font)
      (ly:number->string (inexact->exact
                         (round (* 1000
                                   (ly:font-magnification font)

-                                  (ly:bookpaper-outputscale bookpaper)))))
+                                  (ly:paper-outputscale paper)))))

      "\n"
      "\\def\\" (tex-font-command font) "{%\n"
      ;; UGH.  Should be handled via alist.
      "\n"
      "\\def\\" (tex-font-command font) "{%\n"
      ;; UGH.  Should be handled via alist.


@@ -70,21 +70,22 @@
      )))
 
 
      )))
 
 

-(define (define-fonts bookpaper)
+(define (define-fonts paper)

   (string-append
    ;; UGH. FIXME.   
    "\\def\\lilypondpaperunit{mm}\n"
    (tex-number-def "lilypondpaper" 'outputscale
                   (number->string (exact->inexact
   (string-append
    ;; UGH. FIXME.   
    "\\def\\lilypondpaperunit{mm}\n"
    (tex-number-def "lilypondpaper" 'outputscale
                   (number->string (exact->inexact

-                                   (ly:bookpaper-outputscale bookpaper))))
+                                   (ly:paper-outputscale paper))))

    (tex-string-def "lilypondpaper" 'papersize
    (tex-string-def "lilypondpaper" 'papersize

-                  (eval 'papersize (ly:output-def-scope bookpaper)))
+                  (eval 'papersize (ly:output-def-scope paper)))
+   ;; paper/layout?

    (tex-string-def "lilypondpaper" 'inputencoding
    (tex-string-def "lilypondpaper" 'inputencoding

-                  (eval 'inputencoding (ly:output-def-scope bookpaper)))
+                  (eval 'inputencoding (ly:output-def-scope paper)))

 
    (apply string-append
 
    (apply string-append

-         (map (lambda (x) (font-load-command bookpaper x))
-              (ly:bookpaper-fonts bookpaper)))))
+         (map (lambda (x) (font-load-command paper x))
+              (ly:paper-fonts paper)))))

 
 (define (header-to-file fn key val)
   (set! key (symbol->string key))
 
 (define (header-to-file fn key val)
   (set! key (symbol->string key))


@@ -122,13 +123,12 @@
       (string-append "\\def\\" prefix (symbol->tex-key key)
                     "{" (sanitize-tex-string str) "}%\n")))
 
       (string-append "\\def\\" prefix (symbol->tex-key key)
                     "{" (sanitize-tex-string str) "}%\n")))
 

-(define (header bookpaper page-count classic?)
-  (let ((scale (ly:output-def-lookup bookpaper 'outputscale))
+(define (header paper page-count classic?)
+  (let ((scale (ly:output-def-lookup paper 'outputscale))

        (texpaper (string-append
        (texpaper (string-append

-                  (ly:output-def-lookup bookpaper 'papersizename)
+                  (ly:output-def-lookup paper 'papersizename)

                   "paper"))
                   "paper"))

-       (landscape? (eq? #t (ly:output-def-lookup bookpaper 'landscape)))
-       )
+       (landscape? (eq? #t (ly:output-def-lookup paper 'landscape))))

     
     (string-append
      "% Generated by LilyPond "
     
     (string-append
      "% Generated by LilyPond "


@@ -144,7 +144,7 @@
 
      (tex-string-def
       "lilypondpaper" 'linewidth
 
      (tex-string-def
       "lilypondpaper" 'linewidth

-      (ly:number->string (* scale (ly:output-def-lookup bookpaper 'linewidth))))
+      (ly:number->string (* scale (ly:output-def-lookup paper 'linewidth))))

      "\\def\\lilyponddocumentclassoptions{"
      texpaper
      (if  landscape? ",landscape" "")
      "\\def\\lilyponddocumentclassoptions{"
      texpaper
      (if  landscape? ",landscape" "")


@@ -152,7 +152,7 @@
      (tex-string-def
       "lilypondpaper" 'interscoreline
       (ly:number->string
      (tex-string-def
       "lilypondpaper" 'interscoreline
       (ly:number->string

-       (* scale (ly:output-def-lookup bookpaper 'interscoreline)))))))
+       (* scale (ly:output-def-lookup paper 'interscoreline)))))))

 
 (define (header-end)
   (string-append
 
 (define (header-end)
   (string-append


@@ -186,18 +186,18 @@
        "}\\vss\n}\n\\vfill\\lilypondpagebreak\n")))
 
 (define-public (output-framework outputter book scopes fields basename )
        "}\\vss\n}\n\\vfill\\lilypondpagebreak\n")))
 
 (define-public (output-framework outputter book scopes fields basename )

-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))

         (pages (ly:paper-book-pages book))
         (last-page (car (last-pair pages)))
         (with-extents
         (pages (ly:paper-book-pages book))
         (last-page (car (last-pair pages)))
         (with-extents

-         (eq? #t (ly:output-def-lookup bookpaper 'dump-extents)))
+         (eq? #t (ly:output-def-lookup paper 'dump-extents)))

         )
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
         )
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list

-      (header bookpaper (length pages) #f)
-      (define-fonts bookpaper)
+      (header paper (length pages) #f)
+      (define-fonts paper)

       (header-end)))
     (ly:outputter-dump-string outputter "\\lilypondnopagebreak")
     (for-each
       (header-end)))
     (ly:outputter-dump-string outputter "\\lilypondnopagebreak")
     (for-each


@@ -221,7 +221,7 @@
 
 (define-public (output-classic-framework
                outputter book scopes fields basename)
 
 (define-public (output-classic-framework
                outputter book scopes fields basename)

-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))

         (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
     (for-each
         (lines (ly:paper-book-systems book))
         (last-line (car (last-pair lines))))
     (for-each


@@ -229,10 +229,10 @@
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME

-      (header bookpaper (length lines) #f)
+      (header paper (length lines) #f)

       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)
       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)

-      (define-fonts bookpaper)
+      (define-fonts paper)

       (header-end)))
 
     (for-each
       (header-end)))
 
     (for-each


@@ -242,17 +242,17 @@
 
 (define-public (output-preview-framework
                outputter book scopes fields basename )
 
 (define-public (output-preview-framework
                outputter book scopes fields basename )

-  (let* ((bookpaper (ly:paper-book-book-paper book))
+  (let* ((paper (ly:paper-book-paper book))

         (lines (ly:paper-book-systems book)))
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME
         (lines (ly:paper-book-systems book)))
     (for-each
      (lambda (x)
        (ly:outputter-dump-string outputter x))
      (list
       ;;FIXME

-      (header bookpaper (length lines) #f)
+      (header paper (length lines) #f)

       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)
       "\\def\\lilypondclassic{1}%\n"
       (output-scopes scopes fields basename)

-      (define-fonts bookpaper)
+      (define-fonts paper)

       (header-end)))
 
     (dump-line outputter (car lines) #t)
       (header-end)))
 
     (dump-line outputter (car lines) #t)


@@ -261,7 +261,7 @@
 
 (define-public (convert-to-pdf book name)
   (let*
 
 (define-public (convert-to-pdf book name)
   (let*

-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))

        (size (ly:output-def-lookup defs 'papersize)))
 
     (postscript->pdf (if (string? size) size "a4")
        (size (ly:output-def-lookup defs 'papersize)))
 
     (postscript->pdf (if (string? size) size "a4")


@@ -272,7 +272,7 @@
 
 (define-public (convert-to-png book name)
   (let*
 
 (define-public (convert-to-png book name)
   (let*

-      ((defs (ly:paper-book-book-paper book))
+      ((defs (ly:paper-book-paper book))

        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png
        (resolution (ly:output-def-lookup defs 'pngresolution)))
 
     (postscript->png

diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm
index 82a7ffdea6696f5c4f1e402b699621267635764c..d3e5edb0cd192e4878d926520fb57f9942d9f951 100644 (file)
--- a/scm/fret-diagrams.scm
+++ b/scm/fret-diagrams.scm
@@ -53,17 +53,17 @@
                                                                     (third this-list)))
              (subtract-base-fret base-fret (cdr dot-list))))))
 
                                                                     (third this-list)))
              (subtract-base-fret base-fret (cdr dot-list))))))
 

-(define (sans-serif-stencil paper props mag  text)
-"create a stencil in sans-serif font based on @var{paper} and @var{props}
+(define (sans-serif-stencil layout props mag  text)
+"create a stencil in sans-serif font based on @var{layout} and @var{props}

 with magnification @varr{mag} of the string @var{text}."
   (let* ((my-props (prepend-alist-chain  'font-size (stepmag mag)
                    (prepend-alist-chain  'font-family 'sans props))))
 with magnification @varr{mag} of the string @var{text}."
   (let* ((my-props (prepend-alist-chain  'font-size (stepmag mag)
                    (prepend-alist-chain  'font-family 'sans props))))

-        (interpret-markup paper my-props text)))
+        (interpret-markup layout my-props text)))

 
 

-(define (sans-serif-stencil-white paper props mag text)
-"create a stencil with white text in sans-serif font based on @var{paper} and @var{props}
+(define (sans-serif-stencil-white layout props mag text)
+"create a stencil with white text in sans-serif font based on @var{layout} and @var{props}

 with magnification @varr{mag} of the string @var{text}."
 with magnification @varr{mag} of the string @var{text}."

-  (let* ((text-stencil (sans-serif-stencil paper props mag text))
+  (let* ((text-stencil (sans-serif-stencil layout props mag text))

          (x-extent  (ly:stencil-extent text-stencil X))
          (y-extent  (ly:stencil-extent text-stencil Y))
          (c  `(white-text ,(* 2 mag) ,text))) ;urg -- workaround for using ps font
          (x-extent  (ly:stencil-extent text-stencil X))
          (y-extent  (ly:stencil-extent text-stencil Y))
          (c  `(white-text ,(* 2 mag) ,text))) ;urg -- workaround for using ps font


@@ -121,7 +121,7 @@ with magnification @varr{mag} of the string @var{text}."
                             x-extent y-extent)))           
  
  
                             x-extent y-extent)))           
  
  

-(define (draw-frets paper props fret-range string-count th size)
+(define (draw-frets layout props fret-range string-count th size)

  "Draw the frets (horizontal lines) for a fret diagram with @var{string-count} strings and frets as indicated
    in @var{fret-range}.  Line thickness is given by @var{th}, fret & string spacing by @var{size}. "
   (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1))
  "Draw the frets (horizontal lines) for a fret diagram with @var{string-count} strings and frets as indicated
    in @var{fret-range}.  Line thickness is given by @var{th}, fret & string spacing by @var{size}. "
   (let* ((fret-count (+ (- (cadr fret-range) (car fret-range)) 1))


@@ -146,7 +146,7 @@ with magnification @varr{mag} of the string @var{text}."
           output-stencil)))
 ;       (ly:stencil-align-to (ly:stencil-align-to text-stencil X 0) Y 0))))
 
           output-stencil)))
 ;       (ly:stencil-align-to (ly:stencil-align-to text-stencil X 0) Y 0))))
 

-(define (draw-dots paper props string-count fret-range size finger-code dot-position dot-radius dot-list)
+(define (draw-dots layout props string-count fret-range size finger-code dot-position dot-radius dot-list)

   "Make dots for fret diagram."
   (let* ((scale-dot-radius (* size dot-radius))
          (dot-color (chain-assoc-get 'dot-color props 'black))
   "Make dots for fret diagram."
   (let* ((scale-dot-radius (* size dot-radius))
          (dot-color (chain-assoc-get 'dot-color props 'black))


@@ -184,8 +184,8 @@ with magnification @varr{mag} of the string @var{text}."
                         (ly:stencil-translate-axis 
                           (ly:stencil-translate-axis 
                               (if (eq? dot-color 'white)
                         (ly:stencil-translate-axis 
                           (ly:stencil-translate-axis 
                               (if (eq? dot-color 'white)

-                              (centered-stencil (sans-serif-stencil paper props dot-label-font-mag finger))
-                              (centered-stencil (sans-serif-stencil-white paper props 
+                              (centered-stencil (sans-serif-stencil layout props dot-label-font-mag finger))
+                              (centered-stencil (sans-serif-stencil-white layout props 

                                                  dot-label-font-mag  finger)))
                                xpos X)
                               ypos Y)
                                                  dot-label-font-mag  finger)))
                                xpos X)
                               ypos Y)


@@ -199,7 +199,7 @@ with magnification @varr{mag} of the string @var{text}."
                          positioned-dot
                          (ly:stencil-translate-axis 
                              (ly:stencil-translate-axis 
                          positioned-dot
                          (ly:stencil-translate-axis 
                              (ly:stencil-translate-axis 

-                                 (centered-stencil (sans-serif-stencil paper props 
+                                 (centered-stencil (sans-serif-stencil layout props 

                                                         string-label-font-mag finger)) xpos  X)
                              (* size finger-yoffset) Y))
                      ;unknown finger-code
                                                         string-label-font-mag finger)) xpos  X)
                              (* size finger-yoffset) Y))
                      ;unknown finger-code


@@ -207,11 +207,11 @@ with magnification @varr{mag} of the string @var{text}."
     (if (null? restlist) 
         labeled-dot-stencil
         (ly:stencil-add 
     (if (null? restlist) 
         labeled-dot-stencil
         (ly:stencil-add 

-            (draw-dots paper props string-count fret-range size finger-code 
+            (draw-dots layout props string-count fret-range size finger-code 

                           dot-position dot-radius restlist)
             labeled-dot-stencil))))
 
                           dot-position dot-radius restlist)
             labeled-dot-stencil))))
 

-(define (draw-xo paper props string-count fret-range size xo-list) 
+(define (draw-xo layout props string-count fret-range size xo-list) 

 "Put open and mute string indications on diagram, as contained in @var{xo-list}."
     (let* ((fret-count (+ (- (cadr fret-range) (car fret-range) 1)))
 ;           (xo-font-mag (* size (chain-assoc-get 'xo-font-magnification props 0.5)))
 "Put open and mute string indications on diagram, as contained in @var{xo-list}."
     (let* ((fret-count (+ (- (cadr fret-range) (car fret-range) 1)))
 ;           (xo-font-mag (* size (chain-assoc-get 'xo-font-magnification props 0.5)))


@@ -223,11 +223,11 @@ with magnification @varr{mag} of the string @var{text}."
            (glyph-string (if (eq? (car mypair) 'mute) "X" "O"))
            (xpos (+ (* (- string-count (cadr mypair)) size) xo-horizontal-offset ))
            (glyph-stencil (ly:stencil-translate-axis 
            (glyph-string (if (eq? (car mypair) 'mute) "X" "O"))
            (xpos (+ (* (- string-count (cadr mypair)) size) xo-horizontal-offset ))
            (glyph-stencil (ly:stencil-translate-axis 

-              (sans-serif-stencil paper props (* size xo-font-mag) glyph-string) xpos X)))
+              (sans-serif-stencil layout props (* size xo-font-mag) glyph-string) xpos X)))

       (if (null? restlist)
           glyph-stencil
           (ly:stencil-add
       (if (null? restlist)
           glyph-stencil
           (ly:stencil-add

-            (draw-xo paper props string-count fret-range size restlist)
+            (draw-xo layout props string-count fret-range size restlist)

             glyph-stencil))))
 
 (define (make-bezier-sandwich-list left right bottom height thickness)
             glyph-stencil))))
 
 (define (make-bezier-sandwich-list left right bottom height thickness)


@@ -243,7 +243,7 @@ with magnification @varr{mag} of the string @var{text}."
        (list (cons x1 bottom-control-point-height) (cons x2 bottom-control-point-height) (cons right bottom) (cons left bottom)
              (cons x2 top-control-point-height) (cons x1 top-control-point-height) (cons left bottom) (cons right bottom))))
 
        (list (cons x1 bottom-control-point-height) (cons x2 bottom-control-point-height) (cons right bottom) (cons left bottom)
              (cons x2 top-control-point-height) (cons x1 top-control-point-height) (cons left bottom) (cons right bottom))))
 

-(define (draw-barre paper props string-count fret-range size finger-code dot-position dot-radius barre-list)
+(define (draw-barre layout props string-count fret-range size finger-code dot-position dot-radius barre-list)

    "Create barre indications for a fret diagram"
    (if (not (null? barre-list))
      (let* ((string1 (caar barre-list))
    "Create barre indications for a fret diagram"
    (if (not (null? barre-list))
      (let* ((string1 (caar barre-list))


@@ -271,7 +271,7 @@ with magnification @varr{mag} of the string @var{text}."
                                   (cons bottom (+ bottom (* size bezier-height)))))))
         (if (not (null? (cdr barre-list)))
             (ly:stencil-add barre-stencil
                                   (cons bottom (+ bottom (* size bezier-height)))))))
         (if (not (null? (cdr barre-list)))
             (ly:stencil-add barre-stencil

-                 (draw-barre paper props string-count fret-range size finger-code 
+                 (draw-barre layout props string-count fret-range size finger-code 

                       dot-position dot-radius (cdr barre-list)))
             barre-stencil ))))
 
                       dot-position dot-radius (cdr barre-list)))
             barre-stencil ))))
 


@@ -280,7 +280,7 @@ with magnification @varr{mag} of the string @var{text}."
 "Calculate the font step necessary to get a desired magnification"
 (* 6 (/ (log mag) (log 2))))
 
 "Calculate the font step necessary to get a desired magnification"
 (* 6 (/ (log mag) (log 2))))
 

-(define (label-fret paper props string-count fret-range size)
+(define (label-fret layout props string-count fret-range size)

    "Label the base fret on a fret diagram"
    (let* ((base-fret (car fret-range))
 ;          (label-font-mag (chain-assoc-get 'label-font-mag props 0.7))
    "Label the base fret on a fret diagram"
    (let* ((base-fret (car fret-range))
 ;          (label-font-mag (chain-assoc-get 'label-font-mag props 0.7))


@@ -296,10 +296,10 @@ with magnification @varr{mag} of the string @var{text}."
               ((equal? 'arabic number-type)  (format #f "~d" base-fret))
               (else (format #f  "~(~:@r~)" base-fret)))))
        (ly:stencil-translate-axis 
               ((equal? 'arabic number-type)  (format #f "~d" base-fret))
               (else (format #f  "~(~:@r~)" base-fret)))))
        (ly:stencil-translate-axis 

-           (sans-serif-stencil paper props (* size label-font-mag) label-text) 
+           (sans-serif-stencil layout props (* size label-font-mag) label-text) 

                        (* size (+ fret-count label-vertical-offset)) Y)))
  
                        (* size (+ fret-count label-vertical-offset)) Y)))
  

-(def-markup-command (fret-diagram-verbose paper props marking-list)
+(def-markup-command (fret-diagram-verbose layout props marking-list)

   (list?)
   "Make a fret diagram containing the symbols indicated in @var{marking-list}
   
   (list?)
   "Make a fret diagram containing the symbols indicated in @var{marking-list}
   


@@ -331,9 +331,9 @@ part of the place-fret element is present, @var{finger-value} will be displayed
 @var{finger-code}.  There is no limit to the number of fret indications per string.
 @end table
 "
 @var{finger-code}.  There is no limit to the number of fret indications per string.
 @end table
 "

-   (make-fret-diagram paper props marking-list))
+   (make-fret-diagram layout props marking-list))

    
    

-(define (make-fret-diagram paper props marking-list)
+(define (make-fret-diagram layout props marking-list)

 " Make a fret diagram markup"
   (let* (
          ; note:  here we get items from props that are needed in this routine, or that are needed in more than one
 " Make a fret diagram markup"
   (let* (
          ; note:  here we get items from props that are needed in this routine, or that are needed in more than one


@@ -350,7 +350,7 @@ part of the place-fret element is present, @var{finger-value} will be displayed
          (default-dot-position (if (eq? finger-code 'in-dot) (- 0.95 default-dot-radius) 0.6))  ; move up to make room for bigger if labeled
          (dot-radius (chain-assoc-get 'dot-radius props default-dot-radius))  ; needed for both draw-dots and draw-barre
          (dot-position (chain-assoc-get 'dot-position props default-dot-position)) ; needed for both draw-dots and draw-barre
          (default-dot-position (if (eq? finger-code 'in-dot) (- 0.95 default-dot-radius) 0.6))  ; move up to make room for bigger if labeled
          (dot-radius (chain-assoc-get 'dot-radius props default-dot-radius))  ; needed for both draw-dots and draw-barre
          (dot-position (chain-assoc-get 'dot-position props default-dot-position)) ; needed for both draw-dots and draw-barre

-         (th (* (ly:output-def-lookup paper 'linethickness)
+         (th (* (ly:output-def-lookup layout 'linethickness)

                 (chain-assoc-get 'thickness props 0.5))) ; needed for both draw-frets and draw-strings
                 
          (alignment (chain-assoc-get 'align-dir props -0.4)) ; needed only here
                 (chain-assoc-get 'thickness props 0.5))) ; needed for both draw-frets and draw-strings
                 
          (alignment (chain-assoc-get 'align-dir props -0.4)) ; needed only here


@@ -365,29 +365,29 @@ part of the place-fret element is present, @var{finger-value} will be displayed
          (barre-list (cdr (assoc 'barre-list parameters)))
          (fret-diagram-stencil (ly:stencil-add
                             (draw-strings string-count fret-range th size)
          (barre-list (cdr (assoc 'barre-list parameters)))
          (fret-diagram-stencil (ly:stencil-add
                             (draw-strings string-count fret-range th size)

-                            (draw-frets paper props fret-range string-count th size))))
+                            (draw-frets layout props fret-range string-count th size))))

          (if (not (null? barre-list))
              (set! fret-diagram-stencil (ly:stencil-add
          (if (not (null? barre-list))
              (set! fret-diagram-stencil (ly:stencil-add

-                                    (draw-barre paper props string-count fret-range size finger-code  
+                                    (draw-barre layout props string-count fret-range size finger-code  

                                                 dot-position dot-radius barre-list)
                                     fret-diagram-stencil)))
          (if (not (null? dot-list))
              (set! fret-diagram-stencil (ly:stencil-add
                                                 dot-position dot-radius barre-list)
                                     fret-diagram-stencil)))
          (if (not (null? dot-list))
              (set! fret-diagram-stencil (ly:stencil-add

-                                    (draw-dots paper props string-count fret-range size finger-code 
+                                    (draw-dots layout props string-count fret-range size finger-code 

                                           dot-position dot-radius dot-list)
                                     fret-diagram-stencil)))
          (if (not (null? xo-list))
              (set! fret-diagram-stencil (ly:stencil-combine-at-edge
                                     fret-diagram-stencil Y UP
                                           dot-position dot-radius dot-list)
                                     fret-diagram-stencil)))
          (if (not (null? xo-list))
              (set! fret-diagram-stencil (ly:stencil-combine-at-edge
                                     fret-diagram-stencil Y UP

-                                    (draw-xo paper props string-count fret-range size xo-list) xo-padding 0)))
+                                    (draw-xo layout props string-count fret-range size xo-list) xo-padding 0)))

          (if (> (car fret-range) 1) 
              (set! fret-diagram-stencil
                    (ly:stencil-combine-at-edge fret-diagram-stencil X label-dir
          (if (> (car fret-range) 1) 
              (set! fret-diagram-stencil
                    (ly:stencil-combine-at-edge fret-diagram-stencil X label-dir

-                                              (label-fret paper props string-count fret-range size) label-space 0)))
+                                              (label-fret layout props string-count fret-range size) label-space 0)))

          (ly:stencil-align-to! fret-diagram-stencil X alignment)
          fret-diagram-stencil))
          
          (ly:stencil-align-to! fret-diagram-stencil X alignment)
          fret-diagram-stencil))
          

-(def-markup-command (fret-diagram paper props definition-string)
+(def-markup-command (fret-diagram layout props definition-string)

   (string?)
   "  
 Example
   (string?)
   "  
 Example


@@ -449,7 +449,7 @@ Note:  There is no limit to the number of fret indications per string.
     
 "
        (let ((definition-list (fret-parse-definition-string props definition-string)))
     
 "
        (let ((definition-list (fret-parse-definition-string props definition-string)))

-       (make-fret-diagram paper (car definition-list) (cdr definition-list))))
+       (make-fret-diagram layout (car definition-list) (cdr definition-list))))

 
 (define (fret-parse-definition-string props definition-string)
  "parse a fret diagram string and return a pair containing:
 
 (define (fret-parse-definition-string props definition-string)
  "parse a fret diagram string and return a pair containing:


@@ -518,7 +518,7 @@ Note:  There is no limit to the number of fret indications per string.
                 (cons* numeric-value (numerify (cdr mylist)))
                 (cons* (car (string->list (car mylist))) (numerify (cdr mylist)))))))
            
                 (cons* numeric-value (numerify (cdr mylist)))
                 (cons* (car (string->list (car mylist))) (numerify (cdr mylist)))))))
            

-(def-markup-command (fret-diagram-terse paper props definition-string)
+(def-markup-command (fret-diagram-terse layout props definition-string)

   (string?)
   "Make a fret diagram markup using terse string-based syntax.
 
   (string?)
   "Make a fret diagram markup using terse string-based syntax.
 


@@ -559,7 +559,7 @@ with \"-(\" to start a barre and \"-)\" to end the barre.
 @end itemize"
 ;TODO -- change syntax to fret\string-finger
        (let ((definition-list (fret-parse-terse-definition-string props definition-string)))
 @end itemize"
 ;TODO -- change syntax to fret\string-finger
        (let ((definition-list (fret-parse-terse-definition-string props definition-string)))

-       (make-fret-diagram paper (car definition-list) (cdr definition-list))))
+       (make-fret-diagram layout (car definition-list) (cdr definition-list))))

 
 (define (fret-parse-terse-definition-string props definition-string)
  "parse a fret diagram string that uses terse syntax; return a pair containing:
 
 (define (fret-parse-terse-definition-string props definition-string)
  "parse a fret diagram string that uses terse syntax; return a pair containing:

diff --git a/scm/lily.scm b/scm/lily.scm
index 6dbdbc02b6b370dfdf1e2da7c2baa49a4bb05f64..5bfa942cfd076a9b1243724f6e5cb680c3b5e45a 100644 (file)
--- a/scm/lily.scm
+++ b/scm/lily.scm
@@ -107,20 +107,20 @@
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
   (let* ((head  (ly:parser-lookup parser '$globalheader))
 ;; parser stuff.
 (define-public (print-music-as-book parser music)
   (let* ((head  (ly:parser-lookup parser '$globalheader))

-        (book (ly:make-book (ly:parser-lookup parser $defaultbookpaper)
+        (book (ly:make-book (ly:parser-lookup parser $defaultpaper)

                             head score)))
     (ly:parser-print-book parser book)))
 
 (define-public (print-score-as-book parser score)
   (let*
       ((head  (ly:parser-lookup parser '$globalheader))
                             head score)))
     (ly:parser-print-book parser book)))
 
 (define-public (print-score-as-book parser score)
   (let*
       ((head  (ly:parser-lookup parser '$globalheader))

-       (book (ly:make-book (ly:parser-lookup parser $defaultbookpaper)
+       (book (ly:make-book (ly:parser-lookup parser $defaultpaper)

                           head score)))
     (ly:parser-print-book parser book)))
 
 (define-public (print-score parser score)
   (let* ((head  (ly:parser-lookup parser '$globalheader))
                           head score)))
     (ly:parser-print-book parser book)))
 
 (define-public (print-score parser score)
   (let* ((head  (ly:parser-lookup parser '$globalheader))

-        (book (ly:make-book (ly:parser-lookup parser $defaultbookpaper)
+        (book (ly:make-book (ly:parser-lookup parser $defaultpaper)

                             head score)))
     (ly:parser-print-score parser book)))
                
                             head score)))
     (ly:parser-print-score parser book)))
                

diff --git a/scm/new-markup.scm b/scm/new-markup.scm
index 6eb87cf7ae19a30f17de0cb66cca89bb7e853100..d9cabccea2fc830c2223de59f835acc5c538a4cc 100644 (file)
--- a/scm/new-markup.scm
+++ b/scm/new-markup.scm
@@ -22,7 +22,7 @@ print object).
 
 To add a function, use the def-markup-command utility.
 
 
 To add a function, use the def-markup-command utility.
 

-  (def-markup-command (mycommand paper prop arg1 ...) (arg1-type? ...)
+  (def-markup-command (mycommand layout prop arg1 ...) (arg1-type? ...)

     \"my command usage and description\"
     ...function body...)
 
     \"my command usage and description\"
     ...function body...)
 


@@ -51,7 +51,7 @@ register COMMAND-markup and its signature,
 * define a make-COMMAND-markup function.
 
 Syntax:
 * define a make-COMMAND-markup function.
 
 Syntax:

-  (def-markup-command (COMMAND paper props arg1 arg2 ...) (arg1-type? arg2-type? ...)
+  (def-markup-command (COMMAND layout props arg1 arg2 ...) (arg1-type? arg2-type? ...)

     \"documentation string\"
     ...command body...)
  or:
     \"documentation string\"
     ...command body...)
  or:

diff --git a/scm/output-lib.scm b/scm/output-lib.scm
index 48bca468d92b84207055acf706910b86bc426db0..1128d68b6e5586f6b4838f48863d8b03bd0bcbc9 100644 (file)
--- a/scm/output-lib.scm
+++ b/scm/output-lib.scm
@@ -45,10 +45,10 @@
            ;; FIXME: a hammer is not a slur.
            ;; 
            (ly:make-stencil '() '(0 . 0) '(0 . 0)))
            ;; FIXME: a hammer is not a slur.
            ;; 
            (ly:make-stencil '() '(0 . 0) '(0 . 0)))

-          (paper (ly:grob-paper grob))
+          (layout (ly:grob-layout grob))

           (text (interpret-markup
           (text (interpret-markup

-                 paper
-                 (ly:grob-alist-chain grob (ly:output-def-lookup paper 'text-font-defaults))
+                 layout
+                 (ly:grob-alist-chain grob (ly:output-def-lookup layout 'text-font-defaults))

                  letter)))
     
       (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 
                  letter)))
     
       (let ((x (/ (- (cdr (ly:stencil-extent slur 0)) 

diff --git a/scm/output-ps.scm b/scm/output-ps.scm
index 1615102f6cf5657adca701f7ba07a04753be3430..5db157f282e82603b90fa11e4604bd80bcb63cab 100644 (file)
--- a/scm/output-ps.scm
+++ b/scm/output-ps.scm
@@ -182,7 +182,7 @@
   (draw-line th x1 0 x2 0))
 
 (define (lily-def key val)
   (draw-line th x1 0 x2 0))
 
 (define (lily-def key val)

-  (let ((prefix "lilypondpaper"))
+  (let ((prefix "lilypondlayout"))

     (if (string=?
         (substring key 0 (min (string-length prefix) (string-length key)))
         prefix)
     (if (string=?
         (substring key 0 (min (string-length prefix) (string-length key)))
         prefix)

diff --git a/scm/output-sodipodi.scm b/scm/output-sodipodi.scm
index 9875a1938c66feb42862f31679c6a3dd64d65601..6f6ee224b1c012b5bb90a4c4c77c1b73d985cf99 100644 (file)
--- a/scm/output-sodipodi.scm
+++ b/scm/output-sodipodi.scm
@@ -243,7 +243,7 @@
 (define (comment s)
   (string-append "<!-- " s " -->\n"))
 
 (define (comment s)
   (string-append "<!-- " s " -->\n"))
 

-(define (define-fonts paper font-list)
+(define (define-fonts layout font-list)

   (comment (format #f "Fonts used: ~S" font-list)))
 
 (define (filledbox breapth width depth height)
   (comment (format #f "Fonts used: ~S" font-list)))
 
 (define (filledbox breapth width depth height)


@@ -288,7 +288,7 @@
 (define (header-end)
   (comment "header-end"))
 
 (define (header-end)
   (comment "header-end"))
 

-(define (header creator time-stamp paper page-count- classic?)
+(define (header creator time-stamp layout page-count- classic?)

   (string-append
    xml-header
    (comment creator)
   (string-append
    xml-header
    (comment creator)


@@ -297,12 +297,12 @@
   
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name
   
 ;; FIXME: duplicated in other output backends
 ;; FIXME: silly interface name

-(define (output-scopes paper scopes fields basename)
+(define (output-scopes layout scopes fields basename)

   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 ;; FIXME: duplictates output-scopes, duplicated in other backends
 ;; FIXME: silly interface name
   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 ;; FIXME: duplictates output-scopes, duplicated in other backends
 ;; FIXME: silly interface name

-(define (output-paper-def pd)
+(define (output-layout-def pd)

   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 (define (lily-def key val)
   (format (current-error-port) "TODO: FIX ps/tex/interface\n"))
 
 (define (lily-def key val)

diff --git a/scm/page-layout.scm b/scm/page-layout.scm
index d988a9f2bc80a79bad407aa71ee20720425f7b32..90a02c838c9457e9bbcfc3515bc0ab0176f82db6 100644 (file)
--- a/scm/page-layout.scm
+++ b/scm/page-layout.scm
@@ -35,12 +35,12 @@
 ;; TODO: take <optimally-broken-page-node> iso. page-number
 ;; for all of these functions ?
 
 ;; TODO: take <optimally-broken-page-node> iso. page-number
 ;; for all of these functions ?
 

-(define-public (plain-header paper scopes page-number last?)
+(define-public (plain-header layout scopes page-number last?)

   "Standard header for a part: page number --outside--  and instrument--centered."
 
   "Standard header for a part: page number --outside--  and instrument--centered."
 

-  (let* ((props (page-properties paper))
+  (let* ((props (page-properties layout))

          (pnum
          (pnum

-          (if (ly:output-def-lookup paper 'printpagenumber)
+          (if (ly:output-def-lookup layout 'printpagenumber)

               (markup #:bold (number->string page-number))
               ""))
          (instr (ly:modules-lookup scopes 'instrument))
               (markup #:bold (number->string page-number))
               ""))
          (instr (ly:modules-lookup scopes 'instrument))


@@ -50,19 +50,19 @@
     (if (even? page-number)
         (set! line (reverse line)))
     
     (if (even? page-number)
         (set! line (reverse line)))
     

-    (if ((if (ly:output-def-lookup paper 'printfirstpagenumber)
+    (if ((if (ly:output-def-lookup layout 'printfirstpagenumber)

              <=
              <)
              <=
              <)

-         (ly:output-def-lookup paper 'firstpagenumber) page-number)
-        (interpret-markup paper props (make-fill-line-markup line))
+         (ly:output-def-lookup layout 'firstpagenumber) page-number)
+        (interpret-markup layout props (make-fill-line-markup line))

         '())))
 
 ;; TODO: add publisher ID on non-first page.
         '())))
 
 ;; TODO: add publisher ID on non-first page.

-(define-public (plain-footer paper scopes page-number last?)
+(define-public (plain-footer layout scopes page-number last?)

   "Standard footer. Empty, save for first (copyright) and last (tagline) page."
   
   (let*
   "Standard footer. Empty, save for first (copyright) and last (tagline) page."
   
   (let*

-      ((props (page-properties paper))
+      ((props (page-properties layout))

        (copyright (ly:modules-lookup scopes 'copyright))
        (tagline-var (ly:modules-lookup scopes 'tagline))
        (tagline (if (markup? tagline-var) tagline-var TAGLINE))
        (copyright (ly:modules-lookup scopes 'copyright))
        (tagline-var (ly:modules-lookup scopes 'tagline))
        (tagline (if (markup? tagline-var) tagline-var TAGLINE))


@@ -71,7 +71,7 @@
     (if last?
        (set! stencil
              (ly:stencil-combine-at-edge
     (if last?
        (set! stencil
              (ly:stencil-combine-at-edge

-              stencil Y DOWN (interpret-markup paper props tagline)
+              stencil Y DOWN (interpret-markup layout props tagline)

               0.0
               )))
 
               0.0
               )))
 


@@ -80,21 +80,21 @@
 
        (set! stencil
              (ly:stencil-combine-at-edge
 
        (set! stencil
              (ly:stencil-combine-at-edge

-              stencil Y DOWN (interpret-markup paper props copyright)
+              stencil Y DOWN (interpret-markup layout props copyright)

               0.0
               )))
 
     stencil))
   
               0.0
               )))
 
     stencil))
   

-(define (page-headfoot paper scopes number sym sepsym dir last?)
+(define (page-headfoot layout scopes number sym sepsym dir last?)

   "Create a stencil including separating space."
   (let*
   "Create a stencil including separating space."
   (let*

-      ((header-proc (ly:output-def-lookup paper sym))
-       (sep (ly:output-def-lookup paper sepsym))
+      ((header-proc (ly:output-def-lookup layout sym))
+       (sep (ly:output-def-lookup layout sepsym))

        (stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
        (head-stencil
        (if (procedure? header-proc)
        (stencil (ly:make-stencil "" '(0 . 0) '(0 . 0)))
        (head-stencil
        (if (procedure? header-proc)

-           (header-proc paper scopes number last?)
+           (header-proc layout scopes number last?)

            #f)))
 
     (if (and (number? sep) (ly:stencil? head-stencil))
            #f)))
 
     (if (and (number? sep) (ly:stencil? head-stencil))


@@ -105,14 +105,14 @@
 
     head-stencil))
 
 
     head-stencil))
 

-(define-public (default-page-music-height paper scopes number last?)
+(define-public (default-page-music-height layout scopes number last?)

   "Printable area for music and titles; matches default-page-make-stencil." 
   (let*
   "Printable area for music and titles; matches default-page-make-stencil." 
   (let*

-      ((h (- (ly:output-def-lookup paper 'vsize)
-            (ly:output-def-lookup paper 'topmargin)
-            (ly:output-def-lookup paper 'bottommargin)))
-       (head (page-headfoot paper scopes number 'make-header 'headsep UP last?))
-       (foot (page-headfoot paper scopes number 'make-footer 'footsep DOWN last?)))
+      ((h (- (ly:output-def-lookup layout 'vsize)
+            (ly:output-def-lookup layout 'topmargin)
+            (ly:output-def-lookup layout 'bottommargin)))
+       (head (page-headfoot layout scopes number 'make-header 'headsep UP last?))
+       (foot (page-headfoot layout scopes number 'make-footer 'footsep DOWN last?)))

     (- h (if (ly:stencil? head)
             (interval-length (ly:stencil-extent head Y))
             0)
     (- h (if (ly:stencil? head)
             (interval-length (ly:stencil-extent head Y))
             0)


@@ -123,35 +123,35 @@
 
 
 (define-public (default-page-make-stencil
 
 
 (define-public (default-page-make-stencil

-                lines offsets paper scopes number last? )
+                lines offsets layout scopes number last? )

   "Construct a stencil representing the page from LINES.  "
   (let*
   "Construct a stencil representing the page from LINES.  "
   (let*

-     ((topmargin  (ly:output-def-lookup paper 'topmargin))
+     ((topmargin  (ly:output-def-lookup layout 'topmargin))

       
       ;; TODO: naming vsize/hsize not analogous to TeX.
       
       
       ;; TODO: naming vsize/hsize not analogous to TeX.
       

-      (vsize (ly:output-def-lookup paper 'vsize))
-      (hsize (ly:output-def-lookup paper 'hsize))
+      (vsize (ly:output-def-lookup layout 'vsize))
+      (hsize (ly:output-def-lookup layout 'hsize))

       
       

-      (lmargin (ly:output-def-lookup paper 'leftmargin))
+      (lmargin (ly:output-def-lookup layout 'leftmargin))

       (leftmargin (if lmargin
                       lmargin
                       (/ (- hsize
       (leftmargin (if lmargin
                       lmargin
                       (/ (- hsize

-                            (ly:output-def-lookup paper 'linewidth)) 2)))
+                            (ly:output-def-lookup layout 'linewidth)) 2)))

 
 

-      (rightmargin (ly:output-def-lookup paper 'rightmargin))
+      (rightmargin (ly:output-def-lookup layout 'rightmargin))

       (bottom-edge (- vsize
       (bottom-edge (- vsize

-                     (ly:output-def-lookup paper 'bottommargin)))
+                     (ly:output-def-lookup layout 'bottommargin)))

                     
                     

-      (head (page-headfoot paper scopes number 'make-header 'headsep UP last?))
-      (foot (page-headfoot paper scopes number 'make-footer 'footsep DOWN last?))
+      (head (page-headfoot layout scopes number 'make-header 'headsep UP last?))
+      (foot (page-headfoot layout scopes number 'make-footer 'footsep DOWN last?))

 
       (head-height (if (ly:stencil? head)
                       (interval-length (ly:stencil-extent head Y))
                       0.0))
 
       (line-stencils (map ly:paper-system-stencil lines))
 
       (head-height (if (ly:stencil? head)
                       (interval-length (ly:stencil-extent head Y))
                       0.0))
 
       (line-stencils (map ly:paper-system-stencil lines))

-      (height-proc (ly:output-def-lookup paper 'page-music-height))
+      (height-proc (ly:output-def-lookup layout 'page-music-height))

 
       (page-stencil (ly:make-stencil '()
                                     (cons leftmargin hsize)
 
       (page-stencil (ly:make-stencil '()
                                     (cons leftmargin hsize)


@@ -214,15 +214,15 @@ of lines. "
 
 
   (define MAXPENALTY 1e9)
 
 
   (define MAXPENALTY 1e9)

-  (define bookpaper (ly:paper-book-book-paper paper-book))
+  (define paper (ly:paper-book-paper paper-book))

   (define scopes (ly:paper-book-scopes paper-book))
 
   (define (page-height page-number last?)
     (let
   (define scopes (ly:paper-book-scopes paper-book))
 
   (define (page-height page-number last?)
     (let

-       ((p (ly:output-def-lookup bookpaper 'page-music-height)))
+       ((p (ly:output-def-lookup paper 'page-music-height)))

 
       (if (procedure? p)
 
       (if (procedure? p)

-         (p bookpaper scopes page-number last?)
+         (p paper scopes page-number last?)

          10000)))
   
   (define (get-path node done)
          10000)))
   
   (define (get-path node done)


@@ -241,7 +241,7 @@ is what have collected so far, and has ascending page numbers."
         (prev-penalty (if (null? best-paths)
                           0.0
                           (node-penalty (car best-paths))))
         (prev-penalty (if (null? best-paths)
                           0.0
                           (node-penalty (car best-paths))))

-        (inter-system-space (ly:output-def-lookup bookpaper 'betweensystemspace))
+        (inter-system-space (ly:output-def-lookup paper 'betweensystemspace))

         (force-equalization-factor 0.3)
         (relative-force (/ force inter-system-space))
         (abs-relative-force (abs relative-force))
         (force-equalization-factor 0.3)
         (relative-force (/ force inter-system-space))
         (abs-relative-force (abs relative-force))


@@ -256,7 +256,7 @@ is what have collected so far, and has ascending page numbers."
   (define (space-systems page-height lines ragged?)
     (let*
        ((inter-system-space
   (define (space-systems page-height lines ragged?)
     (let*
        ((inter-system-space

-         (ly:output-def-lookup bookpaper 'betweensystemspace))
+         (ly:output-def-lookup paper 'betweensystemspace))

         (system-vector (list->vector
           (append lines
                   (if (= (length lines) 1)
         (system-vector (list->vector
           (append lines
                   (if (= (length lines) 1)


@@ -294,7 +294,7 @@ is what have collected so far, and has ascending page numbers."
                   (-  (car (vector-ref real-extents (1- no-systems))))
                   ))
 
                   (-  (car (vector-ref real-extents (1- no-systems))))
                   ))
 

-        (fixed-dist (ly:output-def-lookup bookpaper 'betweensystempadding))
+        (fixed-dist (ly:output-def-lookup paper 'betweensystempadding))

         (calc-spring
          (lambda (idx)
            (let*
         (calc-spring
          (lambda (idx)
            (let*


@@ -311,11 +311,11 @@ is what have collected so far, and has ascending page numbers."
                 (ideal (+
                         (cond
                          ((and title2? title1?)
                 (ideal (+
                         (cond
                          ((and title2? title1?)

-                          (ly:output-def-lookup bookpaper 'betweentitlespace))
+                          (ly:output-def-lookup paper 'betweentitlespace))

                          (title1?
                          (title1?

-                          (ly:output-def-lookup bookpaper 'aftertitlespace))
+                          (ly:output-def-lookup paper 'aftertitlespace))

                          (title2?
                          (title2?

-                          (ly:output-def-lookup bookpaper 'beforetitlespace))
+                          (ly:output-def-lookup paper 'beforetitlespace))

                          (else inter-system-space))
                         fixed))
                 (hooke (/ 1 (- ideal fixed)))
                          (else inter-system-space))
                         fixed))
                 (hooke (/ 1 (- ideal fixed)))


@@ -378,12 +378,12 @@ corresponding to DONE-LINES.
 CURRENT-BEST is the best result sofar, or #f."
     
     (let* ((this-page-num (if (null? best-paths)
 CURRENT-BEST is the best result sofar, or #f."
     
     (let* ((this-page-num (if (null? best-paths)

-                              (ly:output-def-lookup bookpaper 'firstpagenumber)
+                              (ly:output-def-lookup paper 'firstpagenumber)

                               (1+ (node-page-number (car best-paths)))))
 
           
                               (1+ (node-page-number (car best-paths)))))
 
           

-          (ragged? (or (eq? #t (ly:output-def-lookup bookpaper 'raggedbottom))
-                       (and (eq? #t (ly:output-def-lookup bookpaper 'raggedlastbottom))
+          (ragged? (or (eq? #t (ly:output-def-lookup paper 'raggedbottom))
+                       (and (eq? #t (ly:output-def-lookup paper 'raggedlastbottom))

                             last?)))
            (page-height (page-height this-page-num last?))
           (vertical-spacing (space-systems page-height current-lines ragged?))
                             last?)))
            (page-height (page-height this-page-num last?))
           (vertical-spacing (space-systems page-height current-lines ragged?))


@@ -472,10 +472,10 @@ DONE."
     ; create stencils.
     
     (map (lambda (node)
     ; create stencils.
     
     (map (lambda (node)

-          ((ly:output-def-lookup bookpaper 'page-make-stencil)
+          ((ly:output-def-lookup paper 'page-make-stencil)

            (node-lines node)
            (node-configuration node)
            (node-lines node)
            (node-configuration node)

-           bookpaper
+           paper

            scopes
            (node-page-number node)
            (eq? node best-break-node)))
            scopes
            (node-page-number node)
            (eq? node best-break-node)))

diff --git a/scm/paper.scm b/scm/paper.scm
index 2b22dd69666ab8560a5957fa226dd5847ade6613..9e96e594439cf5882653f4673ab0dca637efaab7 100644 (file)
--- a/scm/paper.scm
+++ b/scm/paper.scm
@@ -1,4 +1,4 @@
-;;;; paper.scm -- manipulate the paper block.
+;;;; paper.scm -- manipulate the paper and layout block.

 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 
 ;;;;
 ;;;;  source file of the GNU LilyPond music typesetter
 ;;;; 


@@ -12,8 +12,8 @@
                       staffspace linethickness ledgerlinethickness
                       blotdiameter interscoreline leftmargin rightmargin)))
 
                       staffspace linethickness ledgerlinethickness
                       blotdiameter interscoreline leftmargin rightmargin)))
 

-(define-public (paper-set-staff-size sz)
-  "Function to be called inside a \\paper{} block to set the staff size."
+(define-public (layout-set-staff-size sz)
+  "Function to be called inside a \\layout{} block to set the staff size."

   (let* ((m (current-module))
         (ss (/ sz 4))
         (pt (eval 'pt m))
   (let* ((m (current-module))
         (ss (/ sz 4))
         (pt (eval 'pt m))


@@ -42,16 +42,14 @@
     (module-define! m 'linethickness lt)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))
     (module-define! m 'linethickness lt)
     (module-define! m 'ledgerlinethickness (+ (* 0.5 pt) (/ ss 10)))
     (module-define! m 'blotdiameter (* 0.35 pt))

-    (module-define! m 'interscoreline (* 4 mm))
-
-     ))
+    (module-define! m 'interscoreline (* 4 mm))))

 
 (define-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."
   (let* ((old-mod (current-module))
 
 (define-public (set-global-staff-size sz)
   "Set the default staff size, where SZ is thought to be in PT."
   (let* ((old-mod (current-module))

-        (pap (eval '$defaultbookpaper old-mod))
-        (in-paper? (or (module-defined? old-mod 'is-bookpaper)
-                       (module-defined? old-mod 'is-paper)))
+        (pap (eval '$defaultpaper old-mod))
+        (in-layout? (or (module-defined? old-mod 'is-paper)
+                        (module-defined? old-mod 'is-layout)))

 
         ; maybe not necessary.
         ; but let's be paranoid. Maybe someone still refers to the
 
         ; maybe not necessary.
         ; but let's be paranoid. Maybe someone still refers to the


@@ -60,12 +58,12 @@
         
         (new-scope (ly:output-def-scope new-paper)))
     
         
         (new-scope (ly:output-def-scope new-paper)))
     

-    (if in-paper?
+    (if in-layout?

        (ly:warn "Not in toplevel scope"))
     (set-current-module new-scope)
        (ly:warn "Not in toplevel scope"))
     (set-current-module new-scope)

-    (paper-set-staff-size (* sz (eval 'pt new-scope)))
+    (layout-set-staff-size (* sz (eval 'pt new-scope)))

     (set-current-module old-mod)
     (set-current-module old-mod)

-    (module-define! old-mod '$defaultbookpaper new-paper)))
+    (module-define! old-mod '$defaultpaper new-paper)))

 
 (define paper-alist
   '(("a6" . (cons (* 105 mm) (* 148.95 mm)))
 
 (define paper-alist
   '(("a6" . (cons (* 105 mm) (* 148.95 mm)))


@@ -79,7 +77,7 @@
 ;; todo: take dimension arguments.
 
 (define (set-paper-dimensions m w h)
 ;; todo: take dimension arguments.
 
 (define (set-paper-dimensions m w h)

-  "M is a module (i.e. paper->scope_ )"
+  "M is a module (i.e. layout->scope_ )"

   (let* ((mm (eval 'mm m)))
     (module-define! m 'hsize w)
     (module-define! m 'vsize h)
   (let* ((mm (eval 'mm m)))
     (module-define! m 'hsize w)
     (module-define! m 'vsize h)


@@ -101,12 +99,12 @@
     (cons (cdr x) (car x)))
   
   (let* ((entry (assoc name paper-alist))
     (cons (cdr x) (car x)))
   
   (let* ((entry (assoc name paper-alist))

-        (is-bookpaper? (module-defined? module 'is-bookpaper))
+        (is-paper? (module-defined? module 'is-paper))

         (mm (eval 'mm module)))
     
     (cond
         (mm (eval 'mm module)))
     
     (cond

-     ((not is-bookpaper?)
-      (ly:warning "This is not a \\paper {} object, ~S"
+     ((not is-paper?)
+      (ly:warning "This is not a \\layout {} object, ~S"

                   module))
      ((pair? entry)
 
                   module))
      ((pair? entry)
 


@@ -117,51 +115,44 @@
       (module-define! module 'papersize name)
       (module-define! module 'papersizename name)
       (if landscape?
       (module-define! module 'papersize name)
       (module-define! module 'papersizename name)
       (if landscape?

-         (module-define! module 'landscape #t))
-      )
+         (module-define! module 'landscape #t)))

      (else
      (else

-      (ly:warn (string-append "Unknown papersize: " name))))
-
-    ))
+      (ly:warn (string-append "Unknown papersize: " name))))))

 
 (define-public (set-default-paper-size name . rest)
   (internal-set-paper-size
 
 (define-public (set-default-paper-size name . rest)
   (internal-set-paper-size

-   (ly:output-def-scope (eval '$defaultbookpaper (current-module)))
+   (ly:output-def-scope (eval '$defaultpaper (current-module)))

    name
    name

-   (memq 'landscape rest)
-   ))
+   (memq 'landscape rest)))

 
 (define-public (set-paper-size name . rest)
 
 (define-public (set-paper-size name . rest)

-  (if (module-defined? (current-module) 'is-bookpaper)
+  (if (module-defined? (current-module) 'is-paper)

       (internal-set-paper-size (current-module) name
                               (memq 'landscape rest))
 
       ;;; TODO: should raise (generic) exception with throw, and catch
       ;;; that in parse-scm.cc
       (internal-set-paper-size (current-module) name
                               (memq 'landscape rest))
 
       ;;; TODO: should raise (generic) exception with throw, and catch
       ;;; that in parse-scm.cc

-      (ly:warn "Must use #(set-paper-size .. ) within \\bookpaper { ... }")))
+      (ly:warn "Must use #(set-paper-size .. ) within \\paper { ... }")))

 
 

-(define-public (scale-paper pap scale)
-  (let*
-      ((new-pap (ly:output-def-clone pap))
-       (dim-vars (ly:output-def-lookup pap 'dimension-variables))
-       (old-scope (ly:output-def-scope pap))
-       (scope (ly:output-def-scope new-pap)))
+(define-public (scale-layout pap scale)
+  (let* ((new-pap (ly:output-def-clone pap))
+        (dim-vars (ly:output-def-lookup pap 'dimension-variables))
+        (old-scope (ly:output-def-scope pap))
+        (scope (ly:output-def-scope new-pap)))

 
     (for-each
      (lambda (v)
 
     (for-each
      (lambda (v)

-       (let*
-          ((var (module-variable old-scope v))
-           (val (if (variable? var) (variable-ref var) #f)))
+       (let* ((var (module-variable old-scope v))
+             (val (if (variable? var) (variable-ref var) #f)))

 
         (if (number? val)
             (module-define! scope v
                             (/ val scale))
 
 
         (if (number? val)
             (module-define! scope v
                             (/ val scale))
 

-          ;; spurious warnings, eg. for hsize, vsize. 
-;         (ly:warn "not a number, ~S = ~S " v  val)
-          )))
+            ;; spurious warnings, eg. for hsize, vsize. 
+            ;; (ly:warn "not a number, ~S = ~S " v  val)
+            )))

      
      dim-vars)
      
      dim-vars)

-
-    new-pap
-  ))
+    
+    new-pap))

diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm
index 165da128413e6d5f827444b59d67c7759ba3296b..ae751fd02ffe7e6de10c82419e0509d05901fbec 100644 (file)
--- a/scm/safe-lily.scm
+++ b/scm/safe-lily.scm
@@ -49,7 +49,7 @@
      ly:grob-alist-chain
      ly:grob-extent
      ly:grob-original
      ly:grob-alist-chain
      ly:grob-extent
      ly:grob-original

-     ly:grob-paper
+     ly:grob-layout

      ly:grob-parent
      ly:grob-pq-less?
      ly:grob-property
      ly:grob-parent
      ly:grob-pq-less?
      ly:grob-property


@@ -96,7 +96,7 @@
      ly:output-def-scope
      ly:output-description
      ly:paper-book?
      ly:output-def-scope
      ly:output-description
      ly:paper-book?

-     ly:paper-def?
+     ly:layout-def?

      ly:paper-get-font
      ly:paper-get-number
      ly:paper-system-break-penalty
      ly:paper-get-font
      ly:paper-get-number
      ly:paper-system-break-penalty


@@ -149,9 +149,9 @@
      set-global-staff-size
 
      ;; FIXME: cannot change staff size in --safe-mode
      set-global-staff-size
 
      ;; FIXME: cannot change staff size in --safe-mode

-     ;;$defaultbookpaper
-     ;;$defaultmidi

      ;;$defaultpaper
      ;;$defaultpaper

+     ;;$defaultmidi
+     ;;$defaultlayout

 
      ;; need these for parsing init files:
      ;; todo: should have a macro define-safe-public
 
      ;; need these for parsing init files:
      ;; todo: should have a macro define-safe-public

diff --git a/scm/titling.scm b/scm/titling.scm
index 4a0eb678342c832fe7e89c8daf544b492b95422a..07bbc664177c3d1b51adf2d6896e10f8faacc3e0 100644 (file)
--- a/scm/titling.scm
+++ b/scm/titling.scm
@@ -5,14 +5,14 @@
 ;;;; (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
 
 ;;;; (c) 2004 Jan Nieuwenhuizen <janneke@gnu.org>
 ;;;;          Han-Wen Nienhuys <hanwen@cs.uu.nl>
 

-(define-public (page-properties paper)
+(define-public (page-properties layout)

   (list (append `((linewidth . ,(ly:paper-get-number
   (list (append `((linewidth . ,(ly:paper-get-number

-                                paper 'linewidth)))
-               (ly:output-def-lookup paper 'text-font-defaults))))
+                                layout 'linewidth)))
+               (ly:output-def-lookup layout 'text-font-defaults))))

 
 ;;;;;;;;;;;;;;;;;;
                                        ; titling.
 
 ;;;;;;;;;;;;;;;;;;
                                        ; titling.

-(define-public (default-book-title paper scopes)
+(define-public (default-book-title layout scopes)

   "Generate book title from header strings."
 
 
   "Generate book title from header strings."
 
 


@@ -22,10 +22,10 @@
   (define (has sym)
     (markup?  (ly:modules-lookup scopes sym)))
 
   (define (has sym)
     (markup?  (ly:modules-lookup scopes sym)))
 

-  (let ((props (page-properties paper)))
+  (let ((props (page-properties layout)))

 
     (interpret-markup
 
     (interpret-markup

-     paper props
+     layout props

      (make-override-markup
       '(baseline-skip . 4)
       (make-column-markup
      (make-override-markup
       '(baseline-skip . 4)
       (make-column-markup


@@ -92,15 +92,15 @@
            ))))))))))
 
 
            ))))))))))
 
 

-(define-public (default-user-title paper markup)
+(define-public (default-user-title layout markup)

   "Generate book title from header markup."
   (if (markup? markup)
   "Generate book title from header markup."
   (if (markup? markup)

-      (let ((props (page-properties paper))
+      (let ((props (page-properties layout))

            (baseline-skip (chain-assoc-get 'baseline-skip props 2)) )
        (stack-lines DOWN 0 BASELINE-SKIP
            (baseline-skip (chain-assoc-get 'baseline-skip props 2)) )
        (stack-lines DOWN 0 BASELINE-SKIP

-                    (list (interpret-markup paper props markup))))))
+                    (list (interpret-markup layout props markup))))))

 
 

-(define-public (default-score-title paper scopes)
+(define-public (default-score-title layout scopes)

   "Generate score title from header strings."
 
   (define (get sym)
   "Generate score title from header strings."
 
   (define (get sym)


@@ -110,9 +110,9 @@
   (define (has sym)
     (markup? (ly:modules-lookup scopes sym)))
 
   (define (has sym)
     (markup? (ly:modules-lookup scopes sym)))
 

-  (let ((props (page-properties paper)))
+  (let ((props (page-properties layout)))

     (interpret-markup
     (interpret-markup

-     paper props
+     layout props

      (make-override-markup
       '(baseline-skip . 4)
       (make-column-markup
      (make-override-markup
       '(baseline-skip . 4)
       (make-column-markup

diff --git a/scm/to-xml.scm b/scm/to-xml.scm
index a6b9508a6e442d029fbb2f6d9456a6c6f2f5f6e9..f991d5eed2a7dd4fa4477f0df8552608d2099d65 100644 (file)
--- a/scm/to-xml.scm
+++ b/scm/to-xml.scm
@@ -24,8 +24,8 @@ is then separated.
 
    <score>
      <music></music>
 
    <score>
      <music></music>

-     <paperoutput>
-     </paperoutput>
+     <layoutoutput>
+     </layoutoutput>

    </score>
 "
 
    </score>
 "
 

diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py
index 07f0df5a62ca0382474119df147d91f1ccdbcee8..53a5f61b3f3f1578919d4c966c9b4bd7f59acef0 100644 (file)
--- a/scripts/abc2ly.py
+++ b/scripts/abc2ly.py
@@ -189,7 +189,7 @@ def dump_lyrics (outf):
                for i in range (len (lyrics)):
                        outf.write ( lyrics [i])
                        outf.write ("\n")
                for i in range (len (lyrics)):
                        outf.write ( lyrics [i])
                        outf.write ("\n")

-               outf.write("    >>\n    \\paper{}\n}\n")
+               outf.write("    >>\n    \\layout{}\n}\n")

 
 def dump_default_bar (outf):
        """
 
 def dump_default_bar (outf):
        """


@@ -284,7 +284,7 @@ def dump_score (outf):
                                outf.write("\n\t  { \\words%sV%s }" % ( m, l) )
                        outf.write ( "\n\t>>\n" )
        outf.write ("\n    >>")
                                outf.write("\n\t  { \\words%sV%s }" % ( m, l) )
                        outf.write ( "\n\t>>\n" )
        outf.write ("\n    >>")

-       outf.write ("\n\t\\paper {\n")
+       outf.write ("\n\t\\layout {\n")

        if part_names:
                outf.write ("\t    \\translator \n\t    {\n")
                outf.write ("\t\t\\StaffContext\n")
        if part_names:
                outf.write ("\t    \\translator \n\t    {\n")
                outf.write ("\t\t\\StaffContext\n")

diff --git a/scripts/convert-ly.py b/scripts/convert-ly.py
index 971d516130c60ee9f9ccb2d91bce6ee23064da4a..a8163a0c5e6580e63cc55ec78c7386df6bad3230 100644 (file)
--- a/scripts/convert-ly.py
+++ b/scripts/convert-ly.py
@@ -2216,6 +2216,16 @@ conversions.append (((2, 3, 18),
                     conv,
                     '''Text_item -> Text_interface''' ))
 
                     conv,
                     '''Text_item -> Text_interface''' ))
 

+def conv (str):
+       str = re.sub (r'\\paper', r'\\layout', str)
+       str = re.sub (r'\\bookpaper', r'\\paper', str)
+       return str
+
+conversions.append (((2, 3, 22),
+                    conv,
+                    '''paper -> layout
+ bookpaper -> paper''' ))
+

 ################################
 #      END OF CONVERSIONS      
 ################################
 ################################
 #      END OF CONVERSIONS      
 ################################

diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py
index 502190c3c70eb2ba7d21bede9708ed2c43f0ab78..6373e2aa6fefa76f8d448bc65f272113c0672941 100644 (file)
--- a/scripts/lilypond-book.py
+++ b/scripts/lilypond-book.py
@@ -118,13 +118,13 @@ default_ly_options = {}
 #
 AFTER = 'after'
 BEFORE = 'before'
 #
 AFTER = 'after'
 BEFORE = 'before'

-BOOKPAPER = 'bookpaper'

 EXAMPLEINDENT = 'exampleindent'
 FILTER = 'filter'
 FRAGMENT = 'fragment'
 HTML = 'html'
 INDENT = 'indent'
 LATEX = 'latex'
 EXAMPLEINDENT = 'exampleindent'
 FILTER = 'filter'
 FRAGMENT = 'fragment'
 HTML = 'html'
 INDENT = 'indent'
 LATEX = 'latex'

+LAYOUT = 'layout'

 LINEWIDTH = 'linewidth'
 NOFRAGMENT = 'nofragment'
 NOINDENT = 'noindent'
 LINEWIDTH = 'linewidth'
 NOFRAGMENT = 'nofragment'
 NOINDENT = 'noindent'


@@ -205,7 +205,7 @@ ly_options = {
        NOTES: {
                RELATIVE: r'''\relative c%(relative_quotes)s''',
        },
        NOTES: {
                RELATIVE: r'''\relative c%(relative_quotes)s''',
        },

-       BOOKPAPER: {
+       PAPER: {

                INDENT : r'''
     indent = %(indent)s''',
        'linewidth' : r'''
                INDENT : r'''
     indent = %(indent)s''',
        'linewidth' : r'''


@@ -221,7 +221,7 @@ ly_options = {
        },
 
        ##
        },
 
        ##

-       PAPER: {
+       LAYOUT: {

                EXAMPLEINDENT : '',
 
                NOTIME : r'''
                EXAMPLEINDENT : '',
 
                NOTIME : r'''


@@ -322,11 +322,11 @@ PREAMBLE_LY = r"""%%%% Generated by %(program_name)s
                                p (ly:music-scorify m p))
                            ))
 %(preamble_string)s
                                p (ly:music-scorify m p))
                            ))
 %(preamble_string)s

-\bookpaper {
+\paper {

   #(define dump-extents #t)
   #(define dump-extents #t)

-  %(bookpaper_string)s
+  %(paper_string)s

 }
 }

-\paper { %(paper_string)s
+\layout { %(layout_string)s

 }
 
 """
 }
 
 """


@@ -385,14 +385,15 @@ def compose_ly (code, options):
        relative = 1
        staffsize = 16
        override = {}
        relative = 1
        staffsize = 16
        override = {}

-       override.update (default_ly_options)

        #FIXME: where to get sane value for exampleindent?
        override[EXAMPLEINDENT] = r'9.0 \mm'
        #FIXME: where to get sane value for exampleindent?
        override[EXAMPLEINDENT] = r'9.0 \mm'

+       override[LINEWIDTH] = None
+       override.update (default_ly_options)

 
        option_string = string.join (options, ',')
 
        options_dict = {}
 
        option_string = string.join (options, ',')
 
        options_dict = {}

-       option_types = [NOTES, PREAMBLE, PAPER, BOOKPAPER]
+       option_types = [NOTES, PREAMBLE, LAYOUT, PAPER]

        for a in option_types:
                options_dict[a] = []
                
        for a in option_types:
                options_dict[a] = []
                


@@ -437,9 +438,9 @@ def compose_ly (code, options):
                relative_quotes += "'" * relative
                
        program_name = __main__.program_name
                relative_quotes += "'" * relative
                
        program_name = __main__.program_name

-       
+

        paper_string = string.join (options_dict[PAPER], '\n    ') % override
        paper_string = string.join (options_dict[PAPER], '\n    ') % override

-       bookpaper_string = string.join (options_dict[BOOKPAPER], '\n    ') % override
+       layout_string = string.join (options_dict[LAYOUT], '\n    ') % override

        notes_string = string.join (options_dict[NOTES], '\n    ') % vars ()
        preamble_string = string.join (options_dict[PREAMBLE], '\n    ') % override
        return (PREAMBLE_LY + body) % vars ()
        notes_string = string.join (options_dict[NOTES], '\n    ') % vars ()
        preamble_string = string.join (options_dict[PREAMBLE], '\n    ') % override
        return (PREAMBLE_LY + body) % vars ()


@@ -1018,7 +1019,7 @@ def do_file (input_filename):
                                                                % textwidth
                        elif format == TEXINFO:
                                for (k, v) in texinfo_linewidths.items ():
                                                                % textwidth
                        elif format == TEXINFO:
                                for (k, v) in texinfo_linewidths.items ():

-                                       # FIXME: @paper is usually not in chunk #0:
+                                       # FIXME: @layout is usually not in chunk #0:

                                        #        \input texinfo @c -*-texinfo-*-
                                        # bluntly search first K of source
                                        # s = chunks[0].replacement_text ()
                                        #        \input texinfo @c -*-texinfo-*-
                                        # bluntly search first K of source
                                        # s = chunks[0].replacement_text ()

diff --git a/scripts/lilypond-latex.py b/scripts/lilypond-latex.py
index 4b2fe4c2ed2597ee6ab0f132581b6864fdbce7ce..6819166da13016bc8be91f327d9d57a0995e43c3 100644 (file)
--- a/scripts/lilypond-latex.py
+++ b/scripts/lilypond-latex.py
@@ -118,7 +118,7 @@ option_definitions = [
        #junkme?
        ('', '', 'no-lily', _ ("don't run LilyPond")),
        #junkme? 
        #junkme?
        ('', '', 'no-lily', _ ("don't run LilyPond")),
        #junkme? 

-       ('', 'm', 'no-paper', _ ("produce MIDI output only")),
+       ('', 'm', 'no-layout', _ ("produce MIDI output only")),

        
        (_ ("FILE"), 'o', 'output', _ ("write output to FILE")),
        (_ ('RES'), '', 'preview-resolution',
        
        (_ ("FILE"), 'o', 'output', _ ("write output to FILE")),
        (_ ('RES'), '', 'preview-resolution',


@@ -174,7 +174,7 @@ extra_init = {
 header_fields = extra_init.keys ()
 
 include_path = ['.']
 header_fields = extra_init.keys ()
 
 include_path = ['.']

-paper_p = 1
+layout_p = 1

 
 output_name = ''
 
 
 output_name = ''
 


@@ -217,11 +217,11 @@ def run_lilypond (files, dep_prefix):
        ## UGHr
        if pseudo_filter_p:
                opts += ' --output=lelie'
        ## UGHr
        if pseudo_filter_p:
                opts += ' --output=lelie'

-       if paper_p:
+       if layout_p:

                opts += ' ' + string.join (map (lambda x : '--header=' + x,
                                                header_fields))
        else:
                opts += ' ' + string.join (map (lambda x : '--header=' + x,
                                                header_fields))
        else:

-               opts = opts + ' --no-paper'
+               opts = opts + ' --no-layout'

        if safe_mode_p:
                opts = opts + ' --safe-mode'
 
        if safe_mode_p:
                opts = opts + ' --safe-mode'
 


@@ -273,7 +273,7 @@ def analyse_lilypond_output (filename, extra):
        # search only the first 10k
        s = s[:10240]
        for x in header_fields:
        # search only the first 10k
        s = s[:10240]
        for x in header_fields:

-               m = re.search (r'\\def\\lilypondpaper%s{([^}]*)}' % x, s)
+               m = re.search (r'\\def\\lilypondlayout%s{([^}]*)}' % x, s)

                if m:
                        set_setting (extra, x, m.group (1))
 
                if m:
                        set_setting (extra, x, m.group (1))
 


@@ -618,9 +618,9 @@ for opt in options:
                        targets.append ('PNG')
        elif o == '--preview-resolution':
                preview_resolution = string.atoi (a)
                        targets.append ('PNG')
        elif o == '--preview-resolution':
                preview_resolution = string.atoi (a)

-       elif o == '--no-paper' or o == '-m':
+       elif o == '--no-layout' or o == '-m':

                targets = ['MIDI'] 
                targets = ['MIDI'] 

-               paper_p = 0
+               layout_p = 0

        elif o == '--output' or o == '-o':
                output_name = a
        elif o == '--safe-mode' or o == '-s':
        elif o == '--output' or o == '-o':
                output_name = a
        elif o == '--safe-mode' or o == '-s':

diff --git a/scripts/mup2ly.py b/scripts/mup2ly.py
index e1ba8b8fda828d88eae24873d9c23d484e35279e..b7d2d0850e98e448308f129ab5bad12bad30e8eb 100644 (file)
--- a/scripts/mup2ly.py
+++ b/scripts/mup2ly.py
@@ -1101,7 +1101,7 @@ class Parser:
 \score {
   <<%s
   >>
 \score {
   <<%s
   >>

-  \paper {}
+  \layout {}

   \midi {}
 }
 ''' % refs 
   \midi {}
 }
 ''' % refs