From 34e0a6d49865357a191ddec57eaf79b3e06f4ac9 Mon Sep 17 00:00:00 2001 From: Han-Wen Nienhuys Date: Sun, 20 Apr 2003 14:08:33 +0000 Subject: [PATCH] lots of updates. --- Documentation/user/internals.itely | 4 ++-- Documentation/user/introduction.itely | 4 ++-- Documentation/user/lilypond-book.itely | 2 +- Documentation/user/refman.itely | 18 ++++++++++-------- Documentation/user/tutorial.itely | 22 ++++++++++------------ VERSION | 2 +- scripts/lilypond-book.py | 2 +- 7 files changed, 27 insertions(+), 27 deletions(-) diff --git a/Documentation/user/internals.itely b/Documentation/user/internals.itely index bd00087a94..48fb358741 100644 --- a/Documentation/user/internals.itely +++ b/Documentation/user/internals.itely @@ -947,8 +947,8 @@ staves belonging together). From @TeX{}'s point of view, a system is an vertically on the baseline of the text. Between systems, @code{\interscoreline} is inserted vertically to have stretchable space. The horizontal dimension of the @code{\hbox} is given by the -@code{linewidth} parameter from LilyPond's @code{\paper} block (using the -natural line width if its value is@w{ }@minus{}1). +@code{linewidth} parameter from LilyPond's @code{\paper} block. + After the last system LilyPond emits a stronger variant of @code{\interscoreline} only if the macro @code{\lilypondpaperlastpagefill} diff --git a/Documentation/user/introduction.itely b/Documentation/user/introduction.itely index 88adc92c6d..2ff73574d7 100644 --- a/Documentation/user/introduction.itely +++ b/Documentation/user/introduction.itely @@ -118,7 +118,7 @@ the fonts were that we admired at first. #(define magfact 3.0) \score { \notes { as'2 r4 } \paper { - linewidth = -1. + raggedright = ##t \translator { \ScoreContext AccidentalPlacement \override #'right-padding = #3.0 @@ -172,7 +172,7 @@ which? c'4 e''4 e'4 b'4 | \stemDown b'4 e''4 a'4 e''4| } - \paper { linewidth = -1. } } + \paper { raggedright = ##t } } @end lilypond @cindex regular rhythms diff --git a/Documentation/user/lilypond-book.itely b/Documentation/user/lilypond-book.itely index bc96c59664..c789ada593 100644 --- a/Documentation/user/lilypond-book.itely +++ b/Documentation/user/lilypond-book.itely @@ -301,7 +301,7 @@ of the code is used. @item singleline Produce a single, naturally spaced, unjustified line -(i.e., linewidth = @minus{}1). +(i.e., @code{raggedright = ##t}). @item multiline The opposite of @code{singleline}: Justify and break lines. diff --git a/Documentation/user/refman.itely b/Documentation/user/refman.itely index fc846f99ce..a14229aa1f 100644 --- a/Documentation/user/refman.itely +++ b/Documentation/user/refman.itely @@ -805,7 +805,7 @@ measure is subdivided in 2, 2, 2 and 3. This is passed to a4. g4 } \paper { - linewidth = -1.0 + raggedright = ##t \translator { \StaffContext \consists "Measure_grouping_engraver" }}} @@ -4040,7 +4040,7 @@ Currently, the following styles are supported: ^\markup { \musicglyph #"custodes-mensural-u0" } } \paper { - linewidth = -1.0 + raggedright = ##t interscoreline = 1 \translator { \ScoreContext @@ -5178,7 +5178,7 @@ and once with exaggerated corrections. c'4 e''4 e'4 b'4 | b'4 e''4 b'4 e''4| } - \paper { linewidth = -1. } } + \paper { raggedright = ##t } } @end lilypond @cindex SpacingSpanner, overriding properties @@ -5212,7 +5212,7 @@ kneed stems. \context Staff = down { [c8 c \translator Staff=up <> c \translator Staff=down c c c] } > - \paper { linewidth = -1 } + \paper { raggedright = ##t } } @end lilypond @@ -5289,10 +5289,12 @@ This makes the following 28 measures (assuming 4/4 time) be broken every The most basic settings influencing the spacing are @code{indent} and @code{linewidth}. They are set in the @code{\paper} block. They control the indentation of the first line of music, and the lengths of -the lines. If @code{linewidth} set to a negative value, a single -unjustified line is produced. A similar effect for scores that are -longer than one line, can be produced by setting @code{raggedright} to -true in the @code{\paper} block. +the lines. + +If @code{raggedright} is set to true in the @code{\paper} +block, then the lines are justified at their natural length. This +useful for short fragments, and for checking how tight the natural +spacing is. @cindex page layout @cindex vertical spacing diff --git a/Documentation/user/tutorial.itely b/Documentation/user/tutorial.itely index d87a719db7..ceb10d1171 100644 --- a/Documentation/user/tutorial.itely +++ b/Documentation/user/tutorial.itely @@ -971,7 +971,7 @@ fragment of The Free Software Song: Join us now __ and share the soft -- ware; } } -\paper { linewidth = -1. } +\paper { raggedright = ##t } } @end lilypond @@ -1063,7 +1063,7 @@ listed here: Join us now __ and share the soft -- ware; @} @} -\paper @{ linewidth = -1. @} +\paper @{ raggedright = ##t @} @} @end example @@ -1365,7 +1365,7 @@ Opus 1. @lilypond \score { \notes { c'4 d'4 } - \paper { linewidth = -1.0 } + \paper { raggedright = ##t } } @end lilypond @flushright @@ -1390,7 +1390,7 @@ For example, consider the following file (@file{miniatures.ly}) composer = "F. Bar Baz" tagline = "small is beautiful" @} -\paper @{ linewidth = -1.0 @} +\paper @{ raggedright = ##t @} %@{ @@ -1443,18 +1443,16 @@ change @code{tagline} in the @code{\header}, as shown above. @separate @example \paper @{ - linewidth = -1.0 @} + raggedright = ##t @} @end example A paper block at top level (i.e. not in a @code{\score} block) sets the default page layout. The following @code{\score} blocks do not have @code{\paper} sections so the settings of this block are used. -The variable @code{linewidth} normally sets the length of the systems -on the page. However, a negative value has a special meaning. If -@code{linewidth} is less than 0, no line breaks are inserted into the -score, and the spacing is set to natural length: a short phrase takes -up little space, a longer phrase takes more space, all on the same line. +When @code{raggedright} is set, the spacing is set to natural length: +a short phrase takes up little space, a longer phrase takes more +space, all on the same line. @example %@{ @@ -1516,7 +1514,7 @@ will be at the left. composer = "F. Bar Baz" tagline = "small is beautiful" @} -\paper @{ linewidth = -1.0 @} +\paper @{ raggedright = ##t @} \score @{ \notes @{ c'4 d'4 @} @@ -2640,7 +2638,7 @@ example: c2 g'2 \times 2/3 { f8 e d } c'2 g4 } \paper { - linewidth = -1 + raggedright = ##t } } @end lilypond diff --git a/VERSION b/VERSION index 12789aab6d..7ec1a0131f 100644 --- a/VERSION +++ b/VERSION @@ -1,7 +1,7 @@ PACKAGE_NAME=LilyPond MAJOR_VERSION=1 MINOR_VERSION=7 -PATCH_LEVEL=16 +PATCH_LEVEL=17 MY_PATCH_LEVEL= # Use the above to send patches: MY_PATCH_LEVEL is always empty for a diff --git a/scripts/lilypond-book.py b/scripts/lilypond-book.py index 9721cbf22d..248c2905ad 100644 --- a/scripts/lilypond-book.py +++ b/scripts/lilypond-book.py @@ -664,7 +664,7 @@ def compose_full_body (body, opts): if 'singleline' in opts: if not linewidth: - linewidth = 'linewidth = -1.0' + linewidth = 'raggedright = ##t' if not indent: indent = 'indent = 0.0\mm' elif not linewidth: -- 2.39.2