Generated by (address unknown), >From = lilypond-1.4.9, To = lilypond-1.4.9.mb1 usage cd lilypond-source-dir; patch -E -p1 < lilypond-1.4.9.mb1.diff Patches do not contain automatically generated files or (urg) empty directories, i.e., you should rerun autoconf, configure diff -urN ../lilypond-1.4.9/CHANGES ./CHANGES --- ../lilypond-1.4.9/CHANGES Tue Nov 20 18:43:00 2001 +++ ./CHANGES Mon Dec 3 10:54:23 2001 @@ -1,3 +1,14 @@ +1.4.9.mb1 +========= + +* Documentation fix, papersize + +* Allow for font markup in stanza numbers. + +* Bugfix: textNonEmpty works again + +* \breathe: Use feta font comma by default + 1.4.8.moh2 ========== diff -urN ../lilypond-1.4.9/Documentation/user/refman.itely ./Documentation/user/refman.itely --- ../lilypond-1.4.9/Documentation/user/refman.itely Sun Nov 18 01:08:52 2001 +++ ./Documentation/user/refman.itely Mon Dec 3 10:54:11 2001 @@ -1178,7 +1178,9 @@ @refbugs - Currently, only tick marks are supported, not comma style breath marks. + The current layout of the default comma style breath marks + could be improved and more optional symbols should be added to the + font. @c . {Tempo} @@ -3466,19 +3468,19 @@ @cindex @code{papersize} To change the paper size, you must first set the address@hidden variable at top level. Set it to address@hidden paper variable variable. Set it to the strings @code{a4}, @code{letter}, or @code{legal}. After this specification, you must set the font as described above. If you want the default font, then use the 20 point font. @example - papersize = "a4" + \paper{papersize = "a4"} \include "paper16.ly" @end example The file @code{paper16.ly} will now include a file named @file{a4.ly}, which will set the paper variables @code{hsize} and @code{vsize} (used by address@hidden) +Lilypond and @code{ly2dvi}) @c . {Line break} @node Line break diff -urN ../lilypond-1.4.9/VERSION ./VERSION --- ../lilypond-1.4.9/VERSION Tue Nov 20 19:22:50 2001 +++ ./VERSION Fri Nov 30 15:25:58 2001 @@ -2,7 +2,7 @@ MAJOR_VERSION=1 MINOR_VERSION=4 PATCH_LEVEL=9 -MY_PATCH_LEVEL= +MY_PATCH_LEVEL=mb1 # use the above to send patches: MY_PATCH_LEVEL is always empty for a # released version. diff -urN ../lilypond-1.4.9/input/regression/breathing-sign.ly ./input/regression/breathing-sign.ly --- ../lilypond-1.4.9/input/regression/breathing-sign.ly Thu Apr 5 00:02:37 2001 +++ ./input/regression/breathing-sign.ly Mon Dec 3 11:10:59 2001 @@ -21,7 +21,11 @@ < \context Voice = two { \stemDown es4 \breathe bes es } \context Voice = one { \stemUp g4 as g } > | - es8 d es f g4 \breathe | +% Change to wedge: + \property Voice.BreathingSign \override #'text = #"scripts-upbow" + es8 d es f g8 \breathe f | +% Revert to old layout: + \property Voice.BreathingSign \override #'molecule-callback = #Breathing_sign::brew_molecule es8 d \breathe es f g f | es2 r4 \bar "||" } diff -urN ../lilypond-1.4.9/input/regression/non-empty-text.ly ./input/regression/non-empty-text.ly --- ../lilypond-1.4.9/input/regression/non-empty-text.ly Thu Apr 5 00:02:38 2001 +++ ./input/regression/non-empty-text.ly Mon Dec 3 10:23:31 2001 @@ -7,11 +7,12 @@ " } \score { \notes { -\property Voice.TextScript \override #'no-spacing-rods = ##f -c4_"very wide and long text" c4 +c2_"very wide and long text" c | \break +\fatText % short for \property Voice.textNonEmpty = ##t +c_"very wide and long text" c } \paper { - linewidth = -1.0 + linewidth = 3.\cm } } diff -urN ../lilypond-1.4.9/input/regression/stanza-number.ly ./input/regression/stanza-number.ly --- ../lilypond-1.4.9/input/regression/stanza-number.ly Thu Apr 5 00:16:43 2001 +++ ./input/regression/stanza-number.ly Mon Dec 3 10:15:09 2001 @@ -7,7 +7,7 @@ < \context LyricsVoice \lyrics { \property LyricsVoice . stanza = "first" -\property LyricsVoice . stz = "2nd" +\property LyricsVoice . stz = #'("2" (super "nd")) Foo1 Bar1 } \notes { c''1 \break c''1 }>} diff -urN ../lilypond-1.4.9/lily/stanza-number-engraver.cc ./lily/stanza-number-engraver.cc --- ../lilypond-1.4.9/lily/stanza-number-engraver.cc Sun Jun 10 00:17:08 2001 +++ ./lily/stanza-number-engraver.cc Mon Dec 3 10:11:19 2001 @@ -49,7 +49,7 @@ // TODO - if (gh_string_p (s)) + if (gh_string_p (s) || gh_pair_p (s)) /* diff -urN ../lilypond-1.4.9/lily/text-engraver.cc ./lily/text-engraver.cc --- ../lilypond-1.4.9/lily/text-engraver.cc Wed Nov 14 22:24:20 2001 +++ ./lily/text-engraver.cc Mon Dec 3 10:11:57 2001 @@ -128,12 +128,16 @@ text->set_grob_property ("text", r->get_mus_property ("text")); SCM nonempty = get_property ("textNonEmpty"); - if (to_boolean (nonempty)) - /* - empty text: signal that no rods should be applied. - */ - text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); - + if (gh_boolean_p (nonempty)) + if (gh_scm2bool (nonempty)) + /* + empty text: signal that no rods should be applied. + Default nowadays. + */ + text->set_grob_property ("no-spacing-rods" , SCM_BOOL_F); + else + text->set_grob_property ("no-spacing-rods" , SCM_BOOL_T); + announce_grob (text, r); texts_.push (text); } diff -urN ../lilypond-1.4.9/scm/grob-description.scm ./scm/grob-description.scm --- ../lilypond-1.4.9/scm/grob-description.scm Sun Nov 18 17:51:04 2001 +++ ./scm/grob-description.scm Mon Dec 3 11:14:13 2001 @@ -115,10 +115,13 @@ (BreathingSign . ( (break-align-symbol . Breathing_sign) (breakable . #t ) - (molecule-callback . ,Breathing_sign::brew_molecule) + (molecule-callback . ,Text_item::brew_molecule) + (lookup . name) + (font-family . music) + (text . "scripts-rcomma") (Y-offset-callbacks . (,Breathing_sign::offset_callback)) (visibility-lambda . ,begin-of-line-invisible) - (meta . ,(grob-description "BreathingSign" break-aligned-interface)) + (meta . ,(grob-description "BreathingSign" break-aligned-interface text-interface font-interface)) )) (Clef . ( diff -urN ../lilypond-1.4.9/scm/translator-property-description.scm ./scm/translator-property-description.scm --- ../lilypond-1.4.9/scm/translator-property-description.scm Fri May 4 01:31:43 2001 +++ ./scm/translator-property-description.scm Mon Dec 3 10:18:21 2001 @@ -291,7 +291,7 @@ (translator-property-description 'squashedPosition integer? " Vertical position of squashing for Pitch_squash_engraver.") (translator-property-description 'staffsFound list? "list of all staff-symbols found.") -(translator-property-description 'stanza string? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.") +(translator-property-description 'stanza markup? "Stanza `number' to print at start of a verse. Use in LyricsVoice context.") (translator-property-description 'stemLeftBeamCount integer? " @@ -300,7 +300,7 @@ is erased. .") (translator-property-description 'stemRightBeamCount integer? "idem, for the right side.") -(translator-property-description 'stz string? "Abbreviated form for a stanza, see also Stanza property.") +(translator-property-description 'stz markup? "Abbreviated form for a stanza, see also Stanza property.") (translator-property-description 'textNonEmpty boolean? " If set to true then text placed above or below the staff is not assumed to have zero width. @code{\fatText} and @code{\emptyText} are predefined