[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
More patches
From: |
Mats Bengtsson |
Subject: |
More patches |
Date: |
Sat, 02 Feb 2002 00:12:47 +0100 |
During Han-Wen's tour, I've collected a number of patches
for 1.5.28. Unfortunately, I didn't have the time to send
them until 1.5.29 arrived. On the other hand, my first
patch for 1.5.28 (the font encoding supprto) wasn't
included in 1.5.29.
Anyway, here comes the patch against 1.5.28.mb1. If you
prefer, I could collect .28.mb1+mb2 to a new patch for
1.5.29.
/Mats
Generated by (address unknown),
From = lilypond-1.5.28.mb1, To = lilypond-1.5.28.mb2
usage
cd lilypond-source-dir; patch -E -p1 < lilypond-1.5.28.mb2.diff
Patches do not contain automatically generated files
or (urg) empty directories,
i.e., you should rerun autoconf, configure
diff -purN ../lilypond-1.5.28.mb1/ChangeLog ./ChangeLog
--- ../lilypond-1.5.28.mb1/ChangeLog Fri Feb 1 22:21:01 2002
+++ ./ChangeLog Fri Feb 1 23:27:10 2002
@@ -1,10 +1,30 @@
+2002-02-01 Mats Bengtsson <address@hidden>
+
+ * Documentation/user/refman.itely (Paper size): Documentation fix,
+ papersize
+
+ * lily/text-engraver.cc: Bugfix: textNonEmpty works again
+
+ * scm/grob-description.scm: \breathe: Use feta font comma by default
+
+2002-01-23 Mats Bengtsson <address@hidden>
+
+ * input/template/piano-dynamics.ly (pedal): Simplified
+
+2002-01-18 Mats Bengtsson <address@hidden>
+
+ * ly/engraver-init.ly: avoid warnings on \skip in lyrics
+
+2002-01-10 Mats Bengtsson <address@hidden>
+
+ * lilypond-mode.el (LilyPond-command-query): ignore case.
+
2002-01-09 Mats Bengtsson <address@hidden@s3.kth.se>
* lily/font-interface.cc, scm/font.scm, ly2dvi.py: Added support
for different font encodings. OT1 (default) and T1 (=Latin1) are
supported for the moment. Example in input/test/markup.ly
-
2001-12-29 Han-Wen <address@hidden>
* VERSION: 1.5.28 released
diff -purN ../lilypond-1.5.28.mb1/Documentation/user/ly2dvi.itexi
./Documentation/user/ly2dvi.itexi
--- ../lilypond-1.5.28.mb1/Documentation/user/ly2dvi.itexi Fri Feb 1
22:21:01 2002
+++ ./Documentation/user/ly2dvi.itexi Thu Jan 10 16:54:18 2002
@@ -141,11 +141,11 @@ the @code{\paper} block.
@item pagenumber
If set to @code{no}, no page numbers will be printed.
address@hidden table
@item fontenc
The font encoding, should be set identical to the @code{font-encoding}
property in the score.
address@hidden table
@unnumberedsubsec Environment variables
diff -purN ../lilypond-1.5.28.mb1/Documentation/user/refman.itely
./Documentation/user/refman.itely
--- ../lilypond-1.5.28.mb1/Documentation/user/refman.itely Fri Feb 1
22:21:01 2002
+++ ./Documentation/user/refman.itely Fri Feb 1 22:46:11 2002
@@ -1199,7 +1199,9 @@ c'4 \breathe d4
@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}
@@ -3538,19 +3540,19 @@ details, see the file @file{scm/font.scm
@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 -purN ../lilypond-1.5.28.mb1/VERSION ./VERSION
--- ../lilypond-1.5.28.mb1/VERSION Fri Feb 1 22:21:01 2002
+++ ./VERSION Thu Jan 10 16:45:42 2002
@@ -2,7 +2,7 @@ PACKAGE_NAME=LilyPond
MAJOR_VERSION=1
MINOR_VERSION=5
PATCH_LEVEL=28
-MY_PATCH_LEVEL=mb1
+MY_PATCH_LEVEL=mb2
# use the above to send patches: MY_PATCH_LEVEL is always empty for a
# released version.
diff -purN ../lilypond-1.5.28.mb1/input/regression/breathing-sign.ly
./input/regression/breathing-sign.ly
--- ../lilypond-1.5.28.mb1/input/regression/breathing-sign.ly Thu Apr 5
00:02:37 2001
+++ ./input/regression/breathing-sign.ly Fri Feb 1 22:46:11 2002
@@ -21,7 +21,11 @@ two measures all have the same distance
< \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 -purN ../lilypond-1.5.28.mb1/input/regression/non-empty-text.ly
./input/regression/non-empty-text.ly
--- ../lilypond-1.5.28.mb1/input/regression/non-empty-text.ly Thu Apr 5
00:02:38 2001
+++ ./input/regression/non-empty-text.ly Fri Feb 1 22:46:11 2002
@@ -7,11 +7,12 @@ textNonEmpty is used to respect the hori
"
}
\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 -purN ../lilypond-1.5.28.mb1/input/regression/stanza-number.ly
./input/regression/stanza-number.ly
--- ../lilypond-1.5.28.mb1/input/regression/stanza-number.ly Thu Apr 5
00:16:43 2001
+++ ./input/regression/stanza-number.ly Fri Feb 1 22:46:11 2002
@@ -7,7 +7,7 @@ texidoc = "Stanza numbers may differ for
< \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 -purN ../lilypond-1.5.28.mb1/input/template/piano-dynamics.ly
./input/template/piano-dynamics.ly
--- ../lilypond-1.5.28.mb1/input/template/piano-dynamics.ly Sun Oct 14
15:14:45 2001
+++ ./input/template/piano-dynamics.ly Wed Jan 23 10:25:02 2002
@@ -26,11 +26,7 @@ lower = \notes\relative c {
}
dynamics = \notes {
- \outputproperty #(make-type-checker 'dynamic-interface)
- #'extra-offset = #'(0 . 2.5)
s2\fff\> s4
- \outputproperty #(make-type-checker 'dynamic-interface)
- #'extra-offset = #'(0 . 2.5)
\!s\pp
}
@@ -67,6 +63,8 @@ pedal = \notes {
TextScript \override #'font-relative-size = #1
TextScript \override #'font-shape = #'italic
+ DynamicText \override #'extra-offset = #'(0 . 2.5)
+ Hairpin \override #'extra-offset = #'(0 . 2.5)
\consists "Skip_req_swallow_translator"
diff -purN ../lilypond-1.5.28.mb1/input/test/markup.ly ./input/test/markup.ly
--- ../lilypond-1.5.28.mb1/input/test/markup.ly Fri Feb 1 22:21:01 2002
+++ ./input/test/markup.ly Fri Feb 1 23:21:16 2002
@@ -30,13 +30,13 @@
g-"ÅÖÄÜÇÕ"
}
\paper{
- fontenc = "OT1"
+ fontenc = "T1"
linewidth = -1.\mm
\translator{
\ScoreContext
TextScript \override #'font-family = #'roman
TextScript \override #'font-shape = #'upright
- TextScript \override #'font-encoding = #'OT1
+ TextScript \override #'font-encoding = #'T1
TextScript \revert #'no-spacing-rods
TextScript \override #'direction = #1
}
diff -purN ../lilypond-1.5.28.mb1/lily/text-engraver.cc ./lily/text-engraver.cc
--- ../lilypond-1.5.28.mb1/lily/text-engraver.cc Sat Dec 1 15:34:56 2001
+++ ./lily/text-engraver.cc Fri Feb 1 22:46:11 2002
@@ -128,12 +128,16 @@ Text_engraver::create_grobs ()
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 -purN ../lilypond-1.5.28.mb1/lilypond-mode.el ./lilypond-mode.el
--- ../lilypond-1.5.28.mb1/lilypond-mode.el Mon Dec 17 10:11:42 2001
+++ ./lilypond-mode.el Sun Jan 6 11:39:25 2002
@@ -261,6 +261,8 @@ Must be the car of an entry in `LilyPond
;;"LilyPond"
LilyPond-command-default))
(t LilyPond-command-default)))
+
+ (completion-ignore-case t)
(answer (or LilyPond-command-force
(completing-read
diff -purN ../lilypond-1.5.28.mb1/ly/engraver-init.ly ./ly/engraver-init.ly
--- ../lilypond-1.5.28.mb1/ly/engraver-init.ly Sat Dec 29 20:30:42 2001
+++ ./ly/engraver-init.ly Fri Jan 18 10:59:31 2002
@@ -240,6 +240,7 @@ LyricsVoiceContext= \translator{
\consists "Extender_engraver"
\consists "Hyphen_engraver"
\consists "Stanza_number_engraver"
+ \consists "Skip_req_swallow_translator"
phrasingPunctuation = #".,:!?\""
}
diff -purN ../lilypond-1.5.28.mb1/scm/grob-description.scm
./scm/grob-description.scm
--- ../lilypond-1.5.28.mb1/scm/grob-description.scm Sat Dec 29 20:30:42 2001
+++ ./scm/grob-description.scm Fri Feb 1 23:01:39 2002
@@ -134,10 +134,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 break-aligned-interface))
+ (meta . ,(grob-description break-aligned-interface
text-interface font-interface))
))
(Clef . (
- More patches,
Mats Bengtsson <=