From: Jan Nieuwenhuizen Date: Sun, 10 Oct 2004 11:42:13 +0000 (+0000) Subject: The grand \paper -> \layout, \bookpaper -> \paper renaming. X-Git-Tag: release/2.3.22~13 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=34881554afeaf03a55a3a983caf9cfeaaf3ea060;p=lilypond.git The grand \paper -> \layout, \bookpaper -> \paper renaming. --- diff --git a/ChangeLog b/ChangeLog index b31c812f16..965336cb99 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ +2004-10-09 Jan Nieuwenhuizen + + The grand \paper -> \layout, \bookpaper -> \paper renaming. + 2004-10-10 Graham Percival - * 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 diff --git a/Documentation/user/changing-defaults.itely b/Documentation/user/changing-defaults.itely index 398b4a91ee..90af827458 100644 --- 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 -from the music, in the @code{\paper} block, +from the music, in the @code{\layout} block, @example -\paper @{ +\layout @{ @dots{} \context @{ \Staff @@ -591,7 +591,7 @@ affect all staves in the score. 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 @{ @@ -625,7 +625,7 @@ The next example shows how to build a different type of to indicate improvisation in Jazz pieces, @lilypond[raggedright] - \paper { \context { + \layout { \context { \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 -@code{\paper} block, +@code{\layout} block, @example - \paper @{ + \layout @{ \context @{ @dots{} @} @@ -744,10 +744,10 @@ which is sometimes when reusing existing context definitions. } } @end verbatim -Putting both into a @code{\paper} block, like +Putting both into a @code{\layout} block, like @example - \paper @{ + \layout @{ \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 -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 - \paper { + \layout { inputencoding = "latin1" } @end verbatim @@ -1556,7 +1556,7 @@ Rather, you should say @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 @@ -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} -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] @@ -1581,7 +1581,7 @@ block. c4 d^\markup { \score { \relative { c4 d e f } - \paper { } + \layout { } } } e f @@ -1629,7 +1629,7 @@ titles. * Multiple movements:: * Creating titles:: * Page breaking:: -* Paper size:: +* paper size:: * Page layout:: @end menu @@ -1639,7 +1639,7 @@ titles. @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 @@ -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 -@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. -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. @@ -2106,7 +2106,7 @@ This is a demonstration of the fields available, } { c'1 } } - \bookpaper { + \paper { 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 -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. -@cindex \bookpaper +@cindex \paper @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 -@code{\bookpaper} block. +@code{\paper} block. @refcommands @@ -2159,8 +2159,8 @@ Page breaks are computed by the @code{page-breaking} function in the @cindex @code{\noPageBreak} @code{\noPageBreak} -@node Paper size -@subsection Paper size +@node paper size +@subsection paper 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") - \paper@{ + \layout@{ #(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. @@ -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 -@code{\bookpaper} block +@code{\paper} block -@cindex \bookpaper +@cindex \paper @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 - 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 @@ -2276,7 +2276,7 @@ book and the title of piece). @end table @example - \bookpaper@{ + \paper@{ 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 -@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 - \bookpaper@{ + \paper@{ #(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} -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. @@ -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 -@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. @@ -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 -@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 @@ -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 - \paper { + \layout { % movements are non-justified by default raggedright = ##t } diff --git a/Documentation/user/examples.itely b/Documentation/user/examples.itely index 2a8be09fcf..aec99a45df 100644 --- a/Documentation/user/examples.itely +++ b/Documentation/user/examples.itely @@ -87,7 +87,7 @@ melody = \relative c' { \score{ \new Staff \melody - \paper { } + \layout { } \midi { \tempo 4=60 } } @@ -124,7 +124,7 @@ text = \lyricmode { } \lyricsto "one" \new Lyrics \text >> - \paper { } + \layout { } \midi { \tempo 4=60 } } @@ -159,7 +159,7 @@ harmonies = \chordmode { \context Staff = one \melody >> - \paper{ } + \layout{ } \midi { \tempo 4=60} } @@ -200,7 +200,7 @@ harmonies = \chordmode { } \lyricsto "one" \new Lyrics \text >> - \paper { } + \layout { } \midi { \tempo 4=60} } @@ -237,7 +237,7 @@ lower = \relative c { \context Staff = upper \upper \context Staff = lower \lower >> - \paper { } + \layout { } \midi { \tempo 4=60 } } @@ -292,7 +292,7 @@ lower = \relative c { \context Staff = lower \lower >> >> - \paper { + \layout { \context { \RemoveEmptyStaffContext } } \midi { \tempo 4=60} @@ -346,7 +346,7 @@ pedal = { >> \context Dynamics=pedal \pedal >> - \paper { + \layout { \context { \type "Engraver_group_engraver" \name Dynamics @@ -437,7 +437,7 @@ cello = \relative c'{ \new Staff << \global \viola >> \new Staff << \global \cello >> >> - \paper { } + \layout { } \midi { \tempo 4=60} } @@ -511,7 +511,7 @@ bassWords = \lyricmode { \context Lyrics = basses \lyricsto basses \bassWords >> - \paper { + \layout { \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 } >> - \paper { + \layout { \context { \Score \override BarLine #'transparent = ##t @@ -1010,7 +1010,7 @@ drumContents = { \new DrumStaff { \drumContents } >> >> - \paper { + \layout { \context { \RemoveEmptyStaffContext } \context { \Score @@ -1108,7 +1108,7 @@ chant = \relative c' { } \score { \chant - \paper{ } + \layout{ } \midi { \tempo 4=60 } } diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index ccce7fd2db..60c97d6096 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -345,7 +345,7 @@ note heads, the @code{Note_heads_engraver}. \score { \topVoice - \paper { + \layout { \context { \Voice \remove "Stem_engraver" @@ -377,7 +377,7 @@ Then a @code{Staff_symbol_engraver} adds the staff \score { \topVoice - \paper { + \layout { \context { \Voice \remove "Stem_engraver" @@ -408,7 +408,7 @@ the @code{Clef_engraver} defines a reference point for the staff \score { \topVoice - \paper { + \layout { \context { \Voice \remove "Stem_engraver" @@ -437,7 +437,7 @@ and the @code{Stem_engraver} adds stems. \score { \topVoice - \paper { + \layout { \context { \Voice \remove "Phrasing_slur_engraver" diff --git a/Documentation/user/invoking.itexi b/Documentation/user/invoking.itexi index 7fdf1ef142..9cb51848b7 100644 --- 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 -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 @@ -461,19 +461,19 @@ achieve this specify @code{twoside}. @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 - 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 -the @code{\paper} block. +the @code{\layout} block. @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 6132a3a67d..4a8e1fcb93 100644 --- a/Documentation/user/latex-example.latex +++ b/Documentation/user/latex-example.latex @@ -34,7 +34,7 @@ c d e enteredby = "JCN" instrument = "instrument" } -\paper { linewidth = -1. } +\layout { linewidth = -1. } \relative c'' { a b c d } \end{lilypond} diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index 5c549ddc51..83946e378b 100644 --- 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 -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. @@ -408,7 +408,7 @@ adds some boilerplate code, so you can enter like @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}, diff --git a/Documentation/user/lilypond.tely b/Documentation/user/lilypond.tely index 38115ffd5d..04f8dfe5a0 100644 --- 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 } - \paper { + \layout { indent = 0.0\pt raggedright = ##t } diff --git a/Documentation/user/music-glossary.tely b/Documentation/user/music-glossary.tely index e6e75a4c8e..e61c413384 100644 --- 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 } - \paper { + \layout { \context { \Staff \consists Custos_engraver diff --git a/Documentation/user/notation.itely b/Documentation/user/notation.itely index c000743bbd..7536fffb92 100644 --- 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 } - \paper { + \layout { 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 } - \paper { + \layout { \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 -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 @@ -2215,7 +2215,7 @@ to @internalsref{Staff} context. A bracket is started with c4\startGroup c4\stopGroup\stopGroup } - \paper { + \layout { \context { \Staff \consists "Horizontal_bracket_engraver" }}} @@ -2900,7 +2900,7 @@ percent repeats). For example, @example \score @{ @var{..music..} - \paper @{ .. @} + \layout @{ .. @} @} \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 >> - \paper { + \layout { %% 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 - \paper @{ + \layout @{ \context @{ \Voice \consists Ambitus_engraver @@ -4206,7 +4206,7 @@ for example, This results in the following output @lilypond[quote,raggedright] -\paper { +\layout { \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 -@code{indent} setting in the @code{\paper} block. +@code{indent} setting in the @code{\layout} block. @seealso @@ -5382,7 +5382,7 @@ in this example disappears in the second line @lilypond[quote,raggedright,verbatim] -\paper { +\layout { \context { \RemoveEmptyStaffContext } } @@ -5796,7 +5796,7 @@ select ancient accidentals. Supported styles are > } } -\paper { +\layout { 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] -\paper { +\layout { 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 -@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 -\paper @{ +\layout @{ \context @{ \Staff \consists Custos_engraver @@ -6253,7 +6253,7 @@ The result looks like this \break g' } -\paper { +\layout { \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. -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 -\paper @{ +\layout @{ \context @{ \Voice \remove Ligature_bracket_engraver @@ -6448,7 +6448,7 @@ For example, s4 \[ e1 f1 a\breve g\longa \] } - \paper { + \layout { \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} -@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 @@ -6530,7 +6530,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \inclinatum b \] \noBreak s^\markup {"b"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @item @@ -6574,7 +6574,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \virga b \] \noBreak s^\markup {"g"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @tab @@ -6590,7 +6590,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \stropha b \] \noBreak s^\markup {"h"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @@ -6616,7 +6616,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \oriscus b \] \noBreak s^\markup {"j"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @tab @@ -6632,7 +6632,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ b \flexa g \] s^\markup {"k"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @item @@ -6672,7 +6672,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ g \pes b \] s^\markup {"o"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @item @@ -6712,7 +6712,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \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] @@ -6723,7 +6723,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \oriscus g \pes \auctum \descendens b \] s^\markup {"t"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @@ -6738,7 +6738,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \quilisma g \pes b \] s^\markup {"u"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @@ -6764,7 +6764,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ \deminutum g \pes b \] s^\markup {"w"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @tab @@ -6790,7 +6790,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6801,7 +6801,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6812,7 +6812,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ a \pes b \flexa \deminutum g \] s^\markup {"A"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @item @@ -6862,7 +6862,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6873,7 +6873,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6884,7 +6884,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ a \flexa g \pes \deminutum b \] s^\markup {"G"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } - \paper { \neumeDemoPaper } + \layout { \neumeDemoLayout } } @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @end lilypond @item @@ -6935,7 +6935,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6946,7 +6946,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ 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] @@ -6957,7 +6957,7 @@ volume of the Antiphonale Romanum (@emph{Liber Hymnarius}), published \[ g \pes a \pes \deminutum b \] s^\markup {"M"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } -\paper { \neumeDemoPaper }} +\layout { \neumeDemoLayout }} @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"} } - \paper { \neumeDemoPaper } + \layout { \neumeDemoLayout } } @end lilypond @tab @@ -7477,7 +7477,7 @@ moving the @internalsref{Timing_engraver} to @internalsref{Staff} context. @verbatim -\paper{ +\layout{ \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] -\paper{ +\layout{ \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:: -* Blank music paper:: +* Blank music layout:: * 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}. diff --git a/Documentation/user/programming-interface.itely b/Documentation/user/programming-interface.itely index b5b6686270..f4a3f43eed 100644 --- 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 -@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 @} - \paper @{ traLaLa = 1.0 @} + \layout @{ traLaLa = 1.0 @} @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. @@ -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 -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. @@ -505,7 +505,7 @@ raise markup is called as @example (apply raise-markup - @var{\paper object} + @var{\layout object} @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 -(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 @@ -534,8 +534,8 @@ The arguments signify @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 @@ -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 - (def-markup-command (smallcaps paper props argument) (markup?) + (def-markup-command (smallcaps layout props argument) (markup?) @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 - (interpret-markup paper @dots{} argument) + (interpret-markup layout @dots{} argument) @end example @noindent @@ -590,10 +590,10 @@ that takes into account the needed translation, and uses the newly 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\"" - (interpret-markup paper props + (interpret-markup layout props (markup "" #:translate (cons -4 2) #:smallcaps name))) @end verbatim @@ -615,9 +615,9 @@ The final result is as follows: @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\"" - (interpret-markup paper props + (interpret-markup layout props (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))))) -#(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\"" - (interpret-markup paper props + (interpret-markup layout props (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 -#(def-markup-command (smallcaps paper props str) (string?) +#(def-markup-command (smallcaps layout props str) (string?) "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) @@ -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 -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. diff --git a/Documentation/user/sound-output.itexi b/Documentation/user/sound-output.itexi index e7d4220213..be785d2567 100644 --- 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 -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 @} - \paper @{ @} + \layout @{ @} @} @end example -@cindex paper block +@cindex layout block @@ -88,7 +88,7 @@ setting @code{instrumentEqualizer}. @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 @@ -109,7 +109,7 @@ inserted, for example @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}. diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index 3cb6f8e3d7..c6f4481dda 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -1212,14 +1212,14 @@ input. For example, @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 - \paper @{ + \layout @{ \aFivePaper linewidth = \width @} diff --git a/VERSION b/VERSION index d4811779fb..57dd1c437f 100644 --- a/VERSION +++ b/VERSION @@ -1,6 +1,6 @@ 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 4cba2243f2..7e74af991a 100644 --- 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""" } - \paper{ + \layout{ interscoreline = 1.0 indent = 0.0 \cm \context { diff --git a/cygwin/changelog b/cygwin/changelog index 2a306b649b..f400bbeeba 100644 --- a/cygwin/changelog +++ b/cygwin/changelog @@ -1,3 +1,9 @@ +lilypond (2.3.20-1) unstable; urgency=low + + * New upstream release. + + -- Jan Nieuwenhuizen Thu, 7 Oct 2004 00:38:49 +0200 + lilypond (1.9.8-1) unstable; urgency=low * New upstream release. diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint index 87aeb14c35..fe451e6709 100644 --- a/cygwin/lilypond.hint +++ b/cygwin/lilypond.hint @@ -1,6 +1,6 @@ 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. diff --git a/cygwin/mknetrel b/cygwin/mknetrel index efb4a25cf6..ffe043dec4 100644 --- a/cygwin/mknetrel +++ b/cygwin/mknetrel @@ -150,7 +150,7 @@ postinstall () { 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 diff --git a/cygwin/mknetrel.cross b/cygwin/mknetrel.cross index e002f44b25..c22a48b094 100644 --- a/cygwin/mknetrel.cross +++ b/cygwin/mknetrel.cross @@ -7,22 +7,34 @@ crosscache () { cat < 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_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_ptrdiff_t=\${ac_cv_sizeof_ptrdiff_t=4} 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_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_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} diff --git a/cygwin/mknetrel.split b/cygwin/mknetrel.split index a2ce0cb9e6..1506b3d9f2 100644 --- a/cygwin/mknetrel.split +++ b/cygwin/mknetrel.split @@ -44,7 +44,7 @@ devel_split () { doc_split () { mkdir -p ./$docprefix || exit 1 - #mv $inst/$infodir ./$infodir + mv $inst/$infodir ./$infodir true } diff --git a/input/example-1.ly b/input/example-1.ly index b14532b9e1..5292fcb401 100644 --- 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 % @@ -17,6 +17,6 @@ \context Voice \relative c { c' d e f g a b c } - \paper { } + \layout { } \midi { } } diff --git a/input/example-2.ly b/input/example-2.ly index e4705edb30..b2f446a12c 100644 --- 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: @@ -16,6 +16,6 @@ \context Voice \relative c { a''2 ~ a4( e8[ )e] a,16[ a a a] } - \paper { } + \layout { } \midi { } } diff --git a/input/example-3.ly b/input/example-3.ly index 8e7adfea4e..265fb1b8d8 100644 --- a/input/example-3.ly +++ b/input/example-3.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.22" one = \relative c{ c'' d e f @@ -15,7 +15,7 @@ two = \relative c{ \one \two >> - \paper{} + \layout{} \midi{} } diff --git a/input/les-nereides.ly b/input/les-nereides.ly index 0beb14cdb1..01076c2dfb 100644 --- a/input/les-nereides.ly +++ b/input/les-nereides.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.17" +\version "2.3.22" \encoding "latin1" \header { composer = "ARTHUR GRAY" @@ -262,7 +262,7 @@ theScore = \score{ \bassTwo >> >> - \paper { + \layout { \context { \Score pedalSustainStrings = #'("Ped." "*Ped." "*") diff --git a/input/mutopia-header.ly b/input/mutopia-header.ly index 8a6fd2f9d6..d38dad989f 100644 --- 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" diff --git a/input/mutopia/E.Satie/petite-ouverture-a-danser.ly b/input/mutopia/E.Satie/petite-ouverture-a-danser.ly index 8d5b5260db..52edd9f10e 100644 --- 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" } -\version "2.3.16" +\version "2.3.22" \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) >> - \paper { + \layout { \context { \Score \override SpacingSpanner #'spacing-increment = #3 diff --git a/input/mutopia/F.Schubert/morgenlied.ly b/input/mutopia/F.Schubert/morgenlied.ly index fd3df1105f..9f6b864623 100644 --- 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)) -\bookpaper { +\paper { %#(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) diff --git a/input/mutopia/F.Schubert/standchen.ly b/input/mutopia/F.Schubert/standchen.ly index 0bf0cfc019..0e836a0497 100644 --- 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" } -\version "2.3.17" +\version "2.3.22" dynamicUp = \override DynamicLineSpanner #'direction = #1 dynamicRevert = \revert DynamicLineSpanner #'direction @@ -439,7 +439,7 @@ bassStaff = \context Staff = bass<< \bassStaff >> >> - \paper { + \layout { % 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 9329f5167c..0fb0728eab 100644 --- 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) @@ -150,7 +150,7 @@ sarabandeCelloStaff = \context Staff << >> % size perversions -smallerPaper = \paper { +smallerPaper = \layout { \context { \Staff fontSize = #-1 \override StaffSymbol #'staff-space = #0.8 @@ -163,7 +163,7 @@ smallerPaper = \paper { linewidth = 146.8 \mm } -\bookpaper { +\paper { raggedbottom = ##t indent = 7. \mm linewidth =183.5 \mm @@ -174,7 +174,7 @@ smallerPaper = \paper { \score{ \sarabandeCelloStaff \midi{ \tempo 4 = 40 } - \paper { } + \layout { } \header{ opus= "" piece ="Sarabande" } diff --git a/input/mutopia/J.S.Bach/bwv940.ly b/input/mutopia/J.S.Bach/bwv940.ly index a0c40e148e..65265083b5 100644 --- 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) -\version "2.3.17" +\version "2.3.22" %{ Header for Petites Preludes. @@ -149,7 +149,7 @@ global = { \context Voice = iv \four >> >> - \paper{ + \layout{ 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 5dc246e9eb..f6151ae591 100644 --- 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" } - \paper {} + \layout {} \midi { \tempo 4 =84 } } - \bookpaper { + \paper { 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 82707c02ff..756c270a84 100644 --- 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) -\version "2.3.17" +\version "2.3.22" \header { title = "Romanzen" @@ -271,7 +271,7 @@ leftb = \transpose c cis { << \global \context Voice=lva \lefta \context Voice=lvb \leftb >> } >> - \paper { + \layout { 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 09728b4e66..353c773cd9 100644 --- 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" -\bookpaper { +\paper { betweensystempadding = 0.0 betweensystemspace = 20 \mm } @@ -58,7 +58,7 @@ virtuoso that taught in Geneva. \score { { \transpose c' bes \allegro } - \paper{ } + \layout{ } \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 } - \paper{} + \layout{} } @@ -78,7 +78,7 @@ virtuoso that taught in Geneva. { \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 16318c38a6..2b8ce84af0 100644 --- 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 = diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-defs.ily index bf1252958f..7a0442c93a 100644 --- 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." } -\version "2.3.4" +\version "2.3.22" cresc = { #(ly:export (make-event-chord (list (make-span-event 'CrescendoEvent START)))) @@ -29,7 +29,7 @@ stopGraceMusic= \sequential { \stopGraceMusic } -\paper { +\layout { \context { \Score skipBars = ##t @@ -51,7 +51,7 @@ stopGraceMusic= \sequential { } } -\bookpaper{ +\paper{ % #(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 15c344bae5..5712ecead4 100644 --- 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' { diff --git a/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily b/input/mutopia/W.A.Mozart/mozart-hrn3-rondo.ily index e1b27c6741..95f66e9464 100644 --- 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" diff --git a/input/no-notation/bar-check.ly b/input/no-notation/bar-check.ly index 56e201bb01..44088bc735 100644 --- 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 { diff --git a/input/no-notation/beam-warn.ly b/input/no-notation/beam-warn.ly index 17c82f8430..37501a68a3 100644 --- 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 { diff --git a/input/no-notation/denneboom.ly b/input/no-notation/denneboom.ly index 60ece6ed84..554c4c26b9 100644 --- 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" @@ -81,8 +81,8 @@ verseTwoStaff = \context Lyrics = two \verseTwo -denneboomShape = \paper{ - \paperTwenty +denneboomShape = \layout{ + \layoutTwenty indent = 20. \mm % UGH -- THIS IS HAIRY @@ -109,7 +109,7 @@ denneboomShape = \paper{ \oldaddlyrics \context Staff { \time 3/4 \melody } \context Lyrics \verseOne - \paper{ + \layout{ \denneboomShape } \midi{ \tempo 4 = 90 } diff --git a/input/no-notation/die-staff.ly b/input/no-notation/die-staff.ly index d2aabf0452..9e99823dd2 100644 --- 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." diff --git a/input/no-notation/dos-guile.ly b/input/no-notation/dos-guile.ly index 98bf711513..c78af58e64 100644 --- 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{ diff --git a/input/no-notation/dos-ps.ly b/input/no-notation/dos-ps.ly index cff3d02566..045d4f0327 100644 --- 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{ diff --git a/input/no-notation/dos-tex.ly b/input/no-notation/dos-tex.ly index 136366ba24..fbed6b01fc 100644 --- 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{ diff --git a/input/no-notation/dynamic-absolute-volume.ly b/input/no-notation/dynamic-absolute-volume.ly index 9f7038bae1..e10d0db04a 100644 --- 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. @@ -20,7 +20,7 @@ a\ff a\fff a\sf } -\paper{ raggedright = ##t } +\layout{ raggedright = ##t } \midi{ \tempo 1 = 60 } diff --git a/input/no-notation/embedded-scm.ly b/input/no-notation/embedded-scm.ly index 27fde62281..c45a804104 100644 --- 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 @@ -16,7 +16,7 @@ output, ``hello world'' is printed to the console. \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 8f96735404..01d289df27 100644 --- a/input/no-notation/midi-grace.ly +++ b/input/no-notation/midi-grace.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.22" \header{ texidoc = "Tests MIDI output with grace notes. " } \score { @@ -17,7 +17,7 @@ d4 d d d d } - \paper { } + \layout { } \midi { } } diff --git a/input/no-notation/midi-lyric-barcheck.ly b/input/no-notation/midi-lyric-barcheck.ly index 9e3bb45cda..b694aa9719 100644 --- 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: @@ -19,6 +19,6 @@ this examples causes no bar checks in MIDI. } \lyricsto "A" \lyricmode\new Lyrics { bla bla | bla bla | bla bla | bla } >> - \paper {} + \layout {} \midi {} } diff --git a/input/no-notation/midi-scales.ly b/input/no-notation/midi-scales.ly index 7e9b78e136..20aa031d96 100644 --- 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 @@ -153,7 +153,7 @@ scales = \relative c { \score { \context Voice \scales - \paper { } + \layout { } \midi { } } diff --git a/input/no-notation/midi-transposing.ly b/input/no-notation/midi-transposing.ly index 1fb03a0bac..0007bc3cff 100644 --- a/input/no-notation/midi-transposing.ly +++ b/input/no-notation/midi-transposing.ly @@ -1,5 +1,5 @@ #(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. " @@ -19,7 +19,7 @@ The transposing property leaves output invariant, but has effect on MIDI. " \set Staff.transposing = #12 c } - \paper { raggedright = ##t } + \layout { raggedright = ##t } \midi { } } diff --git a/input/no-notation/midi-tuplets.ly b/input/no-notation/midi-tuplets.ly index a6bbd7d346..534cf0a521 100644 --- a/input/no-notation/midi-tuplets.ly +++ b/input/no-notation/midi-tuplets.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.22" \header { texidoc = " @@ -29,7 +29,7 @@ Midi2ly tuplet test. \times 3/5 { c8 c8 c8 c8 c8 } } - \paper { } + \layout { } \midi { } } diff --git a/input/no-notation/midi-volume-equaliser.ly b/input/no-notation/midi-volume-equaliser.ly index 4dbdfc1db5..11a9bac057 100644 --- 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) -\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 @@ -145,8 +145,8 @@ violoncello = \relative c' { >> >> - \paper { - \paperSixteen + \layout { + \layoutSixteen indent=100.0\mm linewidth=150.0\mm \context { diff --git a/input/no-notation/parse.ly b/input/no-notation/parse.ly index 5df975cdd8..909466ad62 100644 --- 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 diff --git a/input/no-notation/parse2.ly b/input/no-notation/parse2.ly index b1afd88d03..3545a546c0 100644 --- 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 diff --git a/input/no-notation/parse3.ly b/input/no-notation/parse3.ly index 4547254f9f..91c19151de 100644 --- 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 diff --git a/input/no-notation/parse4.ly b/input/no-notation/parse4.ly index 9319b668c3..852c8910d5 100644 --- 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 diff --git a/input/no-notation/parse5.ly b/input/no-notation/parse5.ly index cf513bc56d..059c52532c 100644 --- 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. diff --git a/input/no-notation/recording.ly b/input/no-notation/recording.ly index 833dc8a982..33919a6fe1 100644 --- 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 @@ -13,7 +13,7 @@ theMusic = \context Staff { c4 d8-. } #(define (notice-the-events context lst) (map (lambda (x) (display x) (newline)) lst)) -listener = \paper { +listener = \layout { \context { \Voice \type "Recording_group_engraver" diff --git a/input/no-notation/safe-guile.ly b/input/no-notation/safe-guile.ly index 820e1de7f6..dd1a27a4ed 100644 --- 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{ diff --git a/input/no-notation/safe-include.ly b/input/no-notation/safe-include.ly index 9ff8c80726..f38c5b55cd 100644 --- 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{ diff --git a/input/no-notation/safe-ps.ly b/input/no-notation/safe-ps.ly index 47ffcff133..7f35f5424a 100644 --- 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 diff --git a/input/no-notation/safe-tex.ly b/input/no-notation/safe-tex.ly index 536eb2f8cb..3074dce108 100644 --- 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{ diff --git a/input/no-notation/textcresc.ly b/input/no-notation/textcresc.ly index 3dc1d27e43..eb0be02a41 100644 --- 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" } @@ -10,6 +10,6 @@ texidoc="crashes lily" 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 b6015038c6..c383d29574 100644 --- 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 >> } diff --git a/input/puer-fragment.ly b/input/puer-fragment.ly index b1007b270d..9590e0c605 100644 --- 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" @@ -80,7 +80,7 @@ verba = \context Lyrics = "verba" \lyricmode { et fi -- li -- us da -- tus est no -- bis: } -\bookpaper { +\paper { linethickness = \staffspace / 7.0 } @@ -89,7 +89,7 @@ verba = \context Lyrics = "verba" \lyricmode { \cantus \lyricsto "cantus" \verba >> - \paper { + \layout { linewidth = 137.0\mm width = 137.0\mm indent = 0.0 diff --git a/input/regression/+.ly b/input/regression/+.ly index 3c418a3b36..a86600b9f4 100644 --- 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? diff --git a/input/regression/accidental-cautionary.ly b/input/regression/accidental-cautionary.ly index 5f1d785d47..31ca460d18 100644 --- 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 @@ -8,7 +8,7 @@ parentheses (default) or smaller accidentals. } -\paper { raggedright = ##t } +\layout { raggedright = ##t } { c''4 diff --git a/input/regression/accidental-double.ly b/input/regression/accidental-double.ly index acd7f777bb..38a31fd60e 100644 --- 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." @@ -12,7 +12,7 @@ \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 2a7793bf96..95eb727896 100644 --- 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 { diff --git a/input/regression/accidental-octave.ly b/input/regression/accidental-octave.ly index e5b118e197..03f4be8dc8 100644 --- 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=" diff --git a/input/regression/accidental-piano.ly b/input/regression/accidental-piano.ly index 864e484381..0d24c73628 100644 --- 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 } diff --git a/input/regression/accidental-placement.ly b/input/regression/accidental-placement.ly index e9f484ef11..ecc6541121 100644 --- 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 { @@ -31,7 +31,7 @@ flats in a sixth should be staggered. " } - \paper { + \layout { raggedright = ##t } diff --git a/input/regression/accidental-quarter.ly b/input/regression/accidental-quarter.ly index 85b2f1bf97..18fbe4db27 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { \relative c'' { @@ -19,5 +19,5 @@ 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 4a0e97951a..59d732bfe5 100644 --- 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 @@ -20,6 +20,6 @@ gisis'4 gis gisis ges | \thenotes } >> -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/regression/accidental-tie.ly b/input/regression/accidental-tie.ly index e0b2f54937..5c0404eed1 100644 --- 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 { @@ -22,7 +22,7 @@ mus = \relative c' { \new NoteNames \mus \new Voice { \key g \major \mus } >> - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/accidental-unbroken-tie-spacing.ly b/input/regression/accidental-unbroken-tie-spacing.ly index 502e98b46f..ffed838db6 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" rechts = \relative c' { \clef treble @@ -16,7 +16,7 @@ rechts = \relative c' { \score { \rechts - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/accidental-voice.ly b/input/regression/accidental-voice.ly index c702695c5e..85c2d9c8e4 100644 --- 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=" @@ -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 aeaa62fabc..63037e9c95 100644 --- a/input/regression/accidental.ly +++ b/input/regression/accidental.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \header{ texidoc=" @@ -14,5 +14,5 @@ foo = \relative c'' { \key as \major dis4 dis dis!^"force" dis? } << \foo \context NoteNames \foo >> -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/regression/accidentals.ly b/input/regression/accidentals.ly index a5fdd9217b..016f2ca874 100644 --- a/input/regression/accidentals.ly +++ b/input/regression/accidentals.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" \header{ texidoc=" diff --git a/input/regression/ambitus.ly b/input/regression/ambitus.ly index 0fb8828a7f..e3e6733791 100644 --- 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 diff --git a/input/regression/apply-context.ly b/input/regression/apply-context.ly index 1ac38696b1..0fe4c3483c 100644 --- 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 { @@ -14,7 +14,7 @@ This example prints a bar-number during processing on stdout. } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \relative c'' { diff --git a/input/regression/apply-output.ly b/input/regression/apply-output.ly index 89a60daeb5..ef1655f12e 100644 --- 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 @@ -45,7 +45,7 @@ position. } } -\paper { raggedright = ##t +\layout { raggedright = ##t % outputscale = 5 } } diff --git a/input/regression/arpeggio-bracket.ly b/input/regression/arpeggio-bracket.ly index fb77e375af..31f31880c2 100644 --- 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 @@ -15,6 +15,6 @@ arpeggiate the chord. \arpeggio } - \paper { raggedright= ##t } + \layout { raggedright= ##t } } diff --git a/input/regression/arpeggio-collision.ly b/input/regression/arpeggio-collision.ly index 8286e2ee99..a5c9d6d17e 100644 --- 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." @@ -10,7 +10,7 @@ texidoc = "Arpeggio stays clear of accidentals and flipped note heads." \arpeggio \arpeggio } - \paper { + \layout { raggedright = ##t \context{ \Staff diff --git a/input/regression/arpeggio.ly b/input/regression/arpeggio.ly index dc7a216bd5..c74a5c501d 100644 --- 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. @@ -26,5 +26,5 @@ Arpeggios are supported, both cross-staff and broken single staff. \arpeggio } >> - \paper { raggedright= ##t } + \layout { raggedright= ##t } } diff --git a/input/regression/auto-beam-bar.ly b/input/regression/auto-beam-bar.ly index 1e0a3dde8a..eca3453f98 100644 --- 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." @@ -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 } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/auto-beam-no-beam.ly b/input/regression/auto-beam-no-beam.ly index 6f22aa0e22..d603233edc 100644 --- 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 } diff --git a/input/regression/auto-beam-triplet.ly b/input/regression/auto-beam-triplet.ly index eae270d955..a597b0d963 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \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 9ae040f0a7..438fcb7dda 100644 --- 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 @@ -13,6 +13,6 @@ beams even if they're auto generated." 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 029c2e37c8..9ae3374b0f 100644 --- 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." } -\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 } - \paper { + \layout { \context { \Staff \remove "Clef_engraver" diff --git a/input/regression/auto-change.ly b/input/regression/auto-change.ly index 2475209fad..231ddc0785 100644 --- 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 { @@ -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 << diff --git a/input/regression/balloon.ly b/input/regression/balloon.ly index dc99fd557e..5ac97a0881 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { { @@ -28,5 +28,5 @@ with lines and explanatory text added." c8 } } - \paper{ raggedright = ##t } + \layout{ raggedright = ##t } } diff --git a/input/regression/bar-check-redefine.ly b/input/regression/bar-check-redefine.ly index 3bdbbd10f6..b2e81b7d10 100644 --- 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}." @@ -6,6 +6,6 @@ identifier @code{pipeSymbol}." pipeSymbol = \bar "||" -\paper { raggedright = ##t } +\layout { raggedright = ##t } { c'2 | c'2 | } diff --git a/input/regression/bar-number.ly b/input/regression/bar-number.ly index fc2f9e91de..a097b7a3aa 100644 --- 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 { @@ -20,7 +20,7 @@ be increased. \override Score.BarNumber #'padding = #3 c1 c } - \paper { + \layout { raggedright = ##t \context { \Score diff --git a/input/regression/bar-scripts.ly b/input/regression/bar-scripts.ly index 8361506d88..d2ffa5d47a 100644 --- 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=" @@ -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 diff --git a/input/regression/beam-auto-knee.ly b/input/regression/beam-auto-knee.ly index cf052d5076..e2bb428807 100644 --- 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 @@ -12,7 +12,7 @@ threshold. c'8[ c,,] c8[ e'] c,16[ e g c e g c c,,] } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-auto.ly b/input/regression/beam-auto.ly index 500d4d32d8..511a6cb2df 100644 --- 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 @@ -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 } - \paper{ + \layout{ } } diff --git a/input/regression/beam-break.ly b/input/regression/beam-break.ly index 921fa59859..1451e65367 100644 --- 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 diff --git a/input/regression/beam-center-slope.ly b/input/regression/beam-center-slope.ly index 3799cc8423..67e6bbb377 100644 --- 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 @@ -41,7 +41,7 @@ a''[ f] f[ a] } - \paper{ + \layout{ raggedright = ##t indent = 0 } diff --git a/input/regression/beam-concave-damped.ly b/input/regression/beam-concave-damped.ly index 239c03331b..9522f7b54e 100644 --- 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. " } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { raggedright = ##t } diff --git a/input/regression/beam-concave.ly b/input/regression/beam-concave.ly index 4b6ec3887e..d162e12829 100644 --- 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, @@ -59,7 +59,7 @@ rossBeams = \relative c'' { \rossBeams } - \paper{ + \layout{ 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 4191790eae..c9900464c5 100644 --- 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{ @@ -20,7 +20,7 @@ produced with explicit staff switches)." s2. } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-cross-staff-slope.ly b/input/regression/beam-cross-staff-slope.ly index fc8292aeea..f04247449b 100644 --- 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." } @@ -27,6 +27,6 @@ \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 a402253d7f..fbeeb4dd8a 100644 --- 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 diff --git a/input/regression/beam-damp.ly b/input/regression/beam-damp.ly index b2b1e2af8c..347edfe384 100644 --- 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. " } @@ -18,7 +18,7 @@ Beams are less steep than the notes they encompass. " } d'[ c b a] a[ b c d] } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-default-lengths.ly b/input/regression/beam-default-lengths.ly index f5a32e46fa..7b3def1e90 100644 --- 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." @@ -14,5 +14,5 @@ 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 13c182650d..3a1f38cfa2 100644 --- a/input/regression/beam-dir-functions.ly +++ b/input/regression/beam-dir-functions.ly @@ -1,5 +1,5 @@ % junkme? -\version "2.3.17" +\version "2.3.22" \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 @@ -39,7 +39,7 @@ own one. \override Beam #'dir-function = #beam-dir-median c[ c g] } -\paper{raggedright = ##t} +\layout{raggedright = ##t} } %% Local variables: diff --git a/input/regression/beam-extreme.ly b/input/regression/beam-extreme.ly index 30791698df..639aca09de 100644 --- 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. @@ -41,7 +41,7 @@ extreme = \relative c'' { \extreme %} } - \paper{ + \layout{ % raggedright = ##t raggedright = ##t } diff --git a/input/regression/beam-french.ly b/input/regression/beam-french.ly index 2df1558327..900761d511 100644 --- 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 { @@ -16,7 +16,7 @@ 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 12a4397c71..f153cb0aa5 100644 --- 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 @@ -16,6 +16,6 @@ should be pointing to the note head. 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 6076e327fc..28a84941b3 100644 --- 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 @@ -33,7 +33,7 @@ beam. This is in disagreement with the current algorithm." g''' g,,,] } } } -\paper { raggedright = ##t} +\layout { raggedright = ##t} } diff --git a/input/regression/beam-isknee.ly b/input/regression/beam-isknee.ly index 0c1cef21f4..8a20f5048d 100644 --- 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 @@ -21,7 +21,7 @@ Beams can be placed across a @code{PianoStaff}. s2 } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-knee-symmetry.ly b/input/regression/beam-knee-symmetry.ly index 059f8bd870..bfa5fb7b65 100644 --- 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 @@ -12,7 +12,7 @@ a8[ b'' a,, b''] b8[ a,, b'' a,,] } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-length.ly b/input/regression/beam-length.ly index 1127b77f03..c1461614f2 100644 --- 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. " } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/beam-manual-beaming.ly b/input/regression/beam-manual-beaming.ly index 116c977c0c..e03836d03e 100644 --- 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 { @@ -22,7 +22,7 @@ #'beaming = #(cons (list 0 2 4) (list 0 1 4)) c c c] } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-multiple-cross-staff.ly b/input/regression/beam-multiple-cross-staff.ly index ce5636bcc0..488291733e 100644 --- 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) @@ -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 1504143f68..bdf90443f0 100644 --- 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] } - \paper { raggedright= ##t } + \layout { raggedright= ##t } } diff --git a/input/regression/beam-position.ly b/input/regression/beam-position.ly index d81db4fdc7..52b0aca5a1 100644 --- 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 @@ -22,7 +22,7 @@ note beams. Override with @code{no-stem-extend}. " f8[ f] } - \paper { + \layout { raggedright = ##t } \midi { } diff --git a/input/regression/beam-postfix-notation.ly b/input/regression/beam-postfix-notation.ly index 1ff6b91e33..cfa8383c69 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score diff --git a/input/regression/beam-quant-standard.ly b/input/regression/beam-quant-standard.ly index 801c174d88..5cd0eff91a 100644 --- 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) diff --git a/input/regression/beam-quanting-32nd.ly b/input/regression/beam-quanting-32nd.ly index cc4d6b41f4..36934819c8 100644 --- 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''{ @@ -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] } -\paper { } +\layout { } } diff --git a/input/regression/beam-quanting-horizontal.ly b/input/regression/beam-quanting-horizontal.ly index 8b9aad0eb9..da74dee519 100644 --- 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{ diff --git a/input/regression/beam-quarter.ly b/input/regression/beam-quarter.ly index 0a8ecdae30..fd862ecce1 100644 --- 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." @@ -8,5 +8,5 @@ \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 68592dd404..45a9849df2 100644 --- 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." } -\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] | } -\paper { raggedright = ##t} +\layout { raggedright = ##t} } diff --git a/input/regression/beam-second.ly b/input/regression/beam-second.ly index 4f09e3bc93..97fb40a941 100644 --- 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 @@ -14,7 +14,7 @@ seconds, you'll spot something fishy very quickly. b16[ c] a'[ b] } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/beam-shortened-lengths.ly b/input/regression/beam-shortened-lengths.ly index 0ade7d1c95..caaedf486a 100644 --- 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." @@ -14,5 +14,5 @@ \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 3687a54e6d..71321094fa 100644 --- 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." @@ -8,7 +8,7 @@ texidoc = "Hairy case for beam, chord, and automatic knees." %be fixed by uncommenting \stemUp" } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \score{ diff --git a/input/regression/beaming-ternary-metrum.ly b/input/regression/beaming-ternary-metrum.ly index 1fa2b95736..040b6a917a 100644 --- 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." } @@ -9,6 +9,6 @@ texidoc = "Automatic beaming works also in ternary time sigs." \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 bbd9f8ed6f..2a0acfded8 100644 --- a/input/regression/beaming.ly +++ b/input/regression/beaming.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \header{ texidoc=" diff --git a/input/regression/beams.ly b/input/regression/beams.ly index 3294fa6b4b..89cf7c9292 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \relative c' diff --git a/input/regression/break.ly b/input/regression/break.ly index 7197d46fde..7530dd3ff9 100644 --- a/input/regression/break.ly +++ b/input/regression/break.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \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 } - \paper { + \layout { indent = 0.0 linewidth = 4.0\cm} } diff --git a/input/regression/breathing-sign-ancient.ly b/input/regression/breathing-sign-ancient.ly index 1feda799b7..a2a5cd789c 100644 --- 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=" diff --git a/input/regression/breathing-sign.ly b/input/regression/breathing-sign.ly index 3d0499d2bf..bdc50bc1ba 100644 --- a/input/regression/breathing-sign.ly +++ b/input/regression/breathing-sign.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.17" +\version "2.3.22" \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 8bff803b2e..122f236d34 100644 --- 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 @@ -23,5 +23,5 @@ settings = { >> \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 69e918b6bd..576853b07b 100644 --- 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 { @@ -7,6 +7,6 @@ } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \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 3c0ec8f449..85927a47d1 100644 --- 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 { diff --git a/input/regression/chord-name-exceptions.ly b/input/regression/chord-name-exceptions.ly index d08bb1d721..fdcd444485 100644 --- 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. diff --git a/input/regression/chord-name-major7.ly b/input/regression/chord-name-major7.ly index 4abfbc2b5e..e692c2f77d 100644 --- 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}." diff --git a/input/regression/chord-names-bass.ly b/input/regression/chord-names-bass.ly index 7775c40d9e..4599afe834 100644 --- 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 { diff --git a/input/regression/chord-scripts.ly b/input/regression/chord-scripts.ly index 421ef7506a..d4335fea61 100644 --- 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." diff --git a/input/regression/chord-tremolo-short.ly b/input/regression/chord-tremolo-short.ly index 9a852e6f44..2c9934e846 100644 --- 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. @@ -11,6 +11,6 @@ \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 63cba8e3fc..e5b8fc20d9 100644 --- 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=" @@ -41,6 +41,6 @@ notes as well.) } \midi { } - \paper {} + \layout {} } diff --git a/input/regression/chords-funky-ignatzek.ly b/input/regression/chords-funky-ignatzek.ly index 80aba75f29..a57ef63149 100644 --- 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 { diff --git a/input/regression/clef-oct.ly b/input/regression/clef-oct.ly index e1088f5210..2c87d885aa 100644 --- 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 @@ -26,5 +26,5 @@ higher or lower), and can take any value, including 15 for two octaves." \clef "G^9" c4 } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/clefs.ly b/input/regression/clefs.ly index f9e8c79bdf..91efc84141 100644 --- a/input/regression/clefs.ly +++ b/input/regression/clefs.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" \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 "|." } - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/cluster-cross-staff.ly b/input/regression/cluster-cross-staff.ly index ee42bf88db..657a584969 100644 --- 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 << @@ -18,7 +18,7 @@ { \clef bass s1 * 2 } >> >> - \paper { + \layout { raggedright= ##t } } diff --git a/input/regression/cluster.ly b/input/regression/cluster.ly index edc7604a2e..779469b891 100644 --- 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." @@ -15,7 +15,7 @@ fragment = \relative c' { \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 56bf5ce4da..1d3fbb9502 100644 --- 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. " } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/collision-alignment.ly b/input/regression/collision-alignment.ly index aeae1b7f58..689d8a1617 100644 --- 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 { diff --git a/input/regression/collision-dots-invert.ly b/input/regression/collision-dots-invert.ly index 500a05c5ce..4f151e3c7a 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { \relative c'' { << 2\\ { 4 4 } >> << { 2 } \\ { 4. 8 } >> } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/collision-dots-move.ly b/input/regression/collision-dots-move.ly index 83d2c95175..c7e1dade21 100644 --- 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 @@ -6,7 +6,7 @@ } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \score { \relative c { diff --git a/input/regression/collision-dots.ly b/input/regression/collision-dots.ly index 613dd69b2f..ad16e28c63 100644 --- a/input/regression/collision-dots.ly +++ b/input/regression/collision-dots.ly @@ -5,8 +5,8 @@ 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{ diff --git a/input/regression/collision-head-chords.ly b/input/regression/collision-head-chords.ly index 115bd9e769..7f25f9d411 100644 --- 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. @@ -12,7 +12,7 @@ they have the same positions in the extreme note heads. c4 << { c4 d4 8 } \\ { c4 c 8 8 } >> } -\paper {raggedright = ##t} +\layout {raggedright = ##t} } diff --git a/input/regression/collision-heads.ly b/input/regression/collision-heads.ly index 8e776d82d0..18678270a2 100644 --- 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 = @@ -9,7 +9,7 @@ if the black note heads are from 8th or shorter notes. } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \score { diff --git a/input/regression/collision-merge-differently-dotted.ly b/input/regression/collision-merge-differently-dotted.ly index 59ec20bcc4..91f8c38829 100644 --- 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 @@ -7,7 +7,7 @@ should not disappear when merging similar note heads." } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \score { \context Staff \relative c'' << diff --git a/input/regression/collision-merge-dots.ly b/input/regression/collision-merge-dots.ly index bd4ac0a8e1..53d264e8a2 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \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 51ff7fa0b9..36fc522815 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/collisions.ly b/input/regression/collisions.ly index d2e962704e..69a684183f 100644 --- a/input/regression/collisions.ly +++ b/input/regression/collisions.ly @@ -1,5 +1,5 @@ #(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, diff --git a/input/regression/completion-heads-polyphony.ly b/input/regression/completion-heads-polyphony.ly index a667b59952..940ee755d3 100644 --- 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 @@ -14,7 +14,7 @@ Completion heads are not fooled by polyphony with a different rhythm. { c2. a8 g4 f4. g4 f } >> - \paper { + \layout { \context{ \Voice \remove "Note_heads_engraver" diff --git a/input/regression/completion-heads.ly b/input/regression/completion-heads.ly index d2bb2d3402..a642d46d2c 100644 --- 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=" @@ -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 } - \paper{ + \layout{ \context{ \Voice \remove "Note_heads_engraver" diff --git a/input/regression/custos.ly b/input/regression/custos.ly index 1125d89400..13b8bbc3ca 100644 --- 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." } @@ -23,7 +23,7 @@ c'1^"mensural" \break < d' a' f''>1 } - \paper { + \layout { \context { \Staff \consists Custos_engraver diff --git a/input/regression/dot-flag-collision.ly b/input/regression/dot-flag-collision.ly index 6c01d222f8..e59ffde385 100644 --- 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." } @@ -13,7 +13,7 @@ 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 151511514c..7cca28d6ca 100644 --- 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. @@ -38,7 +38,7 @@ The priorities to print the dots are (ranked in importance): } - \paper { } + \layout { } \midi { } } diff --git a/input/regression/drums.ly b/input/regression/drums.ly index 562c9ef314..6718d8762c 100644 --- 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 } @@ -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 } diff --git a/input/regression/dynamics-broken-hairpin.ly b/input/regression/dynamics-broken-hairpin.ly index 34711e6f6d..ba5fad77e8 100644 --- 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." } @@ -7,7 +7,7 @@ texidoc = "Broken crescendi should be open on one side." \score { \relative c'' { c1 \< \break c1\! \> \break c1\! } - \paper { + \layout { linewidth = 4.\cm } } diff --git a/input/regression/dynamics-glyphs.ly b/input/regression/dynamics-glyphs.ly index 31a088a15f..7929f33d46 100644 --- 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 diff --git a/input/regression/dynamics-hairpin-length.ly b/input/regression/dynamics-hairpin-length.ly index 7ee6831e29..33889ac900 100644 --- a/input/regression/dynamics-hairpin-length.ly +++ b/input/regression/dynamics-hairpin-length.ly @@ -6,10 +6,10 @@ respectively." } -\version "2.3.17" +\version "2.3.22" -\paper { raggedright = ##t } +\layout { raggedright = ##t } \relative c'' { c4 \< c4 \! diff --git a/input/regression/dynamics-line.ly b/input/regression/dynamics-line.ly index 345593d853..798213ab98 100644 --- 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 @@ -24,7 +24,7 @@ d\f a } -\paper{ +\layout{ } \midi{ \tempo 1 = 60 diff --git a/input/regression/dynamics-unbound-hairpin.ly b/input/regression/dynamics-unbound-hairpin.ly index ab099b3eee..c9c54a56ae 100644 --- 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." @@ -8,6 +8,6 @@ texidoc = "Crescendi may start off-notes, however, they should not collapse int << 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 a23faaf66a..589f678f7e 100644 --- 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. @@ -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 } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/fermata-rest-position.ly b/input/regression/fermata-rest-position.ly index 9cee58ede1..7b77259076 100644 --- 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. " } -\paper { +\layout { raggedright = ##t } \relative c' { diff --git a/input/regression/figured-bass.ly b/input/regression/figured-bass.ly index a1cc088e98..e33dffcb77 100644 --- 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 @@ -10,7 +10,7 @@ You can also type letters by entering quoted strings, which is shown in the last bass figure. " } -\paper { raggedright = ##t } +\layout { raggedright = ##t } << \figures { <3 [5 7]> diff --git a/input/regression/finger-chords.ly b/input/regression/finger-chords.ly index f30eea155e..fa687a7349 100644 --- 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 @@ -7,7 +7,7 @@ fingerings uniquely with notes. This makes horizontal fingering much easier to process." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/fingering.ly b/input/regression/fingering.ly index 209249af10..da3572be7b 100644 --- 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 @@ -7,7 +7,7 @@ next to noteheads. " } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/follow-voice-break.ly b/input/regression/follow-voice-break.ly index 35ea1e8bcd..7192135a86 100644 --- 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. @@ -19,7 +19,7 @@ printed. } \context Staff=two { \clef bass \skip 1*2 } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/font-magnification.ly b/input/regression/font-magnification.ly index 03d23a0e21..57550cefbc 100644 --- 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. " } diff --git a/input/regression/font-name.ly b/input/regression/font-name.ly index 4288f353f9..97b58c04fb 100644 --- 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 { @@ -36,6 +36,6 @@ available through (La)TeX. 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 6e1f8ba197..539bada76d 100644 --- a/input/regression/font-postscript.ly +++ b/input/regression/font-postscript.ly @@ -5,9 +5,9 @@ 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) @@ -22,7 +22,7 @@ % this file. #(system "afm2tfm `kpsewhich uncb8a.afm` uncb8a.tfm") -\paper { +\layout { 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 cffaf13fce..4a43a17ea1 100644 --- 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=" @@ -24,7 +24,7 @@ setting the @code{extra-offset} of a grob. \mark \default e } -\paper{ +\layout{ raggedright = ##t } } diff --git a/input/regression/glissando.ly b/input/regression/glissando.ly index ca89998d85..77c6988e0d 100644 --- a/input/regression/glissando.ly +++ b/input/regression/glissando.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.17" +\version "2.3.22" \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 } - \paper{ + \layout{ linewidth = 50.\mm indent = 0 \context{ \Staff diff --git a/input/regression/grace-auto-beam.ly b/input/regression/grace-auto-beam.ly index 3ef7e50fee..13b900a690 100644 --- 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." @@ -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 | } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/grace-bar-line.ly b/input/regression/grace-bar-line.ly index 35be3920aa..8047ff7c6c 100644 --- 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." } @@ -10,6 +10,6 @@ texidoc = "Bar line should come before the grace note." \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 472145f39f..94e1d0af86 100644 --- 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 @@ -14,6 +14,6 @@ printed correctly. \grace c8 c1 } -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/regression/grace-beam.ly b/input/regression/grace-beam.ly index 9173689c1f..27f379d2a5 100644 --- 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] }} diff --git a/input/regression/grace-end.ly b/input/regression/grace-end.ly index f32e1758f3..199c661fe5 100644 --- 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 @@ -14,7 +14,7 @@ c4 \grace { d16[ d16] } } - \paper { + \layout { raggedright = ##t } \midi { } diff --git a/input/regression/grace-nest.ly b/input/regression/grace-nest.ly index ae6c00c745..965a89884e 100644 --- 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." @@ -7,7 +7,7 @@ texidoc = "Grace code should not be confused by nested sequential musics, contai { c''2 { \grace b'16 c''2 } \bar "|." } - \paper { + \layout { raggedright = ##t } diff --git a/input/regression/grace-nest1.ly b/input/regression/grace-nest1.ly index 06c06e374b..699c299383 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \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 f2a2d4d751..01cf6bd4d3 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \context Voice { { \grace b'8 c''2 } diff --git a/input/regression/grace-nest3.ly b/input/regression/grace-nest3.ly index cb81dfb379..a8b63149cc 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \relative c'' { f1 diff --git a/input/regression/grace-nest4.ly b/input/regression/grace-nest4.ly index 448f5b36d4..64f30ca77c 100644 --- 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." } @@ -10,7 +10,7 @@ texidoc = "Also in the nested syntax here, grace notes appear rightly." >> \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 c46f442bb4..f327547ddd 100644 --- 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." } @@ -10,6 +10,6 @@ \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 6fc6ba446e..1a4e4ab249 100644 --- 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." } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \score { \new Staff diff --git a/input/regression/grace-staff-length.ly b/input/regression/grace-staff-length.ly index 0483bd1d61..e16d84adf4 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \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 dfe97f8b47..79b97beb17 100644 --- 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." } @@ -9,6 +9,6 @@ texidoc = "Pieces may begin with grace notes." \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 395d2b0ebb..7ac92b4668 100644 --- 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. " } -\version "2.3.17" +\version "2.3.22" -\paper { +\layout { raggedright = ##t % "debug-beam-quanting" = ##t diff --git a/input/regression/grace-stems.ly b/input/regression/grace-stems.ly index 478dfd9cc4..b41b663bde 100644 --- 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. @@ -18,7 +18,7 @@ true; the two grace beams should be the same here. a4 } - \paper { + \layout { raggedright = ##t } \midi { } diff --git a/input/regression/grace-sync.ly b/input/regression/grace-sync.ly index ae6a95c061..2153536e80 100644 --- 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." } @@ -12,6 +12,6 @@ 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 b495ecb7bf..c05a44fcb1 100644 --- 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." } -\paper { +\layout { raggedright = ##t } diff --git a/input/regression/grace-unfold-repeat.ly b/input/regression/grace-unfold-repeat.ly index 376df39238..9301381365 100644 --- 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. diff --git a/input/regression/grace-volta-repeat-2.ly b/input/regression/grace-volta-repeat-2.ly index 200e19d5ad..eb28300b8e 100644 --- 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 { @@ -7,7 +7,7 @@ } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score {\relative c' { \repeat volta 2 { diff --git a/input/regression/grace-volta-repeat.ly b/input/regression/grace-volta-repeat.ly index 9bf7ecba7b..3c326e2c0f 100644 --- 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 { @@ -15,7 +15,7 @@ } } - \paper { raggedright = ##t} + \layout { raggedright = ##t} } diff --git a/input/regression/grace.ly b/input/regression/grace.ly index 389dfd425a..5a00f76b5a 100644 --- a/input/regression/grace.ly +++ b/input/regression/grace.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \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 } -\paper {raggedright = ##t} +\layout {raggedright = ##t} \midi{ } } diff --git a/input/regression/hairpin-dashed.ly b/input/regression/hairpin-dashed.ly index 9fd14f453f..0745122fee 100644 --- 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. " diff --git a/input/regression/hairpin-ending.ly b/input/regression/hairpin-ending.ly index fd023f3511..922ad1787b 100644 --- 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 { @@ -12,6 +12,6 @@ into them." \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 3e71096bf3..d0757c1ce4 100644 --- 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 = @@ -18,7 +18,7 @@ alignment; this should not confuse the mechanism. } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \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 } >> - \paper { + \layout { \context { \RemoveEmptyStaffContext } diff --git a/input/regression/instrument-name-markup.ly b/input/regression/instrument-name-markup.ly index ccd975e765..0c94dd7be9 100644 --- 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} @@ -20,7 +20,7 @@ textFlat = \markup {\smaller \flat} { 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 5787146645..e437737c78 100644 --- 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 } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/instrument-name.ly b/input/regression/instrument-name.ly index f761149a03..8666125800 100644 --- 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 @@ -19,7 +19,7 @@ PianoStaff. \set Staff.instrument = "Right " { c''4 }} \context Staff = bass { \set Staff.instrument = "Left " \clef bass c4 }>> -\paper { +\layout { raggedright = ##t }} diff --git a/input/regression/key-clefs.ly b/input/regression/key-clefs.ly index 0d178fdc2d..7680812110 100644 --- 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) diff --git a/input/regression/key-signature-cancellation.ly b/input/regression/key-signature-cancellation.ly index cfcfd929e1..5fc3fa7f17 100644 --- 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 } diff --git a/input/regression/key-signature-scordatura.ly b/input/regression/key-signature-scordatura.ly index 8803a96ad4..f4d991440d 100644 --- 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. diff --git a/input/regression/keys.ly b/input/regression/keys.ly index 147d24c839..94cffd9e28 100644 --- 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. diff --git a/input/regression/ledger-line-shorten.ly b/input/regression/ledger-line-shorten.ly index ed2400edcd..073de0754b 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" -\paper { +\layout { raggedright = ##t } diff --git a/input/regression/lily-in-scheme.ly b/input/regression/lily-in-scheme.ly index 1cca684550..432fa32b46 100644 --- 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 diff --git a/input/regression/lyric-combine-new.ly b/input/regression/lyric-combine-new.ly index d52f73cfa3..f1b4ded3cf 100644 --- 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 diff --git a/input/regression/lyric-combine-polyphonic.ly b/input/regression/lyric-combine-polyphonic.ly index 18e7b9bd68..f2dc8b079a 100644 --- 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 @@ -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 60a434cd51..da93d9dc51 100644 --- 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 @@ -13,7 +13,7 @@ extenders do not assume anything about lyric lengths, so they continue 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 846df5c8d9..85f194af62 100644 --- 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 { @@ -17,7 +17,7 @@ of the melisma." } \lyricsto A \context Lyrics \lyricmode { a __ a __ ha } >> - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/lyric-extender.ly b/input/regression/lyric-extender.ly index 5dbdbe1562..202e0b0d53 100644 --- 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 { @@ -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 diff --git a/input/regression/lyric-hyphen-break.ly b/input/regression/lyric-hyphen-break.ly index b978584c85..3ace14934b 100644 --- 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 { @@ -20,7 +20,7 @@ r c16[ c c] bla -- bla -- bla -- bla8 -- bla16 -- bla -- bla }>> - \paper { + \layout { 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 a555b56303..6718f10edd 100644 --- 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 { @@ -38,7 +38,7 @@ c16[ c c c] bla -- bla -- bla -- bla }>> - \paper { + \layout { indent = 0.0 \cm linewidth = 3.4 \cm diff --git a/input/regression/lyric-hyphen.ly b/input/regression/lyric-hyphen.ly index 9f35bc78ce..7856725893 100644 --- 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." } -\paper { +\layout { raggedright= ##t } diff --git a/input/regression/lyric-phrasing.ly b/input/regression/lyric-phrasing.ly index 0c4c629ff9..f8aac3f37b 100644 --- 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 = " @@ -22,5 +22,5 @@ texidoc = " izzz } >> - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/lyrics-bar.ly b/input/regression/lyrics-bar.ly index 25f4114427..1ba196fff7 100644 --- 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=" @@ -23,7 +23,7 @@ lyrics do not collide with barlines. >> \new Staff { b1 b1 } >> - \paper { + \layout { raggedright = ##t \context { \Score diff --git a/input/regression/lyrics-melisma-beam.ly b/input/regression/lyrics-melisma-beam.ly index 1934bec635..e7ae87fe0b 100644 --- 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." @@ -14,5 +14,5 @@ \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 081c6bcd0a..48fa3aff76 100644 --- 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." } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { \context { \Staff minimumVerticalExtent = ##f diff --git a/input/regression/markup-note.ly b/input/regression/markup-note.ly index 9869682c44..4576aa74b3 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { { c4^\markup { \note #"1" #1 diff --git a/input/regression/markup-score.ly b/input/regression/markup-score.ly index a026592305..a3586ee997 100644 --- a/input/regression/markup-score.ly +++ b/input/regression/markup-score.ly @@ -2,7 +2,7 @@ texidoc = "Use \\score block as markup command." } -\version "2.3.17" +\version "2.3.22" tuning = \markup { \score { @@ -11,7 +11,7 @@ tuning = \markup { } { \clef bass 1 } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } } diff --git a/input/regression/markup-stack.ly b/input/regression/markup-stack.ly index a6978ad48b..cc2abfdba4 100644 --- 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."} -\paper { raggedright = ##t} +\layout { raggedright = ##t} \score { { c''^\markup { "a" \column < "1" \bold "2" "3" > } } } diff --git a/input/regression/markup-user.ly b/input/regression/markup-user.ly index f7c08e1022..be706cc4bb 100644 --- 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\"" @@ -18,5 +18,5 @@ 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 1b1504a73c..c598b74d49 100644 --- 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. @@ -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.-> } - \paper { + \layout { raggedright = ##t \context { \Staff \consists "Measure_grouping_engraver" diff --git a/input/regression/mensural.ly b/input/regression/mensural.ly index 4b1116624f..8444e939e2 100644 --- 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 diff --git a/input/regression/metronome-marking.ly b/input/regression/metronome-marking.ly index 43fc0fb268..f3f5396579 100644 --- 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 } -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/regression/mm-rests2.ly b/input/regression/mm-rests2.ly index fc563175f1..cc52dee683 100644 --- 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=" diff --git a/input/regression/molecule-hacking.ly b/input/regression/molecule-hacking.ly index 09f5c958fb..63a757a1aa 100644 --- 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 @@ -50,7 +50,7 @@ GROB. The dimensions of the stencil is not affected. parenthesize-stencil) -\paper { raggedright = ##t } +\layout { raggedright = ##t } \relative c' { c4 e diff --git a/input/regression/multi-measure-rest-center.ly b/input/regression/multi-measure-rest-center.ly index fc3c1b9513..0c5173ede2 100644 --- 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." @@ -14,7 +14,7 @@ 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 883597a8dc..0f4d964267 100644 --- 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." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } << \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 5060438522..cff6c1f587 100644 --- 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. @@ -13,7 +13,7 @@ multimeasure rests. " \set Staff.instr = "instr" {c''1 \break R1 } >> - \paper { + \layout { 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 c7ac055dd2..5fc82c9a10 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \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 1d1dab4d94..2b04c0ccbc 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { << @@ -12,7 +12,7 @@ extra spacing column is created. This should not cause problems." << { R1*40 } { s1*0_"bla" }>> } >> - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/multi-measure-rest-text.ly b/input/regression/multi-measure-rest-text.ly index c320cc3190..f1787a2f3c 100644 --- 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 { diff --git a/input/regression/multi-measure-rest.ly b/input/regression/multi-measure-rest.ly index 404ae7afd2..655cdd411b 100644 --- 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=" @@ -26,7 +26,7 @@ are used then a different symbol is used. \time 8/4 R1*2 } - \paper { + \layout { \context { \Score skipBars = ##t diff --git a/input/regression/music-function.ly b/input/regression/music-function.ly index b62a5faad4..99255c3710 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" #(define myBar (ly:make-music-function diff --git a/input/regression/music-map.ly b/input/regression/music-map.ly index 2ea736ead1..1b4a994fa3 100644 --- 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. @@ -27,7 +27,7 @@ Scripts and dynamics are maintained. ) - \paper { raggedright= ##t } + \layout { raggedright= ##t } 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 f00c6dab5f..a1cb93cbe2 100644 --- 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}." } -\version "2.3.17" +\version "2.3.22" \score { { \fatText @@ -53,7 +53,7 @@ #:smaller #:smaller #:smaller "A") #:sub "alike") } - \paper { + \layout { raggedright = ##t indent = #0 \context { diff --git a/input/regression/new-markup-syntax.ly b/input/regression/new-markup-syntax.ly index 2cf8708399..d9f1653494 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { diff --git a/input/regression/new-slur.ly b/input/regression/new-slur.ly index 2c1355a72b..7bccbfbb94 100644 --- a/input/regression/new-slur.ly +++ b/input/regression/new-slur.ly @@ -3,8 +3,8 @@ texidoc = "Scoring based slur formatting." } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { raggedright = ##t % #(define debug-slur-scoring #t) } diff --git a/input/regression/newaddlyrics.ly b/input/regression/newaddlyrics.ly index 216515c193..6a6de5e354 100644 --- a/input/regression/newaddlyrics.ly +++ b/input/regression/newaddlyrics.ly @@ -3,7 +3,7 @@ texidoc = "newlyrics, multiple stanzas, multiple lyric voices." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } << \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 79a874709d..524ade91b7 100644 --- 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 @@ -9,7 +9,7 @@ corresponding engraver. \score { { c4 d4 e8 d8 } - \paper { + \layout { raggedright = ##t \context { \Staff diff --git a/input/regression/non-empty-text.ly b/input/regression/non-empty-text.ly index 6724f703da..28ebf827b1 100644 --- 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. @@ -15,7 +15,7 @@ to control the horizontal size of text. " } \fatText c_"very wide and long text" c } - \paper { + \layout { linewidth = 3.0\cm } } diff --git a/input/regression/note-group-bracket.ly b/input/regression/note-group-bracket.ly index 8683c15d84..4d34b5e338 100644 --- 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 { @@ -28,7 +28,7 @@ analysis brackets start and end. c4\stopGroup\stopGroup } - \paper { + \layout { \context { \Staff \consists "Horizontal_bracket_engraver" } diff --git a/input/regression/note-head-chord.ly b/input/regression/note-head-chord.ly index cfe4a86345..afff8d7b76 100644 --- 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. @@ -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 { diff --git a/input/regression/note-head-harmonic.ly b/input/regression/note-head-harmonic.ly index db6e9f9645..241fcd378f 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" \score { { @@ -18,7 +18,7 @@ < dis'' gis''\harmonic >8 } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/note-head-style.ly b/input/regression/note-head-style.ly index cd6e04d34d..33d5708657 100644 --- 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. @@ -76,7 +76,7 @@ pattern = << \break } - \paper { + \layout { indent = 0.0 raggedright = ##t } diff --git a/input/regression/note-line.ly b/input/regression/note-line.ly index 1606179309..377c2138bf 100644 --- 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) @@ -21,7 +21,7 @@ sd = { \change Staff = down} \clef F s1*4 } >> -\paper { +\layout { linewidth = 8.0 \cm } } diff --git a/input/regression/number-staff-lines.ly b/input/regression/number-staff-lines.ly index 890b54a867..3a049263ff 100644 --- 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 @@ -11,7 +11,7 @@ adjusted accordingly. " \context Voice \relative c { c' c c c | g' g g g \bar ":|" } - \paper { + \layout { \context { \Staff \override StaffSymbol #'line-count = #3 diff --git a/input/regression/ottava-broken.ly b/input/regression/ottava-broken.ly index c5b55cc1b0..00881ffa8a 100644 --- 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) diff --git a/input/regression/ottava.ly b/input/regression/ottava.ly index 516263202b..a2aa3428a4 100644 --- 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 @@ -32,7 +32,7 @@ string can be tuned with @code{Staff.ottavation}. % by the user). The same holds for `8va' and `15ma'. -\paper { raggedright = ##t} +\layout { raggedright = ##t} \score { \relative c''' { a b c a diff --git a/input/regression/page-breaks.ly b/input/regression/page-breaks.ly index 06393cf3e4..3621ea66e3 100644 --- a/input/regression/page-breaks.ly +++ b/input/regression/page-breaks.ly @@ -1,5 +1,5 @@ #(ly:set-point-and-click 'line-column) -\version "2.3.17" +\version "2.3.22" \header { diff --git a/input/regression/page-layout.ly b/input/regression/page-layout.ly index 254544f7d6..8cc5cf25f9 100644 --- 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" @@ -17,7 +17,7 @@ values for the whole paper while \paper for each \score block." } instrument = "Instrument" } -\bookpaper { +\paper { %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"} - \paper {linewidth = 13\cm} + \layout {linewidth = 13\cm} } \score { \relative c'' { @@ -50,6 +50,6 @@ values for the whole paper while \paper for each \score block." } } } \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 aa1ae26b54..b22e7224b1 100644 --- 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." diff --git a/input/regression/part-combine-cross.ly b/input/regression/part-combine-cross.ly index 5247dc7abc..eb33aab7c7 100644 --- 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 - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/part-combine-global.ly b/input/regression/part-combine-global.ly index b663904eda..a0654b1d3b 100644 --- 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 = diff --git a/input/regression/part-combine-mmrest-after-solo.ly b/input/regression/part-combine-mmrest-after-solo.ly index 637775a9da..991c36dc11 100644 --- 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." } -\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 } diff --git a/input/regression/part-combine-solo-end.ly b/input/regression/part-combine-solo-end.ly index ef653aa061..14c35fe5a5 100644 --- 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." } -\version "2.3.17" -\paper { raggedright = ##t } +\version "2.3.22" +\layout { raggedright = ##t } << \new Staff diff --git a/input/regression/part-combine-solo-global.ly b/input/regression/part-combine-solo-global.ly index 1b6258ab45..ef2c086171 100644 --- 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 diff --git a/input/regression/part-combine-solo.ly b/input/regression/part-combine-solo.ly index bea60b2fb3..54a2146514 100644 --- 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 } -\version "2.3.17" +\version "2.3.22" \score { diff --git a/input/regression/part-combine-text.ly b/input/regression/part-combine-text.ly index 4844cfba8c..ef753bd435 100644 --- 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 } diff --git a/input/regression/part-combine.ly b/input/regression/part-combine.ly index ba29b30d7e..b04902ad3b 100644 --- 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 @@ -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 - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/pedal-bracket.ly b/input/regression/pedal-bracket.ly index 5a6fb5fbe3..35d2001abc 100644 --- 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 { @@ -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 } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/pedal-end.ly b/input/regression/pedal-end.ly index ea78d35c5c..260f2dbe21 100644 --- 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. " @@ -11,5 +11,5 @@ c4 \sustainDown \bar "|." } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/pedal-ped.ly b/input/regression/pedal-ped.ly index fff51ddd7a..327ee41bd7 100644 --- 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. diff --git a/input/regression/phrasing-slur-slur-avoid.ly b/input/regression/phrasing-slur-slur-avoid.ly index ad4bb83336..9ef3c4ff99 100644 --- 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." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \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 3ec257eabc..657234a8ef 100644 --- 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 { @@ -8,7 +8,7 @@ the break alignment." } -\paper { raggedright= ##t } +\layout { raggedright= ##t } \score{ { a a a a \break diff --git a/input/regression/prefatory-spacing-matter.ly b/input/regression/prefatory-spacing-matter.ly index da438d9fa5..7fddf68ca0 100644 --- 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, @@ -20,6 +20,6 @@ bar-line is different from the start of line. \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 49815116c8..0a4952af79 100644 --- 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." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } -\version "2.3.17" +\version "2.3.22" \relative c'' { << { \grace e8 d2 } diff --git a/input/regression/property-once.ly b/input/regression/property-once.ly index 44c49633ad..849070b8f8 100644 --- 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." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \relative c' { c4 diff --git a/input/regression/quote-cyclic.ly b/input/regression/quote-cyclic.ly index 9006602dfa..380b767d75 100644 --- 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 \\ @@ -15,7 +15,7 @@ B = \relative c' { << R1 \\ \addquote "qA" \A \addquote "qB" \B -\paper { raggedright = ##t } +\layout { raggedright = ##t } << \context Staff = "A" \A diff --git a/input/regression/quote-transposition.ly b/input/regression/quote-transposition.ly index 857fec9078..2ab18dec1a 100644 --- 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 { diff --git a/input/regression/quote.ly b/input/regression/quote.ly index 18fc7e228f..b98d960fc0 100644 --- 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}." } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { raggedright = ##t } diff --git a/input/regression/rehearsal-mark-letter.ly b/input/regression/rehearsal-mark-letter.ly index 8db67b9fc6..fe56382b25 100644 --- 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}." } -\version "2.3.17" +\version "2.3.22" \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 4654aacc9e..2e16974300 100644 --- 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 diff --git a/input/regression/repeat-fold.ly b/input/regression/repeat-fold.ly index 352835f278..ad4c52362d 100644 --- 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=" diff --git a/input/regression/repeat-line-break.ly b/input/regression/repeat-line-break.ly index f0e63bd7f2..e4daa498fb 100644 --- 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=" @@ -7,7 +7,7 @@ bracket should be equal. " } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { diff --git a/input/regression/repeat-percent-skipbars.ly b/input/regression/repeat-percent-skipbars.ly index 61cf3ca8a2..39967e90af 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \context Staff << diff --git a/input/regression/repeat-percent.ly b/input/regression/repeat-percent.ly index 705f1c8ba1..e29bd2bbcb 100644 --- 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." } diff --git a/input/regression/repeat-slash.ly b/input/regression/repeat-slash.ly index 2fe5ea1b02..cb2bea178f 100644 --- 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." @@ -12,5 +12,5 @@ played again." \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 86057d58ba..393099a1fa 100644 --- 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}." @@ -8,7 +8,7 @@ nots = \relative c' { c4 \repeat volta 2 c4 \alternative { d e } } -\paper {raggedright = ##t} +\layout {raggedright = ##t} \context Voice { \nots diff --git a/input/regression/repeat-unfold-tremolo.ly b/input/regression/repeat-unfold-tremolo.ly index 14ba94340c..81761053ad 100644 --- 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 @@ -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 9ffa2d9670..f63cde71b5 100644 --- 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=" diff --git a/input/regression/repeat-volta-skip-alternatives.ly b/input/regression/repeat-volta-skip-alternatives.ly index 87f5b2d750..f375540c42 100644 --- 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 diff --git a/input/regression/repeat-volta.ly b/input/regression/repeat-volta.ly index 3ed0cc0b53..3645e2daf6 100644 --- 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=" @@ -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 } } - \paper {} + \layout {} \midi {} } diff --git a/input/regression/rest-collision-beam.ly b/input/regression/rest-collision-beam.ly index 5ecebac1c3..263939070c 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" fig = \relative c' { 8[ r r r ] r | @@ -30,7 +30,7 @@ fig = \relative c' { >> } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/rest-collision.ly b/input/regression/rest-collision.ly index 4c38d58742..7cc252579a 100644 --- 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 @@ -48,7 +48,7 @@ restsII = \context Staff { \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 3fbdb81296..898b4e4dce 100644 --- 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 diff --git a/input/regression/rest-ledger.ly b/input/regression/rest-ledger.ly index 46aa971efc..b94d4bd5c7 100644 --- 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." diff --git a/input/regression/rest-pitch.ly b/input/regression/rest-pitch.ly index c98265b565..ec0e8ecb99 100644 --- 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 @@ -7,7 +7,7 @@ beam/rest collision resolving will leave it alone." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \relative c'' { diff --git a/input/regression/rest-polyphonic.ly b/input/regression/rest-polyphonic.ly index 50ae630e61..75ef3430c1 100644 --- 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 } >> } - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/rest.ly b/input/regression/rest.ly index f8eb375ffe..ecf431e3a8 100644 --- a/input/regression/rest.ly +++ b/input/regression/rest.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" \header{ texidoc=" diff --git a/input/regression/rhythmic-staff.ly b/input/regression/rhythmic-staff.ly index 38a9f429e4..bb321df3b0 100644 --- 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." } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \context RhythmicStaff { diff --git a/input/regression/script-collision.ly b/input/regression/script-collision.ly index 35c0a8b8f3..cd88fa6df1 100644 --- 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 { @@ -13,6 +13,6 @@ << { 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 5069945523..ffc39174b9 100644 --- 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 @@ -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" } - \paper { raggedright = ##t} + \layout { raggedright = ##t} } diff --git a/input/regression/script-stacked.ly b/input/regression/script-stacked.ly index 87a1a19b29..e3c4e2e815 100644 --- 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." diff --git a/input/regression/size11.ly b/input/regression/size11.ly index 32f15ae514..e641cc98b2 100644 --- a/input/regression/size11.ly +++ b/input/regression/size11.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" \header{ texidoc=" diff --git a/input/regression/size13.ly b/input/regression/size13.ly index 38a4caa018..8309574d70 100644 --- a/input/regression/size13.ly +++ b/input/regression/size13.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" foollilypondbook = " \score " diff --git a/input/regression/size16.ly b/input/regression/size16.ly index 57ddab0b28..9947569b5d 100644 --- a/input/regression/size16.ly +++ b/input/regression/size16.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" foollilypondbook = " \score " diff --git a/input/regression/size20.ly b/input/regression/size20.ly index 856a075e10..e0cadd408e 100644 --- a/input/regression/size20.ly +++ b/input/regression/size20.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" foollilypondbook = " \score " diff --git a/input/regression/size23.ly b/input/regression/size23.ly index c00eb3dae9..1116ee91eb 100644 --- a/input/regression/size23.ly +++ b/input/regression/size23.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" foollilypondbook = " \score " diff --git a/input/regression/size26.ly b/input/regression/size26.ly index 3152357063..2e7ee43314 100644 --- a/input/regression/size26.ly +++ b/input/regression/size26.ly @@ -1,4 +1,4 @@ -\version "2.3.17" +\version "2.3.22" foollilypondbook = " \score " diff --git a/input/regression/slur-area.ly b/input/regression/slur-area.ly index a1f4f70b95..8f60aa2337 100644 --- 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. " @@ -28,7 +28,7 @@ c,(g' c e f d b g) a8(a a a a a a a) } -\paper{ +\layout{ indent=0.0\mm } } diff --git a/input/regression/slur-attachment.ly b/input/regression/slur-attachment.ly index 0761834b82..0016c11841 100644 --- 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=" @@ -15,7 +15,7 @@ with beams. a8 a(a4) a4( a8) a } - \paper{ + \layout{ indent = 0.0 linewidth = 100.\mm } diff --git a/input/regression/slur-broken-trend.ly b/input/regression/slur-broken-trend.ly index 5bcf479af4..dc14cb7345 100644 --- 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=" @@ -9,7 +9,7 @@ staff. A slur should follow the same vertical direction it would have in unbroken state. " } -\paper { +\layout { linewidth=40.\mm indent=0. } diff --git a/input/regression/slur-cross-staff.ly b/input/regression/slur-cross-staff.ly index a4b4598235..d30877bcab 100644 --- 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. diff --git a/input/regression/slur-dots.ly b/input/regression/slur-dots.ly index 5c9cf80afd..ccf9af72b6 100644 --- 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." @@ -8,7 +8,7 @@ of dots, the problems becomes more visible." \relative c'' { c4.............( c) } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/slur-double.ly b/input/regression/slur-double.ly index a160cf2bda..7fd091dc00 100644 --- 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}" } -\version "2.3.17" +\version "2.3.22" -\paper { raggedright = ##t } +\layout { raggedright = ##t } \relative { \set doubleSlurs = ##t 4 ( ) diff --git a/input/regression/slur-extreme.ly b/input/regression/slur-extreme.ly index 1900656fcc..752f90e438 100644 --- 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 { @@ -8,7 +8,7 @@ Extreme slurs are scaled to fit the pattern, but only symmetrically. Asymmetric slurs are created by setting @code{excentricity}." } -\paper { +\layout { raggedright = ##t } diff --git a/input/regression/slur-nice.ly b/input/regression/slur-nice.ly index 42f82ac598..8bac64709f 100644 --- 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 @@ -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') } - \paper{ + \layout{ linewidth = 120.\mm } } diff --git a/input/regression/slur-rest.ly b/input/regression/slur-rest.ly index 7a93119cfc..2fddf2aa1c 100644 --- 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 @@ -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 95dc0cde66..6a64d90ee4 100644 --- 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 diff --git a/input/regression/slur-script.ly b/input/regression/slur-script.ly index ff0b90b6bd..e216d11f3c 100644 --- 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." } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { raggedright = ##t } \relative diff --git a/input/regression/slur-symmetry-1.ly b/input/regression/slur-symmetry-1.ly index 3d22bbcf7c..475ed9ceaf 100644 --- 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." @@ -14,7 +14,7 @@ e,(e e e) e(d d e) e(c c e) e(b b e) } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/slur-symmetry.ly b/input/regression/slur-symmetry.ly index dfd4c7c953..a53861b460 100644 --- 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." @@ -15,7 +15,7 @@ f'8(f f) f(g f) f(a f) f(b f) } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/slur-tilt.ly b/input/regression/slur-tilt.ly index e16f2e1896..f1aaa05b31 100644 --- 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." } -\paper { +\layout { raggedright = ##t } -\version "2.3.17" +\version "2.3.22" \relative c'' { \time 2/4 diff --git a/input/regression/spacing-accidental-staffs.ly b/input/regression/spacing-accidental-staffs.ly index 1af76315f4..b9a069c25f 100644 --- 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 @@ -14,7 +14,7 @@ spacing of the quarter notes here." } { \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 3c650e5309..8dffb58cfd 100644 --- 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. @@ -15,6 +15,6 @@ The accidental does add a little non-stretchable space. } %% 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 43c9e3dd97..5e073088ab 100644 --- 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 @@ -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] } -\paper { raggedright = ##t} +\layout { raggedright = ##t} } diff --git a/input/regression/spacing-bar-stem.ly b/input/regression/spacing-bar-stem.ly index 64a667d9c2..aab2fa9d1f 100644 --- 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 @@ -21,6 +21,6 @@ su = \override Stem #'direction = #1 \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 c2391e119e..99974b7824 100644 --- 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 @@ -17,7 +17,7 @@ than clef changes halfway the line." c'4 c'4 c'4 } >> - \paper { + \layout { raggedright = ##t \context { \Staff diff --git a/input/regression/spacing-end-of-line.ly b/input/regression/spacing-end-of-line.ly index c81178da29..019254ca9a 100644 --- 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 @@ -13,7 +13,7 @@ \time 3/4 \break e2 e4 | e2 e4 \time 4/4 \break } -\paper { +\layout { raggedright = ##t } } diff --git a/input/regression/spacing-ended-voice.ly b/input/regression/spacing-ended-voice.ly index fdcd19a6d9..83908e40b4 100644 --- a/input/regression/spacing-ended-voice.ly +++ b/input/regression/spacing-ended-voice.ly @@ -1,5 +1,5 @@ #(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." @@ -17,6 +17,6 @@ should not confuse the spacing engine." >> c4 }} - \paper { raggedright = ##t } + \layout { raggedright = ##t } } diff --git a/input/regression/spacing-folded-clef.ly b/input/regression/spacing-folded-clef.ly index 5d22667769..d4ef823bc3 100644 --- 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." @@ -9,6 +9,6 @@ this does not disrupt the flow of the notes." \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 f870f9b736..5ee0680b5d 100644 --- 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 @@ -11,7 +11,7 @@ show where columns are in the score." \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 diff --git a/input/regression/spacing-grace-duration.ly b/input/regression/spacing-grace-duration.ly index 1399d69822..3be4767f17 100644 --- 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 @@ -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 897886fd5a..07f26bd6b5 100644 --- 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 } - \paper { raggedright = ##t} + \layout { raggedright = ##t} } diff --git a/input/regression/spacing-knee.ly b/input/regression/spacing-knee.ly index 831567d1f7..18ecdf9afb 100644 --- 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 @@ -16,7 +16,7 @@ width of the note heads and the thickness of the stem. \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 119cf96b73..f1a9c78289 100644 --- 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. @@ -27,7 +27,7 @@ multipart = \relative c'{ \multipart } -% \paper { raggedright = ##t } +% \layout { raggedright = ##t } } diff --git a/input/regression/spacing-note-flags.ly b/input/regression/spacing-note-flags.ly index 4a773cca7f..55171f4e60 100644 --- 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 } -\paper { +\layout { 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 1fcf51cedb..f26488726f 100644 --- 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 { @@ -11,7 +11,7 @@ \score { \relative c'' \new Staff { \repeat unfold 20 { c1 } } - \paper{ + \layout{ raggedlast = ##t } } diff --git a/input/regression/spacing-rest.ly b/input/regression/spacing-rest.ly index 1a6e1877e8..152798a7e6 100644 --- 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 @@ -10,7 +10,7 @@ effect to be very small. \time 12/4 r4 c4 c4 c4 r4 r4 c4 } -\paper { +\layout { raggedright = ##t } } diff --git a/input/regression/spacing-short-notes.ly b/input/regression/spacing-short-notes.ly index f8aae35bb0..906027d7d2 100644 --- 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 @@ -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 f95a750c32..2cea117024 100644 --- 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 @@ -24,6 +24,6 @@ a a a 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 6a04aa416e..2c0bc7ff0a 100644 --- 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{ @@ -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 } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/spacing-stem-same-direction.ly b/input/regression/spacing-stem-same-direction.ly index 074fbc3dfb..a956db1742 100644 --- 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 @@ -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,] } -\paper { raggedright = ##t} +\layout { raggedright = ##t} } diff --git a/input/regression/spacing-to-grace.ly b/input/regression/spacing-to-grace.ly index 599e40e51e..8e26bcf623 100644 --- 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 @@ -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 cb08e7d9c9..137f2f4ae5 100644 --- 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?) @@ -17,7 +17,7 @@ texidoc = " \relative c''{ r1 e4 f, e' f, } - \paper { + \layout { 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 80f29290cf..29dba5e70b 100644 --- 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 { @@ -15,5 +15,5 @@ barline is drawn between the staves, but the @code{:|} is not." } \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 841d6237fb..d830e2b4aa 100644 --- 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. @@ -26,7 +26,7 @@ between systems. f1 f1 f1 f1 } >> - \paper { + \layout { \context { \Staff } diff --git a/input/regression/staccato-pos.ly b/input/regression/staccato-pos.ly index 5805014b90..4dc1a9687d 100644 --- 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{ @@ -16,7 +16,7 @@ to it. " \stemDown e,-. d-. c-. b-. a-. g-. } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/staff-halfway.ly b/input/regression/staff-halfway.ly index 378c989edf..7d047bef9a 100644 --- 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. " } -\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 } } >> - \paper {} + \layout {} } diff --git a/input/regression/staff-mixed-size.ly b/input/regression/staff-mixed-size.ly index ce091fc631..12a07075df 100644 --- 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 { << @@ -26,7 +26,7 @@ large on smaller staves." } >> - \paper { + \layout { #(paper-set-staff-size 6) raggedright = ##t } diff --git a/input/regression/staff-tweak.ly b/input/regression/staff-tweak.ly index caa0ee6484..ad3234d74e 100644 --- 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}. @@ -19,7 +19,7 @@ mus = \relative c' { c4 g' d'8 d d d } } \mus >> - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/stanza-number.ly b/input/regression/stanza-number.ly index bcdc2fd77b..ce4b520080 100644 --- 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." @@ -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 bbba000f09..33dfe7be81 100644 --- 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=" @@ -13,7 +13,7 @@ notes, and up for low notes. " } -\paper { +\layout { raggedright = ##t } \context Voice \relative c { diff --git a/input/regression/stem-shorten.ly b/input/regression/stem-shorten.ly index 332970160e..15972edcf6 100644 --- 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 { @@ -18,7 +18,7 @@ 2 } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/stem-spacing.ly b/input/regression/stem-spacing.ly index 21af427667..ccecee6aae 100644 --- 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=" @@ -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 } - \paper { + \layout { 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 } - \paper { + \layout { 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 9befb9ecb7..119a8467f8 100644 --- 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 diff --git a/input/regression/system-extents.ly b/input/regression/system-extents.ly index 2a1481162e..6e0f44731a 100644 --- 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 @@ -7,7 +7,7 @@ } -\paper { +\layout { \context { \Score \override System #'print-function = #box-grob-stencil diff --git a/input/regression/system-overstrike.ly b/input/regression/system-overstrike.ly index d98cbe4556..26bc2d5e2f 100644 --- 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. " } -\bookpaper { +\paper { 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 bac4921adb..3471a0fe12 100644 --- 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 = " @@ -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 29fa3bb6e6..2fdd185aaf 100644 --- 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 { diff --git a/input/regression/tablature.ly b/input/regression/tablature.ly index 702a47304e..f2403290a2 100644 --- 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. diff --git a/input/regression/tag-filter.ly b/input/regression/tag-filter.ly index 004f308631..f3d2046cf3 100644 --- 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 @@ -11,7 +11,7 @@ notes and fingerings, but the score has not." } -\paper { raggedright= ##t } +\layout { raggedright= ##t } common = \relative c'' { diff --git a/input/regression/text-spanner.ly b/input/regression/text-spanner.ly index 9a7537193d..6a0d2480ed 100644 --- 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." } -\paper { +\layout { raggedright = ##t } diff --git a/input/regression/tie-busy-grobs.ly b/input/regression/tie-busy-grobs.ly index 20d0c58b3b..008c1cafb9 100644 --- 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 @@ -19,7 +19,7 @@ one may have collisions between ties and beams. { \voiceThree { b,8 ~ b8 ~ b8 ~ b8 }} >> - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/tie-chord.ly b/input/regression/tie-chord.ly index 041dbeca06..d131301b79 100644 --- 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 diff --git a/input/regression/tie-dots.ly b/input/regression/tie-dots.ly index 281014106b..c6ba819c65 100644 --- 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." } diff --git a/input/regression/tie-grace.ly b/input/regression/tie-grace.ly index 1af16e9f99..68024f651c 100644 --- 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." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \score { \context Voice \relative c'' { c4 \grace { c8 ~ c16 ~ } c4 diff --git a/input/regression/tie.ly b/input/regression/tie.ly index f8b364cefa..8cead6d0e7 100644 --- a/input/regression/tie.ly +++ b/input/regression/tie.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \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. " } -\paper{ +\layout{ raggedright= ##t } diff --git a/input/regression/trill-spanner.ly b/input/regression/trill-spanner.ly index dfd918ca41..f5791322f6 100644 --- a/input/regression/trill-spanner.ly +++ b/input/regression/trill-spanner.ly @@ -2,8 +2,8 @@ texidoc = "Trill spanner" } -\version "2.3.17" -\paper { +\version "2.3.22" +\layout { raggedright = ##T } \relative \new Voice { diff --git a/input/regression/tuplet-beam.ly b/input/regression/tuplet-beam.ly index e697258f3e..11496631e5 100644 --- 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 @@ -7,7 +7,7 @@ bracket is removed. This only happens if there is one beam, as long as the bracket." } - \paper { raggedright= ##t } + \layout { raggedright= ##t } \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 2296bc8736..046e68675d 100644 --- 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 } diff --git a/input/regression/tuplet-nest.ly b/input/regression/tuplet-nest.ly index 1138d18c5c..51e62b3b0b 100644 --- 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 { @@ -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 afa2e1ed5d..243dc200c0 100644 --- 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 { diff --git a/input/regression/tuplet-rest.ly b/input/regression/tuplet-rest.ly index 9a8322c7e8..5216c7887e 100644 --- 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. " diff --git a/input/regression/tuplet-slope.ly b/input/regression/tuplet-slope.ly index f5f42ca695..c8e7ed6cca 100644 --- 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' { @@ -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 } } - \paper { + \layout { raggedright = ##t } } diff --git a/input/regression/tuplet-staffline-collision.ly b/input/regression/tuplet-staffline-collision.ly index 7c4440ab6c..75fb5f5691 100644 --- 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 @@ -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 } diff --git a/input/regression/tuplets.ly b/input/regression/tuplets.ly index 28d1feb841..71adc1c51b 100644 --- a/input/regression/tuplets.ly +++ b/input/regression/tuplets.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \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'' { diff --git a/input/regression/voice-follower.ly b/input/regression/voice-follower.ly index 5480c026cd..58da177a1c 100644 --- 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= " @@ -19,7 +19,7 @@ can be printed automatically. This is enabled if the property } \context Staff = two {\clef bass \skip 1*2 } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/regression/volta-broken-left-edge.ly b/input/regression/volta-broken-left-edge.ly index 803655614e..5bf5e3e865 100644 --- 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." @@ -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 321d90de09..212e799210 100644 --- 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." } -\version "2.3.17" +\version "2.3.22" 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 2472caeb0b..adcf9412a6 100644 --- 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" @@ -53,7 +53,7 @@ >> \midi { \tempo 8 = 60 } - \paper { + \layout { raggedright = ##t \context { diff --git a/input/simple-song.ly b/input/simple-song.ly index 57de8e3a54..3469c058b1 100644 --- 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. -\version "2.3.16" +\version "2.3.22" diff --git a/input/simple.ly b/input/simple.ly index 6ba928be6d..84ae567fe0 100644 --- a/input/simple.ly +++ b/input/simple.ly @@ -4,4 +4,4 @@ } %% 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 83b26f8fb5..676dded68e 100644 --- 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." @@ -37,6 +37,6 @@ lowerTwo = \relative c { \context Voice = two \lowerTwo >> >> - \paper { } + \layout { } \midi { } } diff --git a/input/template/piano-lyrics.ly b/input/template/piano-lyrics.ly index 3273ef5882..13a5e9066c 100644 --- 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." @@ -27,7 +27,7 @@ text = \lyricmode { \lower >> >> - \paper { + \layout { \context { \GrandStaff \accepts "Lyrics" diff --git a/input/test/+.ly b/input/test/+.ly index 263904d85f..51f5d4c9ba 100644 --- 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? diff --git a/input/test/add-staccato.ly b/input/test/add-staccato.ly index 0c1cf13f4e..576b5d3d13 100644 --- 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 { @@ -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 } } - \paper{ raggedright = ##t } + \layout{ raggedright = ##t } } diff --git a/input/test/add-text-script.ly b/input/test/add-text-script.ly index 476cd630dc..e7f91e3947 100644 --- 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 @@ -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 } - \paper{ raggedright = ##t } + \layout{ raggedright = ##t } } diff --git a/input/test/ambitus-mixed.ly b/input/test/ambitus-mixed.ly index af7841b06b..a50e447b95 100644 --- 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 } diff --git a/input/test/ancient-accidentals.ly b/input/test/ancient-accidentals.ly index fe30aabbc2..9065b083ae 100644 --- 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 diff --git a/input/test/ancient-font.ly b/input/test/ancient-font.ly index 1772eab2eb..c6041b31e0 100644 --- 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 { @@ -210,7 +210,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << >> >> -\bookpaper { +\paper { linethickness = #(/ staffspace 5.0) } @@ -219,7 +219,7 @@ lowerStaff = \context MensuralStaff = lowerStaff << \upperStaff \lowerStaff >> - \paper { + \layout { % 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 e1408b642b..4839e9499d 100644 --- 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 { @@ -12,6 +12,6 @@ Time signatures may also be engraved in an old style. \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 5f851616e7..ed04916ddd 100644 --- 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 @@ -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 } - \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 63bd0493bd..395ea93bc7 100644 --- 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 @@ -15,7 +15,7 @@ on lyrics. " >> - \paper { + \layout { raggedright = ##t \context { \Lyrics diff --git a/input/test/bar-lines.ly b/input/test/bar-lines.ly index d0bc57bf16..77c81a0fb1 100644 --- 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 { @@ -7,7 +7,7 @@ } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \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 4c6f809771..20991b4f2b 100644 --- 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 @@ -26,5 +26,5 @@ resetBarnum = \context Score \applycontext \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 a9c26f294e..37ce520d8d 100644 --- 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' { diff --git a/input/test/bar-number-show-all.ly b/input/test/bar-number-show-all.ly index 3ee5e910e2..372617bcea 100644 --- 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 @@ -14,7 +14,7 @@ setting can be overridden, so that bar numbers on start of every measure. \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 25b62a3b8f..c01686fa40 100644 --- 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 } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \relative c''<< { diff --git a/input/test/beam-auto-4-8.ly b/input/test/beam-auto-4-8.ly index 48175df505..060c05fb8f 100644 --- 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 @@ -30,7 +30,7 @@ You can override the automatic beaming settings. 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 76a52809bd..955ac00054 100644 --- 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 @@ -42,7 +42,7 @@ The @code{autoBeaming} can also be turned off. \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 d22d236232..b38b1ba988 100644 --- 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 @@ -16,6 +16,6 @@ Beam positions may be controlled manually, by overriding the @code{positions} se \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 630baa5bde..4f61b81fef 100644 --- 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 @@ -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) diff --git a/input/test/boxed-stencil.ly b/input/test/boxed-stencil.ly index 2c8af66bb7..9f008ca2be 100644 --- 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 @@ -24,6 +24,6 @@ grob. " } c4. c4 \mark "F" c1 } -\paper{raggedright = ##t} +\layout{raggedright = ##t} } diff --git a/input/test/caps.ly b/input/test/caps.ly index 21edc20f46..bb47ee8f53 100644 --- 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. @@ -13,6 +13,6 @@ shapeNorm = \revert LyricText #'font-shape \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 5c84ea9149..eebc2e60ea 100644 --- 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 @@ -17,7 +17,7 @@ scm = \chordmode { } -\paper { +\layout { 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 fff26712c3..045aeb3b8b 100644 --- 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 @@ -141,7 +141,7 @@ banterProperties = \sequential { \new Staff \transpose c c' { \chs } >> - \paper { + \layout { indent = 3.\cm \context { \ChordNames diff --git a/input/test/coriolan-margin.ly b/input/test/coriolan-margin.ly index c7502a5aab..8a22a8ec25 100644 --- 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 @@ -102,7 +102,7 @@ violoncello = \relative c' { % ugf, must be here? -\bookpaper { +\paper { indent=10.0\mm linewidth=150.0\mm } @@ -138,7 +138,7 @@ violoncello = \relative c' { \context Staff ="violoncello" \violoncello >> >> - \paper { + \layout { \context { \RemoveEmptyStaffContext } @@ -149,7 +149,7 @@ violoncello = \relative c' { } } % this is ignored? - \bookpaper { + \paper { indent=10.0\mm linewidth=150.0\mm } diff --git a/input/test/divisiones.ly b/input/test/divisiones.ly index da84a57679..89546f3b29 100644 --- 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" diff --git a/input/test/dynamic-extra.ly b/input/test/dynamic-extra.ly index ba1befbcad..4391e1249d 100644 --- 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 @@ -15,7 +15,7 @@ piuf = \markup { \italic "pi\\`u" \dynamic "f" } c2\< c2\! } -\paper{raggedright = ##t} +\layout{raggedright = ##t} } diff --git a/input/test/embedded-postscript.ly b/input/test/embedded-postscript.ly index a875fdaa03..6a5f10e958 100644 --- 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 @@ -17,7 +17,7 @@ insert postscript directly into the output. s2 a'1 } - \paper { linewidth = 70 * 5 \pt + \layout { linewidth = 70 * 5 \pt % raggedright = ##t } } diff --git a/input/test/embedded-tex.ly b/input/test/embedded-tex.ly index 9130a6f7f8..7404e94086 100644 --- 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. "} -\paper { raggedright = ##t} +\layout { raggedright = ##t} -\paper { +\layout { raggedright = ##t inputencoding = "TeX" } diff --git a/input/test/engraver-contexts.ly b/input/test/engraver-contexts.ly index 8ec1f9af1a..6ef81e4912 100644 --- 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 diff --git a/input/test/engraver-one-by-one.ly b/input/test/engraver-one-by-one.ly index eb0c7eece0..ae3742df65 100644 --- 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, @@ -22,7 +22,7 @@ Staff context. " } -\paper { raggedright = ##t } +\layout { raggedright = ##t } \include "engraver-example.lyinc" @@ -128,7 +128,7 @@ MyVoice = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -142,7 +142,7 @@ MyStaff = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -156,7 +156,7 @@ MyStaff = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -169,7 +169,7 @@ MyVoice = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -182,7 +182,7 @@ MyVoice = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -198,7 +198,7 @@ MyVoice= \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -213,7 +213,7 @@ MyStaff = \context { \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } @@ -226,7 +226,7 @@ MyStaff = \context { } \score { \topVoice - \paper { + \layout { \context { \MyStaff } \context { \MyVoice } } diff --git a/input/test/extra-staff.ly b/input/test/extra-staff.ly index e16bd428b1..524f94bc64 100644 --- 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. %{ @@ -43,7 +43,7 @@ a piece. " c } >> - \paper { + \layout { raggedright = ##t \context{ \Score diff --git a/input/test/fret-diagram.ly b/input/test/fret-diagram.ly index 630fcc7f80..f5db28fd7c 100644 --- a/input/test/fret-diagram.ly +++ b/input/test/fret-diagram.ly @@ -3,7 +3,7 @@ texidoc = "Frets are supported as markup commands." } -\version "2.3.17" +\version "2.3.22" \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;" } } >> - \paper{ raggedright = ##t } + \layout{ raggedright = ##t } } diff --git a/input/test/gregorian-scripts.ly b/input/test/gregorian-scripts.ly index 5d4bc3dc03..143d155aa5 100644 --- 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 @@ -26,7 +26,7 @@ FIXME: episem stops one notehead too early. \include "gregorian-init.ly" -\bookpaper { +\paper { linethickness = \staffspace / 5.0 } @@ -47,7 +47,7 @@ FIXME: episem stops one notehead too early. \[ a \episemInitium \pes b \flexa a \episemFinis \] } } - \paper { + \layout { linewidth = 70.0 width = 60.0 indent = 0.0 diff --git a/input/test/header-ifelse.ly b/input/test/header-ifelse.ly index 4acd45978f..b57de97de8 100644 --- 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)) @@ -16,6 +16,6 @@ This example puts the current version in the title via Scheme. " } -\paper {raggedright=##t} +\layout {raggedright=##t} { c'4 } diff --git a/input/test/hymn.ly b/input/test/hymn.ly index b08b0ba4fb..d652cdbdff 100644 --- a/input/test/hymn.ly +++ b/input/test/hymn.ly @@ -1,5 +1,5 @@ -\version "2.3.17" +\version "2.3.22" \header { texidoc = " @@ -24,7 +24,7 @@ texts, so they should be switched off. d2 a } >> - \paper{ + \layout{ linewidth=140.\mm \context { \Voice diff --git a/input/test/instrument-name-grandstaff.ly b/input/test/instrument-name-grandstaff.ly index f5cafed39e..e6913eb427 100644 --- 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. " } @@ -12,7 +12,7 @@ individual @code{Staff}s. " } \context Staff = bass { \set Staff.instrument = " vn II" c''4 }>> -\paper { +\layout { raggedright = ##t \context { \GrandStaff \consists "Instrument_name_engraver" } }} diff --git a/input/test/ligature-vaticana.ly b/input/test/ligature-vaticana.ly index 8ce903dc35..ff886b4005 100644 --- 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 @@ -21,7 +21,7 @@ verba = \context Lyrics = "verba" \lyricmode { Al- le- lu- ia. } -\bookpaper { +\paper { linethickness = \staffspace / 7.0 } @@ -30,7 +30,7 @@ verba = \context Lyrics = "verba" \lyricmode { \cantus \lyricsto "cantus" \verba >> - \paper { + \layout { 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 bd3b27e227..cee7c62e25 100644 --- 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 %{ diff --git a/input/test/mensural-ligatures.ly b/input/test/mensural-ligatures.ly index fb6fbd2dd2..4c4681bc6c 100644 --- 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 @@ -32,7 +32,7 @@ voice = \transpose c c' { \bar "||" } -\bookpaper { +\paper { linethickness = \staffspace / 5.0 } \score { @@ -48,7 +48,7 @@ voice = \transpose c c' { >> >> >> - \paper { + \layout { \context { \Voice \name MensuralVoice diff --git a/input/test/mensural-note-heads.ly b/input/test/mensural-note-heads.ly index a50885ffd0..c48af157c0 100644 --- 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 @@ -14,6 +14,6 @@ Mensural notes may also have note heads. " 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 d265a5d973..e507d055db 100644 --- 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. @@ -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." } - \paper { raggedright = ##t} + \layout { raggedright = ##t} } diff --git a/input/test/music-box.ly b/input/test/music-box.ly index 30bc3c923c..e791fc71f9 100644 --- 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 @@ -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 } } @@ -122,7 +122,7 @@ endc = {\stemDown \tieDown c,,2~c,, c,,~c,, c,,1_\fermata } } >> - \paper { + \layout { \context { \PianoStaff \override VerticalAlignment #'forced-distance = #10 diff --git a/input/test/music-creation.ly b/input/test/music-creation.ly index f183c9ba62..921778be30 100644 --- 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 @@ -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 -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/test/no-bar-lines.ly b/input/test/no-bar-lines.ly index ea8c028067..01252b618c 100644 --- 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 @@ -13,7 +13,7 @@ have been removed. a b c d d c b a } - \paper { + \layout { 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 2a41a5c68c..05c77a6bc2 100644 --- 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 diff --git a/input/test/ossia.ly b/input/test/ossia.ly index fb871f646c..cccd687df1 100644 --- a/input/test/ossia.ly +++ b/input/test/ossia.ly @@ -4,7 +4,7 @@ @code{RemoveEmptyStaffContext} take out the unused parts. " } -\version "2.3.17" +\version "2.3.22" \score { \relative c'' @@ -30,7 +30,7 @@ >> - \paper { + \layout { raggedright= ##t \context {\RemoveEmptyStaffContext} \context { diff --git a/input/test/partial-blank.ly b/input/test/partial-blank.ly index 242d4bcda7..cbb652ba3d 100644 --- 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 @@ -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} >> -\paper {} +\layout {} } diff --git a/input/test/piano-staff-distance.ly b/input/test/piano-staff-distance.ly index 69c9e41908..2785622a67 100644 --- 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) @@ -64,5 +64,5 @@ DISTANCE; then call the original callback. " \skip 1 } >> - \paper { raggedright = ##T } + \layout { raggedright = ##T } } diff --git a/input/test/preset-extent.ly b/input/test/preset-extent.ly index a7d576269b..110acb9ab4 100644 --- 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 @@ -18,7 +18,7 @@ they are spaced so widely. \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 b4335fe34a..b2ff7abaf1 100644 --- 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 @@ -8,7 +8,7 @@ Rests may be used in various styles. " } -\paper { +\layout { indent = 0.0 raggedright = ##t } diff --git a/input/test/reverse-music.ly b/input/test/reverse-music.ly index ef0bc4049e..8129c4a96b 100644 --- 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 @@ -35,7 +35,7 @@ music = \relative c'' { c4 d4( e4 f4 } \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 7d1f1101f0..a03c20d394 100644 --- a/input/test/script-abbreviations.ly +++ b/input/test/script-abbreviations.ly @@ -1,7 +1,7 @@ % 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. diff --git a/input/test/script-chart.ly b/input/test/script-chart.ly index 50eb0e0d59..63feb21813 100644 --- 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. @@ -48,7 +48,7 @@ This chart shows all articulations, or scripts, that feta font contains. coda__ varcoda__ } >> - \paper { + \layout { linewidth = 5.1\in indent = 0.0\mm } diff --git a/input/test/slur-dash.ly b/input/test/slur-dash.ly index e33dd09b21..0570d16d01 100644 --- 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. " @@ -15,7 +15,7 @@ The appearance of slurs may be changed from solid to dotted or dashed. \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 1023eca39a..e02ad49888 100644 --- 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 { @@ -38,6 +38,6 @@ 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 ed40122d0c..f1234b9ab8 100644 --- 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. " diff --git a/input/test/smart-transpose.ly b/input/test/smart-transpose.ly index 986f41f28f..d75f19657c 100644 --- 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 @@ -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 } - \paper { raggedright = ##t} + \layout { raggedright = ##t} } diff --git a/input/test/staff-bracket.ly b/input/test/staff-bracket.ly index becdc5b125..9c6a256088 100644 --- 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} @@ -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 5c65a4321e..b4205e4f58 100644 --- 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 { @@ -36,7 +36,7 @@ what you would expect.) } >> - \paper { + \layout { \context { \Score \accepts StaffContainer diff --git a/input/test/staff-lines.ly b/input/test/staff-lines.ly index 6a7fbfd7df..5bb326096a 100644 --- 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 { @@ -30,5 +30,5 @@ lower = \relative c { \lower } >> - \paper { raggedright=##t} + \layout { raggedright=##t} } diff --git a/input/test/staff-size.ly b/input/test/staff-size.ly index 2ffaf4ec1c..56a0e42be8 100644 --- 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 @@ -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 } diff --git a/input/test/stem-extend.ly b/input/test/stem-extend.ly index b82ba03828..f8bef2a084 100644 --- 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}. @@ -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 c25a112a62..b406d2fcc7 100644 --- 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. " } @@ -12,6 +12,6 @@ A hammer in tablature can be faked with slurs. " d(c) } >> - \paper{ raggedright = ##t} + \layout{ raggedright = ##t} } diff --git a/input/test/temporary-stave.ly b/input/test/temporary-stave.ly index 84857d29c6..a39915bf90 100644 --- 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 { @@ -22,7 +22,7 @@ time and key signatures and clef at the beginning of the extra stave. c4 d e f | } } - \paper { + \layout { \context { \Score \consists Span_bar_engraver diff --git a/input/test/text-rotate.ly b/input/test/text-rotate.ly index 49404f9c2a..eed87a02fc 100644 --- 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'' { @@ -27,7 +27,7 @@ output for printing of the source of this example (commenting one line). c4 c4 } -\paper { raggedright = ##t } +\layout { raggedright = ##t } } diff --git a/input/test/text-spanner.ly b/input/test/text-spanner.ly index 5d6dfeed86..f559a594cc 100644 --- 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. " } -\paper{ raggedright = ##t} +\layout{ raggedright = ##t} \relative c''{ \override TextSpanner #'edge-text = #'("bla" . "blu") diff --git a/input/test/title-markup.ly b/input/test/title-markup.ly index 272bf35207..1a6279c70a 100644 --- 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: @@ -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) @@ -94,7 +94,7 @@ spaceTest = \markup { "two space chars" } \context Staff \relative c' { c2-\sizeTest c2-\spaceTest } - \paper { + \layout { #(paper-set-staff-size (* 11.0 pt)) } } @@ -118,7 +118,7 @@ spaceTest = \markup { "two space chars" } opus = "opus 1" piece = "Second" } - \paper { + \layout { } } } diff --git a/input/test/version-output.ly b/input/test/version-output.ly index f6d4ed1305..4c05b067cf 100644 --- 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 { diff --git a/input/test/vertical-extent.ly b/input/test/vertical-extent.ly index 42e8a888b1..06c29dc599 100644 --- 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 = " @@ -20,7 +20,7 @@ Vertical extents may increased by setting @code{minimumVerticalExtent}, g1 } >> - \paper{ + \layout{ raggedright = ##t } } diff --git a/input/twinkle-pop.ly b/input/twinkle-pop.ly index e0b26a8b9a..16575669e6 100644 --- a/input/twinkle-pop.ly +++ b/input/twinkle-pop.ly @@ -1,5 +1,5 @@ #(ly:set-option 'old-relative) -\version "2.3.16" +\version "2.3.22" \header{ filename = "twinkle-pop.ly" xtitle = "Ah, vous dirais-je, maman " @@ -54,7 +54,7 @@ text = \lyricmode{ \header{ title = "Ah, vous dirais-je, maman " } - \paper { } + \layout { } } \score { @@ -66,6 +66,6 @@ text = \lyricmode{ \header{ piece = "clarinet in B$\flat$" } - \paper { } + \layout { } } diff --git a/input/wilhelmus.ly b/input/wilhelmus.ly index b529b99911..7455c39d97 100644 --- 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" @@ -55,7 +55,7 @@ pipeSymbol = { myBreak = { \bar "" \break } -\paper { +\layout { 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 } > } -\paper { +\layout { raggedright = ##t \context { @@ -185,7 +185,7 @@ oneHalfNoteTime = \markup { \text } >> - \paper {} + \layout {} \midi {} } diff --git a/lily/accidental.cc b/lily/accidental.cc index 0c62beee98..696673d9d6 100644 --- 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); - fm = select_font (me->get_paper (), ac); + fm = select_font (me->get_layout (), ac); } else fm = Font_interface::get_default_font (me); diff --git a/lily/ambitus.cc b/lily/ambitus.cc index e8124d145f..3c40cce7a1 100644 --- a/lily/ambitus.cc +++ b/lily/ambitus.cc @@ -49,9 +49,9 @@ Ambitus::print (SCM smob) 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); - 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); diff --git a/lily/arpeggio.cc b/lily/arpeggio.cc index a6595c95cf..3b9fcc2ff0 100644 --- 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); } - 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; diff --git a/lily/balloon.cc b/lily/balloon.cc index 272be12b7f..2906383d70 100644 --- 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 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); diff --git a/lily/bar-line.cc b/lily/bar-line.cc index 4a4a4513b5..d2f50ca073 100644 --- 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 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; @@ -150,7 +150,7 @@ Bar_line::simple_barline (Grob *me, 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); } diff --git a/lily/beam-quanting.cc b/lily/beam-quanting.cc index f7938d36ab..1315c2dba7 100644 --- 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 (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 ins = ly_scm2interval (inspect_quants); @@ -311,7 +311,7 @@ Beam::quanting (SCM smob) ly_interval2scm (Drul_array (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); diff --git a/lily/beam.cc b/lily/beam.cc index abe86359f1..dcf2e1893a 100644 --- 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 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++) { @@ -415,7 +415,7 @@ Beam::print (SCM grob) 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; @@ -509,7 +509,7 @@ Beam::print (SCM grob) #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)) { @@ -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 - (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 diff --git a/lily/bezier-bow.cc b/lily/bezier-bow.cc index fa2db2c855..044a898d07 100644 --- a/lily/bezier-bow.cc +++ b/lily/bezier-bow.cc @@ -59,7 +59,7 @@ height 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. diff --git a/lily/book-paper-def.cc b/lily/book-paper-def.cc deleted file mode 100644 index 4584fe9ee1..0000000000 --- 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 -*/ - -#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 (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 (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 (fm)) - ell = scm_cons (fm->self_scm (), ell); - } - } - } - return ell; -} diff --git a/lily/book.cc b/lily/book.cc index 94f17bff52..e9f7eee375 100644 --- a/lily/book.cc +++ b/lily/book.cc @@ -26,7 +26,7 @@ Book::Book () : Input () { - bookpaper_ = 0; + paper_ = 0; 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 ()); - if (book->bookpaper_) - scm_gc_mark (book->bookpaper_->self_scm ()); + if (book->paper_) + scm_gc_mark (book->paper_->self_scm ()); return book->header_; } @@ -72,11 +72,11 @@ Book::process (String outname, Output_def *default_def) 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_; @@ -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, - paper_book->bookpaper_, + paper_book->paper_, 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", - 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}.") { - 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; - book->bookpaper_ = odef; + book->paper_ = odef; if (ly_c_module_p (header)) book->header_ = header; diff --git a/lily/break-algorithm.cc b/lily/break-algorithm.cc index 2fe726b5b8..212913f4ae 100644 --- 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 (linewidth_ <=0) - while (retval.size () >2) + if (linewidth_ <= 0) + while (retval.size () > 2) 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 (linewidth_ <=0) + if (linewidth_ <= 0) while (retval.size () >2) retval.del (1); @@ -92,7 +92,7 @@ void 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 diff --git a/lily/breathing-sign.cc b/lily/breathing-sign.cc index 511fbd8373..98966e2bf4 100644 --- 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; - 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 @@ -88,7 +88,7 @@ Breathing_sign::divisio_maior (SCM smob) 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 @@ -128,7 +128,7 @@ Breathing_sign::divisio_maxima (SCM smob) 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); @@ -158,7 +158,7 @@ Breathing_sign::finalis (SCM smob) 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); diff --git a/lily/dynamic-text-spanner.cc b/lily/dynamic-text-spanner.cc index d81246dccd..13b7686c3f 100644 --- 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 (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 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)) - 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); diff --git a/lily/font-interface.cc b/lily/font-interface.cc index 23a12a46d0..01b5cf9c11 100644 --- 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); - fm = select_font (me->get_paper (), chain); + fm = select_font (me->get_layout (), chain); me->set_property ("font", fm->self_scm ()); } @@ -45,7 +45,7 @@ SCM 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); } @@ -53,7 +53,7 @@ SCM 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); } diff --git a/lily/font-select.cc b/lily/font-select.cc index 8472b5acb9..6e3348a335 100644 --- 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, - (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 @@ -55,7 +55,7 @@ wild_compare (SCM field_val, SCM val) 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); @@ -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))); - return find_scaled_font (paper, fm, requested / size, input_encoding); + return find_scaled_font (layout, fm, requested / size, input_encoding); } 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) { - 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); } @@ -108,13 +108,13 @@ properties_to_font_size_family (SCM fonts, SCM alist_chain) } 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 fonts = paper->lookup_variable (ly_symbol2scm ("fonts")); + SCM fonts = layout->lookup_variable (ly_symbol2scm ("fonts")); 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)); - return find_scaled_font (paper, fm, rmag, input_encoding); + return find_scaled_font (layout, fm, rmag, input_encoding); } 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)); - 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); } @@ -149,7 +149,7 @@ select_encoded_font (Output_def *paper, SCM chain, SCM input_encoding) } 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 cd971e6e5e..98c3cb761c 100644 --- 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); - 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++) @@ -110,7 +110,7 @@ Gourlay_breaking::do_solve () const 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 diff --git a/lily/grob-scheme.cc b/lily/grob-scheme.cc index 75c9c7bc1e..d3a0d0a05f 100644 --- 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.) */ -LY_DEFINE (ly_grob_paper, "ly:grob-paper", +LY_DEFINE (ly_grob_layout, "ly:grob-layout", 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"); - 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} " - "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 - = 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); } diff --git a/lily/grob.cc b/lily/grob.cc index eec5868c4f..54b62eff8e 100644 --- a/lily/grob.cc +++ b/lily/grob.cc @@ -151,9 +151,9 @@ robust_relative_extent (Grob*me, Grob*refp, Axis a) } 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 2a81201e5d..7f3eca8607 100644 --- a/lily/include/book.hh +++ b/lily/include/book.hh @@ -20,7 +20,7 @@ class Book : public Input public: SCM header_; - Output_def *bookpaper_; + Output_def *paper_; Link_array scores_; Book (); diff --git a/lily/include/grob.hh b/lily/include/grob.hh index b653ec25d3..52f4a0feec 100644 --- a/lily/include/grob.hh +++ b/lily/include/grob.hh @@ -86,7 +86,7 @@ public: 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; diff --git a/lily/include/lily-parser.hh b/lily/include/lily-parser.hh index 2ebfb7f417..b3f8ddd33e 100644 --- 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&); - DECLARE_SCHEME_CALLBACK (paper_description, ()); + DECLARE_SCHEME_CALLBACK (layout_description, ()); 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); -Output_def *get_paper (Lily_parser *parser); +Output_def *get_layout (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 */ diff --git a/lily/include/lily-proto.hh b/lily/include/lily-proto.hh index fd531f86ec..e6cf9c85db 100644 --- 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_stream; class Paper_system; class Performance; class Performer; diff --git a/lily/include/main.hh b/lily/include/main.hh index a36d29c699..3e055091ac 100644 --- a/lily/include/main.hh +++ b/lily/include/main.hh @@ -28,7 +28,7 @@ extern String init_name_global; /* options */ extern Array 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; diff --git a/lily/include/modified-font-metric.hh b/lily/include/modified-font-metric.hh index 9f264e744d..c3cd7639f0 100644 --- a/lily/include/modified-font-metric.hh +++ b/lily/include/modified-font-metric.hh @@ -11,7 +11,7 @@ #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: diff --git a/lily/include/output-def.hh b/lily/include/output-def.hh index 0f60d9b557..1a7df747d7 100644 --- 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 - 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 - 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, @@ -32,7 +32,7 @@ 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) @@ -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); -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); diff --git a/lily/include/paper-book.hh b/lily/include/paper-book.hh index 72fa47dff3..a770536b6f 100644 --- 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_; - Output_def *bookpaper_; + Output_def *paper_; Paper_book (); diff --git a/lily/include/paper-score.hh b/lily/include/paper-score.hh index 2adfdafb38..8cc83e0644 100644 --- a/lily/include/paper-score.hh +++ b/lily/include/paper-score.hh @@ -16,11 +16,11 @@ #include "lily-guile.hh" #include "protected-scm.hh" -/* PAPER output */ +/* LAYOUT output */ class Paper_score : public Music_output { public: - Output_def *paper_; + Output_def *layout_; System *system_; Paper_score (); diff --git a/lily/ligature-engraver.cc b/lily/ligature-engraver.cc index bd08ed8354..447aeb08ba 100644 --- 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 - * 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 diff --git a/lily/lily-lexer.cc b/lily/lily-lexer.cc index 23daaa4ba4..aa3376dbe5 100644 --- 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}, - {"bookpaper", BOOKPAPER}, {"change", CHANGE}, {"chords", CHORDS}, {"chordmode", CHORDMODE}, @@ -49,6 +48,7 @@ static Keyword_ent the_key_tab[] = { {"grobdescriptions", GROBDESCRIPTIONS}, {"header", HEADER}, {"key", KEY}, + {"layout", LAYOUT}, {"lyricmode", LYRICMODE}, {"lyricsto", LYRICSTO}, {"lyrics", LYRICS}, diff --git a/lily/lily-parser.cc b/lily/lily-parser.cc index 1ca471d53b..355791e719 100644 --- 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* -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"); - 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* -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 (paper->clone ()) : new Output_def; - paper->set_variable (ly_symbol2scm ("is-bookpaper"), SCM_BOOL_T); - return paper; + layout = layout ? dynamic_cast (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 ()); - 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 (), - bookpaper, + paper, 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); - scm_gc_unprotect_object (paper->self_scm ()); + scm_gc_unprotect_object (layout->self_scm ()); } 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); - 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.*/ - book->bookpaper_ = bp; + book->paper_ = bp; 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)++; - 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 ()); } - scm_gc_unprotect_object (paper->self_scm ()); + scm_gc_unprotect_object (layout->self_scm ()); return SCM_UNSPECIFIED; } diff --git a/lily/line-spanner.cc b/lily/line-spanner.cc index 36e35ef6eb..5a3a851a7c 100644 --- 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); - 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"); diff --git a/lily/lyric-extender.cc b/lily/lyric-extender.cc index bae1d9bbfe..51fc9d4b1a 100644 --- 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); - Real sl = me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + Real sl = me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); Link_array heads (Pointer_group_interface__extract_grobs (me, (Grob*)0, "heads")); diff --git a/lily/lyric-hyphen.cc b/lily/lyric-hyphen.cc index 3a2ea9e68f..5af5bf7f7d 100644 --- a/lily/lyric-hyphen.cc +++ b/lily/lyric-hyphen.cc @@ -44,7 +44,7 @@ Hyphen_spanner::print (SCM smob) } 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); diff --git a/lily/main.cc b/lily/main.cc index 4e05741952..de3741ed3f 100644 --- a/lily/main.cc +++ b/lily/main.cc @@ -42,8 +42,8 @@ Array dump_header_fieldnames_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. */ @@ -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")}, - {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")}, @@ -435,7 +435,7 @@ parse_argv (int argc, char **argv) safe_global_b = true; break; case 'm': - no_paper_global_b = true; + no_layout_global_b = true; break; case 'p': make_preview = true; diff --git a/lily/measure-grouping-engraver.cc b/lily/measure-grouping-engraver.cc index b6996ca74e..75bb7b2c3b 100644 --- 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); - where += Rational (scm_to_int (scm_car (s))) * bl, + where += Rational ((int) scm_to_int (scm_car (s))) * bl, s = scm_cdr (s) ) { diff --git a/lily/mensural-ligature-engraver.cc b/lily/mensural-ligature-engraver.cc index da419df21f..04e468c2af 100644 --- a/lily/mensural-ligature-engraver.cc +++ b/lily/mensural-ligature-engraver.cc @@ -344,7 +344,7 @@ Mensural_ligature_engraver::propagate_properties (Spanner *ligature, Array 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)-> diff --git a/lily/mensural-ligature.cc b/lily/mensural-ligature.cc index 25c0419997..b50bd7c557 100644 --- 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)")); - 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) : diff --git a/lily/multi-measure-rest.cc b/lily/multi-measure-rest.cc index 1b57cd7e52..3a7cf73125 100644 --- 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 - = 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) @@ -185,7 +185,7 @@ Multi_measure_rest::big_rest (Grob *me, Real width) 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)); diff --git a/lily/ottava-bracket.cc b/lily/ottava-bracket.cc index dac4104665..59b640e64b 100644 --- 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); - Output_def * paper = me->get_paper (); + Output_def * layout = me->get_layout (); Drul_array 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)) - 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 shorten = robust_scm2interval (me->get_property ("shorten-pair"), diff --git a/lily/output-def.cc b/lily/output-def.cc index bd05a9fbc1..8a1c87707c 100644 --- 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? - all bookpaper_ should be protected by themselves. */ + all paper_ should be protected by themselves. */ 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); } -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.") @@ -186,7 +186,7 @@ LY_DEFINE (ly_output_description, "ly:output-description", } /* 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) { @@ -195,19 +195,19 @@ line_dimensions_int (Output_def *def, int n) 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), - "Is @var{def} a paper definition?") + "Is @var{def} a layout definition?") { 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); - 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)); } diff --git a/lily/paper-book.cc b/lily/paper-book.cc index fa3d4ee73f..8a62290fc1 100644 --- 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; - bookpaper_ = 0; + paper_ = 0; 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 (); - 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_; @@ -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), - "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"); @@ -278,18 +278,18 @@ LY_DEFINE (ly_paper_book_systems, "ly:paper-book-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.") { - 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 () { - 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; @@ -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, - bookpaper_->self_scm (), + paper_->self_scm (), scopes); if (unsmob_stencil (tit)) @@ -315,7 +315,7 @@ Paper_book::book_title () 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; @@ -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, - bookpaper_->self_scm (), + paper_->self_scm (), scopes); if (unsmob_stencil (tit)) @@ -405,7 +405,7 @@ Paper_book::pages () 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_; } diff --git a/lily/paper-column.cc b/lily/paper-column.cc index 02ab4224f5..d4d5a03e7e 100644 --- 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); - 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); diff --git a/lily/paper-def.cc b/lily/paper-def.cc new file mode 100644 index 0000000000..1bc6bab26d --- /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 +*/ + +#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 (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 (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 (fm)) + ell = scm_cons (fm->self_scm (), ell); + } + } + } + return ell; +} diff --git a/lily/paper-outputter.cc b/lily/paper-outputter.cc index 3acadd7f0c..43c6e842b9 100644 --- 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) { - progress_indication (_f ("Paper output to `%s'...", + progress_indication (_f ("Layout output to `%s'...", outname == "-" ? String ("") : outname)); return new Paper_outputter (outname, f); } diff --git a/lily/paper-score.cc b/lily/paper-score.cc index 9d58682b0c..c1487c89b2 100644 --- a/lily/paper-score.cc +++ b/lily/paper-score.cc @@ -25,7 +25,7 @@ Paper_score::Paper_score () { - paper_ = 0; + layout_ = 0; system_ = 0; } diff --git a/lily/parser.yy b/lily/parser.yy index 078c19e098..c942eef02b 100644 --- a/lily/parser.yy +++ b/lily/parser.yy @@ -253,7 +253,6 @@ or %token ALTERNATIVE %token BAR %token BOOK -%token BOOKPAPER %token CHANGE %token CHORDMODIFIERS %token CHORDS @@ -277,6 +276,7 @@ or %token HYPHEN %token INVALID %token KEY +%token LAYOUT %token LYRICS %token LYRICMODE %token MARK @@ -394,7 +394,7 @@ or %type tempo_event %type output_def_body output_def_head -%type output_def book_paper_block +%type output_def paper_block %type Music_list %type 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"); - 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 ()); @@ -638,17 +638,17 @@ book_block: /* FIXME: * Use 'handlers' like for toplevel-* stuff? - * grok \paper and \midi? */ + * grok \layout and \midi? */ book_body: { $$ = new Book; $$->set_spot (THIS->here_input ()); - $$->bookpaper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultbookpaper"))->clone ()); - scm_gc_unprotect_object ($$->bookpaper_->self_scm ()); + $$->paper_ = dynamic_cast (unsmob_output_def (THIS->lexer_->lookup_identifier ("$defaultpaper"))->clone ()); + scm_gc_unprotect_object ($$->paper_->self_scm ()); $$->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 { @@ -660,7 +660,7 @@ book_body: $$->header_ = $2; } | book_body error { - $$->bookpaper_ = 0; + $$->paper_ = 0; $$->scores_.clear(); } ; @@ -694,9 +694,9 @@ score_body: $$->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 @@ -715,13 +715,13 @@ score_body: OUTPUT DEF */ -book_paper_block: +paper_block: 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: - BOOKPAPER { - $$ = get_bookpaper (THIS); + PAPER { + $$ = get_paper (THIS); $$->input_origin_ = THIS->here_input (); THIS->lexer_->add_scope ($$->scope_); } @@ -747,8 +747,8 @@ output_def_head: $$ = 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; diff --git a/lily/score-engraver.cc b/lily/score-engraver.cc index e93de9941d..0b28780dcc 100644 --- a/lily/score-engraver.cc +++ b/lily/score-engraver.cc @@ -111,7 +111,7 @@ Score_engraver::initialize () pscore_ = new Paper_score; - pscore_->paper_ = dynamic_cast (get_output_def ()); + pscore_->layout_ = dynamic_cast (get_output_def ()); SCM props = updated_grob_properties (context (), ly_symbol2scm ("System")); diff --git a/lily/score.cc b/lily/score.cc index 15160896ac..0622d64f7a 100644 --- 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. */ - 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")); @@ -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; - paper_book->bookpaper_ = unsmob_output_def (scaled_bookdef); + paper_book->paper_ = unsmob_output_def (scaled_bookdef); 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. -PAPERBOOK should be scaled already. +LAYOUTBOOK should be scaled already. */ SCM Score::book_rendering (String outname, - Output_def *paperbook, + Output_def *layoutbook, 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; - 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; @@ -239,15 +239,15 @@ Score::book_rendering (String outname, { 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->parent_ = paperbook; + def->parent_ = layoutbook; 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 (unsmob_context (context))) { @@ -267,13 +267,13 @@ Score::book_rendering (String outname, 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, " - "return a list of paper-lines.") + "return a list of layout-lines.") { Score * sc = unsmob_score (score); - Output_def *od = unsmob_output_def (paper); + Output_def *od = unsmob_output_def (layout); 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 (od, paper, SCM_ARG2, __FUNCTION__, "Output_def"); + SCM_ASSERT_TYPE (od, layout, SCM_ARG2, __FUNCTION__, "Output_def"); 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++) - 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) diff --git a/lily/slur-scoring.cc b/lily/slur-scoring.cc index 4cc4490aaf..c9ec0236e3 100644 --- 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); - 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); @@ -399,7 +399,7 @@ Slur_score_state::get_best_curve () #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)) { diff --git a/lily/slur.cc b/lily/slur.cc index 7d1c78afa5..15ebe93eac 100644 --- 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 (to_boolean (me->get_paper () + if (to_boolean (me->get_layout () ->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 - (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); } diff --git a/lily/spacing-spanner.cc b/lily/spacing-spanner.cc index f563623123..841bf43676 100644 --- 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 get_paper ()->c_variable ("packed")); + bool packed = to_boolean (me->get_layout ()->c_variable ("packed")); Real strength, distance; /* diff --git a/lily/staff-symbol-referencer.cc b/lily/staff-symbol-referencer.cc index cb53c0af52..c9c21e500c 100644 --- 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); - return me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + return me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); } Real diff --git a/lily/staff-symbol.cc b/lily/staff-symbol.cc index 9a5db7c46b..e6b73143fe 100644 --- a/lily/staff-symbol.cc +++ b/lily/staff-symbol.cc @@ -38,7 +38,7 @@ Staff_symbol::print (SCM smob) --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; @@ -112,7 +112,7 @@ Staff_symbol::staff_space (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; } diff --git a/lily/stem-tremolo.cc b/lily/stem-tremolo.cc index 8f275069d4..646b18b4e5 100644 --- 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 blot = me->get_paper ()->get_dimension (ly_symbol2scm ("blotdiameter")); + Real blot = me->get_layout ()->get_dimension (ly_symbol2scm ("blotdiameter")); width *= ss; thick *= ss; diff --git a/lily/stem.cc b/lily/stem.cc index 1039631a39..c7242f4af4 100644 --- a/lily/stem.cc +++ b/lily/stem.cc @@ -668,7 +668,7 @@ Stem::print (SCM smob) // 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)); diff --git a/lily/system-start-delimiter.cc b/lily/system-start-delimiter.cc index 1b04631d10..ec7a346dfb 100644 --- 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) { - 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); @@ -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); - 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; diff --git a/lily/text-item.cc b/lily/text-item.cc index f0ec373d60..032bb09ae1 100644 --- a/lily/text-item.cc +++ b/lily/text-item.cc @@ -20,13 +20,13 @@ 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) { - 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), @@ -35,14 +35,14 @@ Text_interface::interpret_string (SCM paper_smob, 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; } - 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; @@ -67,10 +67,10 @@ Text_interface::interpret_string (SCM paper_smob, 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)) - 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); @@ -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."); - return scm_apply_2 (func, paper_smob, props, args); + return scm_apply_2 (func, layout_smob, props, args); } 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); - return interpret_markup (me->get_paper ()->self_scm (), chain, t); + return interpret_markup (me->get_layout ()->self_scm (), chain, t); } /* Ugh. Duplicated from Scheme. */ diff --git a/lily/text-spanner.cc b/lily/text-spanner.cc index dd216a5d0d..41d7bd3cc6 100644 --- 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); - 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"); @@ -94,7 +94,7 @@ Text_spanner::print (SCM smob) 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); diff --git a/lily/time-signature.cc b/lily/time-signature.cc index 40976eb311..f8e7dcf1ab 100644 --- 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); - 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 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); diff --git a/lily/tuplet-bracket.cc b/lily/tuplet-bracket.cc index 52550d2b7e..1f313e84a9 100644 --- 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"); - Output_def *pap = me->get_paper (); + Output_def *pap = me->get_layout (); Stencil num; if (scm_is_string (number) && number_visibility) { diff --git a/lily/vaticana-ligature-engraver.cc b/lily/vaticana-ligature-engraver.cc index 3d73a4d810..41a54ec74b 100644 --- a/lily/vaticana-ligature-engraver.cc +++ b/lily/vaticana-ligature-engraver.cc @@ -155,7 +155,7 @@ Vaticana_ligature_engraver::align_heads (Array primitives, dynamic_cast (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 diff --git a/lily/vaticana-ligature.cc b/lily/vaticana-ligature.cc index 3c0d309964..7cc2263c44 100644 --- 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 = - thickness * me->get_paper ()->get_dimension (ly_symbol2scm ("linethickness")); + thickness * me->get_layout ()->get_dimension (ly_symbol2scm ("linethickness")); 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); diff --git a/lily/virtual-font-metric.cc b/lily/virtual-font-metric.cc index 6d21a71562..5b476be788 100644 --- 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) { diff --git a/lily/volta-bracket.cc b/lily/volta-bracket.cc index 8fd54a281a..9b96d0f950 100644 --- 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); - Output_def * paper =me->get_paper (); + Output_def * layout =me->get_layout (); Real half_space = 0.5; Item * bound = dynamic_cast (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 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 () diff --git a/ly/book-paper-defaults.ly b/ly/book-paper-defaults.ly deleted file mode 100644 index 9ff72cf9fe..0000000000 --- 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 a82f358560..37df2db9df 100644 --- 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 "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) @@ -88,7 +88,7 @@ melismaEnd = #(make-span-event 'ManualMelismaEvent STOP) #(set-default-paper-size "a4") -partCombineListener = \paper { +partCombineListener = \layout { \context { \Voice \consists Note_heads_engraver diff --git a/ly/engraver-init.ly b/ly/engraver-init.ly index 18ef707806..7ba26f4944 100644 --- 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 - @code{\paper} block) is processed." + @code{\layout} block) is processed." \consists "Repeat_acknowledge_engraver" \consists "Staff_collecting_engraver" diff --git a/ly/gregorian-init.ly b/ly/gregorian-init.ly index 32099830c7..be626b2999 100644 --- 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) % -% example paper block for gregorian chant notation +% example layout block for gregorian chant notation % -neumeDemoPaper = \paper { +neumeDemoLayout = \layout { interscoreline = 1 \context { \Score diff --git a/ly/init.ly b/ly/init.ly index d0f73b4281..2e3e849bd9 100644 --- a/ly/init.ly +++ b/ly/init.ly @@ -31,5 +31,5 @@ #(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 index 0000000000..2302613c19 --- /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 0ac7f7f81f..7ab4637d41 100644 --- 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)) - (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)) diff --git a/scm/define-grobs.scm b/scm/define-grobs.scm index e5e930b99e..8c276a97be 100644 --- a/scm/define-grobs.scm +++ b/scm/define-grobs.scm @@ -163,7 +163,7 @@ (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 diff --git a/scm/define-markup-commands.scm b/scm/define-markup-commands.scm index cf55fb61ab..9f4c1b9b45 100644 --- a/scm/define-markup-commands.scm +++ b/scm/define-markup-commands.scm @@ -11,18 +11,18 @@ ;; 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) -(def-markup-command (score paper props score) (ly:score?) +(def-markup-command (score layout props score) (ly:score?) (let* - ((systems (ly:score-embedded-format score paper))) + ((systems (ly:score-embedded-format score layout))) (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* @@ -31,15 +31,15 @@ (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\" @}}." - (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." - (Text_interface::interpret_string paper + (Text_interface::interpret_string layout props sym str)) @@ -51,7 +51,7 @@ (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, @@ -86,15 +86,15 @@ gsave /ecrm10 findfont (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 -(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." - (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) @@ -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) - (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 ""))) @@ -116,33 +116,33 @@ gsave /ecrm10 findfont (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))) -(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) - (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* - ((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))) -(def-markup-command (finger paper props arg) (markup?) +(def-markup-command (finger layout props arg) (markup?) "Set the argument as small numbers." - (interpret-markup paper + (interpret-markup layout (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 @@ -152,11 +152,11 @@ A \\fontsize #2 @{ B C @} D This will enlarge the B and the C by two steps. " (interpret-markup - paper + layout (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 @@ -167,124 +167,124 @@ Note: magnification only works if a font-name is explicitly selected. Use @code{\\fontsize} otherwise." (interpret-markup - paper + layout (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" - (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" - (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. " - (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}." - (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." - (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." - (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." - (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." - (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." - (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." - (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}." - (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." -; (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 - 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}. " - (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 - 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 - 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." - (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." - (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." - (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." - (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." - (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." - (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." - (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." - (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." - (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) - (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))) @@ -292,72 +292,72 @@ of the @code{#'direction} layout property." (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. " - (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))) -(def-markup-command (vcenter paper props arg) (markup?) +(def-markup-command (vcenter layout props arg) (markup?) "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)) -(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)) -(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. " - (let* ((m (interpret-markup paper props arg))) + (let* ((m (interpret-markup layout props arg))) (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." - (let* ((m (interpret-markup paper props arg))) + (let* ((m (interpret-markup layout props arg))) (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." - (let* ((m (interpret-markup paper props arg))) + (let* ((m (interpret-markup layout props arg))) (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 - (ly:paper-get-font paper (cons '((font-encoding . fetaMusic)) + (ly:paper-get-font layout (cons '((font-encoding . fetaMusic)) 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." - (ly:find-glyph-by-name (ly:paper-get-font paper props) + (ly:find-glyph-by-name (ly:paper-get-font layout props) 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'." - (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: @@ -376,14 +376,14 @@ positions it next to the staff cancels any shift made with 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)) -(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." - (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)) @@ -400,11 +400,11 @@ and/or @code{extra-offset} properties. " ;; 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." - (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 @@ -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)))) -(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))) - (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 - paper + layout 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 @@ -514,13 +514,13 @@ Raising and lowering texts can be done with @code{\\super} and (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)) -(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 @@ -532,42 +532,42 @@ that. " - (ly:stencil-translate (interpret-markup paper props arg) + (ly:stencil-translate (interpret-markup layout props arg) 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 - paper + layout (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 - (interpret-markup paper props arg) + (interpret-markup layout props arg) (* -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. - (m (interpret-markup paper props arg))) + (m (interpret-markup layout props arg))) (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. - (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 -(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 @} @@ -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)))) -(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 @@ -589,40 +589,40 @@ any sort of property supported by @internalsref{font-interface} and @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)))) - (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)))) - (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 (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)) - (m (interpret-markup paper props arg))) + (m (interpret-markup layout props arg))) (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." - (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)) @@ -647,16 +647,16 @@ around the markup." (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." - (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." @@ -718,7 +718,7 @@ the elements marked in @var{indices}, which is a list of numbers." ((stencils (map (lambda (x) (interpret-markup - paper + layout props x)) args)) (leading diff --git a/scm/document-translation.scm b/scm/document-translation.scm index 222ee09851..2eac4bfae1 100644 --- a/scm/document-translation.scm +++ b/scm/document-translation.scm @@ -74,8 +74,8 @@ (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 @@ -261,11 +261,11 @@ (define (all-contexts-doc) (let* ( - (paper-alist - (sort (ly:output-description $defaultpaper) + (layout-alist + (sort (ly:output-description $defaultlayout) (lambda (x y) (symbolstring (map car paper-alist)) stringstring (map car layout-alist)) string diff --git a/scm/framework-gnome.scm b/scm/framework-gnome.scm index cd701d279b..968d8132d1 100644 --- a/scm/framework-gnome.scm +++ b/scm/framework-gnome.scm @@ -99,9 +99,9 @@ (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))) diff --git a/scm/framework-ps.scm b/scm/framework-ps.scm index bb04b7efbf..b341102007 100644 --- 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"))) -(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) stringstring, mostly +(define (output-variables layout) + ;; FIXME: duplicates output-layout's scope-entry->string, mostly (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 " " - (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" @@ -163,7 +163,7 @@ (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) @@ -187,53 +187,53 @@ (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: " - (if (eq? (ly:output-def-lookup bookpaper 'landscape) #t) + (if (eq? (ly:output-def-lookup paper 'landscape) #t) "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: " - (if (eq? (ly:output-def-lookup bookpaper 'landscape) #t) + (if (eq? (ly:output-def-lookup paper 'landscape) #t) "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 - (output-variables bookpaper) + (output-variables paper) (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) - (let* ((bookpaper (ly:paper-book-book-paper book)) + (let* ((paper (ly:paper-book-paper 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-header bookpaper page-count) - (preamble bookpaper))) + (page-header paper page-count) + (preamble paper))) (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) - (let* ((bookpaper (ly:paper-book-book-paper book)) + (let* ((paper (ly:paper-book-paper 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)) @@ -261,14 +261,14 @@ (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)))) - (preamble bookpaper))) + (preamble paper))) (ly:outputter-dump-string outputter @@ -281,7 +281,7 @@ (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 "-") @@ -291,7 +291,7 @@ (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) diff --git a/scm/framework-tex.scm b/scm/framework-tex.scm index f9b9e454e1..eb7e867cb9 100644 --- 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))))))) -(define (font-load-command bookpaper font) +(define (font-load-command paper 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) @@ -58,7 +58,7 @@ (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. @@ -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 - (ly:bookpaper-outputscale bookpaper)))) + (ly:paper-outputscale paper)))) (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 - (eval 'inputencoding (ly:output-def-scope bookpaper))) + (eval 'inputencoding (ly:output-def-scope paper))) (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)) @@ -122,13 +123,12 @@ (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 - (ly:output-def-lookup bookpaper 'papersizename) + (ly:output-def-lookup paper 'papersizename) "paper")) - (landscape? (eq? #t (ly:output-def-lookup bookpaper 'landscape))) - ) + (landscape? (eq? #t (ly:output-def-lookup paper 'landscape)))) (string-append "% Generated by LilyPond " @@ -144,7 +144,7 @@ (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" "") @@ -152,7 +152,7 @@ (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 @@ -186,18 +186,18 @@ "}\\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 - (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 - (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 @@ -221,7 +221,7 @@ (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 @@ -229,10 +229,10 @@ (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) - (define-fonts bookpaper) + (define-fonts paper) (header-end))) (for-each @@ -242,17 +242,17 @@ (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 - (header bookpaper (length lines) #f) + (header paper (length lines) #f) "\\def\\lilypondclassic{1}%\n" (output-scopes scopes fields basename) - (define-fonts bookpaper) + (define-fonts paper) (header-end))) (dump-line outputter (car lines) #t) @@ -261,7 +261,7 @@ (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") @@ -272,7 +272,7 @@ (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 diff --git a/scm/fret-diagrams.scm b/scm/fret-diagrams.scm index 82a7ffdea6..d3e5edb0cd 100644 --- 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)))))) -(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)))) - (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}." - (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 @@ -121,7 +121,7 @@ with magnification @varr{mag} of the string @var{text}." 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)) @@ -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)))) -(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)) @@ -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) - (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) @@ -199,7 +199,7 @@ with magnification @varr{mag} of the string @var{text}." 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 @@ -207,11 +207,11 @@ with magnification @varr{mag} of the string @var{text}." (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)))) -(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))) @@ -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 - (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 - (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) @@ -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)))) -(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)) @@ -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 - (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 )))) @@ -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)))) -(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)) @@ -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 - (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))) -(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} @@ -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 " - (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 @@ -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 - (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 @@ -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) - (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 - (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 - (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 - (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 - (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)) -(def-markup-command (fret-diagram paper props definition-string) +(def-markup-command (fret-diagram layout props definition-string) (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))) - (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: @@ -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))))))) -(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. @@ -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))) - (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: diff --git a/scm/lily.scm b/scm/lily.scm index 6dbdbc02b6..5bfa942cfd 100644 --- 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)) - (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)) - (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)) - (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))) diff --git a/scm/new-markup.scm b/scm/new-markup.scm index 6eb87cf7ae..d9cabccea2 100644 --- 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. - (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...) @@ -51,7 +51,7 @@ register COMMAND-markup and its signature, * 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: diff --git a/scm/output-lib.scm b/scm/output-lib.scm index 48bca468d9..1128d68b6e 100644 --- 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))) - (paper (ly:grob-paper grob)) + (layout (ly:grob-layout grob)) (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)) diff --git a/scm/output-ps.scm b/scm/output-ps.scm index 1615102f6c..5db157f282 100644 --- 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) - (let ((prefix "lilypondpaper")) + (let ((prefix "lilypondlayout")) (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 9875a1938c..6f6ee224b1 100644 --- a/scm/output-sodipodi.scm +++ b/scm/output-sodipodi.scm @@ -243,7 +243,7 @@ (define (comment s) (string-append "\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) @@ -288,7 +288,7 @@ (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) @@ -297,12 +297,12 @@ ;; 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 -(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) diff --git a/scm/page-layout.scm b/scm/page-layout.scm index d988a9f2bc..90a02c838c 100644 --- a/scm/page-layout.scm +++ b/scm/page-layout.scm @@ -35,12 +35,12 @@ ;; TODO: take 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." - (let* ((props (page-properties paper)) + (let* ((props (page-properties layout)) (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)) @@ -50,19 +50,19 @@ (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. -(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* - ((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)) @@ -71,7 +71,7 @@ (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 ))) @@ -80,21 +80,21 @@ (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)) -(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* - ((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) - (header-proc paper scopes number last?) + (header-proc layout scopes number last?) #f))) (if (and (number? sep) (ly:stencil? head-stencil)) @@ -105,14 +105,14 @@ 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* - ((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) @@ -123,35 +123,35 @@ (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* - ((topmargin (ly:output-def-lookup paper 'topmargin)) + ((topmargin (ly:output-def-lookup layout 'topmargin)) ;; 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 - (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 - (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)) - (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) @@ -214,15 +214,15 @@ of lines. " (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 - ((p (ly:output-def-lookup bookpaper 'page-music-height))) + ((p (ly:output-def-lookup paper 'page-music-height))) (if (procedure? p) - (p bookpaper scopes page-number last?) + (p paper scopes page-number last?) 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)))) - (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)) @@ -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 - (ly:output-def-lookup bookpaper 'betweensystemspace)) + (ly:output-def-lookup paper 'betweensystemspace)) (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)))) )) - (fixed-dist (ly:output-def-lookup bookpaper 'betweensystempadding)) + (fixed-dist (ly:output-def-lookup paper 'betweensystempadding)) (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?) - (ly:output-def-lookup bookpaper 'betweentitlespace)) + (ly:output-def-lookup paper 'betweentitlespace)) (title1? - (ly:output-def-lookup bookpaper 'aftertitlespace)) + (ly:output-def-lookup paper 'aftertitlespace)) (title2? - (ly:output-def-lookup bookpaper 'beforetitlespace)) + (ly:output-def-lookup paper 'beforetitlespace)) (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) - (ly:output-def-lookup bookpaper 'firstpagenumber) + (ly:output-def-lookup paper 'firstpagenumber) (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?)) @@ -472,10 +472,10 @@ DONE." ; 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) - bookpaper + paper scopes (node-page-number node) (eq? node best-break-node))) diff --git a/scm/paper.scm b/scm/paper.scm index 2b22dd6966..9e96e59443 100644 --- 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 ;;;; @@ -12,8 +12,8 @@ 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)) @@ -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 '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)) - (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 @@ -60,12 +58,12 @@ (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) - (paper-set-staff-size (* sz (eval 'pt new-scope))) + (layout-set-staff-size (* sz (eval 'pt new-scope))) (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))) @@ -79,7 +77,7 @@ ;; 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) @@ -101,12 +99,12 @@ (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 - ((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) @@ -117,51 +115,44 @@ (module-define! module 'papersize name) (module-define! module 'papersizename name) (if landscape? - (module-define! module 'landscape #t)) - ) + (module-define! module 'landscape #t))) (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 - (ly:output-def-scope (eval '$defaultbookpaper (current-module))) + (ly:output-def-scope (eval '$defaultpaper (current-module))) name - (memq 'landscape rest) - )) + (memq 'landscape 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 - (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) - (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)) - ;; 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) - - new-pap - )) + + new-pap)) diff --git a/scm/safe-lily.scm b/scm/safe-lily.scm index 165da12841..ae751fd02f 100644 --- 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-paper + ly:grob-layout 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:paper-def? + ly:layout-def? 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 - ;;$defaultbookpaper - ;;$defaultmidi ;;$defaultpaper + ;;$defaultmidi + ;;$defaultlayout ;; 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 4a0eb67834..07bbc66417 100644 --- a/scm/titling.scm +++ b/scm/titling.scm @@ -5,14 +5,14 @@ ;;;; (c) 2004 Jan Nieuwenhuizen ;;;; Han-Wen Nienhuys -(define-public (page-properties paper) +(define-public (page-properties layout) (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. -(define-public (default-book-title paper scopes) +(define-public (default-book-title layout scopes) "Generate book title from header strings." @@ -22,10 +22,10 @@ (define (has sym) (markup? (ly:modules-lookup scopes sym))) - (let ((props (page-properties paper))) + (let ((props (page-properties layout))) (interpret-markup - paper props + layout props (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) - (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 - (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) @@ -110,9 +110,9 @@ (define (has sym) (markup? (ly:modules-lookup scopes sym))) - (let ((props (page-properties paper))) + (let ((props (page-properties layout))) (interpret-markup - paper props + layout props (make-override-markup '(baseline-skip . 4) (make-column-markup diff --git a/scm/to-xml.scm b/scm/to-xml.scm index a6b9508a6e..f991d5eed2 100644 --- a/scm/to-xml.scm +++ b/scm/to-xml.scm @@ -24,8 +24,8 @@ is then separated. - - + + " diff --git a/scripts/abc2ly.py b/scripts/abc2ly.py index 07f0df5a62..53a5f61b3f 100644 --- 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") - outf.write(" >>\n \\paper{}\n}\n") + outf.write(" >>\n \\layout{}\n}\n") 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\\paper {\n") + outf.write ("\n\t\\layout {\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 971d516130..a8163a0c5e 100644 --- a/scripts/convert-ly.py +++ b/scripts/convert-ly.py @@ -2216,6 +2216,16 @@ conversions.append (((2, 3, 18), 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 ################################ diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 502190c3c7..6373e2aa6f 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -118,13 +118,13 @@ default_ly_options = {} # AFTER = 'after' BEFORE = 'before' -BOOKPAPER = 'bookpaper' EXAMPLEINDENT = 'exampleindent' FILTER = 'filter' FRAGMENT = 'fragment' HTML = 'html' INDENT = 'indent' LATEX = 'latex' +LAYOUT = 'layout' LINEWIDTH = 'linewidth' NOFRAGMENT = 'nofragment' NOINDENT = 'noindent' @@ -205,7 +205,7 @@ ly_options = { NOTES: { RELATIVE: r'''\relative c%(relative_quotes)s''', }, - BOOKPAPER: { + PAPER: { INDENT : r''' indent = %(indent)s''', 'linewidth' : r''' @@ -221,7 +221,7 @@ ly_options = { }, ## - PAPER: { + LAYOUT: { EXAMPLEINDENT : '', NOTIME : r''' @@ -322,11 +322,11 @@ PREAMBLE_LY = r"""%%%% Generated by %(program_name)s p (ly:music-scorify m p)) )) %(preamble_string)s -\bookpaper { +\paper { #(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 = {} - override.update (default_ly_options) #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_types = [NOTES, PREAMBLE, PAPER, BOOKPAPER] + option_types = [NOTES, PREAMBLE, LAYOUT, PAPER] 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 - + 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 () @@ -1018,7 +1019,7 @@ def do_file (input_filename): % 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 () diff --git a/scripts/lilypond-latex.py b/scripts/lilypond-latex.py index 4b2fe4c2ed..6819166da1 100644 --- a/scripts/lilypond-latex.py +++ b/scripts/lilypond-latex.py @@ -118,7 +118,7 @@ option_definitions = [ #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', @@ -174,7 +174,7 @@ extra_init = { header_fields = extra_init.keys () include_path = ['.'] -paper_p = 1 +layout_p = 1 output_name = '' @@ -217,11 +217,11 @@ def run_lilypond (files, dep_prefix): ## 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 = opts + ' --no-paper' + opts = opts + ' --no-layout' 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: - 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)) @@ -618,9 +618,9 @@ for opt in options: 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'] - paper_p = 0 + layout_p = 0 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 e1ba8b8fda..b7d2d0850e 100644 --- a/scripts/mup2ly.py +++ b/scripts/mup2ly.py @@ -1101,7 +1101,7 @@ class Parser: \score { <<%s >> - \paper {} + \layout {} \midi {} } ''' % refs